@graphql-hive/gateway-runtime 2.5.0-alpha-59477cb7230d569ac49ecfea1fc944ce07cde014 → 2.5.0-alpha-fd2d1e0d8e449617611fe942cb85652de6ab07c4

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @graphql-hive/gateway-runtime
 
-## 2.5.0-alpha-59477cb7230d569ac49ecfea1fc944ce07cde014
+## 2.5.0-alpha-fd2d1e0d8e449617611fe942cb85652de6ab07c4
 ### Minor Changes
 
 

package/dist/index.cjs

@@ -2956,8 +2956,21 @@ const useStaticFiles = ({
   };
 };
 
-function getGraphQLWSOptions(gwRuntime, onContext) {
-  async function onSubscribe(ctx, idOrMessage, paramsOrUndefined) {
+const FAKE_DOCUMENT = {
+  kind: graphql.Kind.DOCUMENT,
+  definitions: [
+    {
+      kind: graphql.Kind.OPERATION_DEFINITION,
+      operation: graphql.OperationTypeNode.SUBSCRIPTION,
+      selectionSet: {
+        kind: graphql.Kind.SELECTION_SET,
+        selections: []
+      }
+    }
+  ]
+};
+function getGraphQLWSOptions(yoga, onContext) {
+  function onSubscribe(ctx, idOrMessage, paramsOrUndefined) {
     let params;
     if (typeof idOrMessage === "string") {
       if (paramsOrUndefined == null) {
@@ -2967,32 +2980,25 @@ function getGraphQLWSOptions(gwRuntime, onContext) {
     } else {
       params = idOrMessage.payload;
     }
-    return {
-      schema: await gwRuntime.getSchema(),
-      document: {
-        kind: "Document",
-        definitions: [
-          {
-            kind: "OperationDefinition",
-            operation: "subscription",
-            selectionSet: {
-              kind: "SelectionSet",
-              selections: []
-            }
-          }
-        ]
-      },
-      contextValue: {
-        connectionParams: ctx.connectionParams,
-        waitUntil: gwRuntime.waitUntil,
-        params,
-        ...await onContext(ctx)
-      }
-    };
+    return promiseHelpers.handleMaybePromise(
+      () => onContext(ctx),
+      (additionalContext) => ({
+        // Relax this check https://github.com/enisdenjo/graphql-ws/blob/master/src/server.ts#L805
+        // We don't need `schema` here as it is handled by the gateway runtime
+        document: FAKE_DOCUMENT,
+        contextValue: {
+          connectionParams: ctx.connectionParams,
+          waitUntil: yoga.waitUntil,
+          params,
+          ...additionalContext
+        }
+        // So we cast it to ExecutionArgs to satisfy the return type without `schema`
+      })
+    );
   }
   function handleRegularArgs(args) {
     const context = args.contextValue;
-    return gwRuntime.getResultForParams(
+    return yoga.getResultForParams(
       {
         params: context.params,
         request: context.request

package/dist/index.d.cts

@@ -899,6 +899,6 @@ declare function getProxyExecutor<TContext extends Record<string, any>>({ config
     instrumentation: () => Instrumentation$2 | undefined;
 }): Executor;
 
-declare function getGraphQLWSOptions<TContext extends Record<string, any>, E>(gwRuntime: GatewayRuntime<TContext>, onContext: (ctx: Context<ConnectionInitMessage['payload'], E>) => MaybePromise<Record<string, unknown>>): ServerOptions<ConnectionInitMessage['payload'], E>;
+declare function getGraphQLWSOptions<TContext extends Record<string, any>, E>(yoga: YogaServerInstance<Record<string, any>, TContext>, onContext: (ctx: Context<ConnectionInitMessage['payload'], E>) => MaybePromise<Record<string, unknown>>): ServerOptions<ConnectionInitMessage['payload'], E>;
 
 export { type GatewayConfig, type GatewayConfigBase, type GatewayConfigContext, type GatewayConfigProxy, type GatewayConfigSchemaBase, type GatewayConfigSubgraph, type GatewayConfigSupergraph, type GatewayContext, type GatewayGraphOSManagedFederationOptions, type GatewayGraphOSOptions, type GatewayGraphOSReportingOptions, type GatewayHiveCDNOptions, type GatewayHivePersistedDocumentsOptions, type GatewayHiveReportingOptions, type GatewayPlugin, type GatewayRuntime, type Instrumentation, type OnCacheDeleteHook, type OnCacheDeleteHookEventPayload, type OnCacheDeleteHookResult, type OnCacheErrorHook, type OnCacheErrorHookPayload, type OnCacheGetHook, type OnCacheGetHookEventPayload, type OnCacheGetHookResult, type OnCacheHitHook, type OnCacheHitHookEventPayload, type OnCacheMissHook, type OnCacheSetHook, type OnCacheSetHookEventPayload, type OnCacheSetHookResult, type OnFetchHook, type OnFetchHookDone, type OnFetchHookDonePayload, type OnFetchHookPayload, type ProgressiveOverrideHandler, type PropagateHeadersOpts, type StaticFilesOpts, type UnifiedGraphConfig, createGatewayRuntime, createLoggerFromLogging, getGraphQLWSOptions, getProxyExecutor, getRetryInfo, isRetryExecutionRequest, useCustomFetch, usePropagateHeaders, useStaticFiles, useUpstreamRetry, useUpstreamTimeout };

package/dist/index.d.ts

@@ -899,6 +899,6 @@ declare function getProxyExecutor<TContext extends Record<string, any>>({ config
     instrumentation: () => Instrumentation$2 | undefined;
 }): Executor;
 
-declare function getGraphQLWSOptions<TContext extends Record<string, any>, E>(gwRuntime: GatewayRuntime<TContext>, onContext: (ctx: Context<ConnectionInitMessage['payload'], E>) => MaybePromise<Record<string, unknown>>): ServerOptions<ConnectionInitMessage['payload'], E>;
+declare function getGraphQLWSOptions<TContext extends Record<string, any>, E>(yoga: YogaServerInstance<Record<string, any>, TContext>, onContext: (ctx: Context<ConnectionInitMessage['payload'], E>) => MaybePromise<Record<string, unknown>>): ServerOptions<ConnectionInitMessage['payload'], E>;
 
 export { type GatewayConfig, type GatewayConfigBase, type GatewayConfigContext, type GatewayConfigProxy, type GatewayConfigSchemaBase, type GatewayConfigSubgraph, type GatewayConfigSupergraph, type GatewayContext, type GatewayGraphOSManagedFederationOptions, type GatewayGraphOSOptions, type GatewayGraphOSReportingOptions, type GatewayHiveCDNOptions, type GatewayHivePersistedDocumentsOptions, type GatewayHiveReportingOptions, type GatewayPlugin, type GatewayRuntime, type Instrumentation, type OnCacheDeleteHook, type OnCacheDeleteHookEventPayload, type OnCacheDeleteHookResult, type OnCacheErrorHook, type OnCacheErrorHookPayload, type OnCacheGetHook, type OnCacheGetHookEventPayload, type OnCacheGetHookResult, type OnCacheHitHook, type OnCacheHitHookEventPayload, type OnCacheMissHook, type OnCacheSetHook, type OnCacheSetHookEventPayload, type OnCacheSetHookResult, type OnFetchHook, type OnFetchHookDone, type OnFetchHookDonePayload, type OnFetchHookPayload, type ProgressiveOverrideHandler, type PropagateHeadersOpts, type StaticFilesOpts, type UnifiedGraphConfig, createGatewayRuntime, createLoggerFromLogging, getGraphQLWSOptions, getProxyExecutor, getRetryInfo, isRetryExecutionRequest, useCustomFetch, usePropagateHeaders, useStaticFiles, useUpstreamRetry, useUpstreamTimeout };

package/dist/index.js

@@ -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, buildSchema, buildASTSchema } from 'graphql';
+import { print, visit, visitWithTypeInfo, getArgumentValues, getNamedType, isIntrospectionType, isListType, isCompositeType, getOperationAST, isSchema, parse, buildSchema, buildASTSchema, Kind, OperationTypeNode } 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';
@@ -2955,8 +2955,21 @@ const useStaticFiles = ({
   };
 };
 
-function getGraphQLWSOptions(gwRuntime, onContext) {
-  async function onSubscribe(ctx, idOrMessage, paramsOrUndefined) {
+const FAKE_DOCUMENT = {
+  kind: Kind.DOCUMENT,
+  definitions: [
+    {
+      kind: Kind.OPERATION_DEFINITION,
+      operation: OperationTypeNode.SUBSCRIPTION,
+      selectionSet: {
+        kind: Kind.SELECTION_SET,
+        selections: []
+      }
+    }
+  ]
+};
+function getGraphQLWSOptions(yoga, onContext) {
+  function onSubscribe(ctx, idOrMessage, paramsOrUndefined) {
     let params;
     if (typeof idOrMessage === "string") {
       if (paramsOrUndefined == null) {
@@ -2966,32 +2979,25 @@ function getGraphQLWSOptions(gwRuntime, onContext) {
     } else {
       params = idOrMessage.payload;
     }
-    return {
-      schema: await gwRuntime.getSchema(),
-      document: {
-        kind: "Document",
-        definitions: [
-          {
-            kind: "OperationDefinition",
-            operation: "subscription",
-            selectionSet: {
-              kind: "SelectionSet",
-              selections: []
-            }
-          }
-        ]
-      },
-      contextValue: {
-        connectionParams: ctx.connectionParams,
-        waitUntil: gwRuntime.waitUntil,
-        params,
-        ...await onContext(ctx)
-      }
-    };
+    return handleMaybePromise(
+      () => onContext(ctx),
+      (additionalContext) => ({
+        // Relax this check https://github.com/enisdenjo/graphql-ws/blob/master/src/server.ts#L805
+        // We don't need `schema` here as it is handled by the gateway runtime
+        document: FAKE_DOCUMENT,
+        contextValue: {
+          connectionParams: ctx.connectionParams,
+          waitUntil: yoga.waitUntil,
+          params,
+          ...additionalContext
+        }
+        // So we cast it to ExecutionArgs to satisfy the return type without `schema`
+      })
+    );
   }
   function handleRegularArgs(args) {
     const context = args.contextValue;
-    return gwRuntime.getResultForParams(
+    return yoga.getResultForParams(
       {
         params: context.params,
         request: context.request

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-hive/gateway-runtime",
-  "version": "2.5.0-alpha-59477cb7230d569ac49ecfea1fc944ce07cde014",
+  "version": "2.5.0-alpha-fd2d1e0d8e449617611fe942cb85652de6ab07c4",
   "type": "module",
   "repository": {
     "type": "git",