fix(legacy-ws): clean websocket pointer if the connection is closed

ardatan · Jun 12, 2023 · 621d848 · 621d848
1 parent cb78224
commit 621d848
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/.changeset/fifty-games-reflect.md b/.changeset/fifty-games-reflect.md
@@ -0,0 +1,5 @@
+---
+'@graphql-tools/executor-legacy-ws': patch
+---
+
+Clean websocket pointer if the connection is closed
diff --git a/packages/executors/legacy-ws/src/index.ts b/packages/executors/legacy-ws/src/index.ts
@@ -1,4 +1,4 @@
-import { ExecutionRequest, ExecutionResult, Executor, observableToAsyncIterable, Observer } from '@graphql-tools/utils';
+import { ExecutionRequest, Executor, observableToAsyncIterable } from '@graphql-tools/utils';
 import { print } from 'graphql';
 import WebSocket from 'isomorphic-ws';
 
@@ -25,8 +25,6 @@ export function buildWSLegacyExecutor(
   WebSocketImpl: typeof WebSocket,
   options?: LegacyWSExecutorOpts
 ): Executor {
-  const observerById = new Map<string, Observer<ExecutionResult<any>>>();
-
   let websocket: WebSocket | null = null;
 
   const ensureWebsocket = () => {
@@ -54,10 +52,14 @@ export function buildWSLegacyExecutor(
         })
       );
     };
+
+    websocket.onclose = () => {
+      websocket = null;
+    };
   };
 
   const cleanupWebsocket = () => {
-    if (websocket != null && observerById.size === 0) {
+    if (websocket != null) {
       websocket.send(
         JSON.stringify({
           type: LEGACY_WS.CONNECTION_TERMINATE,
@@ -125,12 +127,14 @@ export function buildWSLegacyExecutor(
 
         return {
           unsubscribe: () => {
-            websocket?.send(
-              JSON.stringify({
-                type: LEGACY_WS.STOP,
-                id,
-              })
-            );
+            if (websocket?.readyState === WebSocket.OPEN) {
+              websocket?.send(
+                JSON.stringify({
+                  type: LEGACY_WS.STOP,
+                  id,
+                })
+              );
+            }
             cleanupWebsocket();
           },
         };