@graphql-tools/executor-graphql-ws 1.3.6 → 1.3.7-alpha-3df7faeea69a8bf7e4423f5661c1cb8974232f19

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @graphql-tools/executor-graphql-ws
 
+## 1.3.7-alpha-3df7faeea69a8bf7e4423f5661c1cb8974232f19
+
+### Patch Changes
+
+- [#381](https://github.com/graphql-hive/gateway/pull/381) [`e31d79c`](https://github.com/graphql-hive/gateway/commit/e31d79c704014d5180074bdb3ce11dcd1675eb58) Thanks [@ardatan](https://github.com/ardatan)! - dependencies updates:
+
+  - Added dependency [`@graphql-tools/executor-common@workspace:^` ↗︎](https://www.npmjs.com/package/@graphql-tools/executor-common/v/workspace:^) (to `dependencies`)
+
+- [#381](https://github.com/graphql-hive/gateway/pull/381) [`73dbe3a`](https://github.com/graphql-hive/gateway/commit/73dbe3a2dabb6b84105c4dac3586696daa3d4fcb) Thanks [@ardatan](https://github.com/ardatan)! - Like HMAC Upstream Signature plugin, different components of the gateway were using different ways of serializing the execution request.
+  Some of them were ignoring `variables` if it is empty, some of not, this was causing the signature generation to be different for the same query.
+  For example, it was working as expected in Proxy mode, but not working as expected in Federation Gateway mode.
+
+  With this change, now we have a shared helper to serialize the upstream execution request with a memoized `print` function for query AST etc to have a consistent serialization so consistent signature generation for HMAC.
+
+- Updated dependencies [[`73dbe3a`](https://github.com/graphql-hive/gateway/commit/73dbe3a2dabb6b84105c4dac3586696daa3d4fcb)]:
+  - @graphql-tools/executor-common@0.0.1-alpha-3df7faeea69a8bf7e4423f5661c1cb8974232f19
+
 ## 1.3.6
 
 ### Patch Changes

package/dist/index.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
+var executorCommon = require('@graphql-tools/executor-common');
 var utils = require('@graphql-tools/utils');
 var disposablestack = require('@whatwg-node/disposablestack');
-var graphql = require('graphql');
 var graphqlWs = require('graphql-ws');
 var WebSocket = require('isomorphic-ws');
 
@@ -10,14 +10,13 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var WebSocket__default = /*#__PURE__*/_interopDefault(WebSocket);
 
-const defaultPrintFn = utils.memoize1(graphql.print);
 function isClient(client) {
   return "subscribe" in client;
 }
 function buildGraphQLWSExecutor(clientOptionsOrClient) {
   let graphqlWSClient;
   let executorConnectionParams = {};
-  let printFn = defaultPrintFn;
+  let printFn = executorCommon.defaultPrintFn;
   if (isClient(clientOptionsOrClient)) {
     graphqlWSClient = clientOptionsOrClient;
   } else {
@@ -46,9 +45,6 @@ function buildGraphQLWSExecutor(clientOptionsOrClient) {
   }
   const executor = function GraphQLWSExecutor(executionRequest) {
     const {
-      document,
-      variables,
-      operationName,
       extensions,
       operationType = utils.getOperationASTFromRequest(executionRequest).operation,
       info,
@@ -60,13 +56,9 @@ function buildGraphQLWSExecutor(clientOptionsOrClient) {
         extensions["connectionParams"]
       );
     }
-    const query = printFn(document);
-    const iterableIterator = graphqlWSClient.iterate({
-      query,
-      variables,
-      operationName,
-      extensions
-    });
+    const iterableIterator = graphqlWSClient.iterate(
+      executorCommon.serializeExecutionRequest({ executionRequest, printFn })
+    );
     if (iterableIterator.return && signal) {
       utils.registerAbortSignalListener(signal, () => {
         iterableIterator.return?.();

package/dist/index.js

@@ -1,10 +1,9 @@
-import { memoize1, getOperationASTFromRequest, registerAbortSignalListener } from '@graphql-tools/utils';
+import { serializeExecutionRequest, defaultPrintFn } from '@graphql-tools/executor-common';
+import { getOperationASTFromRequest, registerAbortSignalListener } from '@graphql-tools/utils';
 import { DisposableSymbols } from '@whatwg-node/disposablestack';
-import { print } from 'graphql';
 import { createClient } from 'graphql-ws';
 import WebSocket from 'isomorphic-ws';
 
-const defaultPrintFn = memoize1(print);
 function isClient(client) {
   return "subscribe" in client;
 }
@@ -40,9 +39,6 @@ function buildGraphQLWSExecutor(clientOptionsOrClient) {
   }
   const executor = function GraphQLWSExecutor(executionRequest) {
     const {
-      document,
-      variables,
-      operationName,
       extensions,
       operationType = getOperationASTFromRequest(executionRequest).operation,
       info,
@@ -54,13 +50,9 @@ function buildGraphQLWSExecutor(clientOptionsOrClient) {
         extensions["connectionParams"]
       );
     }
-    const query = printFn(document);
-    const iterableIterator = graphqlWSClient.iterate({
-      query,
-      variables,
-      operationName,
-      extensions
-    });
+    const iterableIterator = graphqlWSClient.iterate(
+      serializeExecutionRequest({ executionRequest, printFn })
+    );
     if (iterableIterator.return && signal) {
       registerAbortSignalListener(signal, () => {
         iterableIterator.return?.();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/executor-graphql-ws",
-  "version": "1.3.6",
+  "version": "1.3.7-alpha-3df7faeea69a8bf7e4423f5661c1cb8974232f19",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
@@ -39,6 +39,7 @@
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
+    "@graphql-tools/executor-common": "0.0.1-alpha-3df7faeea69a8bf7e4423f5661c1cb8974232f19",
     "@graphql-tools/utils": "^10.7.0",
     "@whatwg-node/disposablestack": "^0.0.5",
     "graphql-ws": "^5.14.0",