@omnigraph/grpc 0.2.0 → 0.2.1-alpha-20250115110131-0a17f005ed7fae40ae55fe4276c949bb61c17531

package/cjs/grpcLoaderHelper.js

@@ -18,17 +18,14 @@ const directives_js_1 = require("./directives.js");
 const utils_js_1 = require("./utils.js");
 const { Root } = protobufjs_1.default;
 const QUERY_METHOD_PREFIXES = ['get', 'list', 'search'];
-class GrpcLoaderHelper {
+class GrpcLoaderHelper extends disposablestack_1.DisposableStack {
     constructor(subgraphName, baseDir, logger, config) {
+        super();
         this.subgraphName = subgraphName;
         this.baseDir = baseDir;
         this.logger = logger;
         this.config = config;
         this.schemaComposer = new graphql_compose_1.SchemaComposer();
-        this.asyncDisposableStack = new disposablestack_1.AsyncDisposableStack();
-    }
-    [Symbol.asyncDispose]() {
-        return this.asyncDisposableStack.disposeAsync();
     }
     async buildSchema() {
         this.schemaComposer.add(graphql_scalars_1.GraphQLBigInt);
@@ -53,6 +50,7 @@ class GrpcLoaderHelper {
         this.config.requestTimeout = this.config.requestTimeout || 200000;
         this.logger.debug(`Getting channel credentials`);
         const creds = await this.getCredentials();
+        this.defer(() => creds._unref());
         this.logger.debug(`Getting stored root and decoded descriptor set objects`);
         const descriptorSets = await this.getDescriptorSets(creds);
         const directives = [];
@@ -100,7 +98,7 @@ class GrpcLoaderHelper {
         const reflectionEndpoint = string_interpolation_1.stringInterpolator.parse(this.config.endpoint, { env: process.env });
         this.logger.debug(`Creating gRPC Reflection Client`);
         const reflectionClient = new grpc_reflection_js_1.Client(reflectionEndpoint, creds);
-        this.asyncDisposableStack.defer(() => reflectionClient.grpcClient.close());
+        this.defer(() => reflectionClient.grpcClient.close());
         return reflectionClient.listServices().then(services => services.filter(service => service && !service?.startsWith('grpc.')).map(service => {
             this.logger.debug(`Resolving root of Service: ${service} from the reflection response`);
             return reflectionClient.fileContainingSymbol(service);

package/cjs/index.js

@@ -3,8 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadGrpcSubgraph = loadGrpcSubgraph;
 const grpcLoaderHelper_js_1 = require("./grpcLoaderHelper.js");
 function loadGrpcSubgraph(name, options) {
-    return (ctx) => ({
-        name,
-        schema$: new grpcLoaderHelper_js_1.GrpcLoaderHelper(name, ctx.cwd, ctx.logger, options).buildSchema(),
-    });
+    return (ctx) => {
+        const helper = new grpcLoaderHelper_js_1.GrpcLoaderHelper(name, ctx.cwd, ctx.logger, options);
+        const schema$ = helper.buildSchema().finally(() => helper.dispose());
+        return {
+            name,
+            schema$,
+        };
+    };
 }

package/esm/grpcLoaderHelper.js

@@ -9,22 +9,19 @@ import { fs, path } from '@graphql-mesh/cross-helpers';
 import { stringInterpolator } from '@graphql-mesh/string-interpolation';
 import { GraphQLStreamDirective } from '@graphql-tools/utils';
 import { credentials } from '@grpc/grpc-js';
-import { AsyncDisposableStack } from '@whatwg-node/disposablestack';
+import { DisposableStack } from '@whatwg-node/disposablestack';
 import { EnumDirective, grpcConnectivityStateDirective, grpcMethodDirective, transportDirective, } from './directives.js';
 import { addIncludePathResolver, getTypeName, walkToFindTypePath } from './utils.js';
 const { Root } = protobufjs;
 const QUERY_METHOD_PREFIXES = ['get', 'list', 'search'];
-export class GrpcLoaderHelper {
+export class GrpcLoaderHelper extends DisposableStack {
     constructor(subgraphName, baseDir, logger, config) {
+        super();
         this.subgraphName = subgraphName;
         this.baseDir = baseDir;
         this.logger = logger;
         this.config = config;
         this.schemaComposer = new SchemaComposer();
-        this.asyncDisposableStack = new AsyncDisposableStack();
-    }
-    [Symbol.asyncDispose]() {
-        return this.asyncDisposableStack.disposeAsync();
     }
     async buildSchema() {
         this.schemaComposer.add(GraphQLBigInt);
@@ -49,6 +46,7 @@ export class GrpcLoaderHelper {
         this.config.requestTimeout = this.config.requestTimeout || 200000;
         this.logger.debug(`Getting channel credentials`);
         const creds = await this.getCredentials();
+        this.defer(() => creds._unref());
         this.logger.debug(`Getting stored root and decoded descriptor set objects`);
         const descriptorSets = await this.getDescriptorSets(creds);
         const directives = [];
@@ -96,7 +94,7 @@ export class GrpcLoaderHelper {
         const reflectionEndpoint = stringInterpolator.parse(this.config.endpoint, { env: process.env });
         this.logger.debug(`Creating gRPC Reflection Client`);
         const reflectionClient = new Client(reflectionEndpoint, creds);
-        this.asyncDisposableStack.defer(() => reflectionClient.grpcClient.close());
+        this.defer(() => reflectionClient.grpcClient.close());
         return reflectionClient.listServices().then(services => services.filter(service => service && !service?.startsWith('grpc.')).map(service => {
             this.logger.debug(`Resolving root of Service: ${service} from the reflection response`);
             return reflectionClient.fileContainingSymbol(service);

package/esm/index.js

@@ -1,7 +1,11 @@
 import { GrpcLoaderHelper } from './grpcLoaderHelper.js';
 export function loadGrpcSubgraph(name, options) {
-    return (ctx) => ({
-        name,
-        schema$: new GrpcLoaderHelper(name, ctx.cwd, ctx.logger, options).buildSchema(),
-    });
+    return (ctx) => {
+        const helper = new GrpcLoaderHelper(name, ctx.cwd, ctx.logger, options);
+        const schema$ = helper.buildSchema().finally(() => helper.dispose());
+        return {
+            name,
+            schema$,
+        };
+    };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnigraph/grpc",
-  "version": "0.2.0",
+  "version": "0.2.1-alpha-20250115110131-0a17f005ed7fae40ae55fe4276c949bb61c17531",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "*"
@@ -14,7 +14,7 @@
     "@grpc/grpc-js": "^1.1.7",
     "@whatwg-node/disposablestack": "^0.0.5",
     "globby": "^11.1.0",
-    "graphql-compose": "^9.0.11",
+    "graphql-compose": "^9.1.0",
     "graphql-scalars": "^1.23.0",
     "lodash.has": "^4.5.2",
     "protobufjs": "^7.2.5"

package/typings/grpcLoaderHelper.d.cts

@@ -2,15 +2,14 @@ import protobufjs, { type AnyNestedObject } from 'protobufjs';
 import type { Logger, YamlConfig } from '@graphql-mesh/types';
 import { type MaybePromise } from '@graphql-tools/utils';
 import { type ChannelCredentials } from '@grpc/grpc-js';
-export declare class GrpcLoaderHelper implements AsyncDisposable {
+import { DisposableStack } from '@whatwg-node/disposablestack';
+export declare class GrpcLoaderHelper extends DisposableStack {
     private subgraphName;
     private baseDir;
     private logger;
     private config;
     private schemaComposer;
-    private asyncDisposableStack;
     constructor(subgraphName: string, baseDir: string, logger: Logger, config: YamlConfig.GrpcHandler);
-    [Symbol.asyncDispose](): Promise<void>;
     buildSchema(): Promise<import("graphql").GraphQLSchema>;
     private processReflection;
     private processDescriptorFile;

package/typings/grpcLoaderHelper.d.ts

@@ -2,15 +2,14 @@ import protobufjs, { type AnyNestedObject } from 'protobufjs';
 import type { Logger, YamlConfig } from '@graphql-mesh/types';
 import { type MaybePromise } from '@graphql-tools/utils';
 import { type ChannelCredentials } from '@grpc/grpc-js';
-export declare class GrpcLoaderHelper implements AsyncDisposable {
+import { DisposableStack } from '@whatwg-node/disposablestack';
+export declare class GrpcLoaderHelper extends DisposableStack {
     private subgraphName;
     private baseDir;
     private logger;
     private config;
     private schemaComposer;
-    private asyncDisposableStack;
     constructor(subgraphName: string, baseDir: string, logger: Logger, config: YamlConfig.GrpcHandler);
-    [Symbol.asyncDispose](): Promise<void>;
     buildSchema(): Promise<import("graphql").GraphQLSchema>;
     private processReflection;
     private processDescriptorFile;