@codiac.io/codiac-cli 1.3.127 → 1.3.129

package/dist/apis/codiac-relay-nats/gen/client.js

@@ -4,18 +4,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RelayNatsClient = void 0;
 const tslib_1 = require("tslib");
 const inversify_1 = require("inversify");
-const buffer_1 = require("buffer");
 const codiac_common_1 = require("@codiac.io/codiac-common");
 const contracts_1 = require("@codiac.io/codiac-common/contracts");
 const jwt_lib_1 = require("@codiac.io/jwt-lib");
 const token_1 = require("../common/token");
 const config_1 = require("./config");
 const Nats = require("@nats-io/nats-core");
-const Transport = require("@nats-io/transport-node");
 const Utils = require("../common/utils");
-const jwt = require("@codiac.io/jwt-lib");
 const _ = require("lodash");
 const token_utils_1 = require("../common/token-utils");
+const nats_1 = require("@codiac.io/codiac-messaging/dist/nats");
+const codiac_messaging_1 = require("@codiac.io/codiac-messaging");
 // FOR nats websocket error:  WebSocket not defined.
 if (typeof WebSocket === 'undefined') {
     const Ws = require('ws');
@@ -23,15 +22,21 @@ if (typeof WebSocket === 'undefined') {
 }
 let RelayNatsClient = RelayNatsClient_1 = class RelayNatsClient {
     static bootstrap(ioc, settings) {
+        let ultimate;
         if (ioc.isBound(config_1.RelayNatsClientConfig)) {
             const existing = ioc.get(config_1.RelayNatsClientConfig);
-            const ultimate = _.assignIn(existing, settings);
+            ultimate = _.assignIn({}, existing, settings);
             ioc.rebind(config_1.RelayNatsClientConfig).toConstantValue(ultimate);
         }
         else {
-            const ultimate = _.assignIn(this.DEFAULTS, settings);
+            ultimate = _.assignIn({}, this.DEFAULTS, settings);
             ioc.bind(config_1.RelayNatsClientConfig).toConstantValue(ultimate);
         }
+        nats_1.NatsConnector.bootstrap(ioc, {
+            natsInstance: ultimate.natsInstance,
+            baseUrl: ultimate.baseUrl,
+            connectTimeoutInMs: ultimate.connectTimeoutInMs
+        }, ultimate.natsInstance);
         // COMMENTED OUT BC:
         // We cant bind the client here bc we need to use lazy-loaded properties 
         // to get injected dependencies, not ioc directly
@@ -49,19 +54,17 @@ let RelayNatsClient = RelayNatsClient_1 = class RelayNatsClient {
         }
     }
     /** This factory method is just for convenience and hasty backward compatibility with consumers not using ioc. */
-    static create(logger, configuration, codiacJwt) {
+    static create(logger, connector, configuration, codiacJwt) {
         let tokenCreds;
         if (codiacJwt) {
             tokenCreds = (typeof codiacJwt == 'string') ? { jwtToken: codiacJwt } : codiacJwt;
         }
-        return new RelayNatsClient_1(logger, configuration !== null && configuration !== void 0 ? configuration : this.DEFAULTS, tokenCreds);
+        return new RelayNatsClient_1(logger, configuration !== null && configuration !== void 0 ? configuration : this.DEFAULTS, connector, tokenCreds);
     }
-    static get nc() {
-        return this._nc;
-    }
-    constructor(logger, _settings, _tokenCredentials) {
+    constructor(logger, _settings, connector, _tokenCredentials) {
         this.logger = logger;
         this._settings = _settings;
+        this.connector = connector;
         this._tokenCredentials = _tokenCredentials;
         this.Auth = new AuthOperations(this);
         this.Call = new OtherOperations(this);
@@ -82,8 +85,9 @@ let RelayNatsClient = RelayNatsClient_1 = class RelayNatsClient {
         this.ScopedSetting = new ScopedSettingCruds(this);
         this.SetupJournal = new SetupJournalCruds(this);
         this.ZombiePeriod = new ZombiePeriodCruds(this);
-        this.clientType = _settings.baseUrl.toLowerCase().startsWith("nats://") ? "nats" : "websockets";
         this.TokenUtils = new token_utils_1.TokenUtils(this.logger);
+        if (_tokenCredentials === null || _tokenCredentials === void 0 ? void 0 : _tokenCredentials.jwtToken)
+            this.connector.setUserToken(_tokenCredentials.jwtToken);
         this.endpoints = {};
     }
     registerEndpoints(endpoints) {
@@ -112,80 +116,35 @@ let RelayNatsClient = RelayNatsClient_1 = class RelayNatsClient {
         return found;
     }
     isExpired(token, throwOnError = false) {
-        return this.TokenUtils.isExpired(token, throwOnError);
+        return this.connector.isExpired(token, throwOnError);
     }
     /** Sets the user context to impersonate in requests made to the api. */
     setUserToken(token) {
-        if (this._tokenCredentials) {
-            this._tokenCredentials.jwtToken = token;
-        }
-        else {
-            this._tokenCredentials = { jwtToken: token };
-        }
+        this.connector.setUserToken(token);
     }
     connect() {
-        var _a, _b, _c, _d;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            try {
-                // Assemble authenticator from codiac jwt
-                const codiacJwt = (_a = this._tokenCredentials) === null || _a === void 0 ? void 0 : _a.jwtToken;
-                if (codiacJwt == undefined) {
-                    throw new Error("No token client available.");
-                }
-                const payload = (_b = new jwt.JwtEncoder().tryDecode(codiacJwt)) === null || _b === void 0 ? void 0 : _b.payload;
-                if (payload == undefined)
-                    throw new Error("Empty jwt payload");
-                const gck = payload[RelayNatsClient_1.CLAIM_FOR_GLOBAL_CLIENT_KEY];
-                if (gck == undefined)
-                    throw new Error("No global client key was available in the token payload.");
-                const natsCreds = buffer_1.Buffer.from(gck, 'base64').toString('utf-8');
-                const opts = {
-                    servers: this._settings.baseUrl,
-                    authenticator: [
-                        Nats.tokenAuthenticator(codiacJwt),
-                        Nats.credsAuthenticator(new TextEncoder().encode(natsCreds))
-                    ],
-                    verbose: true,
-                    timeout: this.settings.connectTimeoutInMs
-                };
-                if (this.clientType === "websockets") {
-                    RelayNatsClient_1._nc = yield Nats.wsconnect(opts);
-                }
-                else {
-                    RelayNatsClient_1._nc = yield Transport.connect(opts);
-                }
-                this.logger.write(`Connected to ${this._settings.baseUrl}`);
-                return (_c = RelayNatsClient_1.nc) === null || _c === void 0 ? void 0 : _c.info;
-            }
-            catch (err) {
-                this.logger.error((_d = err.message) !== null && _d !== void 0 ? _d : "Error connecting to nats: (no error message available)");
-                throw err;
-            }
+            return yield this.connector.connect();
         });
     }
     isConnected() {
-        return RelayNatsClient_1.areAnyConnected();
+        return this.connector.isConnected();
     }
     disconnect() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            yield RelayNatsClient_1.disconnectAll();
+            yield this.connector.disconnect();
             return;
         });
     }
     /** Disregards any instances and checks the underlying connection store
      * for any connections that are currently not closed or draining. */
-    static areAnyConnected() {
-        // is this accurate enough?  or do we need to build a listener on `RelayNatsClient.nc.status()`?
-        return (this.nc != undefined) && (!this.nc.isClosed() && !this.nc.isDraining());
+    areAnyConnected() {
+        return this.connector.areAnyConnected();
     }
     /** Closes any unclosed connections in the underlying connection store (regardless of instances). */
-    static disconnectAll() {
-        var _a;
+    disconnectAll() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.nc != undefined && !this.nc.isClosed()) {
-                yield ((_a = this.nc) === null || _a === void 0 ? void 0 : _a.close());
-            }
-            return;
+            return this.connector.disconnectAll();
         });
     }
     get tokenCredentials() {
@@ -241,7 +200,10 @@ let RelayNatsClient = RelayNatsClient_1 = class RelayNatsClient {
                 if (!this.isConnected()) {
                     yield this.connect();
                 }
-                const res = yield RelayNatsClient_1.nc.request(subject, JSON.stringify(req), {
+                if (!this.connector.connection) {
+                    throw new Error("The messaging client unexpectedly lost its connection instance.  Please try again.");
+                }
+                const res = yield this.connector.connection.request(subject, JSON.stringify(req), {
                     headers: reqHeaders,
                     timeout: (_a = options === null || options === void 0 ? void 0 : options.requestTimeoutInMs) !== null && _a !== void 0 ? _a : this.settings.requestTimeoutInMs
                 });
@@ -262,17 +224,17 @@ RelayNatsClient.apiVersion = "version";
 /** The name of the jwt claim in the codiac token that holds the nats credentials.  */
 RelayNatsClient.CLAIM_FOR_GLOBAL_CLIENT_KEY = "gck";
 RelayNatsClient.DEFAULTS = {
-    baseUrl: "http://localhost:9222",
-    requestTimeoutInMs: 30000,
-    connectTimeoutInMs: 30000,
+    baseUrl: "nats://localhost:4222",
+    requestTimeoutInMs: 180000,
+    connectTimeoutInMs: 30000
 };
 RelayNatsClient = RelayNatsClient_1 = tslib_1.__decorate([
     (0, inversify_1.injectable)(),
     tslib_1.__param(0, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
     tslib_1.__param(1, (0, inversify_1.inject)(config_1.RelayNatsClientConfig)),
-    tslib_1.__param(2, (0, inversify_1.inject)(token_1.TokenCreds)),
-    tslib_1.__metadata("design:paramtypes", [Object, config_1.RelayNatsClientConfig,
-        token_1.TokenCreds])
+    tslib_1.__param(2, (0, inversify_1.inject)(codiac_messaging_1.StreamingConstants.IStreamingConnector)),
+    tslib_1.__param(3, (0, inversify_1.inject)(token_1.TokenCreds)),
+    tslib_1.__metadata("design:paramtypes", [Object, config_1.RelayNatsClientConfig, Object, token_1.TokenCreds])
 ], RelayNatsClient);
 exports.RelayNatsClient = RelayNatsClient;
 //  // EXAMPLE