From 9b881801d8535df4cd0795c2183fbd13538919f3 Mon Sep 17 00:00:00 2001 From: fiatjaf Date: Sat, 4 Apr 2026 09:19:54 -0300 Subject: [PATCH] khatru: get rid of broken unused get-started.go helpers. --- khatru/get-started.go | 65 ------------------------------------------- khatru/relay.go | 8 ++++++ 2 files changed, 8 insertions(+), 65 deletions(-) delete mode 100644 khatru/get-started.go diff --git a/khatru/get-started.go b/khatru/get-started.go deleted file mode 100644 index f1e522c..0000000 --- a/khatru/get-started.go +++ /dev/null @@ -1,65 +0,0 @@ -package khatru - -import ( - "context" - "net" - "net/http" - "strconv" - "time" - - "github.com/fasthttp/websocket" - "github.com/rs/cors" -) - -func (rl *Relay) Router() *http.ServeMux { - return rl.serveMux -} - -func (rl *Relay) SetRouter(mux *http.ServeMux) { - rl.serveMux = mux -} - -// Start creates an http server and starts listening on given host and port. -func (rl *Relay) Start(host string, port int, started ...chan bool) error { - addr := net.JoinHostPort(host, strconv.Itoa(port)) - ln, err := net.Listen("tcp", addr) - if err != nil { - return err - } - - rl.Addr = ln.Addr().String() - rl.httpServer = &http.Server{ - Handler: cors.Default().Handler(rl), - Addr: addr, - WriteTimeout: 2 * time.Second, - ReadTimeout: 2 * time.Second, - IdleTimeout: 30 * time.Second, - } - - // notify caller that we're starting - for _, started := range started { - close(started) - } - - if err := rl.httpServer.Serve(ln); err == http.ErrServerClosed { - return nil - } else if err != nil { - return err - } else { - return nil - } -} - -// Shutdown sends a websocket close control message to all connected clients. -func (rl *Relay) Shutdown(ctx context.Context) { - rl.httpServer.Shutdown(ctx) - rl.clientsMutex.Lock() - defer rl.clientsMutex.Unlock() - for ws := range rl.clients { - ws.conn.WriteControl(websocket.CloseMessage, nil, time.Now().Add(time.Second)) - ws.cancel() - ws.conn.Close() - } - clear(rl.clients) - rl.dispatcher = newDispatcher() -} diff --git a/khatru/relay.go b/khatru/relay.go index ab97ac8..7404e40 100644 --- a/khatru/relay.go +++ b/khatru/relay.go @@ -202,3 +202,11 @@ func (rl *Relay) Stats() (clients, listeners int) { return len(rl.clients), listeners } + +func (rl *Relay) Router() *http.ServeMux { + return rl.serveMux +} + +func (rl *Relay) SetRouter(mux *http.ServeMux) { + rl.serveMux = mux +}