@graphql-tools/executor-http 1.2.2 → 1.2.3-alpha-eeb5a1d4d585f1315b38da3d023b25283b3ac051

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @graphql-tools/executor-http
 
+## 1.2.3-alpha-eeb5a1d4d585f1315b38da3d023b25283b3ac051
+
+### Patch Changes
+
+- [#376](https://github.com/graphql-hive/gateway/pull/376) [`eeb5a1d`](https://github.com/graphql-hive/gateway/commit/eeb5a1d4d585f1315b38da3d023b25283b3ac051) Thanks [@ardatan](https://github.com/ardatan)! - No need to handle event listeners inside HTTP Executor thanks to the improvements with `@graphql-tools/utils`'s `registerAbortSignalListener` to avoid Node.js warnings when multiple event listeners registered to an `AbortSignal`
+
 ## 1.2.2
 
 ### Patch Changes

package/dist/index.cjs

@@ -285,29 +285,12 @@ function prepareGETUrl({
   return finalUrl;
 }
 
-function createSignalWrapper(signal) {
-  const listeners = /* @__PURE__ */ new Set();
-  signal.onabort = (event) => {
-    for (const listener of listeners) {
-      listener(event);
-    }
-  };
-  return Object.assign(signal, {
-    addEventListener(_type, listener) {
-      listeners.add(listener);
-    },
-    removeEventListener(_type, listener) {
-      listeners.delete(listener);
-    }
-  });
-}
 function buildHTTPExecutor(options) {
   const printFn = options?.print ?? defaultPrintFn;
   const disposeCtrl = new AbortController();
-  const sharedSignal = createSignalWrapper(disposeCtrl.signal);
   const baseExecutor = (request, excludeQuery) => {
-    if (sharedSignal.aborted) {
-      return createResultForAbort(sharedSignal.reason);
+    if (disposeCtrl.signal.aborted) {
+      return createResultForAbort(disposeCtrl.signal.reason);
     }
     const fetchFn = request.extensions?.fetch ?? options?.fetch ?? fetch.fetch;
     let method = request.extensions?.method || options?.method;
@@ -336,7 +319,7 @@ function buildHTTPExecutor(options) {
       Object.assign(headers, headersFromExtensions);
       request.extensions = restExtensions;
     }
-    const signals = [sharedSignal];
+    const signals = [disposeCtrl.signal];
     const signalFromRequest = request.signal || request.info?.signal;
     if (signalFromRequest) {
       if (signalFromRequest.aborted) {
@@ -347,7 +330,7 @@ function buildHTTPExecutor(options) {
     if (options?.timeout) {
       signals.push(AbortSignal.timeout(options.timeout));
     }
-    const signal = gatewayAbortSignalAny.abortSignalAny(signals);
+    const signal = signals.length > 1 ? gatewayAbortSignalAny.abortSignalAny(signals) : signals[0];
     const upstreamErrorExtensions = {
       request: {
         method
@@ -557,8 +540,8 @@ function buildHTTPExecutor(options) {
       let result;
       let attempt = 0;
       function retryAttempt() {
-        if (sharedSignal.aborted) {
-          return createResultForAbort(sharedSignal.reason);
+        if (disposeCtrl.signal.aborted) {
+          return createResultForAbort(disposeCtrl.signal.reason);
         }
         attempt++;
         if (attempt > options.retry) {

package/dist/index.js

@@ -283,29 +283,12 @@ function prepareGETUrl({
   return finalUrl;
 }
 
-function createSignalWrapper(signal) {
-  const listeners = /* @__PURE__ */ new Set();
-  signal.onabort = (event) => {
-    for (const listener of listeners) {
-      listener(event);
-    }
-  };
-  return Object.assign(signal, {
-    addEventListener(_type, listener) {
-      listeners.add(listener);
-    },
-    removeEventListener(_type, listener) {
-      listeners.delete(listener);
-    }
-  });
-}
 function buildHTTPExecutor(options) {
   const printFn = options?.print ?? defaultPrintFn;
   const disposeCtrl = new AbortController();
-  const sharedSignal = createSignalWrapper(disposeCtrl.signal);
   const baseExecutor = (request, excludeQuery) => {
-    if (sharedSignal.aborted) {
-      return createResultForAbort(sharedSignal.reason);
+    if (disposeCtrl.signal.aborted) {
+      return createResultForAbort(disposeCtrl.signal.reason);
     }
     const fetchFn = request.extensions?.fetch ?? options?.fetch ?? fetch;
     let method = request.extensions?.method || options?.method;
@@ -334,7 +317,7 @@ function buildHTTPExecutor(options) {
       Object.assign(headers, headersFromExtensions);
       request.extensions = restExtensions;
     }
-    const signals = [sharedSignal];
+    const signals = [disposeCtrl.signal];
     const signalFromRequest = request.signal || request.info?.signal;
     if (signalFromRequest) {
       if (signalFromRequest.aborted) {
@@ -345,7 +328,7 @@ function buildHTTPExecutor(options) {
     if (options?.timeout) {
       signals.push(AbortSignal.timeout(options.timeout));
     }
-    const signal = abortSignalAny(signals);
+    const signal = signals.length > 1 ? abortSignalAny(signals) : signals[0];
     const upstreamErrorExtensions = {
       request: {
         method
@@ -555,8 +538,8 @@ function buildHTTPExecutor(options) {
       let result;
       let attempt = 0;
       function retryAttempt() {
-        if (sharedSignal.aborted) {
-          return createResultForAbort(sharedSignal.reason);
+        if (disposeCtrl.signal.aborted) {
+          return createResultForAbort(disposeCtrl.signal.reason);
         }
         attempt++;
         if (attempt > options.retry) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/executor-http",
-  "version": "1.2.2",
+  "version": "1.2.3-alpha-eeb5a1d4d585f1315b38da3d023b25283b3ac051",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {