@graphql-tools/executor-http 1.2.1 → 1.2.2-alpha-2282ec8f3a56134d51ecb4f1e4981273ceb13d81

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @graphql-tools/executor-http
 
+## 1.2.2-alpha-2282ec8f3a56134d51ecb4f1e4981273ceb13d81
+
+### Patch Changes
+
+- [#367](https://github.com/graphql-hive/gateway/pull/367) [`01a8600`](https://github.com/graphql-hive/gateway/commit/01a86000440fc91c6376fb49202a4534b4bc5697) Thanks [@ardatan](https://github.com/ardatan)! - Fix Retry / Timeout combination
+
 ## 1.2.1
 
 ### Patch Changes

package/dist/index.cjs

@@ -129,8 +129,18 @@ function createAbortErrorReason() {
   return new Error("Executor was disposed.");
 }
 function createGraphQLErrorForAbort(reason, extensions) {
+  if (reason instanceof graphql.GraphQLError) {
+    return reason;
+  }
+  if (reason?.name === "TimeoutError") {
+    return utils.createGraphQLError(reason.message, {
+      extensions,
+      originalError: reason
+    });
+  }
   return utils.createGraphQLError("The operation was aborted. reason: " + reason, {
-    extensions
+    extensions,
+    originalError: reason
   });
 }
 function createResultForAbort(reason, extensions) {
@@ -341,8 +351,7 @@ function buildHTTPExecutor(options) {
     const upstreamErrorExtensions = {
       request: {
         method
-      },
-      response: {}
+      }
     };
     const query = printFn(request.document);
     let serializeFn = function serialize() {
@@ -427,6 +436,7 @@ function buildHTTPExecutor(options) {
           }
         }
       }).then((fetchResult) => {
+        upstreamErrorExtensions.response ||= {};
         upstreamErrorExtensions.response.status = fetchResult.status;
         upstreamErrorExtensions.response.statusText = fetchResult.statusText;
         Object.defineProperty(upstreamErrorExtensions.response, "headers", {
@@ -448,6 +458,7 @@ function buildHTTPExecutor(options) {
         return fetchResult.text();
       }).then((result) => {
         if (typeof result === "string") {
+          upstreamErrorExtensions.response ||= {};
           upstreamErrorExtensions.response.body = result;
           if (result) {
             try {
@@ -603,10 +614,11 @@ function coerceFetchError(e, {
       extensions: upstreamErrorExtensions,
       originalError: e
     });
-  } else if (e.name === "AbortError" && signal?.reason) {
-    return createGraphQLErrorForAbort(signal?.reason, {
-      extensions: upstreamErrorExtensions
-    });
+  } else if (e.name === "AbortError") {
+    return createGraphQLErrorForAbort(
+      signal?.reason || e,
+      upstreamErrorExtensions
+    );
   } else if (e.message) {
     return utils.createGraphQLError(e.message, {
       extensions: upstreamErrorExtensions,

package/dist/index.js

@@ -4,7 +4,7 @@ import { DisposableSymbols } from '@whatwg-node/disposablestack';
 import { File, FormData, TextEncoder, crypto, TextDecoder, fetch } from '@whatwg-node/fetch';
 import { ValueOrPromise } from 'value-or-promise';
 import { extractFiles, isExtractableFile } from 'extract-files';
-import { stripIgnoredCharacters, print } from 'graphql';
+import { stripIgnoredCharacters, print, GraphQLError } from 'graphql';
 import { Repeater } from '@repeaterjs/repeater';
 import { meros as meros$1 } from 'meros/browser';
 import { meros } from 'meros/node';
@@ -127,8 +127,18 @@ function createAbortErrorReason() {
   return new Error("Executor was disposed.");
 }
 function createGraphQLErrorForAbort(reason, extensions) {
+  if (reason instanceof GraphQLError) {
+    return reason;
+  }
+  if (reason?.name === "TimeoutError") {
+    return createGraphQLError(reason.message, {
+      extensions,
+      originalError: reason
+    });
+  }
   return createGraphQLError("The operation was aborted. reason: " + reason, {
-    extensions
+    extensions,
+    originalError: reason
   });
 }
 function createResultForAbort(reason, extensions) {
@@ -339,8 +349,7 @@ function buildHTTPExecutor(options) {
     const upstreamErrorExtensions = {
       request: {
         method
-      },
-      response: {}
+      }
     };
     const query = printFn(request.document);
     let serializeFn = function serialize() {
@@ -425,6 +434,7 @@ function buildHTTPExecutor(options) {
           }
         }
       }).then((fetchResult) => {
+        upstreamErrorExtensions.response ||= {};
         upstreamErrorExtensions.response.status = fetchResult.status;
         upstreamErrorExtensions.response.statusText = fetchResult.statusText;
         Object.defineProperty(upstreamErrorExtensions.response, "headers", {
@@ -446,6 +456,7 @@ function buildHTTPExecutor(options) {
         return fetchResult.text();
       }).then((result) => {
         if (typeof result === "string") {
+          upstreamErrorExtensions.response ||= {};
           upstreamErrorExtensions.response.body = result;
           if (result) {
             try {
@@ -601,10 +612,11 @@ function coerceFetchError(e, {
       extensions: upstreamErrorExtensions,
       originalError: e
     });
-  } else if (e.name === "AbortError" && signal?.reason) {
-    return createGraphQLErrorForAbort(signal?.reason, {
-      extensions: upstreamErrorExtensions
-    });
+  } else if (e.name === "AbortError") {
+    return createGraphQLErrorForAbort(
+      signal?.reason || e,
+      upstreamErrorExtensions
+    );
   } else if (e.message) {
     return createGraphQLError(e.message, {
       extensions: upstreamErrorExtensions,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/executor-http",
-  "version": "1.2.1",
+  "version": "1.2.2-alpha-2282ec8f3a56134d51ecb4f1e4981273ceb13d81",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
@@ -54,7 +54,7 @@
     "@types/extract-files": "8.1.3",
     "@whatwg-node/disposablestack": "^0.0.5",
     "graphql": "^16.9.0",
-    "graphql-yoga": "^5.10.4",
+    "graphql-yoga": "^5.10.6",
     "pkgroll": "2.5.1"
   },
   "sideEffects": false