@graphql-tools/executor-http 1.1.14 → 1.2.0-alpha-753096403f92c5dbcdd17828acdd17a1aa53a51e

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @graphql-tools/executor-http
 
+## 1.2.0-alpha-753096403f92c5dbcdd17828acdd17a1aa53a51e
+
+### Minor Changes
+
+- [#313](https://github.com/graphql-hive/gateway/pull/313) [`7530964`](https://github.com/graphql-hive/gateway/commit/753096403f92c5dbcdd17828acdd17a1aa53a51e) Thanks [@ardatan](https://github.com/ardatan)! - Automatic Persisted Queries support for upstream requests
+
+  For HTTP Executor;
+
+  ```ts
+  buildHTTPExecutor({
+    // ...
+    apq: true,
+  });
+  ```
+
+  For Gateway Configuration;
+
+  ```ts
+  export const gatewayConfig = defineConfig({
+    transportEntries: {
+      '*': {
+        options: {
+          apq: true,
+        },
+      },
+    },
+  });
+  ```
+
 ## 1.1.14
 
 ### Patch Changes

package/dist/index.cjs

@@ -30,32 +30,21 @@ function collectAsyncIterableValues(asyncIterable) {
   }
   return iterate();
 }
-function createFormDataFromVariables({
-  query,
-  variables,
-  operationName,
-  extensions
-}, {
+function createFormDataFromVariables(body, {
   File: FileCtor = fetch.File,
   FormData: FormDataCtor = fetch.FormData
 }) {
-  const vars = Object.assign({}, variables);
+  if (!body.variables) {
+    return JSON.stringify(body);
+  }
+  const vars = Object.assign({}, body.variables);
   const { clone, files } = extractFiles.extractFiles(
     vars,
     "variables",
     (v) => extractFiles.isExtractableFile(v) || v?.promise || utils.isAsyncIterable(v) || v?.then || typeof v?.arrayBuffer === "function"
   );
   if (files.size === 0) {
-    return JSON.stringify(
-      {
-        query,
-        variables,
-        operationName,
-        extensions
-      },
-      null,
-      2
-    );
+    return JSON.stringify(body);
   }
   const map = {};
   const uploads = [];
@@ -69,10 +58,8 @@ function createFormDataFromVariables({
   form.append(
     "operations",
     JSON.stringify({
-      query,
-      variables: clone,
-      operationName,
-      extensions
+      ...body,
+      variables: clone
     })
   );
   form.append("map", JSON.stringify(map));
@@ -150,6 +137,20 @@ function createResultForAbort(reason, extensions) {
     errors: [createGraphQLErrorForAbort(reason, extensions)]
   };
 }
+function hashSHA256(str) {
+  const textEncoder = new fetch.TextEncoder();
+  const utf8 = textEncoder.encode(str);
+  return utils.mapMaybePromise(
+    fetch.crypto.subtle.digest("SHA-256", utf8),
+    (hashBuffer) => {
+      let hashHex = "";
+      for (const bytes of new Uint8Array(hashBuffer)) {
+        hashHex += bytes.toString(16).padStart(2, "0");
+      }
+      return hashHex;
+    }
+  );
+}
 
 const DELIM = "\n\n";
 function isReadableStream(value) {
@@ -252,23 +253,22 @@ const isLiveQueryOperationDefinitionNode = utils.memoize1(
 
 function prepareGETUrl({
   baseUrl = "",
-  query,
-  variables,
-  operationName,
-  extensions
+  body
 }) {
   const dummyHostname = "https://dummyhostname.com";
   const validUrl = baseUrl.startsWith("http") ? baseUrl : baseUrl?.startsWith("/") ? `${dummyHostname}${baseUrl}` : `${dummyHostname}/${baseUrl}`;
   const urlObj = new URL(validUrl);
-  urlObj.searchParams.set("query", graphql.stripIgnoredCharacters(query));
-  if (variables && Object.keys(variables).length > 0) {
-    urlObj.searchParams.set("variables", JSON.stringify(variables));
+  if (body.query) {
+    urlObj.searchParams.set("query", body.query);
+  }
+  if (body.variables && Object.keys(body.variables).length > 0) {
+    urlObj.searchParams.set("variables", JSON.stringify(body.variables));
   }
-  if (operationName) {
-    urlObj.searchParams.set("operationName", operationName);
+  if (body.operationName) {
+    urlObj.searchParams.set("operationName", body.operationName);
   }
-  if (extensions) {
-    urlObj.searchParams.set("extensions", JSON.stringify(extensions));
+  if (body.extensions) {
+    urlObj.searchParams.set("extensions", JSON.stringify(body.extensions));
   }
   const finalUrl = urlObj.toString().replace(dummyHostname, "");
   return finalUrl;
@@ -294,7 +294,7 @@ function buildHTTPExecutor(options) {
   const printFn = options?.print ?? defaultPrintFn;
   const disposeCtrl = new AbortController();
   const sharedSignal = createSignalWrapper(disposeCtrl.signal);
-  const baseExecutor = (request) => {
+  const baseExecutor = (request, excludeQuery) => {
     if (sharedSignal.aborted) {
       return createResultForAbort(sharedSignal.reason);
     }
@@ -325,7 +325,6 @@ function buildHTTPExecutor(options) {
       Object.assign(headers, headersFromExtensions);
       request.extensions = restExtensions;
     }
-    const query = printFn(request.document);
     let signal = sharedSignal;
     if (options?.timeout) {
       signal = AbortSignal.any([
@@ -339,163 +338,204 @@ function buildHTTPExecutor(options) {
       },
       response: {}
     };
-    return new valueOrPromise.ValueOrPromise(() => {
-      switch (method) {
-        case "GET": {
-          const finalUrl = prepareGETUrl({
-            baseUrl: endpoint,
-            query,
-            variables: request.variables,
-            operationName: request.operationName,
-            extensions: request.extensions
-          });
-          const fetchOptions = {
-            method: "GET",
-            headers,
-            signal
+    const query = printFn(request.document);
+    let serializeFn = function serialize() {
+      return {
+        query: excludeQuery ? void 0 : printFn(request.document),
+        variables: (request.variables && Object.keys(request.variables).length) > 0 ? request.variables : void 0,
+        operationName: request.operationName ? request.operationName : void 0,
+        extensions: request.extensions && Object.keys(request.extensions).length > 0 ? request.extensions : void 0
+      };
+    };
+    if (options?.apq) {
+      serializeFn = function serializeWithAPQ() {
+        return utils.mapMaybePromise(hashSHA256(query), (sha256Hash) => {
+          const extensions = request.extensions || {};
+          extensions["persistedQuery"] = {
+            version: 1,
+            sha256Hash
           };
-          if (options?.credentials != null) {
-            fetchOptions.credentials = options.credentials;
-          }
-          upstreamErrorExtensions.request.url = finalUrl;
-          return fetchFn(finalUrl, fetchOptions, request.context, request.info);
-        }
-        case "POST": {
-          const body = {
-            query,
-            variables: request.variables,
-            operationName: request.operationName,
-            extensions: request.extensions
+          return {
+            query: excludeQuery ? void 0 : query,
+            variables: (request.variables && Object.keys(request.variables).length) > 0 ? request.variables : void 0,
+            operationName: request.operationName ? request.operationName : void 0,
+            extensions
           };
-          upstreamErrorExtensions.request.body = body;
-          return utils.mapMaybePromise(
-            createFormDataFromVariables(body, {
-              File: options?.File,
-              FormData: options?.FormData
-            }),
-            (body2) => {
-              if (typeof body2 === "string" && !headers["content-type"]) {
-                upstreamErrorExtensions.request.body = body2;
-                headers["content-type"] = "application/json";
-              }
-              const fetchOptions = {
-                method: "POST",
-                body: body2,
-                headers,
-                signal
-              };
-              if (options?.credentials != null) {
-                fetchOptions.credentials = options.credentials;
-              }
-              return fetchFn(
-                endpoint,
-                fetchOptions,
-                request.context,
-                request.info
-              );
+        });
+      };
+    }
+    return utils.mapMaybePromise(
+      serializeFn(),
+      (body) => new valueOrPromise.ValueOrPromise(() => {
+        switch (method) {
+          case "GET": {
+            const finalUrl = prepareGETUrl({
+              baseUrl: endpoint,
+              body
+            });
+            const fetchOptions = {
+              method: "GET",
+              headers,
+              signal
+            };
+            if (options?.credentials != null) {
+              fetchOptions.credentials = options.credentials;
             }
+            upstreamErrorExtensions.request.url = finalUrl;
+            return fetchFn(
+              finalUrl,
+              fetchOptions,
+              request.context,
+              request.info
+            );
+          }
+          case "POST": {
+            upstreamErrorExtensions.request.body = body;
+            return utils.mapMaybePromise(
+              createFormDataFromVariables(body, {
+                File: options?.File,
+                FormData: options?.FormData
+              }),
+              (body2) => {
+                if (typeof body2 === "string" && !headers["content-type"]) {
+                  upstreamErrorExtensions.request.body = body2;
+                  headers["content-type"] = "application/json";
+                }
+                const fetchOptions = {
+                  method: "POST",
+                  body: body2,
+                  headers,
+                  signal
+                };
+                if (options?.credentials != null) {
+                  fetchOptions.credentials = options.credentials;
+                }
+                return fetchFn(
+                  endpoint,
+                  fetchOptions,
+                  request.context,
+                  request.info
+                );
+              }
+            );
+          }
+        }
+      }).then((fetchResult) => {
+        upstreamErrorExtensions.response.status = fetchResult.status;
+        upstreamErrorExtensions.response.statusText = fetchResult.statusText;
+        Object.defineProperty(upstreamErrorExtensions.response, "headers", {
+          get() {
+            return Object.fromEntries(fetchResult.headers.entries());
+          }
+        });
+        if (options?.retry != null && !fetchResult.status.toString().startsWith("2")) {
+          throw new Error(
+            fetchResult.statusText || `Upstream HTTP Error: ${fetchResult.status}`
           );
         }
-      }
-    }).then((fetchResult) => {
-      upstreamErrorExtensions.response.status = fetchResult.status;
-      upstreamErrorExtensions.response.statusText = fetchResult.statusText;
-      Object.defineProperty(upstreamErrorExtensions.response, "headers", {
-        get() {
-          return Object.fromEntries(fetchResult.headers.entries());
+        const contentType = fetchResult.headers.get("content-type");
+        if (contentType?.includes("text/event-stream")) {
+          return handleEventStreamResponse(signal, fetchResult);
+        } else if (contentType?.includes("multipart/mixed")) {
+          return handleMultipartMixedResponse(fetchResult);
         }
-      });
-      if (options?.retry != null && !fetchResult.status.toString().startsWith("2")) {
-        throw new Error(
-          fetchResult.statusText || `Upstream HTTP Error: ${fetchResult.status}`
-        );
-      }
-      const contentType = fetchResult.headers.get("content-type");
-      if (contentType?.includes("text/event-stream")) {
-        return handleEventStreamResponse(signal, fetchResult);
-      } else if (contentType?.includes("multipart/mixed")) {
-        return handleMultipartMixedResponse(fetchResult);
-      }
-      return fetchResult.text();
-    }).then((result) => {
-      if (typeof result === "string") {
-        upstreamErrorExtensions.response.body = result;
-        if (result) {
-          try {
-            const parsedResult = JSON.parse(result);
-            upstreamErrorExtensions.response.body = parsedResult;
-            if (parsedResult.data == null && (parsedResult.errors == null || parsedResult.errors.length === 0)) {
+        return fetchResult.text();
+      }).then((result) => {
+        if (typeof result === "string") {
+          upstreamErrorExtensions.response.body = result;
+          if (result) {
+            try {
+              const parsedResult = JSON.parse(result);
+              upstreamErrorExtensions.response.body = parsedResult;
+              if (parsedResult.data == null && (parsedResult.errors == null || parsedResult.errors.length === 0)) {
+                return {
+                  errors: [
+                    utils.createGraphQLError(
+                      'Unexpected empty "data" and "errors" fields in result: ' + result,
+                      {
+                        extensions: upstreamErrorExtensions
+                      }
+                    )
+                  ]
+                };
+              }
+              if (Array.isArray(parsedResult.errors)) {
+                return {
+                  ...parsedResult,
+                  errors: parsedResult.errors.map(
+                    ({
+                      message,
+                      ...options2
+                    }) => utils.createGraphQLError(message, {
+                      ...options2,
+                      extensions: {
+                        code: "DOWNSTREAM_SERVICE_ERROR",
+                        ...options2.extensions || {}
+                      }
+                    })
+                  )
+                };
+              }
+              return parsedResult;
+            } catch (e) {
               return {
                 errors: [
                   utils.createGraphQLError(
-                    'Unexpected empty "data" and "errors" fields in result: ' + result,
+                    `Unexpected response: ${JSON.stringify(result)}`,
                     {
-                      extensions: upstreamErrorExtensions
+                      extensions: upstreamErrorExtensions,
+                      originalError: e
                     }
                   )
                 ]
               };
             }
-            if (Array.isArray(parsedResult.errors)) {
-              return {
-                ...parsedResult,
-                errors: parsedResult.errors.map(
-                  ({
-                    message,
-                    ...options2
-                  }) => utils.createGraphQLError(message, {
-                    ...options2,
-                    extensions: {
-                      code: "DOWNSTREAM_SERVICE_ERROR",
-                      ...options2.extensions || {}
-                    }
-                  })
-                )
-              };
-            }
-            return parsedResult;
-          } catch (e) {
-            return {
-              errors: [
-                utils.createGraphQLError(
-                  `Unexpected response: ${JSON.stringify(result)}`,
-                  {
-                    extensions: upstreamErrorExtensions,
-                    originalError: e
-                  }
-                )
-              ]
-            };
           }
+        } else {
+          return result;
+        }
+      }).catch((e) => {
+        if (e.name === "AggregateError") {
+          return {
+            errors: e.errors.map(
+              (e2) => coerceFetchError(e2, {
+                signal,
+                endpoint,
+                upstreamErrorExtensions
+              })
+            )
+          };
         }
-      } else {
-        return result;
-      }
-    }).catch((e) => {
-      if (e.name === "AggregateError") {
         return {
-          errors: e.errors.map(
-            (e2) => coerceFetchError(e2, {
+          errors: [
+            coerceFetchError(e, {
               signal,
               endpoint,
               upstreamErrorExtensions
             })
-          )
+          ]
         };
-      }
-      return {
-        errors: [
-          coerceFetchError(e, {
-            signal,
-            endpoint,
-            upstreamErrorExtensions
-          })
-        ]
-      };
-    }).resolve();
+      }).resolve()
+    );
   };
   let executor = baseExecutor;
+  if (options?.apq != null) {
+    executor = function apqExecutor(request) {
+      return utils.mapMaybePromise(
+        baseExecutor(request, true),
+        (res) => {
+          if (res.errors?.some(
+            (error) => error.extensions["code"] === "PERSISTED_QUERY_NOT_FOUND" || error.message === "PersistedQueryNotFound"
+          )) {
+            return baseExecutor(request, false);
+          }
+          return res;
+        }
+      );
+    };
+  }
   if (options?.retry != null) {
+    const prevExecutor = executor;
     executor = function retryExecutor(request) {
       let result;
       let attempt = 0;
@@ -512,7 +552,7 @@ function buildHTTPExecutor(options) {
             errors: [utils.createGraphQLError("No response returned from fetch")]
           };
         }
-        return utils.mapMaybePromise(baseExecutor(request), (res) => {
+        return utils.mapMaybePromise(prevExecutor(request), (res) => {
           result = res;
           if (result?.errors?.length) {
             return retryAttempt();

package/dist/index.d.cts

@@ -55,12 +55,19 @@ interface HTTPExecutorOptions {
      * Print function for DocumentNode
      */
     print?: (doc: DocumentNode) => string;
+    apq?: boolean;
     /**
      * Enable [Explicit Resource Management](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-2.html#using-declarations-and-explicit-resource-management)
      * @deprecated The executors are always disposable, and this option will be removed in the next major version, there is no need to have a flag for this.
      */
     disposable?: boolean;
 }
+type SerializedRequest = {
+    query?: string;
+    variables?: Record<string, any>;
+    operationName?: string;
+    extensions?: any;
+};
 type HeadersConfig = Record<string, string>;
 declare function buildHTTPExecutor(options?: Omit<HTTPExecutorOptions, 'fetch'> & {
     fetch: SyncFetchFn;
@@ -73,4 +80,4 @@ declare function buildHTTPExecutor(options?: Omit<HTTPExecutorOptions, 'fetch'>
 }): DisposableAsyncExecutor<any, HTTPExecutorOptions>;
 declare function buildHTTPExecutor(options?: Omit<HTTPExecutorOptions, 'fetch'>): DisposableAsyncExecutor<any, HTTPExecutorOptions>;
 
-export { type AsyncFetchFn, type AsyncImportFn, type FetchFn, type HTTPExecutorOptions, type HeadersConfig, type RegularFetchFn, type SyncFetchFn, type SyncImportFn, type SyncResponse, buildHTTPExecutor, isLiveQueryOperationDefinitionNode };
+export { type AsyncFetchFn, type AsyncImportFn, type FetchFn, type HTTPExecutorOptions, type HeadersConfig, type RegularFetchFn, type SerializedRequest, type SyncFetchFn, type SyncImportFn, type SyncResponse, buildHTTPExecutor, isLiveQueryOperationDefinitionNode };

package/dist/index.d.ts

@@ -55,12 +55,19 @@ interface HTTPExecutorOptions {
      * Print function for DocumentNode
      */
     print?: (doc: DocumentNode) => string;
+    apq?: boolean;
     /**
      * Enable [Explicit Resource Management](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-2.html#using-declarations-and-explicit-resource-management)
      * @deprecated The executors are always disposable, and this option will be removed in the next major version, there is no need to have a flag for this.
      */
     disposable?: boolean;
 }
+type SerializedRequest = {
+    query?: string;
+    variables?: Record<string, any>;
+    operationName?: string;
+    extensions?: any;
+};
 type HeadersConfig = Record<string, string>;
 declare function buildHTTPExecutor(options?: Omit<HTTPExecutorOptions, 'fetch'> & {
     fetch: SyncFetchFn;
@@ -73,4 +80,4 @@ declare function buildHTTPExecutor(options?: Omit<HTTPExecutorOptions, 'fetch'>
 }): DisposableAsyncExecutor<any, HTTPExecutorOptions>;
 declare function buildHTTPExecutor(options?: Omit<HTTPExecutorOptions, 'fetch'>): DisposableAsyncExecutor<any, HTTPExecutorOptions>;
 
-export { type AsyncFetchFn, type AsyncImportFn, type FetchFn, type HTTPExecutorOptions, type HeadersConfig, type RegularFetchFn, type SyncFetchFn, type SyncImportFn, type SyncResponse, buildHTTPExecutor, isLiveQueryOperationDefinitionNode };
+export { type AsyncFetchFn, type AsyncImportFn, type FetchFn, type HTTPExecutorOptions, type HeadersConfig, type RegularFetchFn, type SerializedRequest, type SyncFetchFn, type SyncImportFn, type SyncResponse, buildHTTPExecutor, isLiveQueryOperationDefinitionNode };

package/dist/index.js

@@ -1,6 +1,6 @@
 import { isAsyncIterable, isPromise, mapMaybePromise, memoize1, createGraphQLError, inspect, mapAsyncIterator, mergeIncrementalResult, getOperationASTFromRequest } from '@graphql-tools/utils';
 import { DisposableSymbols } from '@whatwg-node/disposablestack';
-import { File, FormData, TextDecoder, fetch } from '@whatwg-node/fetch';
+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';
@@ -28,32 +28,21 @@ function collectAsyncIterableValues(asyncIterable) {
   }
   return iterate();
 }
-function createFormDataFromVariables({
-  query,
-  variables,
-  operationName,
-  extensions
-}, {
+function createFormDataFromVariables(body, {
   File: FileCtor = File,
   FormData: FormDataCtor = FormData
 }) {
-  const vars = Object.assign({}, variables);
+  if (!body.variables) {
+    return JSON.stringify(body);
+  }
+  const vars = Object.assign({}, body.variables);
   const { clone, files } = extractFiles(
     vars,
     "variables",
     (v) => isExtractableFile(v) || v?.promise || isAsyncIterable(v) || v?.then || typeof v?.arrayBuffer === "function"
   );
   if (files.size === 0) {
-    return JSON.stringify(
-      {
-        query,
-        variables,
-        operationName,
-        extensions
-      },
-      null,
-      2
-    );
+    return JSON.stringify(body);
   }
   const map = {};
   const uploads = [];
@@ -67,10 +56,8 @@ function createFormDataFromVariables({
   form.append(
     "operations",
     JSON.stringify({
-      query,
-      variables: clone,
-      operationName,
-      extensions
+      ...body,
+      variables: clone
     })
   );
   form.append("map", JSON.stringify(map));
@@ -148,6 +135,20 @@ function createResultForAbort(reason, extensions) {
     errors: [createGraphQLErrorForAbort(reason, extensions)]
   };
 }
+function hashSHA256(str) {
+  const textEncoder = new TextEncoder();
+  const utf8 = textEncoder.encode(str);
+  return mapMaybePromise(
+    crypto.subtle.digest("SHA-256", utf8),
+    (hashBuffer) => {
+      let hashHex = "";
+      for (const bytes of new Uint8Array(hashBuffer)) {
+        hashHex += bytes.toString(16).padStart(2, "0");
+      }
+      return hashHex;
+    }
+  );
+}
 
 const DELIM = "\n\n";
 function isReadableStream(value) {
@@ -250,23 +251,22 @@ const isLiveQueryOperationDefinitionNode = memoize1(
 
 function prepareGETUrl({
   baseUrl = "",
-  query,
-  variables,
-  operationName,
-  extensions
+  body
 }) {
   const dummyHostname = "https://dummyhostname.com";
   const validUrl = baseUrl.startsWith("http") ? baseUrl : baseUrl?.startsWith("/") ? `${dummyHostname}${baseUrl}` : `${dummyHostname}/${baseUrl}`;
   const urlObj = new URL(validUrl);
-  urlObj.searchParams.set("query", stripIgnoredCharacters(query));
-  if (variables && Object.keys(variables).length > 0) {
-    urlObj.searchParams.set("variables", JSON.stringify(variables));
+  if (body.query) {
+    urlObj.searchParams.set("query", body.query);
+  }
+  if (body.variables && Object.keys(body.variables).length > 0) {
+    urlObj.searchParams.set("variables", JSON.stringify(body.variables));
   }
-  if (operationName) {
-    urlObj.searchParams.set("operationName", operationName);
+  if (body.operationName) {
+    urlObj.searchParams.set("operationName", body.operationName);
   }
-  if (extensions) {
-    urlObj.searchParams.set("extensions", JSON.stringify(extensions));
+  if (body.extensions) {
+    urlObj.searchParams.set("extensions", JSON.stringify(body.extensions));
   }
   const finalUrl = urlObj.toString().replace(dummyHostname, "");
   return finalUrl;
@@ -292,7 +292,7 @@ function buildHTTPExecutor(options) {
   const printFn = options?.print ?? defaultPrintFn;
   const disposeCtrl = new AbortController();
   const sharedSignal = createSignalWrapper(disposeCtrl.signal);
-  const baseExecutor = (request) => {
+  const baseExecutor = (request, excludeQuery) => {
     if (sharedSignal.aborted) {
       return createResultForAbort(sharedSignal.reason);
     }
@@ -323,7 +323,6 @@ function buildHTTPExecutor(options) {
       Object.assign(headers, headersFromExtensions);
       request.extensions = restExtensions;
     }
-    const query = printFn(request.document);
     let signal = sharedSignal;
     if (options?.timeout) {
       signal = AbortSignal.any([
@@ -337,163 +336,204 @@ function buildHTTPExecutor(options) {
       },
       response: {}
     };
-    return new ValueOrPromise(() => {
-      switch (method) {
-        case "GET": {
-          const finalUrl = prepareGETUrl({
-            baseUrl: endpoint,
-            query,
-            variables: request.variables,
-            operationName: request.operationName,
-            extensions: request.extensions
-          });
-          const fetchOptions = {
-            method: "GET",
-            headers,
-            signal
+    const query = printFn(request.document);
+    let serializeFn = function serialize() {
+      return {
+        query: excludeQuery ? void 0 : printFn(request.document),
+        variables: (request.variables && Object.keys(request.variables).length) > 0 ? request.variables : void 0,
+        operationName: request.operationName ? request.operationName : void 0,
+        extensions: request.extensions && Object.keys(request.extensions).length > 0 ? request.extensions : void 0
+      };
+    };
+    if (options?.apq) {
+      serializeFn = function serializeWithAPQ() {
+        return mapMaybePromise(hashSHA256(query), (sha256Hash) => {
+          const extensions = request.extensions || {};
+          extensions["persistedQuery"] = {
+            version: 1,
+            sha256Hash
           };
-          if (options?.credentials != null) {
-            fetchOptions.credentials = options.credentials;
-          }
-          upstreamErrorExtensions.request.url = finalUrl;
-          return fetchFn(finalUrl, fetchOptions, request.context, request.info);
-        }
-        case "POST": {
-          const body = {
-            query,
-            variables: request.variables,
-            operationName: request.operationName,
-            extensions: request.extensions
+          return {
+            query: excludeQuery ? void 0 : query,
+            variables: (request.variables && Object.keys(request.variables).length) > 0 ? request.variables : void 0,
+            operationName: request.operationName ? request.operationName : void 0,
+            extensions
           };
-          upstreamErrorExtensions.request.body = body;
-          return mapMaybePromise(
-            createFormDataFromVariables(body, {
-              File: options?.File,
-              FormData: options?.FormData
-            }),
-            (body2) => {
-              if (typeof body2 === "string" && !headers["content-type"]) {
-                upstreamErrorExtensions.request.body = body2;
-                headers["content-type"] = "application/json";
-              }
-              const fetchOptions = {
-                method: "POST",
-                body: body2,
-                headers,
-                signal
-              };
-              if (options?.credentials != null) {
-                fetchOptions.credentials = options.credentials;
-              }
-              return fetchFn(
-                endpoint,
-                fetchOptions,
-                request.context,
-                request.info
-              );
+        });
+      };
+    }
+    return mapMaybePromise(
+      serializeFn(),
+      (body) => new ValueOrPromise(() => {
+        switch (method) {
+          case "GET": {
+            const finalUrl = prepareGETUrl({
+              baseUrl: endpoint,
+              body
+            });
+            const fetchOptions = {
+              method: "GET",
+              headers,
+              signal
+            };
+            if (options?.credentials != null) {
+              fetchOptions.credentials = options.credentials;
             }
+            upstreamErrorExtensions.request.url = finalUrl;
+            return fetchFn(
+              finalUrl,
+              fetchOptions,
+              request.context,
+              request.info
+            );
+          }
+          case "POST": {
+            upstreamErrorExtensions.request.body = body;
+            return mapMaybePromise(
+              createFormDataFromVariables(body, {
+                File: options?.File,
+                FormData: options?.FormData
+              }),
+              (body2) => {
+                if (typeof body2 === "string" && !headers["content-type"]) {
+                  upstreamErrorExtensions.request.body = body2;
+                  headers["content-type"] = "application/json";
+                }
+                const fetchOptions = {
+                  method: "POST",
+                  body: body2,
+                  headers,
+                  signal
+                };
+                if (options?.credentials != null) {
+                  fetchOptions.credentials = options.credentials;
+                }
+                return fetchFn(
+                  endpoint,
+                  fetchOptions,
+                  request.context,
+                  request.info
+                );
+              }
+            );
+          }
+        }
+      }).then((fetchResult) => {
+        upstreamErrorExtensions.response.status = fetchResult.status;
+        upstreamErrorExtensions.response.statusText = fetchResult.statusText;
+        Object.defineProperty(upstreamErrorExtensions.response, "headers", {
+          get() {
+            return Object.fromEntries(fetchResult.headers.entries());
+          }
+        });
+        if (options?.retry != null && !fetchResult.status.toString().startsWith("2")) {
+          throw new Error(
+            fetchResult.statusText || `Upstream HTTP Error: ${fetchResult.status}`
           );
         }
-      }
-    }).then((fetchResult) => {
-      upstreamErrorExtensions.response.status = fetchResult.status;
-      upstreamErrorExtensions.response.statusText = fetchResult.statusText;
-      Object.defineProperty(upstreamErrorExtensions.response, "headers", {
-        get() {
-          return Object.fromEntries(fetchResult.headers.entries());
+        const contentType = fetchResult.headers.get("content-type");
+        if (contentType?.includes("text/event-stream")) {
+          return handleEventStreamResponse(signal, fetchResult);
+        } else if (contentType?.includes("multipart/mixed")) {
+          return handleMultipartMixedResponse(fetchResult);
         }
-      });
-      if (options?.retry != null && !fetchResult.status.toString().startsWith("2")) {
-        throw new Error(
-          fetchResult.statusText || `Upstream HTTP Error: ${fetchResult.status}`
-        );
-      }
-      const contentType = fetchResult.headers.get("content-type");
-      if (contentType?.includes("text/event-stream")) {
-        return handleEventStreamResponse(signal, fetchResult);
-      } else if (contentType?.includes("multipart/mixed")) {
-        return handleMultipartMixedResponse(fetchResult);
-      }
-      return fetchResult.text();
-    }).then((result) => {
-      if (typeof result === "string") {
-        upstreamErrorExtensions.response.body = result;
-        if (result) {
-          try {
-            const parsedResult = JSON.parse(result);
-            upstreamErrorExtensions.response.body = parsedResult;
-            if (parsedResult.data == null && (parsedResult.errors == null || parsedResult.errors.length === 0)) {
+        return fetchResult.text();
+      }).then((result) => {
+        if (typeof result === "string") {
+          upstreamErrorExtensions.response.body = result;
+          if (result) {
+            try {
+              const parsedResult = JSON.parse(result);
+              upstreamErrorExtensions.response.body = parsedResult;
+              if (parsedResult.data == null && (parsedResult.errors == null || parsedResult.errors.length === 0)) {
+                return {
+                  errors: [
+                    createGraphQLError(
+                      'Unexpected empty "data" and "errors" fields in result: ' + result,
+                      {
+                        extensions: upstreamErrorExtensions
+                      }
+                    )
+                  ]
+                };
+              }
+              if (Array.isArray(parsedResult.errors)) {
+                return {
+                  ...parsedResult,
+                  errors: parsedResult.errors.map(
+                    ({
+                      message,
+                      ...options2
+                    }) => createGraphQLError(message, {
+                      ...options2,
+                      extensions: {
+                        code: "DOWNSTREAM_SERVICE_ERROR",
+                        ...options2.extensions || {}
+                      }
+                    })
+                  )
+                };
+              }
+              return parsedResult;
+            } catch (e) {
               return {
                 errors: [
                   createGraphQLError(
-                    'Unexpected empty "data" and "errors" fields in result: ' + result,
+                    `Unexpected response: ${JSON.stringify(result)}`,
                     {
-                      extensions: upstreamErrorExtensions
+                      extensions: upstreamErrorExtensions,
+                      originalError: e
                     }
                   )
                 ]
               };
             }
-            if (Array.isArray(parsedResult.errors)) {
-              return {
-                ...parsedResult,
-                errors: parsedResult.errors.map(
-                  ({
-                    message,
-                    ...options2
-                  }) => createGraphQLError(message, {
-                    ...options2,
-                    extensions: {
-                      code: "DOWNSTREAM_SERVICE_ERROR",
-                      ...options2.extensions || {}
-                    }
-                  })
-                )
-              };
-            }
-            return parsedResult;
-          } catch (e) {
-            return {
-              errors: [
-                createGraphQLError(
-                  `Unexpected response: ${JSON.stringify(result)}`,
-                  {
-                    extensions: upstreamErrorExtensions,
-                    originalError: e
-                  }
-                )
-              ]
-            };
           }
+        } else {
+          return result;
+        }
+      }).catch((e) => {
+        if (e.name === "AggregateError") {
+          return {
+            errors: e.errors.map(
+              (e2) => coerceFetchError(e2, {
+                signal,
+                endpoint,
+                upstreamErrorExtensions
+              })
+            )
+          };
         }
-      } else {
-        return result;
-      }
-    }).catch((e) => {
-      if (e.name === "AggregateError") {
         return {
-          errors: e.errors.map(
-            (e2) => coerceFetchError(e2, {
+          errors: [
+            coerceFetchError(e, {
               signal,
               endpoint,
               upstreamErrorExtensions
             })
-          )
+          ]
         };
-      }
-      return {
-        errors: [
-          coerceFetchError(e, {
-            signal,
-            endpoint,
-            upstreamErrorExtensions
-          })
-        ]
-      };
-    }).resolve();
+      }).resolve()
+    );
   };
   let executor = baseExecutor;
+  if (options?.apq != null) {
+    executor = function apqExecutor(request) {
+      return mapMaybePromise(
+        baseExecutor(request, true),
+        (res) => {
+          if (res.errors?.some(
+            (error) => error.extensions["code"] === "PERSISTED_QUERY_NOT_FOUND" || error.message === "PersistedQueryNotFound"
+          )) {
+            return baseExecutor(request, false);
+          }
+          return res;
+        }
+      );
+    };
+  }
   if (options?.retry != null) {
+    const prevExecutor = executor;
     executor = function retryExecutor(request) {
       let result;
       let attempt = 0;
@@ -510,7 +550,7 @@ function buildHTTPExecutor(options) {
             errors: [createGraphQLError("No response returned from fetch")]
           };
         }
-        return mapMaybePromise(baseExecutor(request), (res) => {
+        return mapMaybePromise(prevExecutor(request), (res) => {
           result = res;
           if (result?.errors?.length) {
             return retryAttempt();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/executor-http",
-  "version": "1.1.14",
+  "version": "1.2.0-alpha-753096403f92c5dbcdd17828acdd17a1aa53a51e",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
@@ -49,6 +49,7 @@
     "value-or-promise": "^1.0.12"
   },
   "devDependencies": {
+    "@apollo/server": "^4.11.2",
     "@types/extract-files": "8.1.3",
     "@whatwg-node/disposablestack": "^0.0.5",
     "graphql": "^16.9.0",