@graphql-tools/executor-http
Advanced tools
Comparing version 1.2.6-alpha-d6fbffa3533e2ab4005a589cc73e1806eaa73756 to 1.2.6-rc-06b181b5abea9a1151a5c9ae587ffae829c772b4
# @graphql-tools/executor-http | ||
## 1.2.6-alpha-d6fbffa3533e2ab4005a589cc73e1806eaa73756 | ||
## 1.2.6-rc-06b181b5abea9a1151a5c9ae587ffae829c772b4 | ||
### Patch Changes | ||
- Updated dependencies [[`d6fbffa`](https://github.com/graphql-hive/gateway/commit/d6fbffa3533e2ab4005a589cc73e1806eaa73756), [`d6fbffa`](https://github.com/graphql-hive/gateway/commit/d6fbffa3533e2ab4005a589cc73e1806eaa73756), [`d6fbffa`](https://github.com/graphql-hive/gateway/commit/d6fbffa3533e2ab4005a589cc73e1806eaa73756)]: | ||
- @graphql-hive/gateway-abort-signal-any@1.0.0-alpha-d6fbffa3533e2ab4005a589cc73e1806eaa73756 | ||
- [#598](https://github.com/graphql-hive/gateway/pull/598) [`8c80ac9`](https://github.com/graphql-hive/gateway/commit/8c80ac98cd5afd7c063945f4704fe4866622c5d7) Thanks [@ardatan](https://github.com/ardatan)! - dependencies updates: | ||
- Removed dependency [`@graphql-hive/gateway-abort-signal-any@workspace:^` ↗︎](https://www.npmjs.com/package/@graphql-hive/gateway-abort-signal-any/v/workspace:^) (from `dependencies`) | ||
- [#598](https://github.com/graphql-hive/gateway/pull/598) [`8c80ac9`](https://github.com/graphql-hive/gateway/commit/8c80ac98cd5afd7c063945f4704fe4866622c5d7) Thanks [@ardatan](https://github.com/ardatan)! - Use native AbortSignal, AbortController APIs instead of custom ones | ||
## 1.2.5 | ||
@@ -11,0 +14,0 @@ |
@@ -1,2 +0,1 @@ | ||
import { abortSignalAny } from '@graphql-hive/gateway-abort-signal-any'; | ||
import { defaultPrintFn, serializeExecutionRequest } from '@graphql-tools/executor-common'; | ||
@@ -287,25 +286,8 @@ import { isAsyncIterable, isPromise, mapMaybePromise, createGraphQLError, inspect, mapAsyncIterator, mergeIncrementalResult, memoize1, getOperationASTFromRequest } from '@graphql-tools/utils'; | ||
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); | ||
} | ||
@@ -339,3 +321,3 @@ const fetchFn = request.extensions?.fetch ?? options?.fetch ?? fetch; | ||
} | ||
const signals = [sharedSignal]; | ||
const signals = [disposeCtrl.signal]; | ||
const signalFromRequest = request.signal || request.info?.signal; | ||
@@ -351,3 +333,3 @@ if (signalFromRequest) { | ||
} | ||
const signal = abortSignalAny(signals); | ||
const signal = AbortSignal.any(signals); | ||
const upstreamErrorExtensions = { | ||
@@ -563,4 +545,4 @@ request: { | ||
function retryAttempt() { | ||
if (sharedSignal.aborted) { | ||
return createResultForAbort(sharedSignal.reason); | ||
if (disposeCtrl.signal.aborted) { | ||
return createResultForAbort(disposeCtrl.signal.reason); | ||
} | ||
@@ -567,0 +549,0 @@ attempt++; |
{ | ||
"name": "@graphql-tools/executor-http", | ||
"version": "1.2.6-alpha-d6fbffa3533e2ab4005a589cc73e1806eaa73756", | ||
"version": "1.2.6-rc-06b181b5abea9a1151a5c9ae587ffae829c772b4", | ||
"type": "module", | ||
@@ -42,3 +42,2 @@ "description": "A set of utils for faster development of GraphQL tools", | ||
"dependencies": { | ||
"@graphql-hive/gateway-abort-signal-any": "1.0.0-alpha-d6fbffa3533e2ab4005a589cc73e1806eaa73756", | ||
"@graphql-tools/executor-common": "^0.0.1", | ||
@@ -60,5 +59,5 @@ "@graphql-tools/utils": "^10.7.0", | ||
"graphql-yoga": "^5.10.11", | ||
"pkgroll": "2.6.1" | ||
"pkgroll": "2.8.0" | ||
}, | ||
"sideEffects": false | ||
} |
Sorry, the diff of this file is not supported yet
10
75468
1314