@graphql-tools/executor-http 3.5.0 → 3.5.1-rc-f7596fdf71c1b2144a3964ad3a79c6aeadf3d1d4

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @graphql-tools/executor-http
 
+## 3.5.1-rc-f7596fdf71c1b2144a3964ad3a79c6aeadf3d1d4
+### Patch Changes
+
+
+
+- [`4a2d3b6`](https://github.com/graphql-hive/gateway/commit/4a2d3b6a4e34cbe984ce7e36fd3306d907fb29d1) Thanks [@enisdenjo](https://github.com/enisdenjo)! - Deduplicate inflight requests only within the same executor and the same `context`
+  
+  The `fetch` implementation receives the request `context` and may handle each request differently, so identical requests with different contexts or from different executors are no longer deduplicated together.
+
 ## 3.5.0
 ### Minor Changes
 

package/dist/index.cjs

@@ -550,9 +550,10 @@ function prepareGETUrl({
   return finalUrl;
 }
 
-const inflightRequests = /* @__PURE__ */ new Map();
 function buildHTTPExecutor(options) {
   const printFn = options?.print ?? executorCommon.defaultPrintFn;
+  const inflightRequestsByContext = /* @__PURE__ */ new WeakMap();
+  const inflightRequestsWithoutContext = /* @__PURE__ */ new Map();
   let disposeCtrl;
   const baseExecutor = (request, excludeQuery) => {
     if (!request.context?.request?.cf) {
@@ -839,6 +840,18 @@ function buildHTTPExecutor(options) {
       if (typeof inflightRequestOptions.body === "object") {
         return runInflightRequest();
       }
+      let inflightRequests = inflightRequestsWithoutContext;
+      if (context != null) {
+        if (Object(context) !== context) {
+          return runInflightRequest();
+        }
+        let contextInflightRequests = inflightRequestsByContext.get(context);
+        if (!contextInflightRequests) {
+          contextInflightRequests = /* @__PURE__ */ new Map();
+          inflightRequestsByContext.set(context, contextInflightRequests);
+        }
+        inflightRequests = contextInflightRequests;
+      }
       let inflightRequestId = `${inflightRequestOptions.url}|${inflightRequestOptions.method}`;
       if (inflightRequestOptions.body) {
         inflightRequestId += `|${inflightRequestOptions.body}`;

package/dist/index.d.cts

@@ -101,6 +101,11 @@ interface HTTPExecutorOptions {
      * Whether to deduplicate inflight requests with the same parameters.
      * This can be useful to avoid making multiple identical requests to the upstream service when
      * multiple parts of the gateway are requesting the same data at the same time.
+     *
+     * Requests are deduplicated only within the same executor and the same `context` object,
+     * because the `fetch` implementation receives the `context` and may handle each request
+     * differently.
+     *
      * @default true
      */
     deduplicateInflightRequests?: boolean;

package/dist/index.d.ts

@@ -101,6 +101,11 @@ interface HTTPExecutorOptions {
      * Whether to deduplicate inflight requests with the same parameters.
      * This can be useful to avoid making multiple identical requests to the upstream service when
      * multiple parts of the gateway are requesting the same data at the same time.
+     *
+     * Requests are deduplicated only within the same executor and the same `context` object,
+     * because the `fetch` implementation receives the `context` and may handle each request
+     * differently.
+     *
      * @default true
      */
     deduplicateInflightRequests?: boolean;

package/dist/index.js

@@ -548,9 +548,10 @@ function prepareGETUrl({
   return finalUrl;
 }
 
-const inflightRequests = /* @__PURE__ */ new Map();
 function buildHTTPExecutor(options) {
   const printFn = options?.print ?? defaultPrintFn;
+  const inflightRequestsByContext = /* @__PURE__ */ new WeakMap();
+  const inflightRequestsWithoutContext = /* @__PURE__ */ new Map();
   let disposeCtrl;
   const baseExecutor = (request, excludeQuery) => {
     if (!request.context?.request?.cf) {
@@ -837,6 +838,18 @@ function buildHTTPExecutor(options) {
       if (typeof inflightRequestOptions.body === "object") {
         return runInflightRequest();
       }
+      let inflightRequests = inflightRequestsWithoutContext;
+      if (context != null) {
+        if (Object(context) !== context) {
+          return runInflightRequest();
+        }
+        let contextInflightRequests = inflightRequestsByContext.get(context);
+        if (!contextInflightRequests) {
+          contextInflightRequests = /* @__PURE__ */ new Map();
+          inflightRequestsByContext.set(context, contextInflightRequests);
+        }
+        inflightRequests = contextInflightRequests;
+      }
       let inflightRequestId = `${inflightRequestOptions.url}|${inflightRequestOptions.method}`;
       if (inflightRequestOptions.body) {
         inflightRequestId += `|${inflightRequestOptions.body}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/executor-http",
-  "version": "3.5.0",
+  "version": "3.5.1-rc-f7596fdf71c1b2144a3964ad3a79c6aeadf3d1d4",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {