hookup websocket to api handler

pkg/server/websocket.go

@@ -1,16 +1,20 @@
 package server
 
 import (
+	"bytes"
 	"context"
+	"fmt"
 	"net/http"
+	"runtime/debug"
 	"time"
 
 	"golang.org/x/exp/slog"
 	"nhooyr.io/websocket"
-	"nhooyr.io/websocket/wsjson"
 )
 
 func HandleWebsocketAPI(w http.ResponseWriter, r *http.Request) {
+	ctx, cancel := context.WithCancel(r.Context())
+	defer cancel()
 	c, err := websocket.Accept(w, r, nil)
 	if err != nil {
 		slog.Error("Accepting Websocket Connection", err)
@@ -18,17 +22,33 @@ func HandleWebsocketAPI(w http.ResponseWriter, r *http.Request) {
 	}
 	defer c.Close(websocket.StatusInternalError, "Unexpected Closing")
 
-	ctx, cancel := context.WithTimeout(r.Context(), time.Second*10)
+	slog.Info("Accepted API Websocket Connection")
-	defer cancel()
 
-	var v interface{}
+	for {
-	err = wsjson.Read(ctx, c, &v)
+		_, m, err := c.Read(ctx)
-	if err != nil {
+		if websocket.CloseStatus(err) == websocket.StatusNormalClosure {
-		slog.Error("Reading Websocket Message", err)
+			slog.Info("API Websocket Closed Normally")
+			cancel()
 			return
+		} else if err != nil {
+			slog.Error("API Websocket Closed Unexpectedly", err)
+			cancel()
 		}
 
-	slog.Info("received websocket msg", "msg", v)
+		go func() {
+			defer func() {
+				if r := recover(); r != nil {
+					slog.Error("Recovered Panic Handling Websocket API Request", fmt.Errorf("%v", r), "stack", debug.Stack())
+					return
+				}
+			}()
+			ctx, cancel := context.WithTimeout(ctx, time.Second*10)
+			defer cancel()
 
-	c.Close(websocket.StatusNormalClosure, "")
+			err := apiHandler.HandleRequest(ctx, bytes.NewReader(m), w)
+			if err != nil {
+				slog.Error("Handling Websocket API Request", err)
+			}
+		}()
+	}
 }