Homestead/HomesteadGateway
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

quality of life, updated config structure

Browse Source
This commit is contained in:
Overlord
2025-12-08 06:57:54 +01:00
parent 8f75e6491f
commit 786b217f05
6 changed files with 77 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
ws/websocket.go
View File

@@ -17,18 +17,12 @@ import (
func NewWebsocketGateway(cfg config.GatewayConfig, logger *slog.Logger, closefn func() error) *WebsocketGateway {
return &WebsocketGateway{
logger: logger,
closeFn: closefn,
port: cfg.HttpPort,
apiKey: cfg.Websocket,
registry: NewRegistry(32),
upgrader: websocket.Upgrader{
ReadBufferSize: 1024,
WriteBufferSize: 1024,
CheckOrigin: func(r *http.Request) bool {
return true // local by default; change for production
},
},
logger: logger,
closeFn: closefn,
port: cfg.HttpPort,
apiKey: cfg.Websocket,
upgrader: NewUpgrader(),
registry: NewRegistry(cfg.QueueSize),
bodySizeBytes: int64(cfg.BodySize) * 1024 * 1024,
}
}
@@ -47,7 +41,7 @@ func (wsg *WebsocketGateway) Serve(ctx context.Context, listenAddr string) error
srv := &http.Server{
Addr: listenAddr,
Handler: loggingMiddleware(wsg.logger, mux),
Handler: wsg.loggingMiddleware(mux),
BaseContext: func(l net.Listener) context.Context { return ctx },
}
errCh := make(chan error, 1)
@@ -65,121 +59,6 @@ func (wsg *WebsocketGateway) Serve(ctx context.Context, listenAddr string) error
//
//func (wsg *WebsocketGateway) modReadLoop(conn *websocket.Conn, meta cache.ConnectionMetaData) {
// defer func() {
// wsg.unregisterConn(conn, meta, "mod")
// wsg.logger.Info("Client disconnected.", "remote", conn.RemoteAddr().String(), "server_id", meta.ID)
// }()
//
// ticker := time.NewTicker(30 * time.Second)
// defer ticker.Stop()
//
// go func() {
// for range ticker.C {
// wsg.sendWebsocketPing(conn)
// }
// }()
//
// for {
// typ, data, err := conn.ReadMessage()
//
// if err != nil {
// if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseNormalClosure) {
// wsg.logger.Warn("Mod-Client unexpectedly closed the connection.", "err", err)
// }
// return
// }
//
// if typ != websocket.TextMessage && typ != websocket.BinaryMessage {
// continue
// }
//
// var msg GatewayModMessageIn
// if err := json.Unmarshal(data, &msg); err != nil {
// _ = writeJSONSafe(conn, map[string]string{"error": "invalid json: " + err.Error()})
// wsg.logger.Warn("invalid json from mod", "server_id", meta.ID, "remote", conn.RemoteAddr().String(), "err", err)
// continue
// }
//
// msg.ReceivedAt = time.Now().UTC()
// if err := msg.Validate(); err != nil {
// _ = writeJSONSafe(conn, map[string]string{"error": err.Error()})
// wsg.logger.Warn("mod message validation failed", "server_id", meta.ID, "remote", conn.RemoteAddr().String(), "err", err)
// continue
// }
//
// // Handle the message (forward to bot, enrich, etc.)
// if err := wsg.modHandler.Handle(conn, msg); err != nil {
// _ = writeJSONSafe(conn, map[string]string{"error": "handler error: " + err.Error()})
// wsg.logger.Error("mod handler error", "server_id", meta.ID, "err", err)
// continue
// }
//
// _ = writeJSONSafe(conn, map[string]string{"status": "completed"}) // or "queued"
// }
//}
//
//func (wsg *WebsocketGateway) botReadLoop(conn *websocket.Conn, meta cache.ConnectionMetaData) {
// defer func() {
// wsg.unregisterConn(conn, meta, "bot")
// wsg.logger.Info("bot disconnected", "bot_id", meta.ID, "remote", conn.RemoteAddr().String())
// }()
//
// pingTicker := time.NewTicker(30 * time.Second)
// defer pingTicker.Stop()
//
// // Send pings in a separate goroutine
// go func() {
// for range pingTicker.C {
// _ = conn.SetWriteDeadline(time.Now().Add(5 * time.Second))
// if err := conn.WriteMessage(websocket.PingMessage, nil); err != nil {
// wsg.logger.Debug("write ping failed", "bot_id", meta.ID, "err", err)
// return
// }
// wsg.logger.Debug("sent ping to bot", "bot_id", meta.ID)
// }
// }()
//
// for {
// typ, data, err := conn.ReadMessage()
// if err != nil {
// if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseNormalClosure) {
// wsg.logger.Warn("unexpected bot close", "bot_id", meta.ID, "err", err)
// } else {
// wsg.logger.Debug("bot read error", "bot_id", meta.ID, "err", err)
// }
// return
// }
//
// if typ != websocket.TextMessage && typ != websocket.BinaryMessage {
// continue
// }
//
// var msg GatewayBotMessageIn
// if err := json.Unmarshal(data, &msg); err != nil {
// _ = writeJSONSafe(conn, map[string]string{"error": "invalid json: " + err.Error()})
// wsg.logger.Warn("invalid json from bot", "bot_id", meta.ID, "remote", conn.RemoteAddr().String(), "err", err)
// continue
// }
//
// msg.ReceivedAt = time.Now().UTC()
// if err := msg.Validate(); err != nil {
// _ = writeJSONSafe(conn, map[string]string{"error": err.Error()})
// wsg.logger.Warn("bot message validation failed", "bot_id", meta.ID, "remote", conn.RemoteAddr().String(), "err", err)
// continue
// }
//
// // Handle the message (forward to mod, enrich, etc.)
// if err := wsg.botHandler.Handle(conn, msg); err != nil {
// _ = writeJSONSafe(conn, map[string]string{"error": "handler error: " + err.Error()})
// wsg.logger.Error("bot handler error", "bot_id", meta.ID, "err", err)
// continue
// }
//
// _ = writeJSONSafe(conn, map[string]string{"status": "ok"})
// }
//}
func (wsg *WebsocketGateway) read(conn *websocket.Conn, _type, channelId string) {
defer func() {
wsg.unregisterConn(_type, channelId)