@graphql-tools/executor-http 1.2.4 → 1.2.5-alpha-d8dc77bc27e4abf917b03c197fe569c509e54a72

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @graphql-tools/executor-http
 
+## 1.2.5-alpha-d8dc77bc27e4abf917b03c197fe569c509e54a72
+
+### Patch Changes
+
+- [#407](https://github.com/graphql-hive/gateway/pull/407) [`31d44e7`](https://github.com/graphql-hive/gateway/commit/31d44e76d3e17b29527b4604440c39687a0880f5) Thanks [@ardatan](https://github.com/ardatan)! - Introduce disposable timeout signals.
+
+  When `AbortSignal.timeout(MS)` is used, the timer is not cleaned up until it finishes.
+  This leads to memory leaks when the signal is not used anymore.
+
+  This change introduces a disposable timeout signal that cleans up the timer when the signal is disposed, and in the plugins the signal is disposed whenever the operation is completed.
+
+- Updated dependencies [[`d8dc77b`](https://github.com/graphql-hive/gateway/commit/d8dc77bc27e4abf917b03c197fe569c509e54a72), [`31d44e7`](https://github.com/graphql-hive/gateway/commit/31d44e76d3e17b29527b4604440c39687a0880f5)]:
+  - @graphql-hive/gateway-abort-signal-any@0.0.4-alpha-d8dc77bc27e4abf917b03c197fe569c509e54a72
+
 ## 1.2.4
 
 ### Patch Changes

package/dist/index.cjs

@@ -341,8 +341,10 @@ function buildHTTPExecutor(options) {
       }
       signals.push(signalFromRequest);
     }
+    let timeoutSignal;
     if (options?.timeout) {
-      signals.push(AbortSignal.timeout(options.timeout));
+      timeoutSignal = gatewayAbortSignalAny.createTimeoutSignalWithDispose(options.timeout);
+      signals.push(timeoutSignal.signal);
     }
     const signal = gatewayAbortSignalAny.abortSignalAny(signals);
     const upstreamErrorExtensions = {
@@ -434,6 +436,7 @@ function buildHTTPExecutor(options) {
           }
         }
       }).then((fetchResult) => {
+        timeoutSignal?.[disposablestack.DisposableSymbols.dispose]();
         upstreamErrorExtensions.response ||= {};
         upstreamErrorExtensions.response.status = fetchResult.status;
         upstreamErrorExtensions.response.statusText = fetchResult.statusText;
@@ -510,6 +513,7 @@ function buildHTTPExecutor(options) {
           return result;
         }
       }).catch((e) => {
+        timeoutSignal?.[disposablestack.DisposableSymbols.dispose]();
         if (e.name === "AggregateError") {
           return {
             errors: e.errors.map(

package/dist/index.js

@@ -1,4 +1,4 @@
-import { abortSignalAny } from '@graphql-hive/gateway-abort-signal-any';
+import { createTimeoutSignalWithDispose, abortSignalAny } from '@graphql-hive/gateway-abort-signal-any';
 import { defaultPrintFn, serializeExecutionRequest } from '@graphql-tools/executor-common';
 import { isAsyncIterable, isPromise, mapMaybePromise, createGraphQLError, inspect, mapAsyncIterator, mergeIncrementalResult, memoize1, getOperationASTFromRequest } from '@graphql-tools/utils';
 import { DisposableSymbols } from '@whatwg-node/disposablestack';
@@ -339,8 +339,10 @@ function buildHTTPExecutor(options) {
       }
       signals.push(signalFromRequest);
     }
+    let timeoutSignal;
     if (options?.timeout) {
-      signals.push(AbortSignal.timeout(options.timeout));
+      timeoutSignal = createTimeoutSignalWithDispose(options.timeout);
+      signals.push(timeoutSignal.signal);
     }
     const signal = abortSignalAny(signals);
     const upstreamErrorExtensions = {
@@ -432,6 +434,7 @@ function buildHTTPExecutor(options) {
           }
         }
       }).then((fetchResult) => {
+        timeoutSignal?.[DisposableSymbols.dispose]();
         upstreamErrorExtensions.response ||= {};
         upstreamErrorExtensions.response.status = fetchResult.status;
         upstreamErrorExtensions.response.statusText = fetchResult.statusText;
@@ -508,6 +511,7 @@ function buildHTTPExecutor(options) {
           return result;
         }
       }).catch((e) => {
+        timeoutSignal?.[DisposableSymbols.dispose]();
         if (e.name === "AggregateError") {
           return {
             errors: e.errors.map(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/executor-http",
-  "version": "1.2.4",
+  "version": "1.2.5-alpha-d8dc77bc27e4abf917b03c197fe569c509e54a72",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
@@ -39,7 +39,7 @@
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "@graphql-hive/gateway-abort-signal-any": "^0.0.3",
+    "@graphql-hive/gateway-abort-signal-any": "0.0.4-alpha-d8dc77bc27e4abf917b03c197fe569c509e54a72",
     "@graphql-tools/executor-common": "^0.0.1",
     "@graphql-tools/utils": "^10.7.0",
     "@repeaterjs/repeater": "^3.0.4",