@graphql-tools/executor-http 1.2.0 → 1.2.1-alpha-2b5980085d717f9d4c29c1052a95e3c6c05358e4

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @graphql-tools/executor-http
 
+## 1.2.1-alpha-2b5980085d717f9d4c29c1052a95e3c6c05358e4
+
+### Patch Changes
+
+- Updated dependencies [[`b8223a0`](https://github.com/graphql-hive/gateway/commit/b8223a0f28c8308ae8a515e0ade453a02aa7aa37)]:
+  - abort-signal-any@0.0.1-alpha-2b5980085d717f9d4c29c1052a95e3c6c05358e4
+
 ## 1.2.0
 
 ### Minor Changes

package/dist/index.cjs

@@ -3,6 +3,7 @@
 var utils = require('@graphql-tools/utils');
 var disposablestack = require('@whatwg-node/disposablestack');
 var fetch = require('@whatwg-node/fetch');
+var abortSignalAny = require('abort-signal-any');
 var valueOrPromise = require('value-or-promise');
 var extractFiles = require('extract-files');
 var graphql = require('graphql');
@@ -156,7 +157,7 @@ const DELIM = "\n\n";
 function isReadableStream(value) {
   return value && typeof value.getReader === "function";
 }
-function handleEventStreamResponse(signal, response) {
+function handleEventStreamResponse(response, signal) {
   const body = response.body;
   if (!isReadableStream(body)) {
     throw new Error(
@@ -172,7 +173,7 @@ function handleEventStreamResponse(signal, response) {
     });
     let currChunk = "";
     async function pump() {
-      if (signal.aborted) {
+      if (signal?.aborted) {
         await push(createResultForAbort(signal));
         return stop();
       }
@@ -325,13 +326,18 @@ function buildHTTPExecutor(options) {
       Object.assign(headers, headersFromExtensions);
       request.extensions = restExtensions;
     }
-    let signal = sharedSignal;
+    const signals = [sharedSignal];
+    const signalFromRequest = request.signal || request.info?.signal;
+    if (signalFromRequest) {
+      if (signalFromRequest.aborted) {
+        return createResultForAbort(signalFromRequest.reason);
+      }
+      signals.push(signalFromRequest);
+    }
     if (options?.timeout) {
-      signal = AbortSignal.any([
-        sharedSignal,
-        AbortSignal.timeout(options.timeout)
-      ]);
+      signals.push(AbortSignal.timeout(options.timeout));
     }
+    const signal = abortSignalAny.abortSignalAny(signals);
     const upstreamErrorExtensions = {
       request: {
         method
@@ -435,7 +441,7 @@ function buildHTTPExecutor(options) {
         }
         const contentType = fetchResult.headers.get("content-type");
         if (contentType?.includes("text/event-stream")) {
-          return handleEventStreamResponse(signal, fetchResult);
+          return handleEventStreamResponse(fetchResult, signal);
         } else if (contentType?.includes("multipart/mixed")) {
           return handleMultipartMixedResponse(fetchResult);
         }
@@ -597,8 +603,8 @@ function coerceFetchError(e, {
       extensions: upstreamErrorExtensions,
       originalError: e
     });
-  } else if (e.name === "AbortError" && signal.reason) {
-    return createGraphQLErrorForAbort(signal.reason, {
+  } else if (e.name === "AbortError" && signal?.reason) {
+    return createGraphQLErrorForAbort(signal?.reason, {
       extensions: upstreamErrorExtensions
     });
   } else if (e.message) {

package/dist/index.js

@@ -1,6 +1,7 @@
 import { isAsyncIterable, isPromise, mapMaybePromise, memoize1, createGraphQLError, inspect, mapAsyncIterator, mergeIncrementalResult, getOperationASTFromRequest } from '@graphql-tools/utils';
 import { DisposableSymbols } from '@whatwg-node/disposablestack';
 import { File, FormData, TextEncoder, crypto, TextDecoder, fetch } from '@whatwg-node/fetch';
+import { abortSignalAny } from 'abort-signal-any';
 import { ValueOrPromise } from 'value-or-promise';
 import { extractFiles, isExtractableFile } from 'extract-files';
 import { stripIgnoredCharacters, print } from 'graphql';
@@ -154,7 +155,7 @@ const DELIM = "\n\n";
 function isReadableStream(value) {
   return value && typeof value.getReader === "function";
 }
-function handleEventStreamResponse(signal, response) {
+function handleEventStreamResponse(response, signal) {
   const body = response.body;
   if (!isReadableStream(body)) {
     throw new Error(
@@ -170,7 +171,7 @@ function handleEventStreamResponse(signal, response) {
     });
     let currChunk = "";
     async function pump() {
-      if (signal.aborted) {
+      if (signal?.aborted) {
         await push(createResultForAbort(signal));
         return stop();
       }
@@ -323,13 +324,18 @@ function buildHTTPExecutor(options) {
       Object.assign(headers, headersFromExtensions);
       request.extensions = restExtensions;
     }
-    let signal = sharedSignal;
+    const signals = [sharedSignal];
+    const signalFromRequest = request.signal || request.info?.signal;
+    if (signalFromRequest) {
+      if (signalFromRequest.aborted) {
+        return createResultForAbort(signalFromRequest.reason);
+      }
+      signals.push(signalFromRequest);
+    }
     if (options?.timeout) {
-      signal = AbortSignal.any([
-        sharedSignal,
-        AbortSignal.timeout(options.timeout)
-      ]);
+      signals.push(AbortSignal.timeout(options.timeout));
     }
+    const signal = abortSignalAny(signals);
     const upstreamErrorExtensions = {
       request: {
         method
@@ -433,7 +439,7 @@ function buildHTTPExecutor(options) {
         }
         const contentType = fetchResult.headers.get("content-type");
         if (contentType?.includes("text/event-stream")) {
-          return handleEventStreamResponse(signal, fetchResult);
+          return handleEventStreamResponse(fetchResult, signal);
         } else if (contentType?.includes("multipart/mixed")) {
           return handleMultipartMixedResponse(fetchResult);
         }
@@ -595,8 +601,8 @@ function coerceFetchError(e, {
       extensions: upstreamErrorExtensions,
       originalError: e
     });
-  } else if (e.name === "AbortError" && signal.reason) {
-    return createGraphQLErrorForAbort(signal.reason, {
+  } else if (e.name === "AbortError" && signal?.reason) {
+    return createGraphQLErrorForAbort(signal?.reason, {
       extensions: upstreamErrorExtensions
     });
   } else if (e.message) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/executor-http",
-  "version": "1.2.0",
+  "version": "1.2.1-alpha-2b5980085d717f9d4c29c1052a95e3c6c05358e4",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
@@ -43,6 +43,7 @@
     "@repeaterjs/repeater": "^3.0.4",
     "@whatwg-node/disposablestack": "^0.0.5",
     "@whatwg-node/fetch": "^0.10.1",
+    "abort-signal-any": "0.0.1-alpha-2b5980085d717f9d4c29c1052a95e3c6c05358e4",
     "extract-files": "^11.0.0",
     "meros": "^1.2.1",
     "tslib": "^2.8.1",