fix: also send operationName to server (#67)

* fix: also send operationName to server * add changeset
n1ru4l · Sep 7, 2020 · bb822cd · bb822cd
1 parent dd99745
commit bb822cd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/.changeset/cool-bananas-perform.md b/.changeset/cool-bananas-perform.md
@@ -0,0 +1,6 @@
+---
+"@n1ru4l/socket-io-graphql-client": minor
+"@n1ru4l/socket-io-graphql-server": minor
+---
+
+The client now also sends the operationName to the server if provided. The `operationName` is now also optional.
diff --git a/packages/socket-io-graphql-client/src/createSocketIOGraphQLClient.ts b/packages/socket-io-graphql-client/src/createSocketIOGraphQLClient.ts
@@ -23,7 +23,7 @@ type Observable<T> = {
 
 type Parameter = {
   operation: string;
-  operationName: string;
+  operationName?: string | null;
   variables?: { [key: string]: any };
 };
 
@@ -57,7 +57,7 @@ export const createSocketIOGraphQLClient = (
   };
 
   const onReconnect = () => {
-    Array.from(operations.values()).forEach(record => {
+    Array.from(operations.values()).forEach((record) => {
       record.execute();
     });
   };
@@ -70,7 +70,7 @@ export const createSocketIOGraphQLClient = (
     socket.off("reconnect", onReconnect);
   };
 
-  const execute = ({ operation, variables }: Parameter) => {
+  const execute = ({ operation, variables, operationName }: Parameter) => {
     const operationId = currentOperationId;
     currentOperationId = currentOperationId + 1;
 
@@ -88,11 +88,12 @@ export const createSocketIOGraphQLClient = (
           execute: () => {
             socket.emit("@graphql/execute", {
               id: operationId,
+              operationName,
               operation,
-              variables
+              variables,
             });
           },
-          sink
+          sink,
         };
 
         operations.set(operationId, record);
@@ -102,16 +103,16 @@ export const createSocketIOGraphQLClient = (
           unsubscribe: () => {
             operations.delete(operationId);
             socket.emit("@graphql/unsubscribe", {
-              id: operationId
+              id: operationId,
             });
-          }
+          },
         };
-      }
+      },
     } as Observable<any>;
   };
 
   return {
     execute,
-    destroy
+    destroy,
   };
 };
diff --git a/packages/socket-io-graphql-server/src/registerSocketIOGraphQLServer.ts b/packages/socket-io-graphql-server/src/registerSocketIOGraphQLServer.ts
@@ -76,7 +76,7 @@ const decodeMessage = (message: unknown): MessagePayload | Error => {
     }
     const maybeOperationName: unknown = (message as any).operationName ?? null;
     if (maybeOperationName === null || typeof maybeOperationName === "string") {
-      operationName = maybeOperationName ?? null;
+      operationName = maybeOperationName;
     } else {
       return new Error(
         "Invalid message format. Field 'operationName' is invalid."