@graphql-hive/gateway-runtime 2.4.0-alpha-65ad5f97b6cf2a8dd5ad0a7bb8ea9cf3b540b497 → 2.4.0-alpha-b2b2f2862d2a13c2868dada93d42f78d08fa0e02

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @graphql-hive/gateway-runtime
 
-## 2.4.0-alpha-65ad5f97b6cf2a8dd5ad0a7bb8ea9cf3b540b497
+## 2.4.0-alpha-b2b2f2862d2a13c2868dada93d42f78d08fa0e02
 ### Minor Changes
 
 
@@ -24,18 +24,18 @@
   export const gatewayConfig = defineConfig({
     supergraph: {
       type: 'hive',
-  -   endpoint: 'https://cdn.graphql-hive.com/artifacts/v1/...../supergraph',
+  -   endpoint: 'https://cdn.graphql-hive.com/artifacts/v1/<target-id>/supergraph',
   +   endpoint: [
-  +     'https://cdn.graphql-hive.com/artifacts/v1/...../supergraph',
-  +     'https://cdn-mirror.graphql-hive.com/artifacts/v1/...../supergraph'
+  +     '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/artifacts/v1/...',
+  -   endpoint: 'https://cdn.graphql-hive.com/<target-id>',
   +   endpoint: [
-  +     'https://cdn.graphql-hive.com/artifacts/v1/...',
-  +     'https://cdn-mirror.graphql-hive.com/artifacts/v1/...'
+  +     'https://cdn.graphql-hive.com/<target-id>',
+  +     'https://cdn-mirror.graphql-hive.com/<target-id>'
   +   ]
     }
   })
@@ -78,13 +78,13 @@
   - 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 [[`da8b8e3`](https://github.com/graphql-hive/gateway/commit/da8b8e3f3545487249b11c6577e3889f68527249)]:
-  - @graphql-tools/delegate@12.0.2-alpha-65ad5f97b6cf2a8dd5ad0a7bb8ea9cf3b540b497
+  - @graphql-tools/delegate@12.0.2-alpha-b2b2f2862d2a13c2868dada93d42f78d08fa0e02
   - @graphql-mesh/hmac-upstream-signature@2.0.8
-  - @graphql-tools/batch-delegate@10.0.8-alpha-65ad5f97b6cf2a8dd5ad0a7bb8ea9cf3b540b497
-  - @graphql-tools/federation@4.2.6-alpha-65ad5f97b6cf2a8dd5ad0a7bb8ea9cf3b540b497
-  - @graphql-mesh/fusion-runtime@1.6.2-alpha-65ad5f97b6cf2a8dd5ad0a7bb8ea9cf3b540b497
-  - @graphql-tools/stitch@10.1.6-alpha-65ad5f97b6cf2a8dd5ad0a7bb8ea9cf3b540b497
-  - @graphql-tools/wrap@11.1.2-alpha-65ad5f97b6cf2a8dd5ad0a7bb8ea9cf3b540b497
+  - @graphql-tools/batch-delegate@10.0.8-alpha-b2b2f2862d2a13c2868dada93d42f78d08fa0e02
+  - @graphql-tools/federation@4.2.6-alpha-b2b2f2862d2a13c2868dada93d42f78d08fa0e02
+  - @graphql-mesh/fusion-runtime@1.6.2-alpha-b2b2f2862d2a13c2868dada93d42f78d08fa0e02
+  - @graphql-tools/stitch@10.1.6-alpha-b2b2f2862d2a13c2868dada93d42f78d08fa0e02
+  - @graphql-tools/wrap@11.1.2-alpha-b2b2f2862d2a13c2868dada93d42f78d08fa0e02
 
 ## 2.3.7
 ### Patch Changes

package/dist/index.cjs

@@ -2088,15 +2088,19 @@ function createGatewayRuntime(config) {
     let initialFetch$;
     let schemaFetcher;
     if (config.schema && typeof config.schema === "object" && "type" in config.schema) {
+      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 endpoints = (Array.isArray(endpoint) ? endpoint : [endpoint]).map(
-        (url) => url.endsWith("/sdl") ? url : core$1.joinUrl(
-          url.endsWith("/services") ? url.substring(0, url.length - 8) : url,
-          "sdl"
-        )
-      );
       const fetcher = core$1.createCDNArtifactFetcher({
-        endpoint: endpoints,
+        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] ")
@@ -2200,10 +2204,12 @@ function createGatewayRuntime(config) {
           setResult([]);
         }
       },
-      async onDispose() {
+      onDispose() {
         pausePolling2();
-        await transportExecutorStack.disposeAsync();
-        return schemaFetcher.dispose?.();
+        return promiseHelpers.handleMaybePromise(
+          () => transportExecutorStack.disposeAsync(),
+          () => schemaFetcher.dispose?.()
+        );
       }
     };
     readinessChecker = () => promiseHelpers.handleMaybePromise(
@@ -2431,12 +2437,18 @@ function createGatewayRuntime(config) {
     let unifiedGraphFetcher;
     if (typeof config.supergraph === "object" && "type" in config.supergraph) {
       if (config.supergraph.type === "hive") {
+        let ensureSupergraph2 = function(endpoint2) {
+          if (!/\/supergraph(\.graphql)*$/.test(endpoint2)) {
+            endpoint2 = core$1.joinUrl(endpoint2, "supergraph");
+          }
+          return endpoint2;
+        };
         const { endpoint, key, circuitBreaker } = config.supergraph;
-        const endpoints = (Array.isArray(endpoint) ? endpoint : [endpoint]).map(
-          (url) => url.endsWith("/supergraph") ? url : `${url}/supergraph`
-        );
         const fetcher = core$1.createCDNArtifactFetcher({
-          endpoint: endpoints,
+          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`
@@ -2544,8 +2556,9 @@ function createGatewayRuntime(config) {
     getExecutor = () => unifiedGraphManager.getExecutor();
     unifiedGraphPlugin = {
       onDispose() {
-        return promiseHelpers.unfakePromise(
-          promiseHelpers.fakePromise(void 0).then(() => utils$1.dispose(unifiedGraphManager)).then(() => unifiedGraphFetcher.dispose?.())
+        return promiseHelpers.handleMaybePromise(
+          () => utils$1.dispose(unifiedGraphManager),
+          () => unifiedGraphFetcher.dispose?.()
         );
       }
     };

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 { joinUrl, createCDNArtifactFetcher } 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';
@@ -21,7 +21,7 @@ import { useDeferStream } from '@graphql-yoga/plugin-defer-stream';
 import { usePersistedOperations } from '@graphql-yoga/plugin-persisted-operations';
 import { AsyncDisposableStack } from '@whatwg-node/disposablestack';
 export * from '@whatwg-node/disposablestack';
-import { handleMaybePromise, iterateAsync, unfakePromise, fakePromise } from '@whatwg-node/promise-helpers';
+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, buildSchema, buildASTSchema } from 'graphql';
 import { isAsyncIterable as isAsyncIterable$1, useReadinessCheck, useExecutionCancellation, createYoga, chain, mergeSchemas } from 'graphql-yoga';
@@ -2087,15 +2087,19 @@ function createGatewayRuntime(config) {
     let initialFetch$;
     let schemaFetcher;
     if (config.schema && typeof config.schema === "object" && "type" in config.schema) {
+      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 endpoints = (Array.isArray(endpoint) ? endpoint : [endpoint]).map(
-        (url) => url.endsWith("/sdl") ? url : joinUrl(
-          url.endsWith("/services") ? url.substring(0, url.length - 8) : url,
-          "sdl"
-        )
-      );
       const fetcher = createCDNArtifactFetcher({
-        endpoint: endpoints,
+        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] ")
@@ -2199,10 +2203,12 @@ function createGatewayRuntime(config) {
           setResult([]);
         }
       },
-      async onDispose() {
+      onDispose() {
         pausePolling2();
-        await transportExecutorStack.disposeAsync();
-        return schemaFetcher.dispose?.();
+        return handleMaybePromise(
+          () => transportExecutorStack.disposeAsync(),
+          () => schemaFetcher.dispose?.()
+        );
       }
     };
     readinessChecker = () => handleMaybePromise(
@@ -2430,12 +2436,18 @@ function createGatewayRuntime(config) {
     let unifiedGraphFetcher;
     if (typeof config.supergraph === "object" && "type" in config.supergraph) {
       if (config.supergraph.type === "hive") {
+        let ensureSupergraph2 = function(endpoint2) {
+          if (!/\/supergraph(\.graphql)*$/.test(endpoint2)) {
+            endpoint2 = joinUrl(endpoint2, "supergraph");
+          }
+          return endpoint2;
+        };
         const { endpoint, key, circuitBreaker } = config.supergraph;
-        const endpoints = (Array.isArray(endpoint) ? endpoint : [endpoint]).map(
-          (url) => url.endsWith("/supergraph") ? url : `${url}/supergraph`
-        );
         const fetcher = createCDNArtifactFetcher({
-          endpoint: endpoints,
+          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`
@@ -2543,8 +2555,9 @@ function createGatewayRuntime(config) {
     getExecutor = () => unifiedGraphManager.getExecutor();
     unifiedGraphPlugin = {
       onDispose() {
-        return unfakePromise(
-          fakePromise(void 0).then(() => dispose(unifiedGraphManager)).then(() => unifiedGraphFetcher.dispose?.())
+        return handleMaybePromise(
+          () => dispose(unifiedGraphManager),
+          () => unifiedGraphFetcher.dispose?.()
         );
       }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-hive/gateway-runtime",
-  "version": "2.4.0-alpha-65ad5f97b6cf2a8dd5ad0a7bb8ea9cf3b540b497",
+  "version": "2.4.0-alpha-b2b2f2862d2a13c2868dada93d42f78d08fa0e02",
   "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-65ad5f97b6cf2a8dd5ad0a7bb8ea9cf3b540b497",
+    "@graphql-mesh/fusion-runtime": "1.6.2-alpha-b2b2f2862d2a13c2868dada93d42f78d08fa0e02",
     "@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-65ad5f97b6cf2a8dd5ad0a7bb8ea9cf3b540b497",
-    "@graphql-tools/delegate": "12.0.2-alpha-65ad5f97b6cf2a8dd5ad0a7bb8ea9cf3b540b497",
+    "@graphql-tools/batch-delegate": "10.0.8-alpha-b2b2f2862d2a13c2868dada93d42f78d08fa0e02",
+    "@graphql-tools/delegate": "12.0.2-alpha-b2b2f2862d2a13c2868dada93d42f78d08fa0e02",
     "@graphql-tools/executor-common": "^1.0.5",
     "@graphql-tools/executor-http": "^3.0.7",
-    "@graphql-tools/federation": "4.2.6-alpha-65ad5f97b6cf2a8dd5ad0a7bb8ea9cf3b540b497",
-    "@graphql-tools/stitch": "10.1.6-alpha-65ad5f97b6cf2a8dd5ad0a7bb8ea9cf3b540b497",
+    "@graphql-tools/federation": "4.2.6-alpha-b2b2f2862d2a13c2868dada93d42f78d08fa0e02",
+    "@graphql-tools/stitch": "10.1.6-alpha-b2b2f2862d2a13c2868dada93d42f78d08fa0e02",
     "@graphql-tools/utils": "^10.10.3",
-    "@graphql-tools/wrap": "11.1.2-alpha-65ad5f97b6cf2a8dd5ad0a7bb8ea9cf3b540b497",
+    "@graphql-tools/wrap": "11.1.2-alpha-b2b2f2862d2a13c2868dada93d42f78d08fa0e02",
     "@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",