pkg/wrap: move to btwiuse/wsconn

.mods

@@ -16,5 +16,4 @@ k0s.io/pkg/simple
 k0s.io/pkg/tunnel
 k0s.io/pkg/ui
 k0s.io/pkg/utils
-k0s.io/pkg/wrap
 k0s.io/third_party

go.work

@@ -19,7 +19,6 @@ use (
  ./pkg/tunnel
  ./pkg/ui
  ./pkg/utils
- ./pkg/wrap
  ./third_party
 )
 
@@ -42,6 +41,5 @@ replace (
  k0s.io/pkg/tunnel v0.1.15 => ./pkg/tunnel/
  k0s.io/pkg/ui v0.1.15 => ./pkg/ui/
  k0s.io/pkg/utils v0.1.15 => ./pkg/utils/
- k0s.io/pkg/wrap v0.1.15 => ./pkg/wrap/
  k0s.io/third_party v0.1.15 => ./third_party/
 )

go_repos.bzl

@@ -977,6 +977,14 @@ def go_repositories():
  sum = "h1:MSMG+C1wR+bgG5xB2TRZK+5yxYiOmGwe44c/3gpaGT0=",
  version = "v0.0.36",
  )
+ go_repository(
+ name = "com_github_btwiuse_wsconn",
+ build_file_generation = "on",
+ build_file_proto_mode = "disable",
+ importpath = "github.com/btwiuse/wsconn",
+ sum = "h1:rg91k9EygX1K5XErlo6mIkyD0cdtaG7FhdPAUKMBKEc=",
+ version = "v0.0.0",
+ )
  go_repository(
  name = "com_github_buger_jsonparser",
  build_file_generation = "on",
@@ -10081,6 +10089,14 @@ def go_repositories():
  sum = "h1:cZhhbV8+DE0Y1kotwhr1a3RC3kFO7AtuZ4GLr3qKSc8=",
  version = "v1.0.2",
  )
+ go_repository(
+ name = "io_k0s_pkg_wrap",
+ build_file_generation = "on",
+ build_file_proto_mode = "disable",
+ importpath = "k0s.io/pkg/wrap",
+ sum = "h1:n6nfxU+72QfHR1COxNts2xaJa0jv5BMO2prrt9wMgNg=",
+ version = "v0.1.15",
+ )
  go_repository(
  name = "io_k8s_api",
  build_file_generation = "on",

pkg/dial/dial_gorilla.go

@@ -9,7 +9,7 @@ import (
  "net/url"
 
  "github.com/gorilla/websocket"
- "k0s.io/pkg/wrap"
+ "github.com/btwiuse/wsconn"
 )
 
 func Dial(u *url.URL) (conn net.Conn, err error) {
@@ -26,5 +26,5 @@ func Dial(u *url.URL) (conn net.Conn, err error) {
  return nil, err
  }
 
- return wrap.NetConn(wsconn), nil
+ return wsconn.NetConn(wsconn), nil
 }

pkg/dial/go.mod

@@ -3,12 +3,9 @@ module k0s.io/pkg/dial
 go 1.22.1
 
 require (
+ github.com/btwiuse/wsconn v0.0.0
  github.com/gorilla/websocket v1.5.1
- k0s.io/pkg/wrap v0.1.15
  nhooyr.io/websocket v1.8.10
 )
 
-require (
- golang.org/x/net v0.21.0 // indirect
- k0s.io v0.1.15 // indirect
-)
+require golang.org/x/net v0.21.0 // indirect

pkg/hub/go.mod

@@ -9,6 +9,7 @@ require (
  github.com/btwiuse/sse v0.0.1
  github.com/btwiuse/version v0.0.0
  github.com/btwiuse/wetty v0.0.36
+ github.com/btwiuse/wsconn v0.0.0
  github.com/gorilla/mux v1.8.1
  github.com/jpillora/go-echo-server v0.5.0
  k0s.io v0.1.15
@@ -17,7 +18,6 @@ require (
  k0s.io/pkg/middleware v0.1.15
  k0s.io/pkg/ui v0.1.15
  k0s.io/pkg/utils v0.1.15
- k0s.io/pkg/wrap v0.1.15
  modernc.org/httpfs v1.0.6
  nhooyr.io/websocket v1.8.10
 )
@@ -67,5 +67,6 @@ require (
  k0s.io/pkg/asciitransport v0.1.15 // indirect
  k0s.io/pkg/dial v0.1.15 // indirect
  k0s.io/pkg/distro v0.1.15 // indirect
+ k0s.io/pkg/wrap v0.1.15 // indirect
  k8s.io/apimachinery v0.29.1 // indirect
 )

pkg/hub/server/BUILD.bazel

@@ -21,11 +21,11 @@ go_library(
  "//pkg/manager:go_default_library",
  "//pkg/middleware:go_default_library",
  "//pkg/ui:go_default_library",
- "//pkg/wrap:go_default_library",
  "@com_github_btwiuse_pretty//:go_default_library",
  "@com_github_btwiuse_rng//:go_default_library",
  "@com_github_btwiuse_sse//:go_default_library",
  "@com_github_btwiuse_wetty//pkg/assets:go_default_library",
+ "@com_github_btwiuse_wsconn//:go_default_library",
  "@com_github_gorilla_mux//:go_default_library",
  "@com_github_jpillora_go_echo_server//handler:go_default_library",
  "@io_nhooyr_websocket//:go_default_library",

pkg/hub/server/relays.go

@@ -13,7 +13,7 @@ import (
  "k0s.io"
  "k0s.io/pkg/api"
  "k0s.io/pkg/hub"
- "k0s.io/pkg/wrap"
+ "github.com/btwiuse/wsconn"
  "nhooyr.io/websocket"
 )
 
@@ -74,7 +74,7 @@ func fsRelay(ag hub.Agent) http.HandlerFunc {
  return
  }
 
- conn, err := wrap.Hijack(w)
+ conn, err := wsconn.Hijack(w)
  if err != nil {
  log.Println(err)
  return
@@ -106,7 +106,7 @@ func versionRelay(ag hub.Agent) http.HandlerFunc {
  return
  }
 
- conn, err := wrap.Hijack(w)
+ conn, err := wsconn.Hijack(w)
  if err != nil {
  log.Println(err)
  return
@@ -138,7 +138,7 @@ func dohRelay(ag hub.Agent) http.HandlerFunc {
  return
  }
 
- conn, err := wrap.Hijack(w)
+ conn, err := wsconn.Hijack(w)
  if err != nil {
  log.Println(err)
  return
@@ -217,7 +217,7 @@ func envRelay(ag hub.Agent) http.HandlerFunc {
  return
  }
 
- conn, err := wrap.Hijack(w)
+ conn, err := wsconn.Hijack(w)
  if err != nil {
  log.Println(err)
  return

pkg/hub/server/req2conn.go

@@ -5,7 +5,7 @@ import (
  "net"
  "net/http"
 
- "k0s.io/pkg/wrap"
+ "github.com/btwiuse/wsconn"
 )
 
 var (
@@ -21,7 +21,7 @@ type lys struct {
 
 func (l *lys) ServeHTTP(w http.ResponseWriter, r *http.Request) {
  // log.Println(r.Header)
- conn, err := wrap.Wrconn(w, r)
+ conn, err := wsconn.Wrconn(w, r)
  if err != nil {
  log.Println("error ws accept:", err)
  return
@@ -34,8 +34,8 @@ func (l *lys) ServeHTTP(w http.ResponseWriter, r *http.Request) {
  }
  network := conn.RemoteAddr().Network()
  hostport := forwardIP + ":" + forwardPort
- addr := wrap.NewAddr(network, hostport)
- conn = wrap.ConnWithAddr(conn, addr)
+ addr := wsconn.NewAddr(network, hostport)
+ conn = wsconn.ConnWithAddr(conn, addr)
  }
 
  l.conns <- conn

pkg/hub/server/routes.go

@@ -20,7 +20,7 @@ import (
  "k0s.io/pkg/log"
  "k0s.io/pkg/middleware"
  "k0s.io/pkg/ui"
- "k0s.io/pkg/wrap"
+ "github.com/btwiuse/wsconn"
  "modernc.org/httpfs"
 )
 
@@ -259,7 +259,7 @@ func (h *hubServer) handleTunnel(tun api.Tunnel) func(w http.ResponseWriter, r *
  return
  }
 
- conn, err := wrap.Wrconn(w, r)
+ conn, err := wsconn.Wrconn(w, r)
  if err != nil {
  log.Printf("error accepting %s: %s\n", tun, err)
  return

pkg/tunnel/BUILD.bazel

@@ -8,5 +8,5 @@ go_library(
  ],
  importpath = "k0s.io/pkg/tunnel",
  visibility = ["//visibility:public"],
- deps = ["//pkg/wrap:go_default_library"],
+ deps = ["@com_github_btwiuse_wsconn//:go_default_library"],
 )

pkg/tunnel/go.mod

@@ -3,9 +3,9 @@ module k0s.io/pkg/tunnel
 go 1.22.1
 
 require (
+ github.com/btwiuse/wsconn v0.0.0
  k0s.io v0.1.15
  k0s.io/pkg/middleware v0.1.15
- k0s.io/pkg/wrap v0.1.15
  nhooyr.io/websocket v1.8.10
 )
 

pkg/tunnel/handler/BUILD.bazel

@@ -9,6 +9,6 @@ go_library(
  "//pkg/log:go_default_library",
  "//pkg/middleware:go_default_library",
  "//pkg/tunnel:go_default_library",
- "//pkg/wrap:go_default_library",
+ "@com_github_btwiuse_wsconn//:go_default_library",
  ],
 )

pkg/tunnel/handler/handler.go

@@ -19,7 +19,7 @@ import (
  "k0s.io/pkg/log"
  "k0s.io/pkg/middleware"
  portless "k0s.io/pkg/tunnel"
- "k0s.io/pkg/wrap"
+ "github.com/btwiuse/wsconn"
 )
 
 func Handler(prefix string) http.Handler {
@@ -97,7 +97,7 @@ func setupTunnel(next http.Handler) http.Handler {
  pattern := r.URL.Path
  from := r.URL.Query().Get("from")
  switch _, ok := defaultTunnelMux.Tunnels[fp]; {
- // passthrough regular request to wrapped handler
+ // passthrough regular request to wsconnped handler
  case fp == "":
  next.ServeHTTP(w, r)
  // new stream identifier, create new tunnel
@@ -205,7 +205,7 @@ func (mux *tunnelMux) ServeHTTP(w http.ResponseWriter, r *http.Request) {
  return
  }
 
- connDst, err := wrap.Wrconn(w, r)
+ connDst, err := wsconn.Wrconn(w, r)
  if err != nil {
  log.Println(err)
  return

pkg/tunnel/tunnel.go

@@ -7,7 +7,7 @@ import (
  "net/http"
  "sync"
 
- "k0s.io/pkg/wrap"
+ "github.com/btwiuse/wsconn"
 )
 
 func NewTunnel() *Tunnel {
@@ -59,7 +59,7 @@ func (t *Tunnel) String() string {
 var _ http.Handler = (*Tunnel)(nil)
 
 func (t *Tunnel) ServeHTTP(w http.ResponseWriter, r *http.Request) {
- conn, err := wrap.Wrconn(w, r)
+ conn, err := wsconn.Wrconn(w, r)
  if err != nil {
  log.Println(err)
  return