feat: Use new panrpc TypeScript API, bump panrpc version

Signed-off-by: Felicitas Pojtinger <felicitas@pojtinger.com>
loopholelabs · Aug 15, 2024 · 334d98d · 334d98d
1 parent 977fa27
commit 334d98d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/pkg/backend/server.go b/pkg/backend/server.go
@@ -258,7 +258,7 @@ func StartServer(ctx context.Context, addr string, heartbeat time.Duration, loca
 				if err := recover(); err != nil {
 					w.WriteHeader(http.StatusInternalServerError)
 
-					log.Printf("Client disconnected with error: %v", err)
+					log.Println("Client disconnected with error:", err)
 				}
 			}()
 
@@ -288,11 +288,16 @@ func StartServer(ctx context.Context, addr string, heartbeat time.Duration, loca
 				conn := websocket.NetConn(ctx, c, websocket.MessageText)
 				defer conn.Close()
 
+				linkCtx, cancelLinkCtx := context.WithCancel(r.Context())
+				defer cancelLinkCtx()
+
 				encoder := json.NewEncoder(conn)
 				decoder := json.NewDecoder(conn)
 
 				go func() {
 					if err := registry.LinkStream(
+						linkCtx,
+
 						func(v rpc.Message[json.RawMessage]) error {
 							return encoder.Encode(v)
 						},

diff --git a/pkg/frontend/package-lock.json b/pkg/frontend/package-lock.json
diff --git a/pkg/frontend/package.json b/pkg/frontend/package.json
@@ -24,7 +24,7 @@
     "@patternfly/react-charts": "^8.0.0-alpha.20",
     "@patternfly/react-core": "^6.0.0-alpha.57",
     "@patternfly/react-icons": "^6.0.0-alpha.20",
-    "@pojntfx/panrpc": "^0.8.1",
+    "@pojntfx/panrpc": "^0.9.0",
     "@streamparser/json-whatwg": "^0.0.21",
     "papaparse": "^5.4.1",
     "react": "^18.3.1",

diff --git a/pkg/frontend/src/App.tsx b/pkg/frontend/src/App.tsx
@@ -233,6 +233,8 @@ const App = () => {
       socket.addEventListener("error", rej);
     });
 
+    const linkSignal = new AbortController();
+
     const encoder = new WritableStream({
       write(chunk) {
         socket.send(JSON.stringify(chunk));
@@ -272,9 +274,12 @@ const App = () => {
     socket.addEventListener("close", () => {
       parserReader.cancel();
       parserWriter.abort();
+      linkSignal.abort();
     });
 
     registry.linkStream(
+      linkSignal.signal,
+
       encoder,
       decoder,