@conduitplatform/grpc-sdk 0.14.7 → 0.15.0-rc.1

package/dist/classes/ConduitActiveSchema.d.ts

@@ -1,19 +1,19 @@
-import { ConduitModel, ConduitModelOptions } from '../interfaces';
+import { ConduitModel, ConduitSchemaOptions } from '../interfaces';
 import { ConduitSchema } from './ConduitSchema';
 import { DatabaseProvider } from '../modules';
-import { Query } from '../interfaces';
+import { Query } from '../types/db';
 export declare class ConduitActiveSchema<T> extends ConduitSchema {
     private readonly dbInstance;
-    constructor(dbInstance: DatabaseProvider, name: string, fields?: ConduitModel, schemaOptions?: ConduitModelOptions, collectionName?: string);
-    findOne(query: Query, select?: string, populate?: string | string[]): Promise<T | null>;
-    findMany(query: Query, select?: string, skip?: number, limit?: number, sort?: {
+    constructor(dbInstance: DatabaseProvider, name: string, fields?: ConduitModel, modelOptions?: ConduitSchemaOptions, collectionName?: string);
+    findOne(query: Query<T>, select?: string, populate?: string | string[]): Promise<T | null>;
+    findMany(query: Query<T>, select?: string, skip?: number, limit?: number, sort?: {
         [key: string]: number;
     } | string[], populate?: string | string[]): Promise<T[]>;
-    create(query: Query): Promise<T>;
-    createMany(query: Query): Promise<T[]>;
-    findByIdAndUpdate(id: string, document: Query, updateProvidedOnly?: boolean, populate?: string | string[]): Promise<T | null>;
-    updateMany(filterQuery: Query, query: Query, updateProvidedOnly?: boolean): Promise<any>;
-    deleteOne(query: Query): Promise<any>;
-    deleteMany(query: Query): Promise<any>;
-    countDocuments(query: Query): Promise<number>;
+    create(query: Query<T>): Promise<T>;
+    createMany(query: Query<T>): Promise<T[]>;
+    findByIdAndUpdate(id: string, document: Query<T>, updateProvidedOnly?: boolean, populate?: string | string[]): Promise<T | null>;
+    updateMany(filterQuery: Query<T>, query: Query<T>, updateProvidedOnly?: boolean): Promise<any>;
+    deleteOne(query: Query<T>): Promise<any>;
+    deleteMany(query: Query<T>): Promise<any>;
+    countDocuments(query: Query<T>): Promise<number>;
 }

package/dist/classes/ConduitActiveSchema.js

@@ -19,8 +19,8 @@ exports.ConduitActiveSchema = void 0;
 var ConduitSchema_1 = require("./ConduitSchema");
 var ConduitActiveSchema = /** @class */ (function (_super) {
     __extends(ConduitActiveSchema, _super);
-    function ConduitActiveSchema(dbInstance, name, fields, schemaOptions, collectionName) {
-        var _this = _super.call(this, name, fields !== null && fields !== void 0 ? fields : {}, schemaOptions, collectionName) || this;
+    function ConduitActiveSchema(dbInstance, name, fields, modelOptions, collectionName) {
+        var _this = _super.call(this, name, fields !== null && fields !== void 0 ? fields : {}, modelOptions, collectionName) || this;
         _this.dbInstance = dbInstance;
         return _this;
     }

package/dist/classes/ConduitActiveSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConduitActiveSchema.js","sourceRoot":"","sources":["../../src/classes/ConduitActiveSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AACA,iDAAgD;AAIhD;IAA4C,uCAAa;IAGvD,6BACE,UAA4B,EAC5B,IAAY,EACZ,MAAqB,EACrB,aAAmC,EACnC,cAAuB;QALzB,YAOE,kBAAM,IAAI,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,EAAE,aAAa,EAAE,cAAc,CAAC,SAEzD;QADC,KAAI,CAAC,UAAU,GAAG,UAAU,CAAC;;IAC/B,CAAC;IAED,qCAAO,GAAP,UACE,KAAY,EACZ,MAAe,EACf,QAA4B;QAE5B,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACxE,CAAC;IAED,sCAAQ,GAAR,UACE,KAAY,EACZ,MAAe,EACf,IAAa,EACb,KAAc,EACd,IAA2C,EAC3C,QAA4B;QAE5B,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAC7B,IAAI,CAAC,IAAI,EACT,KAAK,EACL,MAAM,EACN,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,oCAAM,GAAN,UAAO,KAAY;QACjB,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAI,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACrD,CAAC;IAED,wCAAU,GAAV,UAAW,KAAY;QACrB,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAI,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACzD,CAAC;IAED,+CAAiB,GAAjB,UACE,EAAU,EACV,QAAe,EACf,kBAA4B,EAC5B,QAA4B;QAE5B,OAAO,IAAI,CAAC,UAAU,CAAC,iBAAiB,CACtC,IAAI,CAAC,IAAI,EACT,EAAE,EACF,QAAQ,EACR,kBAAkB,EAClB,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,wCAAU,GAAV,UAAW,WAAkB,EAAE,KAAY,EAAE,kBAA4B;QACvE,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,kBAAkB,CAAC,CAAC;IACvF,CAAC;IAED,uCAAS,GAAT,UAAU,KAAY;QACpB,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACrD,CAAC;IAED,wCAAU,GAAV,UAAW,KAAY;QACrB,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACtD,CAAC;IAED,4CAAc,GAAd,UAAe,KAAY;QACzB,OAAO,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC1D,CAAC;IACH,0BAAC;AAAD,CAAC,AA/ED,CAA4C,6BAAa,GA+ExD;AA/EY,kDAAmB"}
+{"version":3,"file":"ConduitActiveSchema.js","sourceRoot":"","sources":["../../src/classes/ConduitActiveSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AACA,iDAAgD;AAIhD;IAA4C,uCAAa;IAGvD,6BACE,UAA4B,EAC5B,IAAY,EACZ,MAAqB,EACrB,YAAmC,EACnC,cAAuB;QALzB,YAOE,kBAAM,IAAI,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,EAAE,YAAY,EAAE,cAAc,CAAC,SAExD;QADC,KAAI,CAAC,UAAU,GAAG,UAAU,CAAC;;IAC/B,CAAC;IAED,qCAAO,GAAP,UACE,KAAe,EACf,MAAe,EACf,QAA4B;QAE5B,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACxE,CAAC;IAED,sCAAQ,GAAR,UACE,KAAe,EACf,MAAe,EACf,IAAa,EACb,KAAc,EACd,IAA2C,EAC3C,QAA4B;QAE5B,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAC7B,IAAI,CAAC,IAAI,EACT,KAAK,EACL,MAAM,EACN,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,oCAAM,GAAN,UAAO,KAAe;QACpB,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAI,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACrD,CAAC;IAED,wCAAU,GAAV,UAAW,KAAe;QACxB,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAI,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACzD,CAAC;IAED,+CAAiB,GAAjB,UACE,EAAU,EACV,QAAkB,EAClB,kBAA4B,EAC5B,QAA4B;QAE5B,OAAO,IAAI,CAAC,UAAU,CAAC,iBAAiB,CACtC,IAAI,CAAC,IAAI,EACT,EAAE,EACF,QAAQ,EACR,kBAAkB,EAClB,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,wCAAU,GAAV,UAAW,WAAqB,EAAE,KAAe,EAAE,kBAA4B;QAC7E,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,kBAAkB,CAAC,CAAC;IACvF,CAAC;IAED,uCAAS,GAAT,UAAU,KAAe;QACvB,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACrD,CAAC;IAED,wCAAU,GAAV,UAAW,KAAe;QACxB,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACtD,CAAC;IAED,4CAAc,GAAd,UAAe,KAAe;QAC5B,OAAO,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC1D,CAAC;IACH,0BAAC;AAAD,CAAC,AA/ED,CAA4C,6BAAa,GA+ExD;AA/EY,kDAAmB"}

package/dist/classes/ConduitModule.d.ts

@@ -4,17 +4,18 @@ import { Channel, Client } from 'nice-grpc';
 import { HealthDefinition } from '../protoUtils/grpc_health_check';
 import { EventEmitter } from 'events';
 export declare class ConduitModule<T extends CompatServiceDefinition> {
+    readonly _clientName: string;
+    private readonly _serviceName;
+    private readonly _serviceUrl;
+    private readonly _grpcToken?;
     active: boolean;
     private _client?;
     private _healthClient?;
     protected channel?: Channel;
     protected protoPath?: string;
     protected type?: T;
-    protected readonly _clientName: string;
-    protected readonly _serviceUrl: string;
     protected readonly healthCheckEmitter: EventEmitter;
-    protected readonly _grpcToken?: string;
-    constructor(clientName: string, serviceName: string, serviceUrl: string, grpcToken?: string);
+    constructor(_clientName: string, _serviceName: string, _serviceUrl: string, _grpcToken?: string | undefined);
     initializeClient(type: T): Client<T>;
     openConnection(): void;
     get client(): Client<T> | undefined;

package/dist/classes/ConduitModule.js

@@ -46,15 +46,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConduitModule = void 0;
 var interceptors_1 = require("../interceptors");
 var nice_grpc_1 = require("nice-grpc");
+var nice_grpc_client_middleware_retry_1 = require("nice-grpc-client-middleware-retry");
 var grpc_health_check_1 = require("../protoUtils/grpc_health_check");
 var events_1 = require("events");
 var ConduitModule = /** @class */ (function () {
-    function ConduitModule(clientName, serviceName, serviceUrl, grpcToken) {
+    function ConduitModule(_clientName, _serviceName, _serviceUrl, _grpcToken) {
+        this._clientName = _clientName;
+        this._serviceName = _serviceName;
+        this._serviceUrl = _serviceUrl;
+        this._grpcToken = _grpcToken;
         this.active = false;
         this.healthCheckEmitter = new events_1.EventEmitter();
-        this._clientName = clientName;
-        this._serviceUrl = serviceUrl;
-        this._grpcToken = grpcToken;
     }
     ConduitModule.prototype.initializeClient = function (type) {
         if (this._client)
@@ -64,14 +66,25 @@ var ConduitModule = /** @class */ (function () {
         return this._client;
     };
     ConduitModule.prototype.openConnection = function () {
+        // ConduitGrpcSdk.Logger.log(`Opening connection for ${this._serviceName}`);
         this.channel = (0, nice_grpc_1.createChannel)(this._serviceUrl, undefined, {
             'grpc.max_receive_message_length': 1024 * 1024 * 100,
             'grpc.max_send_message_length': 1024 * 1024 * 100,
         });
-        var clientFactory = (0, nice_grpc_1.createClientFactory)().use(this._grpcToken
+        var clientFactory = (0, nice_grpc_1.createClientFactory)()
+            .use(this._grpcToken
             ? (0, interceptors_1.getGrpcSignedTokenInterceptor)(this._grpcToken)
-            : (0, interceptors_1.getModuleNameInterceptor)(this._clientName));
-        this._client = clientFactory.create(this.type, this.channel);
+            : (0, interceptors_1.getModuleNameInterceptor)(this._clientName))
+            .use(nice_grpc_client_middleware_retry_1.retryMiddleware);
+        this._client = clientFactory.create(this.type, this.channel, {
+            '*': {
+                // https://grpc.github.io/grpc/core/md_doc_statuscodes.html
+                retryableStatuses: [1, 10, 14],
+                retryBaseDelayMs: 250,
+                retryMaxAttempts: 5,
+                retry: true,
+            },
+        });
         this._healthClient = clientFactory.create(grpc_health_check_1.HealthDefinition, this.channel);
         this.active = true;
     };
@@ -99,6 +112,7 @@ var ConduitModule = /** @class */ (function () {
     ConduitModule.prototype.closeConnection = function () {
         if (!this.channel)
             return;
+        // ConduitGrpcSdk.Logger.warn(`Closing connection for ${this._serviceName}`);
         this.channel.close();
         this.channel = undefined;
         this.active = false;

package/dist/classes/ConduitModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConduitModule.js","sourceRoot":"","sources":["../../src/classes/ConduitModule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ConduitModule.js","sourceRoot":"","sources":["../../src/classes/ConduitModule.ts"],"names":[],"mappings":"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"}

package/dist/classes/ConduitParser.d.ts

@@ -1,7 +1,10 @@
-import { Array, ConduitModel, ConduitRouteOption, TYPE } from '../interfaces';
+import { Array, ConduitModel, TYPE } from '../interfaces';
+import { ConduitRouteOption } from '../routing';
 export declare abstract class ConduitParser<ParseResult, ProcessingObject> {
     result: ParseResult;
     isInput: boolean;
+    readonly knownTypes: Set<string>;
+    readonly requestedTypes: Set<string>;
     abstract extractTypes(name: string, fields: ConduitModel | ConduitRouteOption | string, isInput: boolean): ParseResult;
     protected abstract getType(conduitType: TYPE): string | {
         type?: string;
@@ -12,7 +15,7 @@ export declare abstract class ConduitParser<ParseResult, ProcessingObject> {
     protected abstract getInitializedResult(): ParseResult;
     protected abstract getProcessingObject(name: string, isArray: boolean): ProcessingObject;
     protected abstract finalizeProcessingObject(object: ProcessingObject): ProcessingObject;
-    protected abstract getResultFromString(processingObject: ProcessingObject, name: string, value: any, isRequired: boolean, isArray: boolean): void;
+    protected abstract getResultFromString(processingObject: ProcessingObject, name: string, value: any, isRequired: boolean, isArray: boolean, parentField: string): void;
     protected abstract getResultFromObject(processingObject: ProcessingObject, name: string, fieldName: string, value: any, isRequired: boolean, isArray: boolean): void;
     protected abstract getResultFromArray(processingObject: ProcessingObject, resolverName: string, name: string, value: any[], isRequired: boolean, nestedType?: boolean): void;
     protected abstract getResultFromRelation(processingObject: ProcessingObject, resolverName: string, name: string, value: any, isRequired: boolean, isArray: boolean): void;

package/dist/classes/ConduitParser.js

@@ -1,13 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConduitParser = void 0;
+var baseTypes = ['String', 'Number', 'Boolean', 'Date', 'ObjectId', 'JSON'];
 var ConduitParser = /** @class */ (function () {
     function ConduitParser() {
+        this.knownTypes = new Set();
+        this.requestedTypes = new Set();
     }
     ConduitParser.prototype.extractTypesInternal = function (name, fields) {
         var processingObject = this.getProcessingObject(name, false);
         if (typeof fields === 'string') {
-            this.getResultFromString(processingObject, 'result', fields, false, false);
+            this.getResultFromString(processingObject, baseTypes.includes(fields) ? 'result' : name, fields, false, false, name);
         }
         else {
             for (var field in fields) {
@@ -15,7 +18,7 @@ var ConduitParser = /** @class */ (function () {
                     continue;
                 // if field is simply a type
                 if (typeof fields[field] === 'string') {
-                    this.getResultFromString(processingObject, field, fields[field], false, false);
+                    this.getResultFromString(processingObject, field, fields[field], false, false, name);
                 }
                 // if field is an array
                 else if (Array.isArray(fields[field])) {
@@ -30,7 +33,7 @@ var ConduitParser = /** @class */ (function () {
                                 this.getResultFromRelation(processingObject, name, field, fields[field].model, fields[field].required, false);
                             }
                             else {
-                                this.getResultFromString(processingObject, field, fields[field].type, fields[field].required, false);
+                                this.getResultFromString(processingObject, field, fields[field].type, fields[field].required, false, name);
                             }
                         }
                         // if type is an array
@@ -54,7 +57,7 @@ var ConduitParser = /** @class */ (function () {
         var processingObject = this.getProcessingObject(name, true);
         // if array contains simply a type
         if (typeof value[0] === 'string') {
-            this.getResultFromString(processingObject, field, value[0], false, true);
+            this.getResultFromString(processingObject, field, value[0], false, true, name);
         }
         else if (value[0].type) {
             // if array contains a model
@@ -62,7 +65,7 @@ var ConduitParser = /** @class */ (function () {
                 this.getResultFromRelation(processingObject, name, field, value[0].model, value[0].required, true);
             }
             else if (typeof value[0].type === 'string') {
-                this.getResultFromString(processingObject, field, value[0].type, value[0].required, true);
+                this.getResultFromString(processingObject, field, value[0].type, value[0].required, true, name);
             }
             else if (Array.isArray(value[0].type)) {
                 this.getResultFromArray(processingObject, name, field, value[0].type, value[0].required, true);

package/dist/classes/ConduitParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConduitParser.js","sourceRoot":"","sources":["../../src/classes/ConduitParser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ConduitParser.js","sourceRoot":"","sources":["../../src/classes/ConduitParser.ts"],"names":[],"mappings":"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"}

package/dist/classes/ConduitSchema.d.ts

@@ -1,10 +1,9 @@
-import { ConduitModel, ConduitModelOptions } from '../interfaces';
+import { ConduitModel, ConduitSchemaOptions } from '../interfaces';
 export declare class ConduitSchema {
     readonly name: string;
     readonly fields: ConduitModel;
     readonly collectionName: string | '';
-    readonly schemaOptions: ConduitModelOptions;
+    readonly modelOptions: ConduitSchemaOptions;
     ownerModule: string;
-    constructor(name: string, fields: ConduitModel, schemaOptions?: ConduitModelOptions, collectionName?: string);
-    get modelSchema(): ConduitModel;
+    constructor(name: string, fields: ConduitModel, modelOptions?: ConduitSchemaOptions, collectionName?: string);
 }

package/dist/classes/ConduitSchema.js

@@ -2,20 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConduitSchema = void 0;
 var ConduitSchema = /** @class */ (function () {
-    function ConduitSchema(name, fields, schemaOptions, collectionName) {
+    function ConduitSchema(name, fields, modelOptions, collectionName) {
         this.ownerModule = 'unknown';
         this.name = name;
         this.fields = fields;
-        this.schemaOptions = schemaOptions !== null && schemaOptions !== void 0 ? schemaOptions : {};
+        this.modelOptions = modelOptions !== null && modelOptions !== void 0 ? modelOptions : {};
         this.collectionName = collectionName && collectionName !== '' ? collectionName : '';
     }
-    Object.defineProperty(ConduitSchema.prototype, "modelSchema", {
-        get: function () {
-            return this.fields;
-        },
-        enumerable: false,
-        configurable: true
-    });
     return ConduitSchema;
 }());
 exports.ConduitSchema = ConduitSchema;

package/dist/classes/ConduitSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConduitSchema.js","sourceRoot":"","sources":["../../src/classes/ConduitSchema.ts"],"names":[],"mappings":";;;AAEA;IAOE,uBACE,IAAY,EACZ,MAAoB,EACpB,aAAmC,EACnC,cAAuB;QANzB,gBAAW,GAAW,SAAS,CAAC;QAQ9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,aAAa,GAAG,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,EAAE,CAAC;QACzC,IAAI,CAAC,cAAc,GAAG,cAAc,IAAI,cAAc,KAAK,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;IACtF,CAAC;IAED,sBAAI,sCAAW;aAAf;YACE,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC;;;OAAA;IACH,oBAAC;AAAD,CAAC,AAtBD,IAsBC;AAtBY,sCAAa"}
+{"version":3,"file":"ConduitSchema.js","sourceRoot":"","sources":["../../src/classes/ConduitSchema.ts"],"names":[],"mappings":";;;AAEA;IAOE,uBACE,IAAY,EACZ,MAAoB,EACpB,YAAmC,EACnC,cAAuB;QANzB,gBAAW,GAAW,SAAS,CAAC;QAQ9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE,CAAC;QACvC,IAAI,CAAC,cAAc,GAAG,cAAc,IAAI,cAAc,KAAK,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;IACtF,CAAC;IACH,oBAAC;AAAD,CAAC,AAlBD,IAkBC;AAlBY,sCAAa"}

package/dist/classes/ConduitServiceModule.d.ts

@@ -8,6 +8,7 @@ import { ServerWritableStream } from '@grpc/grpc-js';
 export declare abstract class ConduitServiceModule {
     protected readonly _moduleName: string;
     protected _serviceName?: string;
+    protected _address: string;
     protected _port: string;
     protected grpcServer: GrpcServer;
     private _grpcSdk;

package/dist/classes/ConduitServiceModule.js

@@ -117,7 +117,7 @@ var ConduitServiceModule = /** @class */ (function () {
         });
     };
     ConduitServiceModule.prototype.updateHealth = function (state, init) {
-        var _a;
+        var _a, _b;
         if (init === void 0) { init = false; }
         if ((state === __1.HealthCheckStatus.UNKNOWN && !init) ||
             state === __1.HealthCheckStatus.SERVICE_UNKNOWN) {
@@ -129,6 +129,7 @@ var ConduitServiceModule = /** @class */ (function () {
         if (this._serviceHealthState !== state) {
             this._serviceHealthState = state;
             this.events.emit("grpc-health-change:".concat(this._serviceName), state);
+            (_b = this._grpcSdk) === null || _b === void 0 ? void 0 : _b.config.moduleHealthProbe(this._moduleName, this._address);
         }
     };
     ConduitServiceModule.prototype.healthCheck = function (call, callback) {

package/dist/classes/ConduitServiceModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConduitServiceModule.js","sourceRoot":"","sources":["../../src/classes/ConduitServiceModule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ConduitServiceModule.js","sourceRoot":"","sources":["../../src/classes/ConduitServiceModule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAmE;AACnE,8CAAwB;AACxB,iCAAsC;AACtC,iCAAmC;AAUnC;IAUE,8BAAsB,UAAkB;QAHhC,wBAAmB,GAAsB,qBAAiB,CAAC,OAAO,CAAC,CAAC,sCAAsC;QAC/F,WAAM,GAAiB,IAAI,qBAAY,EAAE,CAAC;QAG3D,IAAI,CAAC,WAAW,GAAG,IAAA,kBAAS,EAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;IAED,sBAAI,6CAAW;aAAf;YACE,OAAO,IAAI,CAAC,mBAAmB,CAAC;QAClC,CAAC;;;OAAA;IAED,sBAAW,yCAAO;aAKlB;YACE,IAAI,CAAC,IAAI,CAAC,QAAQ;gBAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;YAC/D,OAAO,IAAI,CAAC,QAAQ,CAAC;QACvB,CAAC;aARD,UAAmB,OAAuB;YACxC,IAAI,IAAI,CAAC,QAAQ;gBAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;YAC9D,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QAC1B,CAAC;;;OAAA;IAOD,sBAAI,sCAAI;aAAR;YACE,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC;;;OAAA;IAEe,oDAAqB,GAArC;;;;4BACE,qBAAM,IAAI,CAAC,UAAU,CAAC,UAAU,CAC9B,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,mCAAmC,CAAC,EAC5D,uBAAuB,EACvB;4BACE,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;4BAClC,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;yBACnC,CACF,EAAA;;wBAPD,SAOC,CAAC;;;;;KACH;IAED,2CAAY,GAAZ,UAAa,KAAwB,EAAE,IAAY;;QAAZ,qBAAA,EAAA,YAAY;QACjD,IACE,CAAC,KAAK,KAAK,qBAAiB,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC;YAC9C,KAAK,KAAK,qBAAiB,CAAC,eAAe,EAC3C;YACA,MAAM,IAAI,KAAK,CACb,qDAA8C,qBAAiB,CAAC,KAAK,CAAC,CAAE,CACzE,CAAC;SACH;QACD,IAAI,CAAC,IAAI,EAAE;YACT,MAAA,WAAc,CAAC,OAAO,0CAAE,GAAG,CACzB,qBAAqB,EACrB,KAAK,KAAK,qBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC5C,CAAC;SACH;QACD,IAAI,IAAI,CAAC,mBAAmB,KAAK,KAAK,EAAE;YACtC,IAAI,CAAC,mBAAmB,GAAG,KAAK,CAAC;YACjC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6BAAsB,IAAI,CAAC,YAAY,CAAE,EAAE,KAAK,CAAC,CAAC;YACnE,MAAA,IAAI,CAAC,QAAQ,0CAAE,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;SAC1E;IACH,CAAC;IAED,0CAAW,GAAX,UACE,IAAqC,EACrC,QAA2C;QAE3C,IAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACtF,IAAI,OAAO,IAAI,OAAO,KAAK,IAAI,CAAC,YAAY,EAAE;YAC5C,QAAQ,CAAC,IAAI,EAAE;gBACb,MAAM,EACJ,qBAAiB,CAAC,eAA+D;aACpF,CAAC,CAAC;SACJ;aAAM;YACL,QAAQ,CAAC,IAAI,EAAE;gBACb,MAAM,EAAE,IAAI,CAAC,mBAAmE;aACjF,CAAC,CAAC;SACJ;IACH,CAAC;IAED,0CAAW,GAAX,UAAY,IAAmE;QAC7E,IAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACtF,IAAI,OAAO,IAAI,OAAO,KAAK,IAAI,CAAC,YAAY,EAAE;YAC5C,IAAI,CAAC,KAAK,CAAC;gBACT,MAAM,EACJ,qBAAiB,CAAC,eAA+D;aACpF,CAAC,CAAC;SACJ;aAAM;YACL,IAAI,CAAC,MAAM,CAAC,EAAE,CACZ,6BAAsB,IAAI,CAAC,YAAY,CAAE,EACzC,UAAC,MAAyB;gBACxB,IAAI,CAAC,KAAK,CAAC;oBACT,MAAM,EAAE,MAAsD;iBAC/D,CAAC,CAAC;YACL,CAAC,CACF,CAAC;SACH;IACH,CAAC;IACH,2BAAC;AAAD,CAAC,AApGD,IAoGC;AApGqB,oDAAoB"}

package/dist/classes/GrpcServer.d.ts

@@ -4,9 +4,11 @@ export declare class GrpcServer {
     private startedOnce;
     private _serviceNames;
     private scheduledRestart;
+    private _postponeRequests;
     private _useForce?;
     private _services;
     constructor(port?: string);
+    private postponeRestart;
     private _url;
     get url(): string;
     createNewServer(useForce?: boolean): Promise<number>;

package/dist/classes/GrpcServer.js

@@ -48,9 +48,16 @@ var GrpcServer = /** @class */ (function () {
         this.started = false;
         this.startedOnce = false;
         this._serviceNames = [];
+        this._postponeRequests = 0;
         this._services = [];
         this._url = "0.0.0.0:".concat(port !== null && port !== void 0 ? port : '5000');
     }
+    GrpcServer.prototype.postponeRestart = function () {
+        if (!this.scheduledRestart || this._postponeRequests > 5)
+            return;
+        this._postponeRequests++;
+        this.scheduleRefresh();
+    };
     Object.defineProperty(GrpcServer.prototype, "url", {
         get: function () {
             return this._url;
@@ -83,7 +90,7 @@ var GrpcServer = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        functions = (0, helpers_1.wrapGrpcFunctions)(functions);
+                        functions = (0, helpers_1.wrapGrpcFunctions)(functions, this.postponeRestart.bind(this));
                         if (!(this._serviceNames.indexOf(protoDescription) !== -1)) return [3 /*break*/, 1];
                         index_1.default.Logger.log('Service already exists, performing replace');
                         this._services[this._serviceNames.indexOf(protoDescription)] = {
@@ -173,6 +180,9 @@ var GrpcServer = /** @class */ (function () {
                     case 1:
                         _a.sent();
                         index_1.default.Logger.log('Refresh complete');
+                        clearTimeout(self.scheduledRestart);
+                        self.scheduledRestart = undefined;
+                        self._postponeRequests = 0;
                         return [2 /*return*/];
                 }
             });

package/dist/classes/GrpcServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"GrpcServer.js","sourceRoot":"","sources":["../../src/classes/GrpcServer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GrpcServer.js","sourceRoot":"","sources":["../../src/classes/GrpcServer.ts"],"names":[],"mappings":"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"}

package/dist/classes/HealthCheck.js

@@ -40,7 +40,7 @@ exports.checkModuleHealth = void 0;
 var interceptors_1 = require("../interceptors");
 var nice_grpc_1 = require("nice-grpc");
 var grpc_health_check_1 = require("../protoUtils/grpc_health_check");
-var nice_grpc_prometheus_1 = require("nice-grpc-prometheus");
+var clientMiddleware_1 = require("../metrics/clientMiddleware");
 function checkModuleHealth(clientName, serviceUrl, service, grpcToken) {
     if (service === void 0) { service = ''; }
     return __awaiter(this, void 0, void 0, function () {
@@ -53,8 +53,7 @@ function checkModuleHealth(clientName, serviceUrl, service, grpcToken) {
                         'grpc.max_send_message_length': 1024 * 1024 * 100,
                     });
                     clientFactory = (0, nice_grpc_1.createClientFactory)()
-                        //@ts-ignore
-                        .use((0, nice_grpc_prometheus_1.prometheusClientMiddleware)())
+                        .use((0, clientMiddleware_1.clientMiddleware)())
                         .use(grpcToken
                         ? (0, interceptors_1.getGrpcSignedTokenInterceptor)(grpcToken)
                         : (0, interceptors_1.getModuleNameInterceptor)(clientName));

package/dist/classes/HealthCheck.js.map

@@ -1 +1 @@
-{"version":3,"file":"HealthCheck.js","sourceRoot":"","sources":["../../src/classes/HealthCheck.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0F;AAC1F,uCAA+D;AAC/D,qEAAwF;AACxF,6DAAkE;AAElE,SAAsB,iBAAiB,CACrC,UAAkB,EAClB,UAAkB,EAClB,OAAoB,EACpB,SAAkB;IADlB,wBAAA,EAAA,YAAoB;;;;;;oBAGhB,OAAO,GAAG,IAAA,yBAAa,EAAC,UAAU,EAAE,SAAS,EAAE;wBACjD,iCAAiC,EAAE,IAAI,GAAG,IAAI,GAAG,GAAG;wBACpD,8BAA8B,EAAE,IAAI,GAAG,IAAI,GAAG,GAAG;qBAClD,CAAC,CAAC;oBACG,aAAa,GAAG,IAAA,+BAAmB,GAAE;wBACzC,YAAY;yBACX,GAAG,CAAC,IAAA,iDAA0B,GAAE,CAAC;yBACjC,GAAG,CACF,SAAS;wBACP,CAAC,CAAC,IAAA,4CAA6B,EAAC,SAAS,CAAC;wBAC1C,CAAC,CAAC,IAAA,uCAAwB,EAAC,UAAU,CAAC,CACzC,CAAC;oBACA,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC,oCAAgB,EAAE,OAAO,CAAC,CAAC;oBAGvD,qBAAM,aAAa;6BAC7B,KAAK,CAAC,EAAE,OAAO,SAAA,EAAE,CAAC;6BAClB,IAAI,CAAC,UAAC,GAAwB;4BAC7B,OAAO,GAAG,CAAC,MAAM,CAAC;wBACpB,CAAC,CAAC;6BACD,KAAK,CAAC,UAAA,GAAG,IAAI,OAAA,CAAC,KAAK,GAAG,GAAG,CAAC,EAAb,CAAa,CAAC,EAAA;;oBAL1B,MAAM,GAAG,SAKiB;oBAC9B,OAAO,CAAC,KAAK,EAAE,CAAC;oBAChB,IAAI,CAAC,KAAK,EAAE;wBACV,sBAAO,MAAM,EAAC;qBACf;oBACD,MAAM,KAAK,CAAC;;;;CACb;AAhCD,8CAgCC"}
+{"version":3,"file":"HealthCheck.js","sourceRoot":"","sources":["../../src/classes/HealthCheck.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0F;AAC1F,uCAA+D;AAC/D,qEAAwF;AACxF,gEAA+D;AAE/D,SAAsB,iBAAiB,CACrC,UAAkB,EAClB,UAAkB,EAClB,OAAoB,EACpB,SAAkB;IADlB,wBAAA,EAAA,YAAoB;;;;;;oBAGd,OAAO,GAAG,IAAA,yBAAa,EAAC,UAAU,EAAE,SAAS,EAAE;wBACnD,iCAAiC,EAAE,IAAI,GAAG,IAAI,GAAG,GAAG;wBACpD,8BAA8B,EAAE,IAAI,GAAG,IAAI,GAAG,GAAG;qBAClD,CAAC,CAAC;oBACG,aAAa,GAAG,IAAA,+BAAmB,GAAE;yBACxC,GAAG,CAAC,IAAA,mCAAgB,GAAE,CAAC;yBACvB,GAAG,CACF,SAAS;wBACP,CAAC,CAAC,IAAA,4CAA6B,EAAC,SAAS,CAAC;wBAC1C,CAAC,CAAC,IAAA,uCAAwB,EAAC,UAAU,CAAC,CACzC,CAAC;oBACE,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC,oCAAgB,EAAE,OAAO,CAAC,CAAC;oBAGzD,qBAAM,aAAa;6BAC7B,KAAK,CAAC,EAAE,OAAO,SAAA,EAAE,CAAC;6BAClB,IAAI,CAAC,UAAC,GAAwB;4BAC7B,OAAO,GAAG,CAAC,MAAM,CAAC;wBACpB,CAAC,CAAC;6BACD,KAAK,CAAC,UAAA,GAAG,IAAI,OAAA,CAAC,KAAK,GAAG,GAAG,CAAC,EAAb,CAAa,CAAC,EAAA;;oBAL1B,MAAM,GAAG,SAKiB;oBAC9B,OAAO,CAAC,KAAK,EAAE,CAAC;oBAChB,IAAI,CAAC,KAAK,EAAE;wBACV,sBAAO,MAAM,EAAC;qBACf;oBACD,MAAM,KAAK,CAAC;;;;CACb;AA/BD,8CA+BC"}

package/dist/classes/ManagedModule.d.ts

@@ -2,16 +2,21 @@ import ConduitGrpcSdk, { ConduitService, SetConfigRequest, SetConfigResponse } f
 import { ConduitServiceModule } from './ConduitServiceModule';
 import convict from 'convict';
 export declare abstract class ManagedModule<T> extends ConduitServiceModule {
-    abstract readonly configSchema?: object;
+    protected abstract readonly configSchema?: object;
+    protected abstract readonly metricsSchema?: object;
     readonly config?: convict.Config<T>;
+    configOverride: boolean;
     service?: ConduitService;
     protected constructor(moduleName: string);
     get name(): string;
+    get address(): string;
     /**
      * This is the first function triggered on module spin up.
-     * @param grpcSdk
+     * @param grpcSdk {ConduitGrpcSdk}
+     * @param address {string} external address:port of service (LoadBalancer)
+     * @param port {string} port to bring up gRPC service
      */
-    initialize(grpcSdk: ConduitGrpcSdk): void;
+    initialize(grpcSdk: ConduitGrpcSdk, address: string, port: string): void;
     /**
      * This is triggered before spinning up the Grpc Server
      * of the module. On this stage, the redis bus and state have
@@ -53,11 +58,15 @@ export declare abstract class ManagedModule<T> extends ConduitServiceModule {
      */
     onConfig(): Promise<void>;
     /**
-     * This is triggered when a module needs to initialize its own custom metric
-     * types and configuration by using the sdk's ConduitMetrics.
+     * Registers common and module-specific metric types.
      */
-    initializeMetrics(): void;
-    createGrpcServer(servicePort?: string): Promise<void>;
+    registerMetrics(): Promise<void>;
+    /**
+     * Initializes metric startup values.
+     * Implemented by individual modules.
+     */
+    initializeMetrics(): Promise<void>;
+    createGrpcServer(): Promise<void>;
     startGrpcServer(): Promise<void>;
     setConfig(call: SetConfigRequest, callback: SetConfigResponse): Promise<void>;
     /** Used to update the module's configuration on initial Redis/DB reconciliation. */

package/dist/classes/ManagedModule.js

@@ -14,17 +14,6 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -98,7 +87,9 @@ var convict_1 = __importDefault(require("convict"));
 var ManagedModule = /** @class */ (function (_super) {
     __extends(ManagedModule, _super);
     function ManagedModule(moduleName) {
-        return _super.call(this, moduleName) || this;
+        var _this = _super.call(this, moduleName) || this;
+        _this.configOverride = false;
+        return _this;
     }
     Object.defineProperty(ManagedModule.prototype, "name", {
         get: function () {
@@ -107,12 +98,23 @@ var ManagedModule = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(ManagedModule.prototype, "address", {
+        get: function () {
+            return this._address;
+        },
+        enumerable: false,
+        configurable: true
+    });
     /**
      * This is the first function triggered on module spin up.
-     * @param grpcSdk
+     * @param grpcSdk {ConduitGrpcSdk}
+     * @param address {string} external address:port of service (LoadBalancer)
+     * @param port {string} port to bring up gRPC service
      */
-    ManagedModule.prototype.initialize = function (grpcSdk) {
+    ManagedModule.prototype.initialize = function (grpcSdk, address, port) {
         this.grpcSdk = grpcSdk;
+        this._address = address;
+        this._port = port;
         if (this.configSchema) {
             this.config = (0, convict_1.default)(this.configSchema);
         }
@@ -184,17 +186,39 @@ var ManagedModule = /** @class */ (function (_super) {
         }); });
     };
     /**
-     * This is triggered when a module needs to initialize its own custom metric
-     * types and configuration by using the sdk's ConduitMetrics.
+     * Registers common and module-specific metric types.
      */
-    ManagedModule.prototype.initializeMetrics = function () { };
-    ManagedModule.prototype.createGrpcServer = function (servicePort) {
+    ManagedModule.prototype.registerMetrics = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                if (__1.default.Metrics) {
+                    __1.default.Metrics.initializeDefaultMetrics();
+                    if (this.metricsSchema) {
+                        Object.values(this.metricsSchema).forEach(function (metric) {
+                            __1.default.Metrics.registerMetric(metric.type, metric.config);
+                        });
+                    }
+                }
+                return [2 /*return*/];
+            });
+        });
+    };
+    /**
+     * Initializes metric startup values.
+     * Implemented by individual modules.
+     */
+    ManagedModule.prototype.initializeMetrics = function () {
+        return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    };
+    ManagedModule.prototype.createGrpcServer = function () {
         return __awaiter(this, void 0, void 0, function () {
             var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        this.grpcServer = new __1.GrpcServer(servicePort);
+                        this.grpcServer = new __1.GrpcServer(this._port);
                         _a = this;
                         return [4 /*yield*/, this.grpcServer.createNewServer()];
                     case 1:
@@ -220,7 +244,7 @@ var ManagedModule = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.grpcServer.start()];
                     case 3:
                         _a.sent();
-                        __1.default.Logger.log('gRPC server is online');
+                        __1.default.Logger.log('gRPC server listening on ' + this._port);
                         _a.label = 4;
                     case 4: return [2 /*return*/];
                 }
@@ -242,7 +266,7 @@ var ManagedModule = /** @class */ (function (_super) {
                                 })];
                         }
                         config = JSON.parse(call.request.newConfig);
-                        config = __assign(__assign({}, this.config.getProperties()), config);
+                        config = (0, lodash_1.merge)(this.config.getProperties(), config);
                         return [4 /*yield*/, this.preConfig(config)];
                     case 1:
                         config = _b.sent();