@conduitplatform/grpc-sdk 0.16.0-alpha.1 → 0.16.0-alpha.11

package/README.mdx

@@ -1,7 +1,6 @@
 # Conduit gRPC SDK
 
 This library provides a framework to bind all Conduit modules in a safe and consistent way.<br />
-It is also used to provide syntactic sugar that makes development easier.
 
 ## Build Steps
 
@@ -10,12 +9,7 @@ It is also used to provide syntactic sugar that makes development easier.
 
 ## Features ✔️
 
-- Service registration & discovery
-- Application route registration
-- Administrative route registration
+- Service discovery
 - Provides wrappers for gRPC handlers to support async
-- Parses incoming requests and outgoing responses to JSON
 - Provides health check service out of the box
-- Manages the gRPC server so you don't have to
 - Provides typings for common Conduit models
-- Provides classes to facilitate building your own Conduit modules

package/dist/classes/ConduitModule.d.ts

@@ -3,25 +3,28 @@ import { CompatServiceDefinition } from 'nice-grpc/lib/service-definitions';
 import { Channel, Client } from 'nice-grpc';
 import { HealthDefinition } from '../protoUtils/grpc_health_check';
 import { EventEmitter } from 'events';
+import { ConduitModuleDefinition } from '../protoUtils';
 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 healthCheckEmitter: EventEmitter;
     constructor(_clientName: string, _serviceName: string, _serviceUrl: string, _grpcToken?: string | undefined);
-    initializeClient(type: T): Client<T>;
-    openConnection(): void;
+    private _client?;
     get client(): Client<T> | undefined;
+    private _healthClient?;
     get healthClient(): Client<typeof HealthDefinition> | undefined;
+    private _moduleClient?;
+    get moduleClient(): Client<typeof ConduitModuleDefinition> | undefined;
+    get active(): boolean;
     get healthCheckWatcher(): EventEmitter;
+    initializeClient(type: T): Client<T>;
+    openConnection(): void;
     closeConnection(): void;
-    check(service?: string): Promise<import("../protoUtils/grpc_health_check").HealthCheckResponse_ServingStatus>;
+    check(service?: string): Promise<import("../protoUtils").HealthCheckResponse_ServingStatus>;
     watch(service?: string): Promise<void>;
 }

package/dist/classes/ConduitModule.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -49,15 +49,54 @@ 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 protoUtils_1 = require("../protoUtils");
 var ConduitModule = /** @class */ (function () {
     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();
     }
+    Object.defineProperty(ConduitModule.prototype, "client", {
+        get: function () {
+            return this._client;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(ConduitModule.prototype, "healthClient", {
+        get: function () {
+            return this._healthClient;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(ConduitModule.prototype, "moduleClient", {
+        get: function () {
+            return this._moduleClient;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(ConduitModule.prototype, "active", {
+        get: function () {
+            if (!this.channel) {
+                return false;
+            }
+            var connectivityState = this.channel.getConnectivityState(true);
+            return connectivityState === 2 || connectivityState === 1 || connectivityState === 0;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(ConduitModule.prototype, "healthCheckWatcher", {
+        get: function () {
+            return this.healthCheckEmitter;
+        },
+        enumerable: false,
+        configurable: true
+    });
     ConduitModule.prototype.initializeClient = function (type) {
         if (this._client)
             return this._client;
@@ -66,6 +105,9 @@ var ConduitModule = /** @class */ (function () {
         return this._client;
     };
     ConduitModule.prototype.openConnection = function () {
+        var _this = this;
+        if (this.channel)
+            return;
         // 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,
@@ -86,36 +128,24 @@ var ConduitModule = /** @class */ (function () {
             },
         });
         this._healthClient = clientFactory.create(grpc_health_check_1.HealthDefinition, this.channel);
-        this.active = true;
+        this._moduleClient = clientFactory.create(protoUtils_1.ConduitModuleDefinition, this.channel);
+        var monitorChannel = function () {
+            if (!_this.channel)
+                return;
+            try {
+                var state = _this.channel.getConnectivityState(true);
+                _this.channel.watchConnectivityState(state, Infinity, monitorChannel);
+            }
+            catch (e) { }
+        };
+        monitorChannel();
     };
-    Object.defineProperty(ConduitModule.prototype, "client", {
-        get: function () {
-            return this._client;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(ConduitModule.prototype, "healthClient", {
-        get: function () {
-            return this._healthClient;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(ConduitModule.prototype, "healthCheckWatcher", {
-        get: function () {
-            return this.healthCheckEmitter;
-        },
-        enumerable: false,
-        configurable: true
-    });
     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;
     };
     ConduitModule.prototype.check = function (service) {
         if (service === void 0) { service = ''; }
@@ -124,45 +154,52 @@ var ConduitModule = /** @class */ (function () {
         });
     };
     ConduitModule.prototype.watch = function (service) {
-        var e_1, _a;
-        var _b;
+        var _a, e_1, _b, _c;
+        var _d;
         if (service === void 0) { service = ''; }
         return __awaiter(this, void 0, void 0, function () {
-            var self, serviceName, call, call_1, call_1_1, data, e_1_1, error_1;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var self, serviceName, call, _e, call_1, call_1_1, data, e_1_1, error_1;
+            return __generator(this, function (_f) {
+                switch (_f.label) {
                     case 0:
                         self = this;
-                        serviceName = (_b = this.type) === null || _b === void 0 ? void 0 : _b.name;
+                        serviceName = (_d = this.type) === null || _d === void 0 ? void 0 : _d.name;
                         this.healthCheckEmitter.setMaxListeners(150);
-                        _c.label = 1;
+                        _f.label = 1;
                     case 1:
-                        _c.trys.push([1, 14, , 15]);
+                        _f.trys.push([1, 14, , 15]);
                         call = this.healthClient.watch({ service: service });
-                        _c.label = 2;
+                        _f.label = 2;
                     case 2:
-                        _c.trys.push([2, 7, 8, 13]);
-                        call_1 = __asyncValues(call);
-                        _c.label = 3;
+                        _f.trys.push([2, 7, 8, 13]);
+                        _e = true, call_1 = __asyncValues(call);
+                        _f.label = 3;
                     case 3: return [4 /*yield*/, call_1.next()];
                     case 4:
-                        if (!(call_1_1 = _c.sent(), !call_1_1.done)) return [3 /*break*/, 6];
-                        data = call_1_1.value;
-                        self.healthCheckEmitter.emit("grpc-health-change:".concat(serviceName), data.status);
-                        _c.label = 5;
+                        if (!(call_1_1 = _f.sent(), _a = call_1_1.done, !_a)) return [3 /*break*/, 6];
+                        _c = call_1_1.value;
+                        _e = false;
+                        try {
+                            data = _c;
+                            self.healthCheckEmitter.emit("grpc-health-change:".concat(serviceName), data.status);
+                        }
+                        finally {
+                            _e = true;
+                        }
+                        _f.label = 5;
                     case 5: return [3 /*break*/, 3];
                     case 6: return [3 /*break*/, 13];
                     case 7:
-                        e_1_1 = _c.sent();
+                        e_1_1 = _f.sent();
                         e_1 = { error: e_1_1 };
                         return [3 /*break*/, 13];
                     case 8:
-                        _c.trys.push([8, , 11, 12]);
-                        if (!(call_1_1 && !call_1_1.done && (_a = call_1.return))) return [3 /*break*/, 10];
-                        return [4 /*yield*/, _a.call(call_1)];
+                        _f.trys.push([8, , 11, 12]);
+                        if (!(!_e && !_a && (_b = call_1.return))) return [3 /*break*/, 10];
+                        return [4 /*yield*/, _b.call(call_1)];
                     case 9:
-                        _c.sent();
-                        _c.label = 10;
+                        _f.sent();
+                        _f.label = 10;
                     case 10: return [3 /*break*/, 12];
                     case 11:
                         if (e_1) throw e_1.error;
@@ -170,7 +207,7 @@ var ConduitModule = /** @class */ (function () {
                     case 12: return [7 /*endfinally*/];
                     case 13: return [3 /*break*/, 15];
                     case 14:
-                        error_1 = _c.sent();
+                        error_1 = _f.sent();
                         return [3 /*break*/, 15];
                     case 15: return [2 /*return*/];
                 }

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/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,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"}
+{"version":3,"file":"ConduitSchema.js","sourceRoot":"","sources":["../../src/classes/ConduitSchema.ts"],"names":[],"mappings":";;;AAEA;IAQE,uBACE,IAAY,EACZ,MAAoB,EACpB,YAAmC,EACnC,cAAuB;QAPzB,gBAAW,GAAW,SAAS,CAAC;QAS9B,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,AAnBD,IAmBC;AAnBY,sCAAa"}

package/dist/classes/HealthCheck.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -35,26 +35,53 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 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 clientMiddleware_1 = require("../metrics/clientMiddleware");
+var index_1 = __importDefault(require("../index"));
 function checkModuleHealth(clientName, serviceUrl, service, grpcToken) {
     if (service === void 0) { service = ''; }
     return __awaiter(this, void 0, void 0, function () {
-        var channel, clientFactory, _healthClient, error, status;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var channel, clientFactory, _a, _b, interceptor, _healthClient, error, status;
+        var e_1, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
                     channel = (0, nice_grpc_1.createChannel)(serviceUrl, undefined, {
                         'grpc.max_receive_message_length': 1024 * 1024 * 100,
                         'grpc.max_send_message_length': 1024 * 1024 * 100,
                     });
-                    clientFactory = (0, nice_grpc_1.createClientFactory)()
-                        .use((0, clientMiddleware_1.clientMiddleware)())
-                        .use(grpcToken
+                    clientFactory = (0, nice_grpc_1.createClientFactory)();
+                    try {
+                        for (_a = __values(index_1.default.interceptors), _b = _a.next(); !_b.done; _b = _a.next()) {
+                            interceptor = _b.value;
+                            clientFactory.use(interceptor);
+                        }
+                    }
+                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                    finally {
+                        try {
+                            if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                        }
+                        finally { if (e_1) throw e_1.error; }
+                    }
+                    clientFactory.use(grpcToken
                         ? (0, interceptors_1.getGrpcSignedTokenInterceptor)(grpcToken)
                         : (0, interceptors_1.getModuleNameInterceptor)(clientName));
                     _healthClient = clientFactory.create(grpc_health_check_1.HealthDefinition, channel);
@@ -65,7 +92,7 @@ function checkModuleHealth(clientName, serviceUrl, service, grpcToken) {
                         })
                             .catch(function (err) { return (error = err); })];
                 case 1:
-                    status = _a.sent();
+                    status = _d.sent();
                     channel.close();
                     if (!error) {
                         return [2 /*return*/, status];

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,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;oBAGvD,qBAAM,aAAa;6BAC/B,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;;oBALxB,MAAM,GAAG,SAKe;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"}
+{"version":3,"file":"HealthCheck.js","sourceRoot":"","sources":["../../src/classes/HealthCheck.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0F;AAC1F,uCAA+D;AAC/D,qEAAwF;AACxF,mDAAsC;AAEtC,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,CAAC;;wBAC5C,KAA0B,KAAA,SAAA,eAAc,CAAC,YAAY,CAAA,4CAAE;4BAA5C,WAAW;4BACpB,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;yBAChC;;;;;;;;;oBACD,aAAa,CAAC,GAAG,CACf,SAAS;wBACP,CAAC,CAAC,IAAA,4CAA6B,EAAC,SAAS,CAAC;wBAC1C,CAAC,CAAC,IAAA,uCAAwB,EAAC,UAAU,CAAC,CACzC,CAAC;oBACI,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC,oCAAgB,EAAE,OAAO,CAAC,CAAC;oBAGvD,qBAAM,aAAa;6BAC/B,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;;oBALxB,MAAM,GAAG,SAKe;oBAC9B,OAAO,CAAC,KAAK,EAAE,CAAC;oBAChB,IAAI,CAAC,KAAK,EAAE;wBACV,sBAAO,MAAM,EAAC;qBACf;oBACD,MAAM,KAAK,CAAC;;;;CACb;AAjCD,8CAiCC"}

package/dist/classes/index.d.ts

@@ -1,9 +1,5 @@
 export * from './Error';
+export * from './ConduitModule';
+export * from './HealthCheck';
 export * from './ConduitSchema';
-export * from './ConduitActiveSchema';
-export * from './GrpcServer';
-export * from './ConduitServiceModule';
-export * from './ManagedModule';
-export * from './ModuleManager';
-export * from './ConfigController';
 export * from './ConduitAuthorizedResource';

package/dist/classes/index.js

@@ -15,12 +15,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Error"), exports);
+__exportStar(require("./ConduitModule"), exports);
+__exportStar(require("./HealthCheck"), exports);
 __exportStar(require("./ConduitSchema"), exports);
-__exportStar(require("./ConduitActiveSchema"), exports);
-__exportStar(require("./GrpcServer"), exports);
-__exportStar(require("./ConduitServiceModule"), exports);
-__exportStar(require("./ManagedModule"), exports);
-__exportStar(require("./ModuleManager"), exports);
-__exportStar(require("./ConfigController"), exports);
 __exportStar(require("./ConduitAuthorizedResource"), exports);
 //# sourceMappingURL=index.js.map

package/dist/classes/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/classes/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,kDAAgC;AAChC,wDAAsC;AACtC,+CAA6B;AAC7B,yDAAuC;AACvC,kDAAgC;AAChC,kDAAgC;AAChC,qDAAmC;AACnC,8DAA4C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/classes/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,kDAAgC;AAChC,gDAA8B;AAC9B,kDAAgC;AAChC,8DAA4C"}

package/dist/index.d.ts

@@ -1,40 +1,48 @@
-import { Admin, Authentication, Authorization, Chat, Config, Core, DatabaseProvider, Email, Forms, Functions, PushNotifications, Router, SMS, Storage } from './modules';
-import { EventBus } from './utilities/EventBus';
-import { RedisManager } from './utilities/RedisManager';
-import { StateManager } from './utilities/StateManager';
+import { Admin, Authentication, Authorization, Chat, Config, Core, DatabaseProvider, Email, PushNotifications, Router, SMS, Storage } from './modules';
+import { EventBus, RedisManager, StateManager } from './utilities';
 import { CompatServiceDefinition } from 'nice-grpc/lib/service-definitions';
-import { ConduitModule } from './classes/ConduitModule';
+import { ConduitModule } from './classes';
 import { Client } from 'nice-grpc';
-import { HealthDefinition } from './protoUtils/grpc_health_check';
+import { ConduitModuleDefinition, HealthDefinition } from './protoUtils';
 import { HealthCheckStatus } from './types';
-import { ConduitLogger } from './utilities/Logger';
-import { ConduitMetrics } from './metrics';
 import { ClusterOptions, RedisOptions } from 'ioredis';
+import { IConduitLogger, IConduitMetrics } from './interfaces';
 export default class ConduitGrpcSdk {
-    private readonly urlRemap?;
+    private static middleware;
+    readonly name: string;
+    readonly instance: string;
     private readonly serverUrl;
     private readonly _watchModules;
     private readonly _core?;
     private readonly _config?;
     private readonly _admin?;
-    private _redisManager;
-    private _redisDetails?;
     private readonly _modules;
     private readonly _availableModules;
     private _dynamicModules;
     private _eventBus?;
     private _stateManager?;
     private lastSearch;
-    private readonly name;
-    private readonly instance;
+    private readonly urlRemap?;
     private readonly _serviceHealthStatusGetter;
     private readonly _grpcToken?;
     private _initialized;
-    static Metrics?: ConduitMetrics;
-    static readonly Logger: ConduitLogger;
-    constructor(serverUrl: string, serviceHealthStatusGetter?: () => HealthCheckStatus, name?: string, watchModules?: boolean, urlRemap?: string | undefined);
-    initialize(): Promise<void>;
-    private _initialize;
+    constructor(serverUrl: string, name?: string, watchModules?: boolean, logger?: IConduitLogger, serviceHealthStatusGetter?: () => HealthCheckStatus);
+    private static _Logger;
+    static get Logger(): IConduitLogger | Console;
+    private static _Metrics;
+    static get Metrics(): IConduitMetrics | undefined;
+    static set Metrics(metrics: IConduitMetrics | undefined);
+    static get interceptors(): any[];
+    private _redisManager;
+    get redisManager(): RedisManager;
+    private _redisDetails?;
+    get redisDetails(): RedisOptions | {
+        nodes: {
+            host: string;
+            port: number;
+        }[];
+        options: ClusterOptions;
+    };
     get bus(): EventBus | null;
     get state(): StateManager | null;
     get core(): Core;
@@ -44,26 +52,19 @@ export default class ConduitGrpcSdk {
     get database(): DatabaseProvider | null;
     get databaseProvider(): DatabaseProvider | null;
     get storage(): Storage | null;
-    get forms(): Forms | null;
     get emailProvider(): Email | null;
     get pushNotifications(): PushNotifications | null;
     get authentication(): Authentication | null;
     get authorization(): Authorization | null;
     get sms(): SMS | null;
     get chat(): Chat | null;
-    get functions(): Functions | null;
-    get redisDetails(): RedisOptions | {
-        nodes: {
-            host: string;
-            port: number;
-        }[];
-        options: ClusterOptions;
-    };
+    get grpcToken(): string | undefined;
+    addMiddleware(middleware: any): void;
+    initialize(): Promise<void>;
     watchModules(): void;
     monitorModule(moduleName: string, callback: (serving: boolean) => void, wait?: boolean): void;
     unmonitorModule(moduleName: string): void;
     initializeEventBus(): Promise<EventBus>;
-    get redisManager(): RedisManager;
     /**
      * Gets all the registered modules from the config and creates clients for them.
      * This will only work on known modules, since the primary usage for the sdk is internal
@@ -74,6 +75,7 @@ export default class ConduitGrpcSdk {
     moduleClient(name: string, type: CompatServiceDefinition): void;
     getModule<T extends CompatServiceDefinition>(name: string): ConduitModule<T> | undefined;
     getServiceClient<T extends CompatServiceDefinition>(name: string): Client<T> | undefined;
+    getModuleClient(name: string): Client<ConduitModuleDefinition> | undefined;
     getHealthClient<T extends CompatServiceDefinition>(name: string): Client<typeof HealthDefinition> | undefined;
     isAvailable(moduleName: string): boolean;
     waitForExistence(moduleName: string): Promise<boolean>;
@@ -84,13 +86,13 @@ export default class ConduitGrpcSdk {
      * @param force If true will check for new modules no matter the interval
      */
     refreshModules(force?: boolean): Promise<string | void>;
-    get grpcToken(): string | undefined;
+    private _initialize;
 }
 export * from './interfaces';
 export * from './classes';
 export * from './modules';
-export * from './helpers';
 export * from './constants';
-export * from './routing';
 export * from './types';
 export * from './utilities';
+export * from './protoUtils';
+export * from '@grpc/grpc-js';