@rsdk/grpc.clients 2.6.0-next.0 → 2.6.0-next.3

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.6.0-next.3](https://github.com/R-Vision/rsdk/compare/v2.6.0-next.2...v2.6.0-next.3) (2023-07-07)
+
+### Features
+
+* **grpc-clients:** added support grpc client factory ([#78](https://github.com/R-Vision/rsdk/issues/78)) ([4f9d761](https://github.com/R-Vision/rsdk/commit/4f9d761516abfa0264ee4c707fdd784f7ad9fd0c))
+
+# [2.6.0-next.1](https://github.com/R-Vision/rsdk/compare/v2.6.0-next.0...v2.6.0-next.1) (2023-07-04)
+
+### Bug Fixes
+
+* gRPC error mapping into rsdk exceptions ([8c6a2b8](https://github.com/R-Vision/rsdk/commit/8c6a2b8276a7a309d26bc21e4c9ae36d7ee4210c))
+
 # [2.6.0-next.0](https://github.com/R-Vision/rsdk/compare/v2.5.0...v2.6.0-next.0) (2023-07-03)
 
 ### Bug Fixes

package/dist/decorators/inject-client-factory.decorator.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InjectGrpcClientsFactory = void 0;
 const common_1 = require("@nestjs/common");
+const constants_1 = require("@rsdk/core/dist/rsdk-metadata/constants");
+const metadata_1 = require("@rsdk/metadata");
+const module_generator_1 = require("../module.generator");
 const token_factories_1 = require("../token.factories");
 /**
  * Injects factory of grpc clients for specific grpc-service. Main
@@ -11,9 +14,10 @@ const token_factories_1 = require("../token.factories");
  * @returns ParameterDecorator
  */
 const InjectGrpcClientsFactory = (definition) => {
-    const token = (0, token_factories_1.getFactoryToken)(definition);
-    // TODO Add metadata registration
-    return (0, common_1.Inject)(token);
+    return (target, propertyKey, parameterIndex) => {
+        (0, common_1.Inject)((0, token_factories_1.getFactoryToken)(definition))(target, propertyKey, parameterIndex);
+        metadata_1.RsdkMetadata.setWithScope(target, constants_1.PLATFORM_RAW_GLOBAL_METADATA_SCOPE, definition.fullName, module_generator_1.ModuleGenerator.createClientFactoryModuleDefinition(definition), true);
+    };
 };
 exports.InjectGrpcClientsFactory = InjectGrpcClientsFactory;
 //# sourceMappingURL=inject-client-factory.decorator.js.map

package/dist/decorators/inject-client-factory.decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"inject-client-factory.decorator.js","sourceRoot":"","sources":["../../src/decorators/inject-client-factory.decorator.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AAGxC,wDAAqD;AAWrD;;;;;;GAMG;AACI,MAAM,wBAAwB,GAAG,CACtC,UAAmC,EACf,EAAE;IACtB,MAAM,KAAK,GAAG,IAAA,iCAAe,EAAC,UAAU,CAAC,CAAC;IAE1C,iCAAiC;IACjC,OAAO,IAAA,eAAM,EAAC,KAAK,CAAC,CAAC;AACvB,CAAC,CAAC;AAPW,QAAA,wBAAwB,4BAOnC"}
+{"version":3,"file":"inject-client-factory.decorator.js","sourceRoot":"","sources":["../../src/decorators/inject-client-factory.decorator.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AACxC,uEAA6F;AAC7F,6CAA8C;AAG9C,0DAAsD;AACtD,wDAAqD;AAWrD;;;;;;GAMG;AACI,MAAM,wBAAwB,GAAG,CACtC,UAAmC,EACf,EAAE;IACtB,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,EAAE;QAC7C,IAAA,eAAM,EAAC,IAAA,iCAAe,EAAC,UAAU,CAAC,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;QACzE,uBAAY,CAAC,YAAY,CACvB,MAAM,EACN,8CAAkC,EAClC,UAAU,CAAC,QAAQ,EACnB,kCAAe,CAAC,mCAAmC,CAAC,UAAU,CAAC,EAC/D,IAAI,CACL,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC;AAbW,QAAA,wBAAwB,4BAanC"}

package/dist/decorators/inject-client.decorator.js

@@ -17,7 +17,7 @@ const token_factories_1 = require("../token.factories");
 const InjectGrpcClient = (grpcServerDeclarationValue) => {
     return (target, propertyKey, parameterIndex) => {
         (0, common_1.Inject)((0, token_factories_1.getClientToken)(grpcServerDeclarationValue.definition))(target, propertyKey, parameterIndex);
-        metadata_1.RsdkMetadata.setWithScope(target, constants_1.PLATFORM_RAW_GLOBAL_METADATA_SCOPE, `${grpcServerDeclarationValue.serverName}.${grpcServerDeclarationValue.serviceName}`, module_generator_1.ModuleGenerator.createModuleDefinition(grpcServerDeclarationValue.serverName, grpcServerDeclarationValue.definition), true);
+        metadata_1.RsdkMetadata.setWithScope(target, constants_1.PLATFORM_RAW_GLOBAL_METADATA_SCOPE, `${grpcServerDeclarationValue.serverName}.${grpcServerDeclarationValue.serviceName}`, module_generator_1.ModuleGenerator.createClientModuleDefinition(grpcServerDeclarationValue.serverName, grpcServerDeclarationValue.definition), true);
     };
 };
 exports.InjectGrpcClient = InjectGrpcClient;

package/dist/decorators/inject-client.decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"inject-client.decorator.js","sourceRoot":"","sources":["../../src/decorators/inject-client.decorator.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AACxC,uEAA6F;AAC7F,6CAA8C;AAE9C,0DAAsD;AAEtD,wDAAoD;AAEpD;;;;;;;GAOG;AACI,MAAM,gBAAgB,GAAG,CAI9B,0BAGC,EACmB,EAAE;IACtB,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,EAAE;QAC7C,IAAA,eAAM,EAAC,IAAA,gCAAc,EAAC,0BAA0B,CAAC,UAAU,CAAC,CAAC,CAC3D,MAAM,EACN,WAAW,EACX,cAAc,CACf,CAAC;QACF,uBAAY,CAAC,YAAY,CACvB,MAAM,EACN,8CAAkC,EAClC,GAAG,0BAA0B,CAAC,UAAU,IAAI,0BAA0B,CAAC,WAAW,EAAE,EACpF,kCAAe,CAAC,sBAAsB,CACpC,0BAA0B,CAAC,UAAU,EACrC,0BAA0B,CAAC,UAAU,CACtC,EACD,IAAI,CACL,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC;AA1BW,QAAA,gBAAgB,oBA0B3B"}
+{"version":3,"file":"inject-client.decorator.js","sourceRoot":"","sources":["../../src/decorators/inject-client.decorator.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AACxC,uEAA6F;AAC7F,6CAA8C;AAE9C,0DAAsD;AAEtD,wDAAoD;AAEpD;;;;;;;GAOG;AACI,MAAM,gBAAgB,GAAG,CAI9B,0BAGC,EACmB,EAAE;IACtB,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,EAAE;QAC7C,IAAA,eAAM,EAAC,IAAA,gCAAc,EAAC,0BAA0B,CAAC,UAAU,CAAC,CAAC,CAC3D,MAAM,EACN,WAAW,EACX,cAAc,CACf,CAAC;QACF,uBAAY,CAAC,YAAY,CACvB,MAAM,EACN,8CAAkC,EAClC,GAAG,0BAA0B,CAAC,UAAU,IAAI,0BAA0B,CAAC,WAAW,EAAE,EACpF,kCAAe,CAAC,4BAA4B,CAC1C,0BAA0B,CAAC,UAAU,EACrC,0BAA0B,CAAC,UAAU,CACtC,EACD,IAAI,CACL,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC;AA1BW,QAAA,gBAAgB,oBA0B3B"}

package/dist/metadata/constants.d.ts

@@ -1 +1,2 @@
 export declare const GRPC_CLIENTS_RSDK_METADATA_SCOPE = "grpc-clients";
+export declare const GRPC_CLIENTS_FACTORY_RSDK_METADATA_SCOPE = "grpc-clients-factory";

package/dist/metadata/constants.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GRPC_CLIENTS_RSDK_METADATA_SCOPE = void 0;
+exports.GRPC_CLIENTS_FACTORY_RSDK_METADATA_SCOPE = exports.GRPC_CLIENTS_RSDK_METADATA_SCOPE = void 0;
 exports.GRPC_CLIENTS_RSDK_METADATA_SCOPE = 'grpc-clients';
+exports.GRPC_CLIENTS_FACTORY_RSDK_METADATA_SCOPE = 'grpc-clients-factory';
 //# sourceMappingURL=constants.js.map

package/dist/metadata/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/metadata/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,gCAAgC,GAAG,cAAc,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/metadata/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,gCAAgC,GAAG,cAAc,CAAC;AAClD,QAAA,wCAAwC,GAAG,sBAAsB,CAAC"}

package/dist/metadata/grpc-clients-factory.autodoc-resolver.d.ts

@@ -0,0 +1,8 @@
+import type { DocumentNode, DocumentResolver } from '@rsdk/autodoc.protocol';
+import type { RsdkMetadataProvider } from '@rsdk/metadata';
+import type { Promisable } from 'type-fest';
+declare class GrpcClientsFactoryAutodocResolver implements DocumentResolver {
+    getNode(rsdkMetadata: RsdkMetadataProvider): Promisable<DocumentNode | null>;
+}
+export declare const grpcClientsFactoryAutodocResolver: GrpcClientsFactoryAutodocResolver;
+export {};

package/dist/metadata/grpc-clients-factory.autodoc-resolver.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.grpcClientsFactoryAutodocResolver = void 0;
+const autodoc_protocol_1 = require("@rsdk/autodoc.protocol");
+const constants_1 = require("./constants");
+class GrpcClientsFactoryAutodocResolver {
+    getNode(rsdkMetadata) {
+        const resources = rsdkMetadata.get(constants_1.GRPC_CLIENTS_FACTORY_RSDK_METADATA_SCOPE);
+        if (!resources) {
+            return null;
+        }
+        return new autodoc_protocol_1.Composite(new autodoc_protocol_1.Table(resources.map(({ value: { definition } }) => ({
+            name: definition.name.toString(),
+            fullName: definition.fullName.toString(),
+        }))), 'Grpc clients factory');
+    }
+}
+exports.grpcClientsFactoryAutodocResolver = new GrpcClientsFactoryAutodocResolver();
+//# sourceMappingURL=grpc-clients-factory.autodoc-resolver.js.map

package/dist/metadata/grpc-clients-factory.autodoc-resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"grpc-clients-factory.autodoc-resolver.js","sourceRoot":"","sources":["../../src/metadata/grpc-clients-factory.autodoc-resolver.ts"],"names":[],"mappings":";;;AACA,6DAA0D;AAM1D,2CAAuE;AAEvE,MAAM,iCAAiC;IACrC,OAAO,CAAC,YAAkC;QACxC,MAAM,SAAS,GAAG,YAAY,CAAC,GAAG,CAChC,oDAAwC,CACzC,CAAC;QACF,IAAI,CAAC,SAAS,EAAE;YACd,OAAO,IAAI,CAAC;SACb;QACD,OAAO,IAAI,4BAAS,CAClB,IAAI,wBAAK,CACP,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YAC5C,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE;YAChC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE;SACzC,CAAC,CAAC,CACJ,EACD,sBAAsB,CACvB,CAAC;IACJ,CAAC;CACF;AAEY,QAAA,iCAAiC,GAC5C,IAAI,iCAAiC,EAAE,CAAC"}

package/dist/middleware/exception-mapper.middleware.d.ts

@@ -0,0 +1,5 @@
+import type { ClientMiddleware } from 'nice-grpc-common';
+/**
+ * Client middleware that performs gRPC code mapping into RSDK exception
+ */
+export declare const exceptionMapperMiddleware: () => ClientMiddleware;

package/dist/middleware/exception-mapper.middleware.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.exceptionMapperMiddleware = void 0;
+const core_1 = require("@rsdk/core");
+const nice_grpc_1 = require("nice-grpc");
+/**
+ * Client middleware that performs gRPC code mapping into RSDK exception
+ */
+const exceptionMapperMiddleware = () => 
+// eslint-disable-next-line unicorn/consistent-function-scoping
+async function* (call, options) {
+    try {
+        return yield* call.next(call.request, options);
+    }
+    catch (error) {
+        if (!(error instanceof nice_grpc_1.ClientError)) {
+            throw new core_1.InternalException('GRPC call failed with unknown error', {
+                cause: error,
+            });
+        }
+        const message = 'GRPC Call failed!';
+        const props = {
+            details: {
+                /*
+                 * Details - will be original message from server,
+                 * while message field will be a composite string with
+                 * status path and original message in one line
+                 */
+                message: error.details,
+                /**
+                 * GRPC-package and method
+                 */
+                path: error.path,
+                /**
+                 * TBD: Other context from original error is not yet passed
+                 * via GRPC. Will be added later.
+                 */
+            },
+        };
+        /**
+         * According to /docs/images/exceptions.mapping.png
+         */
+        switch (error.code) {
+            case nice_grpc_1.Status.DEADLINE_EXCEEDED:
+                throw new core_1.TimeoutException(message, props);
+            case nice_grpc_1.Status.INVALID_ARGUMENT:
+                throw new core_1.InputException(message, props);
+            case nice_grpc_1.Status.ALREADY_EXISTS:
+                throw new core_1.DuplicateEntityException(message, props);
+            case nice_grpc_1.Status.FAILED_PRECONDITION:
+                throw new core_1.ConflictException(message, props);
+            case nice_grpc_1.Status.UNAUTHENTICATED:
+                throw new core_1.AuthException(message, props);
+            case nice_grpc_1.Status.PERMISSION_DENIED:
+                throw new core_1.NotAllowedException(message, props);
+            case nice_grpc_1.Status.NOT_FOUND:
+                throw new core_1.NotFoundException(message, props);
+            default:
+                throw new core_1.InternalException(message, props);
+        }
+    }
+};
+exports.exceptionMapperMiddleware = exceptionMapperMiddleware;
+//# sourceMappingURL=exception-mapper.middleware.js.map

package/dist/middleware/exception-mapper.middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"exception-mapper.middleware.js","sourceRoot":"","sources":["../../src/middleware/exception-mapper.middleware.ts"],"names":[],"mappings":";;;AAAA,qCASoB;AACpB,yCAAgD;AAGhD;;GAEG;AACI,MAAM,yBAAyB,GAAG,GAAqB,EAAE;AAC9D,+DAA+D;AAC/D,KAAK,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO;IAC5B,IAAI;QACF,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;KAChD;IAAC,OAAO,KAAc,EAAE;QACvB,IAAI,CAAC,CAAC,KAAK,YAAY,uBAAW,CAAC,EAAE;YACnC,MAAM,IAAI,wBAAiB,CAAC,qCAAqC,EAAE;gBACjE,KAAK,EAAE,KAAK;aACb,CAAC,CAAC;SACJ;QAED,MAAM,OAAO,GAAG,mBAAmB,CAAC;QACpC,MAAM,KAAK,GAAG;YACZ,OAAO,EAAE;gBACP;;;;mBAIG;gBACH,OAAO,EAAE,KAAK,CAAC,OAAO;gBAEtB;;mBAEG;gBACH,IAAI,EAAE,KAAK,CAAC,IAAI;gBAEhB;;;mBAGG;aACJ;SACF,CAAC;QAEF;;WAEG;QACH,QAAQ,KAAK,CAAC,IAAI,EAAE;YAClB,KAAK,kBAAM,CAAC,iBAAiB;gBAC3B,MAAM,IAAI,uBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC7C,KAAK,kBAAM,CAAC,gBAAgB;gBAC1B,MAAM,IAAI,qBAAc,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC3C,KAAK,kBAAM,CAAC,cAAc;gBACxB,MAAM,IAAI,+BAAwB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YACrD,KAAK,kBAAM,CAAC,mBAAmB;gBAC7B,MAAM,IAAI,wBAAiB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC9C,KAAK,kBAAM,CAAC,eAAe;gBACzB,MAAM,IAAI,oBAAa,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC1C,KAAK,kBAAM,CAAC,iBAAiB;gBAC3B,MAAM,IAAI,0BAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAChD,KAAK,kBAAM,CAAC,SAAS;gBACnB,MAAM,IAAI,wBAAiB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC9C;gBACE,MAAM,IAAI,wBAAiB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;SAC/C;KACF;AACH,CAAC,CAAC;AAxDS,QAAA,yBAAyB,6BAwDlC"}

package/dist/module.generator.d.ts

@@ -1,7 +1,8 @@
 import type { DynamicModule } from '@nestjs/common';
 import type { CompatServiceDefinition } from 'nice-grpc/lib/service-definitions';
 export declare class ModuleGenerator {
-    static createModuleDefinition(serverName: string, definition: CompatServiceDefinition): DynamicModule;
+    static createClientModuleDefinition(serverName: string, definition: CompatServiceDefinition): DynamicModule;
+    static createClientFactoryModuleDefinition(definition: CompatServiceDefinition): DynamicModule;
     private static createChannelProvider;
     private static createClientProvider;
 }

package/dist/module.generator.js

@@ -7,11 +7,12 @@ const grpc_common_1 = require("@rsdk/grpc.common");
 const metadata_1 = require("@rsdk/metadata");
 const constants_1 = require("./metadata/constants");
 const grpc_clients_autodoc_resolver_1 = require("./metadata/grpc-clients.autodoc-resolver");
+const grpc_clients_factory_autodoc_resolver_1 = require("./metadata/grpc-clients-factory.autodoc-resolver");
 const grpc_client_repository_1 = require("./repository/grpc-client.repository");
 const grpc_client_repository_module_1 = require("./repository/grpc-client-repository.module");
 const token_factories_1 = require("./token.factories");
 class ModuleGenerator {
-    static createModuleDefinition(serverName, definition) {
+    static createClientModuleDefinition(serverName, definition) {
         const CONFIG_PROPERTY_ALIAS = (0, token_factories_1.getPropertyKey)(serverName);
         const propertyToken = (0, core_1.getPropertyToken)(CONFIG_PROPERTY_ALIAS);
         const clientToken = (0, token_factories_1.getClientToken)(definition);
@@ -42,6 +43,32 @@ class ModuleGenerator {
         autodoc_protocol_1.AutodocMetadata.defineResolver(moduleDefinition, constants_1.GRPC_CLIENTS_RSDK_METADATA_SCOPE, grpc_clients_autodoc_resolver_1.grpcClientAutodocResolver);
         return moduleDefinition;
     }
+    static createClientFactoryModuleDefinition(definition) {
+        const token = (0, token_factories_1.getFactoryToken)(definition);
+        const factoryProvider = {
+            provide: token,
+            inject: [grpc_client_repository_1.GrpcClientRepository],
+            useFactory(grpcClientRepository) {
+                return {
+                    create(address) {
+                        return grpcClientRepository.resolveClient(definition, grpcClientRepository.resolveChannel(address, (0, token_factories_1.getChannelToken)(address)), (0, token_factories_1.getClientToken)(definition));
+                    },
+                };
+            },
+        };
+        const moduleDefinition = {
+            global: true,
+            imports: [grpc_client_repository_module_1.GrpcClientRepositoryModule],
+            module: ModuleGenerator,
+            providers: [factoryProvider],
+            exports: [factoryProvider],
+        };
+        metadata_1.RsdkMetadata.add(moduleDefinition, {
+            definition,
+        }, constants_1.GRPC_CLIENTS_FACTORY_RSDK_METADATA_SCOPE);
+        autodoc_protocol_1.AutodocMetadata.defineResolver(moduleDefinition, constants_1.GRPC_CLIENTS_FACTORY_RSDK_METADATA_SCOPE, grpc_clients_factory_autodoc_resolver_1.grpcClientsFactoryAutodocResolver);
+        return moduleDefinition;
+    }
     static createChannelProvider(channelToken, propertyToken) {
         return {
             provide: channelToken,

package/dist/module.generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.generator.js","sourceRoot":"","sources":["../src/module.generator.ts"],"names":[],"mappings":";;;AACA,6DAAyD;AACzD,qCAIoB;AACpB,mDAAsD;AACtD,6CAA8C;AAI9C,oDAAwE;AACxE,4FAAqF;AACrF,gFAA2E;AAC3E,8FAAwF;AAExF,uDAI2B;AAE3B,MAAa,eAAe;IAC1B,MAAM,CAAC,sBAAsB,CAC3B,UAAkB,EAClB,UAAmC;QAEnC,MAAM,qBAAqB,GAAG,IAAA,gCAAc,EAAC,UAAU,CAAC,CAAC;QACzD,MAAM,aAAa,GAAG,IAAA,uBAAgB,EAAC,qBAAqB,CAAC,CAAC;QAC9D,MAAM,WAAW,GAAG,IAAA,gCAAc,EAAC,UAAU,CAAC,CAAC;QAC/C,MAAM,YAAY,GAAG,IAAA,iCAAe,EAAC,UAAU,CAAC,CAAC;QAEjD,MAAM,eAAe,GACnB,eAAe,CAAC,qBAAqB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QAErE,MAAM,cAAc,GAClB,eAAe,CAAC,oBAAoB,CAClC,WAAW,EACX,YAAY,EACZ,UAAU,CACX,CAAC;QAEJ,MAAM,gBAAgB,GAAG;YACvB,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE;gBACP,2BAAoB,CAAC,WAAW,CAAC,qBAAqB,CAAC;gBACvD,0DAA0B;aAC3B;YACD,MAAM,EAAE,eAAe;YACvB,SAAS,EAAE,CAAC,eAAe,EAAE,cAAc,CAAC;YAC5C,OAAO,EAAE,CAAC,cAAc,CAAC;SAC1B,CAAC;QAEF,MAAM,GAAG,GAAG,IAAA,gCAAc,EAAC,UAAU,CAAC,CAAC;QAEvC,6BAAsB,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,GAAG,EAAE;YAC7D,GAAG,EAAE,GAAG;YACR,MAAM,EAAE,IAAI,+BAAiB,EAAE;YAC/B,WAAW,EAAE,GAAG,UAAU,CAAC,QAAQ,EAAE,eAAe;YACpD,aAAa,EAAE,KAAK;SACrB,CAAC,CAAC;QAEH,uBAAY,CAAC,GAAG,CACd,gBAAgB,EAChB;YACE,UAAU;YACV,UAAU;SACX,EACD,4CAAgC,CACjC,CAAC;QAEF,kCAAe,CAAC,cAAc,CAC5B,gBAAgB,EAChB,4CAAgC,EAChC,yDAAyB,CAC1B,CAAC;QACF,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAEO,MAAM,CAAC,qBAAqB,CAClC,YAAoB,EACpB,aAAqD;QAErD,OAAO;YACL,OAAO,EAAE,YAAY;YAErB,MAAM,EAAE,CAAC,aAAa,EAAE,6CAAoB,CAAC;YAC7C,UAAU,EAAE,CAAC,OAAe,EAAE,IAA0B,EAAW,EAAE;gBACnE,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACpD,CAAC;SACF,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,oBAAoB,CACjC,WAAmB,EACnB,YAAoB,EACpB,UAAmC;QAEnC,OAAO;YACL,OAAO,EAAE,WAAW;YAEpB,MAAM,EAAE,CAAC,YAAY,EAAE,6CAAoB,CAAC;YAC5C,UAAU,EAAE,CACV,OAAgB,EAChB,IAA0B,EACO,EAAE;gBACnC,OAAO,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;YAC9D,CAAC;SACF,CAAC;IACJ,CAAC;CACF;AAxFD,0CAwFC"}
+{"version":3,"file":"module.generator.js","sourceRoot":"","sources":["../src/module.generator.ts"],"names":[],"mappings":"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"}

package/dist/repository/grpc-client.repository.d.ts

@@ -6,13 +6,11 @@ import type { CompatServiceDefinition } from 'nice-grpc/lib/service-definitions'
  */
 export declare class GrpcClientRepository {
     private static factory;
-    logger: import("@rsdk/logging").ILogger;
-    servers: Set<string>;
-    definitions: Set<CompatServiceDefinition>;
-    channels: Map<string, ChannelImplementation>;
-    clients: Map<string, Client<CompatServiceDefinition>>;
-    private static createChannel;
-    private static createClient;
+    readonly logger: import("@rsdk/logging").ILogger;
+    readonly servers: Set<string>;
+    readonly definitions: Set<CompatServiceDefinition>;
+    readonly channels: Map<string, ChannelImplementation>;
+    readonly clients: Map<string, Client<CompatServiceDefinition>>;
     resolveChannel(address: string, channelToken: string): ChannelImplementation;
     resolveClient(definition: CompatServiceDefinition, channel: ChannelImplementation, clientToken: string): Client<CompatServiceDefinition>;
 }

package/dist/repository/grpc-client.repository.js

@@ -4,11 +4,14 @@ exports.GrpcClientRepository = void 0;
 const logging_1 = require("@rsdk/logging");
 const nice_grpc_1 = require("nice-grpc");
 const nice_grpc_opentelemetry_1 = require("nice-grpc-opentelemetry");
+const exception_mapper_middleware_1 = require("../middleware/exception-mapper.middleware");
 /**
  * Простое кеш хранилище внутри DI для кеширования на замену статике
  */
 class GrpcClientRepository {
-    static factory = (0, nice_grpc_1.createClientFactory)().use((0, nice_grpc_opentelemetry_1.openTelemetryClientMiddleware)());
+    static factory = (0, nice_grpc_1.createClientFactory)()
+        .use((0, nice_grpc_opentelemetry_1.openTelemetryClientMiddleware)())
+        .use((0, exception_mapper_middleware_1.exceptionMapperMiddleware)());
     logger = logging_1.LoggerFactory.create(GrpcClientRepository);
     // Registration
     servers = new Set();
@@ -16,21 +19,14 @@ class GrpcClientRepository {
     // Caches
     channels = new Map();
     clients = new Map();
-    static createChannel(address) {
-        return (0, nice_grpc_1.createChannel)(address);
-    }
-    static createClient(definition, channel) {
-        return GrpcClientRepository.factory.create(definition, channel);
-    }
     resolveChannel(address, channelToken) {
-        const existed = this.channels.get(channelToken) ??
-            GrpcClientRepository.createChannel(address);
-        this.channels.set(channelToken, existed);
-        return existed;
+        const channel = this.channels.get(channelToken) ?? (0, nice_grpc_1.createChannel)(address);
+        this.channels.set(channelToken, channel);
+        return channel;
     }
     resolveClient(definition, channel, clientToken) {
         const existed = this.clients.get(clientToken) ??
-            GrpcClientRepository.createClient(definition, channel);
+            GrpcClientRepository.factory.create(definition, channel);
         this.clients.set(clientToken, existed);
         return existed;
     }

package/dist/repository/grpc-client.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"grpc-client.repository.js","sourceRoot":"","sources":["../../src/repository/grpc-client.repository.ts"],"names":[],"mappings":";;;AACA,2CAA8C;AAE9C,yCAA+D;AAE/D,qEAAwE;AAExE;;GAEG;AACH,MAAa,oBAAoB;IACvB,MAAM,CAAC,OAAO,GAAkB,IAAA,+BAAmB,GAAE,CAAC,GAAG,CAC/D,IAAA,uDAA6B,GAAE,CAChC,CAAC;IAEF,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;IACpD,eAAe;IACf,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAC5B,WAAW,GAAG,IAAI,GAAG,EAA2B,CAAC;IACjD,SAAS;IACT,QAAQ,GAAG,IAAI,GAAG,EAAmB,CAAC;IACtC,OAAO,GAAG,IAAI,GAAG,EAA2C,CAAC;IAErD,MAAM,CAAC,aAAa,CAAC,OAAe;QAC1C,OAAO,IAAA,yBAAa,EAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IAEO,MAAM,CAAC,YAAY,CACzB,UAAmC,EACnC,OAA8B;QAE9B,OAAO,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAClE,CAAC;IAED,cAAc,CAAC,OAAe,EAAE,YAAoB;QAClD,MAAM,OAAO,GACX,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC;YAC/B,oBAAoB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAE9C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAEzC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,aAAa,CACX,UAAmC,EACnC,OAA8B,EAC9B,WAAmB;QAEnB,MAAM,OAAO,GACX,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;YAC7B,oBAAoB,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAEzD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAEvC,OAAO,OAAO,CAAC;IACjB,CAAC;;AA9CH,oDA+CC"}
+{"version":3,"file":"grpc-client.repository.js","sourceRoot":"","sources":["../../src/repository/grpc-client.repository.ts"],"names":[],"mappings":";;;AACA,2CAA8C;AAE9C,yCAA+D;AAE/D,qEAAwE;AAExE,2FAAsF;AAEtF;;GAEG;AACH,MAAa,oBAAoB;IACvB,MAAM,CAAC,OAAO,GAAG,IAAA,+BAAmB,GAAE;SAC3C,GAAG,CAAC,IAAA,uDAA6B,GAAE,CAAC;SACpC,GAAG,CAAC,IAAA,uDAAyB,GAAE,CAAC,CAAC;IAE3B,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;IAE7D,eAAe;IACN,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAC5B,WAAW,GAAG,IAAI,GAAG,EAA2B,CAAC;IAE1D,SAAS;IACA,QAAQ,GAAG,IAAI,GAAG,EAAmB,CAAC;IACtC,OAAO,GAAG,IAAI,GAAG,EAA2C,CAAC;IAEtE,cAAc,CAAC,OAAe,EAAE,YAAoB;QAClD,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,IAAA,yBAAa,EAAC,OAAO,CAAC,CAAC;QAE1E,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAEzC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,aAAa,CACX,UAAmC,EACnC,OAA8B,EAC9B,WAAmB;QAEnB,MAAM,OAAO,GACX,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;YAC7B,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAE3D,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAEvC,OAAO,OAAO,CAAC;IACjB,CAAC;;AAnCH,oDAoCC"}

package/dist/servers/types.d.ts

@@ -26,3 +26,6 @@ export type GrpcServerMetadataValue = {
     serverName: string;
     definition: CompatServiceDefinition;
 };
+export type GrpcFactoryMetadataValue = {
+    definition: CompatServiceDefinition;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/grpc.clients",
-  "version": "2.6.0-next.0",
+  "version": "2.6.0-next.3",
   "description": "Grpc clients infrastructure",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -17,15 +17,15 @@
     "@grpc/grpc-js": "^1.8.7",
     "@nestjs/common": "^9.0.0",
     "@nestjs/microservices": "^9.0.0",
-    "@rsdk/autodoc.protocol": "^2.4.2",
+    "@rsdk/autodoc.protocol": "^2.6.0-next.3",
     "@rsdk/common": "^2.4.2",
-    "@rsdk/core": "^2.5.0",
-    "@rsdk/grpc.common": "^2.5.0",
+    "@rsdk/core": "^2.6.0-next.3",
+    "@rsdk/grpc.common": "^2.6.0-next.3",
     "@rsdk/logging": "^2.4.2",
-    "@rsdk/metadata": "^2.4.2",
+    "@rsdk/metadata": "^2.6.0-next.3",
     "nice-grpc": "^2.1.4",
     "nice-grpc-opentelemetry": "^0.1.2",
     "rxjs": "^7.0.0"
   },
-  "gitHead": "0b5c41c482784db44ab35ef3b8990d10f9978645"
+  "gitHead": "db498c874d3d6179b00e9e7f80c739cf3f76646c"
 }

package/src/decorators/inject-client-factory.decorator.ts

@@ -1,6 +1,9 @@
 import { Inject } from '@nestjs/common';
+import { PLATFORM_RAW_GLOBAL_METADATA_SCOPE } from '@rsdk/core/dist/rsdk-metadata/constants';
+import { RsdkMetadata } from '@rsdk/metadata';
 import type { CompatServiceDefinition } from 'nice-grpc/lib/service-definitions';
 
+import { ModuleGenerator } from '../module.generator';
 import { getFactoryToken } from '../token.factories';
 
 // Factory for grpc-clients
@@ -22,8 +25,14 @@ export interface GrpcClientsFactory<T> {
 export const InjectGrpcClientsFactory = (
   definition: CompatServiceDefinition,
 ): ParameterDecorator => {
-  const token = getFactoryToken(definition);
-
-  // TODO Add metadata registration
-  return Inject(token);
+  return (target, propertyKey, parameterIndex) => {
+    Inject(getFactoryToken(definition))(target, propertyKey, parameterIndex);
+    RsdkMetadata.setWithScope(
+      target,
+      PLATFORM_RAW_GLOBAL_METADATA_SCOPE,
+      definition.fullName,
+      ModuleGenerator.createClientFactoryModuleDefinition(definition),
+      true,
+    );
+  };
 };

package/src/decorators/inject-client.decorator.ts

@@ -33,7 +33,7 @@ export const InjectGrpcClient = <
       target,
       PLATFORM_RAW_GLOBAL_METADATA_SCOPE,
       `${grpcServerDeclarationValue.serverName}.${grpcServerDeclarationValue.serviceName}`,
-      ModuleGenerator.createModuleDefinition(
+      ModuleGenerator.createClientModuleDefinition(
         grpcServerDeclarationValue.serverName,
         grpcServerDeclarationValue.definition,
       ),

package/src/metadata/constants.ts

@@ -1 +1,2 @@
 export const GRPC_CLIENTS_RSDK_METADATA_SCOPE = 'grpc-clients';
+export const GRPC_CLIENTS_FACTORY_RSDK_METADATA_SCOPE = 'grpc-clients-factory';

package/src/metadata/grpc-clients-factory.autodoc-resolver.ts

@@ -0,0 +1,31 @@
+import type { DocumentNode, DocumentResolver } from '@rsdk/autodoc.protocol';
+import { Composite, Table } from '@rsdk/autodoc.protocol';
+import type { RsdkMetadataProvider } from '@rsdk/metadata';
+import type { Promisable } from 'type-fest';
+
+import type { GrpcFactoryMetadataValue } from '../servers/types';
+
+import { GRPC_CLIENTS_FACTORY_RSDK_METADATA_SCOPE } from './constants';
+
+class GrpcClientsFactoryAutodocResolver implements DocumentResolver {
+  getNode(rsdkMetadata: RsdkMetadataProvider): Promisable<DocumentNode | null> {
+    const resources = rsdkMetadata.get<GrpcFactoryMetadataValue>(
+      GRPC_CLIENTS_FACTORY_RSDK_METADATA_SCOPE,
+    );
+    if (!resources) {
+      return null;
+    }
+    return new Composite(
+      new Table(
+        resources.map(({ value: { definition } }) => ({
+          name: definition.name.toString(),
+          fullName: definition.fullName.toString(),
+        })),
+      ),
+      'Grpc clients factory',
+    );
+  }
+}
+
+export const grpcClientsFactoryAutodocResolver =
+  new GrpcClientsFactoryAutodocResolver();

package/src/middleware/exception-mapper.middleware.ts

@@ -0,0 +1,73 @@
+import {
+  AuthException,
+  ConflictException,
+  DuplicateEntityException,
+  InputException,
+  InternalException,
+  NotAllowedException,
+  NotFoundException,
+  TimeoutException,
+} from '@rsdk/core';
+import { ClientError, Status } from 'nice-grpc';
+import type { ClientMiddleware } from 'nice-grpc-common';
+
+/**
+ * Client middleware that performs gRPC code mapping into RSDK exception
+ */
+export const exceptionMapperMiddleware = (): ClientMiddleware =>
+  // eslint-disable-next-line unicorn/consistent-function-scoping
+  async function* (call, options) {
+    try {
+      return yield* call.next(call.request, options);
+    } catch (error: unknown) {
+      if (!(error instanceof ClientError)) {
+        throw new InternalException('GRPC call failed with unknown error', {
+          cause: error,
+        });
+      }
+
+      const message = 'GRPC Call failed!';
+      const props = {
+        details: {
+          /*
+           * Details - will be original message from server,
+           * while message field will be a composite string with
+           * status path and original message in one line
+           */
+          message: error.details,
+
+          /**
+           * GRPC-package and method
+           */
+          path: error.path,
+
+          /**
+           * TBD: Other context from original error is not yet passed
+           * via GRPC. Will be added later.
+           */
+        },
+      };
+
+      /**
+       * According to /docs/images/exceptions.mapping.png
+       */
+      switch (error.code) {
+        case Status.DEADLINE_EXCEEDED:
+          throw new TimeoutException(message, props);
+        case Status.INVALID_ARGUMENT:
+          throw new InputException(message, props);
+        case Status.ALREADY_EXISTS:
+          throw new DuplicateEntityException(message, props);
+        case Status.FAILED_PRECONDITION:
+          throw new ConflictException(message, props);
+        case Status.UNAUTHENTICATED:
+          throw new AuthException(message, props);
+        case Status.PERMISSION_DENIED:
+          throw new NotAllowedException(message, props);
+        case Status.NOT_FOUND:
+          throw new NotFoundException(message, props);
+        default:
+          throw new InternalException(message, props);
+      }
+    }
+  };

package/src/module.generator.ts

@@ -1,4 +1,4 @@
-import type { DynamicModule, FactoryProvider } from '@nestjs/common';
+import type { DynamicModule, FactoryProvider, Provider } from '@nestjs/common';
 import { AutodocMetadata } from '@rsdk/autodoc.protocol';
 import {
   ConfigMetadataRegistry,
@@ -10,19 +10,28 @@ import { RsdkMetadata } from '@rsdk/metadata';
 import type { Channel, Client } from 'nice-grpc';
 import type { CompatServiceDefinition } from 'nice-grpc/lib/service-definitions';
 
-import { GRPC_CLIENTS_RSDK_METADATA_SCOPE } from './metadata/constants';
+import type { GrpcClientsFactory } from './decorators/inject-client-factory.decorator';
+import {
+  GRPC_CLIENTS_FACTORY_RSDK_METADATA_SCOPE,
+  GRPC_CLIENTS_RSDK_METADATA_SCOPE,
+} from './metadata/constants';
 import { grpcClientAutodocResolver } from './metadata/grpc-clients.autodoc-resolver';
+import { grpcClientsFactoryAutodocResolver } from './metadata/grpc-clients-factory.autodoc-resolver';
 import { GrpcClientRepository } from './repository/grpc-client.repository';
 import { GrpcClientRepositoryModule } from './repository/grpc-client-repository.module';
-import type { GrpcServerMetadataValue } from './servers/types';
+import type {
+  GrpcFactoryMetadataValue,
+  GrpcServerMetadataValue,
+} from './servers/types';
 import {
   getChannelToken,
   getClientToken,
+  getFactoryToken,
   getPropertyKey,
 } from './token.factories';
 
 export class ModuleGenerator {
-  static createModuleDefinition(
+  static createClientModuleDefinition(
     serverName: string,
     definition: CompatServiceDefinition,
   ): DynamicModule {
@@ -78,6 +87,54 @@ export class ModuleGenerator {
     return moduleDefinition;
   }
 
+  static createClientFactoryModuleDefinition(
+    definition: CompatServiceDefinition,
+  ): DynamicModule {
+    const token = getFactoryToken(definition);
+    const factoryProvider: Provider = {
+      provide: token,
+      inject: [GrpcClientRepository],
+      useFactory(
+        grpcClientRepository: GrpcClientRepository,
+      ): GrpcClientsFactory<any> {
+        return {
+          create(address: string): any {
+            return grpcClientRepository.resolveClient(
+              definition,
+              grpcClientRepository.resolveChannel(
+                address,
+                getChannelToken(address),
+              ),
+              getClientToken(definition),
+            );
+          },
+        };
+      },
+    };
+    const moduleDefinition = {
+      global: true,
+      imports: [GrpcClientRepositoryModule],
+      module: ModuleGenerator,
+      providers: [factoryProvider],
+      exports: [factoryProvider],
+    };
+
+    RsdkMetadata.add<GrpcFactoryMetadataValue>(
+      moduleDefinition,
+      {
+        definition,
+      },
+      GRPC_CLIENTS_FACTORY_RSDK_METADATA_SCOPE,
+    );
+
+    AutodocMetadata.defineResolver(
+      moduleDefinition,
+      GRPC_CLIENTS_FACTORY_RSDK_METADATA_SCOPE,
+      grpcClientsFactoryAutodocResolver,
+    );
+    return moduleDefinition;
+  }
+
   private static createChannelProvider(
     channelToken: string,
     propertyToken: `STANDALONE_CONFIG_PROPERTY_${string}`,

package/src/repository/grpc-client.repository.ts

@@ -1,45 +1,36 @@
 import type { ChannelImplementation } from '@grpc/grpc-js/build/src/channel';
 import { LoggerFactory } from '@rsdk/logging';
-import type { Channel, Client, ClientFactory } from 'nice-grpc';
+import type { Channel, Client } from 'nice-grpc';
 import { createChannel, createClientFactory } from 'nice-grpc';
 import type { CompatServiceDefinition } from 'nice-grpc/lib/service-definitions';
 import { openTelemetryClientMiddleware } from 'nice-grpc-opentelemetry';
 
+import { exceptionMapperMiddleware } from '../middleware/exception-mapper.middleware';
+
 /**
  * Простое кеш хранилище внутри DI для кеширования на замену статике
  */
 export class GrpcClientRepository {
-  private static factory: ClientFactory = createClientFactory().use(
-    openTelemetryClientMiddleware(),
-  );
+  private static factory = createClientFactory()
+    .use(openTelemetryClientMiddleware())
+    .use(exceptionMapperMiddleware());
 
-  logger = LoggerFactory.create(GrpcClientRepository);
-  // Registration
-  servers = new Set<string>();
-  definitions = new Set<CompatServiceDefinition>();
-  // Caches
-  channels = new Map<string, Channel>();
-  clients = new Map<string, Client<CompatServiceDefinition>>();
+  readonly logger = LoggerFactory.create(GrpcClientRepository);
 
-  private static createChannel(address: string): Channel {
-    return createChannel(address);
-  }
+  // Registration
+  readonly servers = new Set<string>();
+  readonly definitions = new Set<CompatServiceDefinition>();
 
-  private static createClient(
-    definition: CompatServiceDefinition,
-    channel: ChannelImplementation,
-  ): Client<CompatServiceDefinition> {
-    return GrpcClientRepository.factory.create(definition, channel);
-  }
+  // Caches
+  readonly channels = new Map<string, Channel>();
+  readonly clients = new Map<string, Client<CompatServiceDefinition>>();
 
   resolveChannel(address: string, channelToken: string): ChannelImplementation {
-    const existed: Channel =
-      this.channels.get(channelToken) ??
-      GrpcClientRepository.createChannel(address);
+    const channel = this.channels.get(channelToken) ?? createChannel(address);
 
-    this.channels.set(channelToken, existed);
+    this.channels.set(channelToken, channel);
 
-    return existed;
+    return channel;
   }
 
   resolveClient(
@@ -49,7 +40,7 @@ export class GrpcClientRepository {
   ): Client<CompatServiceDefinition> {
     const existed: Client<CompatServiceDefinition> =
       this.clients.get(clientToken) ??
-      GrpcClientRepository.createClient(definition, channel);
+      GrpcClientRepository.factory.create(definition, channel);
 
     this.clients.set(clientToken, existed);
 

package/src/servers/types.ts

@@ -43,3 +43,7 @@ export type GrpcServerMetadataValue = {
   serverName: string;
   definition: CompatServiceDefinition;
 };
+
+export type GrpcFactoryMetadataValue = {
+  definition: CompatServiceDefinition;
+};