feat(overmind-graphql): allow passing existing socket for subscriptions

Author: christianalfoni

packages/node_modules/overmind-graphql/src/index.ts

@@ -38,10 +38,12 @@ type Http = {
   options?: Options;
 };
 
-type Ws = {
-  endpoint: string;
-  params?: () => { [key: string]: string | number | boolean };
-};
+type Ws =
+  | {
+      endpoint: string;
+      params?: () => { [key: string]: string | number | boolean };
+    }
+  | (() => PhoenixSocket | null);
 
 type Queries = {
   queries?: {
@@ -92,7 +94,6 @@ function createError(message: string) {
 }
 
 const _clients: { [url: string]: GraphQLClient } = {};
-const _wsClients: { [url: string]: PhoenixSocket } = {};
 const _subscriptions: {
   [query: string]: Subscription[];
 } = {};
@@ -127,20 +128,26 @@ export const graphql: <T extends Queries>(
     return null;
   }
 
+  let wsClient: PhoenixSocket | null = null;
   function getWsClient(): PhoenixSocket | null {
-    if (_ws) {
-      if (!_wsClients[_ws.endpoint]) {
-        _wsClients[_ws.endpoint] = withAbsintheSocket.create(
-          new PhoenixSocket(_ws.endpoint, {
-            params: _ws.params ? _ws.params() : undefined,
-          })
+    if (_ws && !wsClient) {
+      const socket =
+        typeof _ws === 'function'
+          ? _ws()
+          : new PhoenixSocket(_ws.endpoint, {
+              params: _ws.params ? _ws.params() : undefined,
+            });
+
+      if (!socket) {
+        throw createError(
+          'You are trying to create a Socket for subscriptions, but there is no socket or socket information provided'
         );
       }
-
-      return _wsClients[_ws.endpoint];
+      wsClient = withAbsintheSocket.create(socket);
+      return wsClient;
     }
 
-    return null;
+    return wsClient;
   }
 
   const evaluatedQueries = {
@@ -212,7 +219,11 @@ export const graphql: <T extends Queries>(
 
         subscription.dispose = () => {
           _subscriptions[queryString].forEach(sub => {
-            sub.dispose();
+            try {
+              sub.dispose();
+            } catch (e) {
+              // Ignore, it probably throws an error because we weren't subscribed in the first place
+            }
           });
           _subscriptions[queryString].length = 0;
         };
@@ -222,6 +233,11 @@ export const graphql: <T extends Queries>(
             Subscription[]
           >((subAggr, sub) => {
             if (cb(sub.variables)) {
+              try {
+                sub.dispose();
+              } catch (e) {
+                // Ignore, it probably throws an error because we weren't subscribed in the first place
+              }
               return subAggr;
             }
             return subAggr.concat(sub);