@graphql-hive/gateway-runtime 2.4.0-alpha-905497611eff623b4c782baf8e5a2d3f3aa2446e → 2.4.0-alpha-f5c948dc129d453f43378098ef0956fa6f6531c2

package/CHANGELOG.md

@@ -1,49 +1,90 @@
 # @graphql-hive/gateway-runtime
 
-## 2.4.0-alpha-905497611eff623b4c782baf8e5a2d3f3aa2446e
+## 2.4.0-alpha-f5c948dc129d453f43378098ef0956fa6f6531c2
 ### Minor Changes
 
 
 
-- [#1636](https://github.com/graphql-hive/gateway/pull/1636) [`837d0dd`](https://github.com/graphql-hive/gateway/commit/837d0ddf477e0171f455633f47867c2a1e30d586) Thanks [@EmrysMyrddin](https://github.com/EmrysMyrddin)! - Expose GraphQLError as OpenTelemetry Events.
+- [#1738](https://github.com/graphql-hive/gateway/pull/1738) [`5a2207f`](https://github.com/graphql-hive/gateway/commit/5a2207f13466d56376ae246d4226b6d214b6b3a3) Thanks [@EmrysMyrddin](https://github.com/EmrysMyrddin)! - New Hive CDN mirror and circuit breaker
   
-  Errors contains in the result of a graphql operation are now reported as standalone OpenTelemetry
-  Events (name `graphql.error`) instead of OpenTelemetry Exceptions.
+  Hive CDN introduced a new CDN mirror and circuit breaker to mitigate the risk related to Cloudflare
+  services failures.
   
-  This is aligned with the guidance of the Graphql OpenTelemetry working group.
+  You can now provide multiple endpoint in Hive Console related features, and configure the circuit
+  breaker handling CDN failure and how it switches to the CDN mirror.
   
-  It allows to add more graphql specific attributes to errors reported in a response:
+  ### Usage
   
-  - `message`: The error message
-  - `path`: The path in the operation document from which the error originated
-  - `locations`: The list of related locations in the document source
-  - `coordinate`: The schema coordinate of the resolver which is the source of the error
+  To enable this feature, please provide the mirror endpoint in `supergraph` and `persistedDocument`
+  options:
   
-  This brings the experimental support of the `coordinate` error attribute in the Yoga Runtime. For
-  security reason, this attribute is purposefully not serialized, to avoid leaking schema information
-  to clients.
+  ```diff
+  import { defineConfig } from '@graphql-hive/gateway'
+  
+  export const gatewayConfig = defineConfig({
+    supergraph: {
+      type: 'hive',
+  -   endpoint: 'https://cdn.graphql-hive.com/artifacts/v1/<target-id>/supergraph',
+  +   endpoint: [
+  +     'https://cdn.graphql-hive.com/artifacts/v1/<target-id>/supergraph',
+  +     'https://cdn-mirror.graphql-hive.com/artifacts/v1/<target-id>/supergraph'
+  +   ]
+    },
+  
+    persistedDocuments: {
+  -   endpoint: 'https://cdn.graphql-hive.com/<target-id>',
+  +   endpoint: [
+  +     'https://cdn.graphql-hive.com/<target-id>',
+  +     'https://cdn-mirror.graphql-hive.com/<target-id>'
+  +   ]
+    }
+  })
+  ```
+  
+  ### Configuration
+  
+  The circuit breaker has production ready default configuration, but you customize its behavior:
+  
+  ```ts
+  import { defineConfig, CircuitBreakerConfiguration } from '@graphql-hive/gateway';
+  
+  const circuitBreaker: CircuitBreakerConfiguration = {
+      resetTimeout: 30_000; // 30s
+      errorThresholdPercentage: 50;
+      volumeThreshold: 5;
+  }
+  
+  export const gatewayConfig = defineConfig({
+    supergraph: {
+      type: 'hive',
+      endpoint: [...],
+      circuitBreaker,
+    },
+  
+    persistedDocuments: {
+      type: 'hive',
+      endpoint: [...],
+      circuitBreaker,
+    },
+  });
+  ```
 
 ### Patch Changes
 
 
 
-- [#1636](https://github.com/graphql-hive/gateway/pull/1636) [`1495bd9`](https://github.com/graphql-hive/gateway/commit/1495bd90d9603bb1c66676a2d31990b16c3f3c4d) Thanks [@EmrysMyrddin](https://github.com/EmrysMyrddin)! - dependencies updates:
-  
-  - Updated dependency [`graphql-yoga@^5.17.0` ↗︎](https://www.npmjs.com/package/graphql-yoga/v/5.17.0) (from `^5.16.2`, in `dependencies`)
-
-
 - [#1747](https://github.com/graphql-hive/gateway/pull/1747) [`8fdaef5`](https://github.com/graphql-hive/gateway/commit/8fdaef56d70998dacaed829c278fa7079062ad67) Thanks [@dependabot](https://github.com/apps/dependabot)! - dependencies updates:
   
   - Updated dependency [`@graphql-hive/core@^0.18.0` ↗︎](https://www.npmjs.com/package/@graphql-hive/core/v/0.18.0) (from `^0.15.1`, in `dependencies`)
   - Updated dependency [`@graphql-hive/yoga@^0.46.0` ↗︎](https://www.npmjs.com/package/@graphql-hive/yoga/v/0.46.0) (from `^0.43.1`, in `dependencies`)
-- Updated dependencies [[`1495bd9`](https://github.com/graphql-hive/gateway/commit/1495bd90d9603bb1c66676a2d31990b16c3f3c4d), [`da8b8e3`](https://github.com/graphql-hive/gateway/commit/da8b8e3f3545487249b11c6577e3889f68527249)]:
-  - @graphql-mesh/fusion-runtime@1.6.2-alpha-905497611eff623b4c782baf8e5a2d3f3aa2446e
-  - @graphql-tools/delegate@12.0.2-alpha-905497611eff623b4c782baf8e5a2d3f3aa2446e
+- Updated dependencies [[`da8b8e3`](https://github.com/graphql-hive/gateway/commit/da8b8e3f3545487249b11c6577e3889f68527249)]:
+  - @graphql-tools/delegate@12.0.2-alpha-f5c948dc129d453f43378098ef0956fa6f6531c2
   - @graphql-mesh/hmac-upstream-signature@2.0.8
-  - @graphql-tools/batch-delegate@10.0.8-alpha-905497611eff623b4c782baf8e5a2d3f3aa2446e
-  - @graphql-tools/federation@4.2.6-alpha-905497611eff623b4c782baf8e5a2d3f3aa2446e
-  - @graphql-tools/stitch@10.1.6-alpha-905497611eff623b4c782baf8e5a2d3f3aa2446e
-  - @graphql-tools/wrap@11.1.2-alpha-905497611eff623b4c782baf8e5a2d3f3aa2446e
+  - @graphql-tools/batch-delegate@10.0.8-alpha-f5c948dc129d453f43378098ef0956fa6f6531c2
+  - @graphql-tools/federation@4.2.6-alpha-f5c948dc129d453f43378098ef0956fa6f6531c2
+  - @graphql-mesh/fusion-runtime@1.6.2-alpha-f5c948dc129d453f43378098ef0956fa6f6531c2
+  - @graphql-tools/stitch@10.1.6-alpha-f5c948dc129d453f43378098ef0956fa6f6531c2
+  - @graphql-tools/wrap@11.1.2-alpha-f5c948dc129d453f43378098ef0956fa6f6531c2
 
 ## 2.3.7
 ### Patch Changes

package/dist/index.cjs

@@ -143,8 +143,7 @@ const getExecuteFnFromExecutor = utils.memoize1(
         operationName: args.operationName ?? void 0,
         rootValue: args.rootValue,
         context: args.contextValue,
-        signal: args.signal,
-        schemaCoordinateInErrors: args.schemaCoordinateInErrors
+        signal: args.signal
       });
     };
   }
@@ -609,6 +608,7 @@ function getReportingPlugin(config, configContext, allowArbitraryDocuments = fal
             endpoint: config.persistedDocuments.endpoint,
             accessToken: config.persistedDocuments.token
           },
+          circuitBreaker: config.persistedDocuments.circuitBreaker,
           // Trick to satisfy the Hive Console plugin types
           allowArbitraryDocuments
         }
@@ -2044,6 +2044,7 @@ function createGatewayRuntime(config) {
           endpoint: config.persistedDocuments.endpoint,
           accessToken: config.persistedDocuments.token
         },
+        circuitBreaker: config.persistedDocuments.circuitBreaker,
         // @ts-expect-error - Hive Console plugin options are not compatible yet
         allowArbitraryDocuments: allowArbitraryDocumentsForPersistedDocuments
       }
@@ -2063,7 +2064,7 @@ function createGatewayRuntime(config) {
         clearTimeout(currentTimeout);
       }
       if (pollingInterval) {
-        currentTimeout = setTimeout(schemaFetcher, pollingInterval);
+        currentTimeout = setTimeout(schemaFetcher.fetch, pollingInterval);
       }
     }, pausePolling2 = function() {
       if (currentTimeout) {
@@ -2087,79 +2088,103 @@ function createGatewayRuntime(config) {
     let initialFetch$;
     let schemaFetcher;
     if (config.schema && typeof config.schema === "object" && "type" in config.schema) {
-      const { endpoint, key } = config.schema;
-      const fetcher = core$1.createSchemaFetcher({
-        endpoint,
-        key,
+      let ensureSdl2 = function(endpoint2) {
+        endpoint2 = endpoint2.replace(/\/services$/, "/sdl");
+        if (!/\/sdl(\.graphql)*$/.test(endpoint2)) {
+          endpoint2 = core$1.joinUrl(endpoint2, "sdl");
+        }
+        return endpoint2;
+      };
+      const { endpoint, key, circuitBreaker } = config.schema;
+      const fetcher = core$1.createCDNArtifactFetcher({
+        endpoint: Array.isArray(endpoint) ? (
+          // no endpoint.map just to make ts happy without casting
+          [ensureSdl2(endpoint[0]), ensureSdl2(endpoint[1])]
+        ) : ensureSdl2(endpoint),
+        circuitBreaker,
+        accessKey: key,
         logger: configContext.log.child("[hiveSchemaFetcher] ")
       });
-      schemaFetcher = function fetchSchemaFromCDN() {
-        pausePolling2();
-        initialFetch$ = promiseHelpers.handleMaybePromise(fetcher, ({ sdl }) => {
-          {
-            unifiedGraph = graphql.buildSchema(sdl, {
-              assumeValid: true,
-              assumeValidSDL: true
-            });
-          }
-          continuePolling2();
-          return true;
-        });
-        return initialFetch$;
+      schemaFetcher = {
+        fetch: function fetchSchemaFromCDN() {
+          pausePolling2();
+          initialFetch$ = promiseHelpers.handleMaybePromise(
+            fetcher.fetch,
+            ({ contents }) => {
+              {
+                unifiedGraph = graphql.buildSchema(contents, {
+                  assumeValid: true,
+                  assumeValidSDL: true
+                });
+              }
+              continuePolling2();
+              return true;
+            }
+          );
+          return initialFetch$;
+        },
+        dispose: () => fetcher.dispose()
       };
     } else if (config.schema) {
       if (!isDynamicUnifiedGraphSchema(config.schema)) {
         delete config.pollingInterval;
       }
-      schemaFetcher = function fetchSchema() {
-        pausePolling2();
-        initialFetch$ = promiseHelpers.handleMaybePromise(
-          () => handleUnifiedGraphConfig(
-            // @ts-expect-error TODO: what's up with type narrowing
-            config.schema,
-            configContext
-          ),
-          (schema) => {
-            if (graphql.isSchema(schema)) {
-              unifiedGraph = schema;
-            } else if (utils.isDocumentNode(schema)) {
-              unifiedGraph = graphql.buildASTSchema(schema, {
-                assumeValid: true,
-                assumeValidSDL: true
-              });
-            } else {
-              unifiedGraph = graphql.buildSchema(schema, {
-                noLocation: true,
-                assumeValid: true,
-                assumeValidSDL: true
-              });
+      schemaFetcher = {
+        fetch: function fetchSchema() {
+          pausePolling2();
+          initialFetch$ = promiseHelpers.handleMaybePromise(
+            () => handleUnifiedGraphConfig(
+              // @ts-expect-error TODO: what's up with type narrowing
+              config.schema,
+              configContext
+            ),
+            (schema) => {
+              if (graphql.isSchema(schema)) {
+                unifiedGraph = schema;
+              } else if (utils.isDocumentNode(schema)) {
+                unifiedGraph = graphql.buildASTSchema(schema, {
+                  assumeValid: true,
+                  assumeValidSDL: true
+                });
+              } else {
+                unifiedGraph = graphql.buildSchema(schema, {
+                  noLocation: true,
+                  assumeValid: true,
+                  assumeValidSDL: true
+                });
+              }
+              continuePolling2();
+              return true;
             }
-            continuePolling2();
-            return true;
-          }
-        );
-        return initialFetch$;
+          );
+          return initialFetch$;
+        }
       };
     } else {
-      schemaFetcher = function fetchSchemaWithExecutor() {
-        pausePolling2();
-        return promiseHelpers.handleMaybePromise(
-          () => wrap.schemaFromExecutor(proxyExecutor, configContext, {
-            assumeValid: true
-          }),
-          (schema) => {
-            unifiedGraph = schema;
-            continuePolling2();
-            return true;
-          }
-        );
+      schemaFetcher = {
+        fetch: function fetchSchemaWithExecutor() {
+          pausePolling2();
+          return promiseHelpers.handleMaybePromise(
+            () => wrap.schemaFromExecutor(proxyExecutor, configContext, {
+              assumeValid: true
+            }),
+            (schema) => {
+              unifiedGraph = schema;
+              continuePolling2();
+              return true;
+            }
+          );
+        }
       };
     }
-    const instrumentedFetcher = schemaFetcher;
-    schemaFetcher = (...args) => core.getInstrumented(null).asyncFn(
-      instrumentation?.schema,
-      instrumentedFetcher
-    )(...args);
+    const instrumentedFetcher = schemaFetcher.fetch;
+    schemaFetcher = {
+      ...schemaFetcher,
+      fetch: (...args) => core.getInstrumented(null).asyncFn(
+        instrumentation?.schema,
+        instrumentedFetcher
+      )(...args)
+    };
     getSchema = () => {
       if (unifiedGraph != null) {
         return unifiedGraph;
@@ -2170,10 +2195,10 @@ function createGatewayRuntime(config) {
           () => unifiedGraph
         );
       }
-      return promiseHelpers.handleMaybePromise(schemaFetcher, () => unifiedGraph);
+      return promiseHelpers.handleMaybePromise(schemaFetcher.fetch, () => unifiedGraph);
     };
     const shouldSkipValidation = "skipValidation" in config ? config.skipValidation : false;
-    const executorPlugin = {
+    unifiedGraphPlugin = {
       onValidate({ params, setResult }) {
         if (shouldSkipValidation || !params.schema) {
           setResult([]);
@@ -2181,10 +2206,12 @@ function createGatewayRuntime(config) {
       },
       onDispose() {
         pausePolling2();
-        return transportExecutorStack.disposeAsync();
+        return promiseHelpers.handleMaybePromise(
+          () => transportExecutorStack.disposeAsync(),
+          () => schemaFetcher.dispose?.()
+        );
       }
     };
-    unifiedGraphPlugin = executorPlugin;
     readinessChecker = () => promiseHelpers.handleMaybePromise(
       () => proxyExecutor({
         document: graphql.parse(`query ReadinessCheck { __typename }`, {
@@ -2195,7 +2222,7 @@ function createGatewayRuntime(config) {
     );
     schemaInvalidator = () => {
       unifiedGraph = void 0;
-      initialFetch$ = schemaFetcher();
+      initialFetch$ = schemaFetcher.fetch();
     };
   } else if ("subgraph" in config) {
     let getSubschemaConfig2 = function() {
@@ -2410,31 +2437,46 @@ function createGatewayRuntime(config) {
     let unifiedGraphFetcher;
     if (typeof config.supergraph === "object" && "type" in config.supergraph) {
       if (config.supergraph.type === "hive") {
-        const { endpoint, key } = config.supergraph;
-        const fetcher = core$1.createSupergraphSDLFetcher({
-          endpoint,
-          key,
-          logger: logger.LegacyLogger.from(
-            configContext.log.child("[hiveSupergraphFetcher] ")
-          ),
+        let ensureSupergraph2 = function(endpoint2) {
+          if (!/\/supergraph(\.graphql)*$/.test(endpoint2)) {
+            endpoint2 = core$1.joinUrl(endpoint2, "supergraph");
+          }
+          return endpoint2;
+        };
+        const { endpoint, key, circuitBreaker } = config.supergraph;
+        const fetcher = core$1.createCDNArtifactFetcher({
+          endpoint: Array.isArray(endpoint) ? (
+            // no endpoint.map just to make ts happy without casting
+            [ensureSupergraph2(endpoint[0]), ensureSupergraph2(endpoint[1])]
+          ) : ensureSupergraph2(endpoint),
+          accessKey: key,
+          logger: configContext.log.child("[hiveSupergraphFetcher] "),
           // @ts-expect-error - MeshFetch is not compatible with `typeof fetch`
-          fetchImplementation: configContext.fetch,
+          fetch: configContext.fetch,
+          circuitBreaker,
           name: "hive-gateway",
           version: globalThis.__VERSION__
         });
-        unifiedGraphFetcher = () => fetcher().then(({ supergraphSdl }) => supergraphSdl);
+        unifiedGraphFetcher = {
+          fetch: () => fetcher.fetch().then(({ contents }) => contents),
+          dispose: () => fetcher.dispose()
+        };
       } else if (config.supergraph.type === "graphos") {
         const graphosFetcherContainer = createGraphOSFetcher({
           graphosOpts: config.supergraph,
           configContext,
           pollingInterval: config.pollingInterval
         });
-        unifiedGraphFetcher = graphosFetcherContainer.unifiedGraphFetcher;
+        unifiedGraphFetcher = {
+          fetch: graphosFetcherContainer.unifiedGraphFetcher
+        };
       } else {
-        unifiedGraphFetcher = () => {
-          throw new Error(
-            `Unknown supergraph configuration: ${config.supergraph}`
-          );
+        unifiedGraphFetcher = {
+          fetch: () => {
+            throw new Error(
+              `Unknown supergraph configuration: ${config.supergraph}`
+            );
+          }
         };
       }
     } else {
@@ -2446,20 +2488,25 @@ function createGatewayRuntime(config) {
           `Polling interval not set for supergraph, if you want to get updates of supergraph, we recommend setting a polling interval`
         );
       }
-      unifiedGraphFetcher = () => handleUnifiedGraphConfig(
-        // @ts-expect-error TODO: what's up with type narrowing
-        config.supergraph,
-        configContext
-      );
+      unifiedGraphFetcher = {
+        fetch: () => handleUnifiedGraphConfig(
+          // @ts-expect-error TODO: what's up with type narrowing
+          config.supergraph,
+          configContext
+        )
+      };
     }
-    const instrumentedGraphFetcher = unifiedGraphFetcher;
-    unifiedGraphFetcher = (...args) => core.getInstrumented(null).asyncFn(
-      instrumentation?.schema,
-      instrumentedGraphFetcher
-    )(...args);
+    const instrumentedGraphFetcher = unifiedGraphFetcher.fetch;
+    unifiedGraphFetcher = {
+      ...unifiedGraphFetcher,
+      fetch: (...args) => core.getInstrumented(null).asyncFn(
+        instrumentation?.schema,
+        instrumentedGraphFetcher
+      )(...args)
+    };
     const unifiedGraphManager = new fusionRuntime.UnifiedGraphManager({
       handleUnifiedGraph: config.unifiedGraphHandler,
-      getUnifiedGraph: unifiedGraphFetcher,
+      getUnifiedGraph: unifiedGraphFetcher.fetch,
       onUnifiedGraphChange(newUnifiedGraph) {
         unifiedGraph = newUnifiedGraph;
         replaceSchema(newUnifiedGraph);
@@ -2509,7 +2556,10 @@ function createGatewayRuntime(config) {
     getExecutor = () => unifiedGraphManager.getExecutor();
     unifiedGraphPlugin = {
       onDispose() {
-        return utils$1.dispose(unifiedGraphManager);
+        return promiseHelpers.handleMaybePromise(
+          () => utils$1.dispose(unifiedGraphManager),
+          () => unifiedGraphFetcher.dispose?.()
+        );
       }
     };
   }

package/dist/index.d.cts

@@ -5,6 +5,8 @@ import { Plugin as Plugin$1 } from '@envelop/core';
 export { withState } from '@envelop/core';
 import { GenericAuthPluginOptions } from '@envelop/generic-auth';
 export { ResolveUserFn, ValidateUserFn } from '@envelop/generic-auth';
+import { HivePluginOptions, CircuitBreakerConfiguration } from '@graphql-hive/core';
+export { CircuitBreakerConfiguration } from '@graphql-hive/core';
 import { Logger, LogLevel } from '@graphql-hive/logger';
 export * from '@graphql-hive/logger';
 import { PubSub } from '@graphql-hive/pubsub';
@@ -22,7 +24,6 @@ import { UsePersistedOperationsOptions } from '@graphql-yoga/plugin-persisted-op
 import { GraphQLResolveInfo } from 'graphql/type';
 import { Agent } from 'node:http';
 import { Agent as Agent$1 } from 'node:https';
-import { HivePluginOptions } from '@graphql-hive/core';
 import { FetchAPI } from '@whatwg-node/server';
 export * from '@whatwg-node/disposablestack';
 import { Context, ConnectionInitMessage, ServerOptions } from 'graphql-ws';
@@ -414,11 +415,12 @@ interface GatewayHiveCDNOptions {
     /**
      * GraphQL Hive CDN endpoint URL.
      */
-    endpoint: string;
+    endpoint: string | [string, string];
     /**
      * GraphQL Hive CDN access key.
      */
     key: string;
+    circuitBreaker?: CircuitBreakerConfiguration;
 }
 interface GatewayHiveReportingOptions extends Omit<HiveConsolePluginOptions, 'experimental__persistedDocuments'> {
     type: 'hive';
@@ -507,7 +509,11 @@ interface GatewayHivePersistedDocumentsOptions {
     /**
      * GraphQL Hive persisted documents CDN endpoint URL.
      */
-    endpoint: string;
+    endpoint: string | [string, string];
+    /**
+     * Circuit Breaker configuration to customize CDN failures handling and switch to mirror endpoint.
+     */
+    circuitBreaker?: CircuitBreakerConfiguration;
     /**
      * GraphQL Hive persisted documents CDN access token.
      */

package/dist/index.d.ts

@@ -5,6 +5,8 @@ import { Plugin as Plugin$1 } from '@envelop/core';
 export { withState } from '@envelop/core';
 import { GenericAuthPluginOptions } from '@envelop/generic-auth';
 export { ResolveUserFn, ValidateUserFn } from '@envelop/generic-auth';
+import { HivePluginOptions, CircuitBreakerConfiguration } from '@graphql-hive/core';
+export { CircuitBreakerConfiguration } from '@graphql-hive/core';
 import { Logger, LogLevel } from '@graphql-hive/logger';
 export * from '@graphql-hive/logger';
 import { PubSub } from '@graphql-hive/pubsub';
@@ -22,7 +24,6 @@ import { UsePersistedOperationsOptions } from '@graphql-yoga/plugin-persisted-op
 import { GraphQLResolveInfo } from 'graphql/type';
 import { Agent } from 'node:http';
 import { Agent as Agent$1 } from 'node:https';
-import { HivePluginOptions } from '@graphql-hive/core';
 import { FetchAPI } from '@whatwg-node/server';
 export * from '@whatwg-node/disposablestack';
 import { Context, ConnectionInitMessage, ServerOptions } from 'graphql-ws';
@@ -414,11 +415,12 @@ interface GatewayHiveCDNOptions {
     /**
      * GraphQL Hive CDN endpoint URL.
      */
-    endpoint: string;
+    endpoint: string | [string, string];
     /**
      * GraphQL Hive CDN access key.
      */
     key: string;
+    circuitBreaker?: CircuitBreakerConfiguration;
 }
 interface GatewayHiveReportingOptions extends Omit<HiveConsolePluginOptions, 'experimental__persistedDocuments'> {
     type: 'hive';
@@ -507,7 +509,11 @@ interface GatewayHivePersistedDocumentsOptions {
     /**
      * GraphQL Hive persisted documents CDN endpoint URL.
      */
-    endpoint: string;
+    endpoint: string | [string, string];
+    /**
+     * Circuit Breaker configuration to customize CDN failures handling and switch to mirror endpoint.
+     */
+    circuitBreaker?: CircuitBreakerConfiguration;
     /**
      * GraphQL Hive persisted documents CDN access token.
      */

package/dist/index.js

@@ -2,7 +2,7 @@ import { isOriginalGraphQLError, getInstrumented as getInstrumented$1 } from '@e
 export { withState } from '@envelop/core';
 import { useDisableIntrospection } from '@envelop/disable-introspection';
 import { useGenericAuth } from '@envelop/generic-auth';
-import { createSchemaFetcher, createSupergraphSDLFetcher } from '@graphql-hive/core';
+import { createCDNArtifactFetcher, joinUrl } from '@graphql-hive/core';
 import { Logger, LegacyLogger } from '@graphql-hive/logger';
 export * from '@graphql-hive/logger';
 import { millisecondsToStr, getOnSubgraphExecute, UnifiedGraphManager, restoreExtraDirectives, getTransportEntryMapUsingFusionAndFederationDirectives, getStitchingDirectivesTransformerForSubschema, handleFederationSubschema, handleResolveToDirectives } from '@graphql-mesh/fusion-runtime';
@@ -15,7 +15,7 @@ import { batchDelegateToSchema } from '@graphql-tools/batch-delegate';
 import { getTypeInfo, EMPTY_OBJECT, delegateToSchema, defaultMergedResolver } from '@graphql-tools/delegate';
 import { defaultPrintFn as defaultPrintFn$1 } from '@graphql-tools/executor-common';
 import { getDirectiveExtensions, memoize1, mergeDeep, isValidPath, pathToArray, memoize3, getDirective, createGraphQLError, isAsyncIterable, mapAsyncIterator, createDeferred, isPromise, isDocumentNode, asArray, printSchemaWithDirectives, parseSelectionSet } from '@graphql-tools/utils';
-import { wrapSchema, schemaFromExecutor } from '@graphql-tools/wrap';
+import { schemaFromExecutor, wrapSchema } from '@graphql-tools/wrap';
 import { useCSRFPrevention } from '@graphql-yoga/plugin-csrf-prevention';
 import { useDeferStream } from '@graphql-yoga/plugin-defer-stream';
 import { usePersistedOperations } from '@graphql-yoga/plugin-persisted-operations';
@@ -23,7 +23,7 @@ import { AsyncDisposableStack } from '@whatwg-node/disposablestack';
 export * from '@whatwg-node/disposablestack';
 import { handleMaybePromise, iterateAsync } from '@whatwg-node/promise-helpers';
 import { useCookies } from '@whatwg-node/server-plugin-cookies';
-import { print, visit, visitWithTypeInfo, getArgumentValues, getNamedType, isIntrospectionType, isListType, isCompositeType, getOperationAST, isSchema, parse, buildASTSchema, buildSchema } from 'graphql';
+import { print, visit, visitWithTypeInfo, getArgumentValues, getNamedType, isIntrospectionType, isListType, isCompositeType, getOperationAST, isSchema, parse, buildSchema, buildASTSchema } from 'graphql';
 import { isAsyncIterable as isAsyncIterable$1, useReadinessCheck, useExecutionCancellation, createYoga, chain, mergeSchemas } from 'graphql-yoga';
 import { DEFAULT_UPLINKS, fetchSupergraphSdlFromManagedFederation } from '@graphql-tools/federation';
 import { useApolloUsageReport } from '@graphql-yoga/plugin-apollo-usage-report';
@@ -142,8 +142,7 @@ const getExecuteFnFromExecutor = memoize1(
         operationName: args.operationName ?? void 0,
         rootValue: args.rootValue,
         context: args.contextValue,
-        signal: args.signal,
-        schemaCoordinateInErrors: args.schemaCoordinateInErrors
+        signal: args.signal
       });
     };
   }
@@ -608,6 +607,7 @@ function getReportingPlugin(config, configContext, allowArbitraryDocuments = fal
             endpoint: config.persistedDocuments.endpoint,
             accessToken: config.persistedDocuments.token
           },
+          circuitBreaker: config.persistedDocuments.circuitBreaker,
           // Trick to satisfy the Hive Console plugin types
           allowArbitraryDocuments
         }
@@ -2043,6 +2043,7 @@ function createGatewayRuntime(config) {
           endpoint: config.persistedDocuments.endpoint,
           accessToken: config.persistedDocuments.token
         },
+        circuitBreaker: config.persistedDocuments.circuitBreaker,
         // @ts-expect-error - Hive Console plugin options are not compatible yet
         allowArbitraryDocuments: allowArbitraryDocumentsForPersistedDocuments
       }
@@ -2062,7 +2063,7 @@ function createGatewayRuntime(config) {
         clearTimeout(currentTimeout);
       }
       if (pollingInterval) {
-        currentTimeout = setTimeout(schemaFetcher, pollingInterval);
+        currentTimeout = setTimeout(schemaFetcher.fetch, pollingInterval);
       }
     }, pausePolling2 = function() {
       if (currentTimeout) {
@@ -2086,79 +2087,103 @@ function createGatewayRuntime(config) {
     let initialFetch$;
     let schemaFetcher;
     if (config.schema && typeof config.schema === "object" && "type" in config.schema) {
-      const { endpoint, key } = config.schema;
-      const fetcher = createSchemaFetcher({
-        endpoint,
-        key,
+      let ensureSdl2 = function(endpoint2) {
+        endpoint2 = endpoint2.replace(/\/services$/, "/sdl");
+        if (!/\/sdl(\.graphql)*$/.test(endpoint2)) {
+          endpoint2 = joinUrl(endpoint2, "sdl");
+        }
+        return endpoint2;
+      };
+      const { endpoint, key, circuitBreaker } = config.schema;
+      const fetcher = createCDNArtifactFetcher({
+        endpoint: Array.isArray(endpoint) ? (
+          // no endpoint.map just to make ts happy without casting
+          [ensureSdl2(endpoint[0]), ensureSdl2(endpoint[1])]
+        ) : ensureSdl2(endpoint),
+        circuitBreaker,
+        accessKey: key,
         logger: configContext.log.child("[hiveSchemaFetcher] ")
       });
-      schemaFetcher = function fetchSchemaFromCDN() {
-        pausePolling2();
-        initialFetch$ = handleMaybePromise(fetcher, ({ sdl }) => {
-          {
-            unifiedGraph = buildSchema(sdl, {
-              assumeValid: true,
-              assumeValidSDL: true
-            });
-          }
-          continuePolling2();
-          return true;
-        });
-        return initialFetch$;
+      schemaFetcher = {
+        fetch: function fetchSchemaFromCDN() {
+          pausePolling2();
+          initialFetch$ = handleMaybePromise(
+            fetcher.fetch,
+            ({ contents }) => {
+              {
+                unifiedGraph = buildSchema(contents, {
+                  assumeValid: true,
+                  assumeValidSDL: true
+                });
+              }
+              continuePolling2();
+              return true;
+            }
+          );
+          return initialFetch$;
+        },
+        dispose: () => fetcher.dispose()
       };
     } else if (config.schema) {
       if (!isDynamicUnifiedGraphSchema(config.schema)) {
         delete config.pollingInterval;
       }
-      schemaFetcher = function fetchSchema() {
-        pausePolling2();
-        initialFetch$ = handleMaybePromise(
-          () => handleUnifiedGraphConfig(
-            // @ts-expect-error TODO: what's up with type narrowing
-            config.schema,
-            configContext
-          ),
-          (schema) => {
-            if (isSchema(schema)) {
-              unifiedGraph = schema;
-            } else if (isDocumentNode(schema)) {
-              unifiedGraph = buildASTSchema(schema, {
-                assumeValid: true,
-                assumeValidSDL: true
-              });
-            } else {
-              unifiedGraph = buildSchema(schema, {
-                noLocation: true,
-                assumeValid: true,
-                assumeValidSDL: true
-              });
+      schemaFetcher = {
+        fetch: function fetchSchema() {
+          pausePolling2();
+          initialFetch$ = handleMaybePromise(
+            () => handleUnifiedGraphConfig(
+              // @ts-expect-error TODO: what's up with type narrowing
+              config.schema,
+              configContext
+            ),
+            (schema) => {
+              if (isSchema(schema)) {
+                unifiedGraph = schema;
+              } else if (isDocumentNode(schema)) {
+                unifiedGraph = buildASTSchema(schema, {
+                  assumeValid: true,
+                  assumeValidSDL: true
+                });
+              } else {
+                unifiedGraph = buildSchema(schema, {
+                  noLocation: true,
+                  assumeValid: true,
+                  assumeValidSDL: true
+                });
+              }
+              continuePolling2();
+              return true;
             }
-            continuePolling2();
-            return true;
-          }
-        );
-        return initialFetch$;
+          );
+          return initialFetch$;
+        }
       };
     } else {
-      schemaFetcher = function fetchSchemaWithExecutor() {
-        pausePolling2();
-        return handleMaybePromise(
-          () => schemaFromExecutor(proxyExecutor, configContext, {
-            assumeValid: true
-          }),
-          (schema) => {
-            unifiedGraph = schema;
-            continuePolling2();
-            return true;
-          }
-        );
+      schemaFetcher = {
+        fetch: function fetchSchemaWithExecutor() {
+          pausePolling2();
+          return handleMaybePromise(
+            () => schemaFromExecutor(proxyExecutor, configContext, {
+              assumeValid: true
+            }),
+            (schema) => {
+              unifiedGraph = schema;
+              continuePolling2();
+              return true;
+            }
+          );
+        }
       };
     }
-    const instrumentedFetcher = schemaFetcher;
-    schemaFetcher = (...args) => getInstrumented$1(null).asyncFn(
-      instrumentation?.schema,
-      instrumentedFetcher
-    )(...args);
+    const instrumentedFetcher = schemaFetcher.fetch;
+    schemaFetcher = {
+      ...schemaFetcher,
+      fetch: (...args) => getInstrumented$1(null).asyncFn(
+        instrumentation?.schema,
+        instrumentedFetcher
+      )(...args)
+    };
     getSchema = () => {
       if (unifiedGraph != null) {
         return unifiedGraph;
@@ -2169,10 +2194,10 @@ function createGatewayRuntime(config) {
           () => unifiedGraph
         );
       }
-      return handleMaybePromise(schemaFetcher, () => unifiedGraph);
+      return handleMaybePromise(schemaFetcher.fetch, () => unifiedGraph);
     };
     const shouldSkipValidation = "skipValidation" in config ? config.skipValidation : false;
-    const executorPlugin = {
+    unifiedGraphPlugin = {
       onValidate({ params, setResult }) {
         if (shouldSkipValidation || !params.schema) {
           setResult([]);
@@ -2180,10 +2205,12 @@ function createGatewayRuntime(config) {
       },
       onDispose() {
         pausePolling2();
-        return transportExecutorStack.disposeAsync();
+        return handleMaybePromise(
+          () => transportExecutorStack.disposeAsync(),
+          () => schemaFetcher.dispose?.()
+        );
       }
     };
-    unifiedGraphPlugin = executorPlugin;
     readinessChecker = () => handleMaybePromise(
       () => proxyExecutor({
         document: parse(`query ReadinessCheck { __typename }`, {
@@ -2194,7 +2221,7 @@ function createGatewayRuntime(config) {
     );
     schemaInvalidator = () => {
       unifiedGraph = void 0;
-      initialFetch$ = schemaFetcher();
+      initialFetch$ = schemaFetcher.fetch();
     };
   } else if ("subgraph" in config) {
     let getSubschemaConfig2 = function() {
@@ -2409,31 +2436,46 @@ function createGatewayRuntime(config) {
     let unifiedGraphFetcher;
     if (typeof config.supergraph === "object" && "type" in config.supergraph) {
       if (config.supergraph.type === "hive") {
-        const { endpoint, key } = config.supergraph;
-        const fetcher = createSupergraphSDLFetcher({
-          endpoint,
-          key,
-          logger: LegacyLogger.from(
-            configContext.log.child("[hiveSupergraphFetcher] ")
-          ),
+        let ensureSupergraph2 = function(endpoint2) {
+          if (!/\/supergraph(\.graphql)*$/.test(endpoint2)) {
+            endpoint2 = joinUrl(endpoint2, "supergraph");
+          }
+          return endpoint2;
+        };
+        const { endpoint, key, circuitBreaker } = config.supergraph;
+        const fetcher = createCDNArtifactFetcher({
+          endpoint: Array.isArray(endpoint) ? (
+            // no endpoint.map just to make ts happy without casting
+            [ensureSupergraph2(endpoint[0]), ensureSupergraph2(endpoint[1])]
+          ) : ensureSupergraph2(endpoint),
+          accessKey: key,
+          logger: configContext.log.child("[hiveSupergraphFetcher] "),
           // @ts-expect-error - MeshFetch is not compatible with `typeof fetch`
-          fetchImplementation: configContext.fetch,
+          fetch: configContext.fetch,
+          circuitBreaker,
           name: "hive-gateway",
           version: globalThis.__VERSION__
         });
-        unifiedGraphFetcher = () => fetcher().then(({ supergraphSdl }) => supergraphSdl);
+        unifiedGraphFetcher = {
+          fetch: () => fetcher.fetch().then(({ contents }) => contents),
+          dispose: () => fetcher.dispose()
+        };
       } else if (config.supergraph.type === "graphos") {
         const graphosFetcherContainer = createGraphOSFetcher({
           graphosOpts: config.supergraph,
           configContext,
           pollingInterval: config.pollingInterval
         });
-        unifiedGraphFetcher = graphosFetcherContainer.unifiedGraphFetcher;
+        unifiedGraphFetcher = {
+          fetch: graphosFetcherContainer.unifiedGraphFetcher
+        };
       } else {
-        unifiedGraphFetcher = () => {
-          throw new Error(
-            `Unknown supergraph configuration: ${config.supergraph}`
-          );
+        unifiedGraphFetcher = {
+          fetch: () => {
+            throw new Error(
+              `Unknown supergraph configuration: ${config.supergraph}`
+            );
+          }
         };
       }
     } else {
@@ -2445,20 +2487,25 @@ function createGatewayRuntime(config) {
           `Polling interval not set for supergraph, if you want to get updates of supergraph, we recommend setting a polling interval`
         );
       }
-      unifiedGraphFetcher = () => handleUnifiedGraphConfig(
-        // @ts-expect-error TODO: what's up with type narrowing
-        config.supergraph,
-        configContext
-      );
+      unifiedGraphFetcher = {
+        fetch: () => handleUnifiedGraphConfig(
+          // @ts-expect-error TODO: what's up with type narrowing
+          config.supergraph,
+          configContext
+        )
+      };
     }
-    const instrumentedGraphFetcher = unifiedGraphFetcher;
-    unifiedGraphFetcher = (...args) => getInstrumented$1(null).asyncFn(
-      instrumentation?.schema,
-      instrumentedGraphFetcher
-    )(...args);
+    const instrumentedGraphFetcher = unifiedGraphFetcher.fetch;
+    unifiedGraphFetcher = {
+      ...unifiedGraphFetcher,
+      fetch: (...args) => getInstrumented$1(null).asyncFn(
+        instrumentation?.schema,
+        instrumentedGraphFetcher
+      )(...args)
+    };
     const unifiedGraphManager = new UnifiedGraphManager({
       handleUnifiedGraph: config.unifiedGraphHandler,
-      getUnifiedGraph: unifiedGraphFetcher,
+      getUnifiedGraph: unifiedGraphFetcher.fetch,
       onUnifiedGraphChange(newUnifiedGraph) {
         unifiedGraph = newUnifiedGraph;
         replaceSchema(newUnifiedGraph);
@@ -2508,7 +2555,10 @@ function createGatewayRuntime(config) {
     getExecutor = () => unifiedGraphManager.getExecutor();
     unifiedGraphPlugin = {
       onDispose() {
-        return dispose(unifiedGraphManager);
+        return handleMaybePromise(
+          () => dispose(unifiedGraphManager),
+          () => unifiedGraphFetcher.dispose?.()
+        );
       }
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-hive/gateway-runtime",
-  "version": "2.4.0-alpha-905497611eff623b4c782baf8e5a2d3f3aa2446e",
+  "version": "2.4.0-alpha-f5c948dc129d453f43378098ef0956fa6f6531c2",
   "type": "module",
   "repository": {
     "type": "git",
@@ -55,20 +55,20 @@
     "@graphql-hive/signal": "^2.0.0",
     "@graphql-hive/yoga": "^0.46.0",
     "@graphql-mesh/cross-helpers": "^0.4.10",
-    "@graphql-mesh/fusion-runtime": "1.6.2-alpha-905497611eff623b4c782baf8e5a2d3f3aa2446e",
+    "@graphql-mesh/fusion-runtime": "1.6.2-alpha-f5c948dc129d453f43378098ef0956fa6f6531c2",
     "@graphql-mesh/hmac-upstream-signature": "^2.0.8",
     "@graphql-mesh/plugin-response-cache": "^0.104.18",
     "@graphql-mesh/transport-common": "^1.0.12",
     "@graphql-mesh/types": "^0.104.16",
     "@graphql-mesh/utils": "^0.104.16",
-    "@graphql-tools/batch-delegate": "10.0.8-alpha-905497611eff623b4c782baf8e5a2d3f3aa2446e",
-    "@graphql-tools/delegate": "12.0.2-alpha-905497611eff623b4c782baf8e5a2d3f3aa2446e",
+    "@graphql-tools/batch-delegate": "10.0.8-alpha-f5c948dc129d453f43378098ef0956fa6f6531c2",
+    "@graphql-tools/delegate": "12.0.2-alpha-f5c948dc129d453f43378098ef0956fa6f6531c2",
     "@graphql-tools/executor-common": "^1.0.5",
     "@graphql-tools/executor-http": "^3.0.7",
-    "@graphql-tools/federation": "4.2.6-alpha-905497611eff623b4c782baf8e5a2d3f3aa2446e",
-    "@graphql-tools/stitch": "10.1.6-alpha-905497611eff623b4c782baf8e5a2d3f3aa2446e",
+    "@graphql-tools/federation": "4.2.6-alpha-f5c948dc129d453f43378098ef0956fa6f6531c2",
+    "@graphql-tools/stitch": "10.1.6-alpha-f5c948dc129d453f43378098ef0956fa6f6531c2",
     "@graphql-tools/utils": "^10.10.3",
-    "@graphql-tools/wrap": "11.1.2-alpha-905497611eff623b4c782baf8e5a2d3f3aa2446e",
+    "@graphql-tools/wrap": "11.1.2-alpha-f5c948dc129d453f43378098ef0956fa6f6531c2",
     "@graphql-yoga/plugin-apollo-usage-report": "^0.12.0",
     "@graphql-yoga/plugin-csrf-prevention": "^3.16.2",
     "@graphql-yoga/plugin-defer-stream": "^3.16.2",
@@ -79,7 +79,7 @@
     "@whatwg-node/server": "^0.10.17",
     "@whatwg-node/server-plugin-cookies": "^1.0.5",
     "graphql-ws": "^6.0.6",
-    "graphql-yoga": "^5.17.0",
+    "graphql-yoga": "^5.16.2",
     "tslib": "^2.8.1"
   },
   "devDependencies": {