@rsdk/grpc.clients 5.0.4-next.0 → 5.0.5-next.0

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.5-next.0](https://github.com/R-Vision/rsdk/compare/v5.0.4...v5.0.5-next.0) (2024-08-19)
+
+### Bug Fixes
+
+* added channelOptions to client and server ([#279](https://github.com/R-Vision/rsdk/issues/279)) ([#281](https://github.com/R-Vision/rsdk/issues/281)) ([ff07265](https://github.com/R-Vision/rsdk/commit/ff072652e81b6b1f9b9f69645edb667a3e427b0a))
+
+## [5.0.4](https://github.com/R-Vision/rsdk/compare/v5.0.4-next.0...v5.0.4) (2024-07-24)
+
+**Note:** Version bump only for package @rsdk/grpc.clients
+
 ## [5.0.4-next.0](https://github.com/R-Vision/rsdk/compare/v5.0.3...v5.0.4-next.0) (2024-07-24)
 
 **Note:** Version bump only for package @rsdk/grpc.clients

package/dist/grpc.clients.config.d.ts

@@ -0,0 +1,5 @@
+import { ChannelOptions } from '@grpc/grpc-js';
+import { Config } from '@rsdk/core';
+export declare class GrpcClientsConfig extends Config {
+    channelOptions: ChannelOptions;
+}

package/dist/grpc.clients.config.js

@@ -0,0 +1,28 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GrpcClientsConfig = void 0;
+const core_1 = require("@rsdk/core");
+let GrpcClientsConfig = class GrpcClientsConfig extends core_1.Config {
+    channelOptions;
+};
+exports.GrpcClientsConfig = GrpcClientsConfig;
+__decorate([
+    (0, core_1.Property)('GRPC_CLIENTS_CHANNEL_OPTIONS', new core_1.JsonParser(), {
+        defaultValue: {},
+        description: 'Channel options https://www.npmjs.com/package/%40grpc/grpc-js#:~:text=Supported%20Channel%20Options',
+    }),
+    __metadata("design:type", Object)
+], GrpcClientsConfig.prototype, "channelOptions", void 0);
+exports.GrpcClientsConfig = GrpcClientsConfig = __decorate([
+    (0, core_1.ConfigSection)()
+], GrpcClientsConfig);
+//# sourceMappingURL=grpc.clients.config.js.map

package/dist/grpc.clients.config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"grpc.clients.config.js","sourceRoot":"","sources":["../src/grpc.clients.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qCAAyE;AAGlE,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,aAAM;IAM3C,cAAc,CAAkB;CACjC,CAAA;AAPY,8CAAiB;AAM5B;IALC,IAAA,eAAQ,EAAC,8BAA8B,EAAE,IAAI,iBAAU,EAAE,EAAE;QAC1D,YAAY,EAAE,EAAE;QAChB,WAAW,EACT,qGAAqG;KACxG,CAAC;;yDAC8B;4BANrB,iBAAiB;IAD7B,IAAA,oBAAa,GAAE;GACH,iBAAiB,CAO7B"}

package/dist/options/options.module.js

@@ -9,6 +9,8 @@ var GrpcClientOptionsModule_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GrpcClientOptionsModule = void 0;
 const common_1 = require("@nestjs/common");
+const core_1 = require("@rsdk/core");
+const grpc_clients_config_1 = require("../grpc.clients.config");
 const di_1 = require("./di");
 let GrpcClientOptionsModule = GrpcClientOptionsModule_1 = class GrpcClientOptionsModule {
     static forRoot(options) {
@@ -21,6 +23,7 @@ let GrpcClientOptionsModule = GrpcClientOptionsModule_1 = class GrpcClientOption
             module: GrpcClientOptionsModule_1,
             providers: [optionsProvider],
             exports: [optionsProvider],
+            imports: [core_1.PlatformConfigModule.forFeature(grpc_clients_config_1.GrpcClientsConfig)],
         };
     }
 };

package/dist/options/options.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"options.module.js","sourceRoot":"","sources":["../../src/options/options.module.ts"],"names":[],"mappings":";;;;;;;;;;AACA,2CAAwC;AAExC,6BAA4C;AAIrC,IAAM,uBAAuB,+BAA7B,MAAM,uBAAuB;IAClC,MAAM,CAAC,OAAO,CAAC,OAA2B;QACxC,MAAM,eAAe,GAAG;YACtB,OAAO,EAAE,yBAAoB;YAC7B,QAAQ,EAAE,OAAO;SAClB,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,yBAAuB;YAC/B,SAAS,EAAE,CAAC,eAAe,CAAC;YAC5B,OAAO,EAAE,CAAC,eAAe,CAAC;SAC3B,CAAC;IACJ,CAAC;CACF,CAAA;AAdY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,uBAAuB,CAcnC"}
+{"version":3,"file":"options.module.js","sourceRoot":"","sources":["../../src/options/options.module.ts"],"names":[],"mappings":";;;;;;;;;;AACA,2CAAwC;AACxC,qCAAkD;AAElD,gEAA2D;AAE3D,6BAA4C;AAIrC,IAAM,uBAAuB,+BAA7B,MAAM,uBAAuB;IAClC,MAAM,CAAC,OAAO,CAAC,OAA2B;QACxC,MAAM,eAAe,GAAG;YACtB,OAAO,EAAE,yBAAoB;YAC7B,QAAQ,EAAE,OAAO;SAClB,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,yBAAuB;YAC/B,SAAS,EAAE,CAAC,eAAe,CAAC;YAC5B,OAAO,EAAE,CAAC,eAAe,CAAC;YAC1B,OAAO,EAAE,CAAC,2BAAoB,CAAC,UAAU,CAAC,uCAAiB,CAAC,CAAC;SAC9D,CAAC;IACJ,CAAC;CACF,CAAA;AAfY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,uBAAuB,CAenC"}

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

@@ -1,15 +1,17 @@
 import type { ChannelImplementation } from '@grpc/grpc-js/build/src/channel';
 import type { Client } from 'nice-grpc';
 import type { CompatServiceDefinition } from 'nice-grpc/lib/service-definitions';
+import { GrpcClientsConfig } from '../grpc.clients.config';
 import { GrpcClientsOptions } from '../options/types';
 /**
  * Простое кеш хранилище внутри DI для кеширования на замену статике
  */
 export declare class GrpcClientRepository {
+    private readonly grpcClientsConfig;
     private readonly factory;
     private readonly channels;
     private readonly clients;
-    constructor(options?: GrpcClientsOptions);
+    constructor(grpcClientsConfig: GrpcClientsConfig, options?: GrpcClientsOptions);
     resolveChannel(address: string, channelToken: string): ChannelImplementation;
     resolveClient(definition: CompatServiceDefinition, channel: ChannelImplementation, clientToken: string): Client<CompatServiceDefinition>;
 }

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

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GrpcClientRepository = void 0;
 const common_1 = require("@nestjs/common");
 const nice_grpc_1 = require("nice-grpc");
+const grpc_clients_config_1 = require("../grpc.clients.config");
 const exception_mapper_middleware_1 = require("../middleware/exception-mapper.middleware");
 const tracing_middleware_1 = require("../middleware/tracing.middleware");
 const di_1 = require("../options/di");
@@ -22,11 +23,13 @@ const di_1 = require("../options/di");
  * Простое кеш хранилище внутри DI для кеширования на замену статике
  */
 let GrpcClientRepository = class GrpcClientRepository {
+    grpcClientsConfig;
     factory;
     // Caches
     channels = new Map();
     clients = new Map();
-    constructor(options) {
+    constructor(grpcClientsConfig, options) {
+        this.grpcClientsConfig = grpcClientsConfig;
         this.factory = (0, nice_grpc_1.createClientFactory)()
             .use((0, exception_mapper_middleware_1.exceptionMapperMiddleware)())
             .use((0, tracing_middleware_1.tracingMiddleware)());
@@ -44,6 +47,7 @@ let GrpcClientRepository = class GrpcClientRepository {
             (0, nice_grpc_1.createChannel)(address, nice_grpc_1.ChannelCredentials.createInsecure(), {
                 // unlimited
                 'grpc.max_receive_message_length': -1,
+                ...this.grpcClientsConfig.channelOptions,
             });
         this.channels.set(channelToken, channel);
         return channel;
@@ -57,8 +61,8 @@ let GrpcClientRepository = class GrpcClientRepository {
 exports.GrpcClientRepository = GrpcClientRepository;
 exports.GrpcClientRepository = GrpcClientRepository = __decorate([
     (0, common_1.Injectable)(),
-    __param(0, (0, common_1.Optional)()),
-    __param(0, (0, common_1.Inject)(di_1.GRPC_CLIENTS_OPTIONS)),
-    __metadata("design:paramtypes", [Object])
+    __param(1, (0, common_1.Optional)()),
+    __param(1, (0, common_1.Inject)(di_1.GRPC_CLIENTS_OPTIONS)),
+    __metadata("design:paramtypes", [grpc_clients_config_1.GrpcClientsConfig, Object])
 ], GrpcClientRepository);
 //# sourceMappingURL=grpc-client.repository.js.map

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,2CAA8D;AAE9D,yCAImB;AAGnB,2FAAsF;AACtF,yEAAqE;AACrE,sCAAqD;AAGrD;;GAEG;AAGI,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IACd,OAAO,CAAgB;IAExC,SAAS;IACQ,QAAQ,GAAG,IAAI,GAAG,EAAmB,CAAC;IACtC,OAAO,GAAG,IAAI,GAAG,EAA2C,CAAC;IAE9E,YAC4C,OAA4B;QAEtE,IAAI,CAAC,OAAO,GAAG,IAAA,+BAAmB,GAAE;aACjC,GAAG,CAAC,IAAA,uDAAyB,GAAE,CAAC;aAChC,GAAG,CAAC,IAAA,sCAAiB,GAAE,CAAC,CAAC;QAE5B,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;QAErC,IAAI,UAAU,EAAE,CAAC;YACf,KAAK,MAAM,CAAC,IAAI,UAAU;gBAAE,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAED,cAAc,CAAC,OAAe,EAAE,YAAoB;QAClD,uFAAuF;QACvF,sFAAsF;QACtF,kFAAkF;QAElF,MAAM,OAAO,GACX,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC;YAC/B,IAAA,yBAAa,EAAC,OAAO,EAAE,8BAAkB,CAAC,cAAc,EAAE,EAAE;gBAC1D,YAAY;gBACZ,iCAAiC,EAAE,CAAC,CAAC;aACtC,CAAC,CAAC;QAEL,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,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAE5E,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAEvC,OAAO,OAAO,CAAC;IACjB,CAAC;CACF,CAAA;AAlDY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;IASR,WAAA,IAAA,iBAAQ,GAAE,CAAA;IAAE,WAAA,IAAA,eAAM,EAAC,yBAAoB,CAAC,CAAA;;GARhC,oBAAoB,CAkDhC"}
+{"version":3,"file":"grpc-client.repository.js","sourceRoot":"","sources":["../../src/repository/grpc-client.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,2CAA8D;AAE9D,yCAImB;AAGnB,gEAA2D;AAC3D,2FAAsF;AACtF,yEAAqE;AACrE,sCAAqD;AAGrD;;GAEG;AAGI,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAQZ;IAPF,OAAO,CAAgB;IAExC,SAAS;IACQ,QAAQ,GAAG,IAAI,GAAG,EAAmB,CAAC;IACtC,OAAO,GAAG,IAAI,GAAG,EAA2C,CAAC;IAE9E,YACmB,iBAAoC,EACX,OAA4B;QADrD,sBAAiB,GAAjB,iBAAiB,CAAmB;QAGrD,IAAI,CAAC,OAAO,GAAG,IAAA,+BAAmB,GAAE;aACjC,GAAG,CAAC,IAAA,uDAAyB,GAAE,CAAC;aAChC,GAAG,CAAC,IAAA,sCAAiB,GAAE,CAAC,CAAC;QAE5B,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;QAErC,IAAI,UAAU,EAAE,CAAC;YACf,KAAK,MAAM,CAAC,IAAI,UAAU;gBAAE,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAED,cAAc,CAAC,OAAe,EAAE,YAAoB;QAClD,uFAAuF;QACvF,sFAAsF;QACtF,kFAAkF;QAElF,MAAM,OAAO,GACX,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC;YAC/B,IAAA,yBAAa,EAAC,OAAO,EAAE,8BAAkB,CAAC,cAAc,EAAE,EAAE;gBAC1D,YAAY;gBACZ,iCAAiC,EAAE,CAAC,CAAC;gBACrC,GAAG,IAAI,CAAC,iBAAiB,CAAC,cAAc;aACzC,CAAC,CAAC;QAEL,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,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAE5E,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAEvC,OAAO,OAAO,CAAC;IACjB,CAAC;CACF,CAAA;AApDY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;IAUR,WAAA,IAAA,iBAAQ,GAAE,CAAA;IAAE,WAAA,IAAA,eAAM,EAAC,yBAAoB,CAAC,CAAA;qCADL,uCAAiB;GAR5C,oBAAoB,CAoDhC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/grpc.clients",
-  "version": "5.0.4-next.0",
+  "version": "5.0.5-next.0",
   "description": "Grpc clients infrastructure",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -26,5 +26,5 @@
     "reflect-metadata": "^0.1.12 || ^0.2.0",
     "rxjs": "^7.8.1"
   },
-  "gitHead": "55a97875e0c4c86757c032782c39ab00f05ce5a0"
+  "gitHead": "69cc17448de4db247e4fc27ab4d00896271c178a"
 }

package/src/grpc.clients.config.ts

@@ -0,0 +1,12 @@
+import { ChannelOptions } from '@grpc/grpc-js';
+import { Config, ConfigSection, JsonParser, Property } from '@rsdk/core';
+
+@ConfigSection()
+export class GrpcClientsConfig extends Config {
+  @Property('GRPC_CLIENTS_CHANNEL_OPTIONS', new JsonParser(), {
+    defaultValue: {},
+    description:
+      'Channel options https://www.npmjs.com/package/%40grpc/grpc-js#:~:text=Supported%20Channel%20Options',
+  })
+  channelOptions!: ChannelOptions;
+}

package/src/options/options.module.ts

@@ -1,5 +1,8 @@
 import type { DynamicModule } from '@nestjs/common';
 import { Module } from '@nestjs/common';
+import { PlatformConfigModule } from '@rsdk/core';
+
+import { GrpcClientsConfig } from '../grpc.clients.config';
 
 import { GRPC_CLIENTS_OPTIONS } from './di';
 import type { GrpcClientsOptions } from './types';
@@ -17,6 +20,7 @@ export class GrpcClientOptionsModule {
       module: GrpcClientOptionsModule,
       providers: [optionsProvider],
       exports: [optionsProvider],
+      imports: [PlatformConfigModule.forFeature(GrpcClientsConfig)],
     };
   }
 }

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

@@ -8,6 +8,7 @@ import {
 } from 'nice-grpc';
 import type { CompatServiceDefinition } from 'nice-grpc/lib/service-definitions';
 
+import { GrpcClientsConfig } from '../grpc.clients.config';
 import { exceptionMapperMiddleware } from '../middleware/exception-mapper.middleware';
 import { tracingMiddleware } from '../middleware/tracing.middleware';
 import { GRPC_CLIENTS_OPTIONS } from '../options/di';
@@ -26,6 +27,7 @@ export class GrpcClientRepository {
   private readonly clients = new Map<string, Client<CompatServiceDefinition>>();
 
   constructor(
+    private readonly grpcClientsConfig: GrpcClientsConfig,
     @Optional() @Inject(GRPC_CLIENTS_OPTIONS) options?: GrpcClientsOptions,
   ) {
     this.factory = createClientFactory()
@@ -49,6 +51,7 @@ export class GrpcClientRepository {
       createChannel(address, ChannelCredentials.createInsecure(), {
         // unlimited
         'grpc.max_receive_message_length': -1,
+        ...this.grpcClientsConfig.channelOptions,
       });
 
     this.channels.set(channelToken, channel);