@codiac.io/codiac-cli 1.3.83 → 1.3.85

package/README.md

@@ -21,7 +21,7 @@ $ npm install -g @codiac.io/codiac-cli
 $ codiac COMMAND
 running command...
 $ codiac (--version|-v)
-@codiac.io/codiac-cli/1.3.83 linux-x64 node-v16.17.1
+@codiac.io/codiac-cli/1.3.85 linux-x64 node-v16.17.1
 $ codiac --help [COMMAND]
 USAGE
   $ codiac COMMAND

package/dist/apis/codiac-api-nats/gen/client.d.ts

@@ -2540,10 +2540,10 @@ declare class OtherOperations {
     /** Shows the cabinets to which the given asset is currently deployed and which version is where. */
     assetWhere(request: Contracts.AssetWhereRequest, options?: IRepoOptions): Promise<ListResult<Contracts.CabinetAssetVersion>>;
     /** Retrieves the enterprise configuration currently in play in a single given cabinet,
-      in terms of versions of the enterprise and its assets.
-      This is a composite/hybrid object made up of a Cabinet, EnterpriseVersionConfig and an EnterpriseRunState.
-      Compares versions of each asset between the version specified in the assigned enterprise version config
-      and the version that is actually physically running in the cabinet. */
+        in terms of versions of the enterprise and its assets.
+        This is a composite/hybrid object made up of a Cabinet, EnterpriseVersionConfig and an EnterpriseRunState.
+        Compares versions of each asset between the version specified in the assigned enterprise version config
+        and the version that is actually physically running in the cabinet. */
     getCabinetConfigState(request: Contracts.CabinetConfigStateRequest, options?: IRepoOptions): Promise<Contracts.CabinetConfigState>;
     /** Retrieves all available enterprises, environments, cabinets, and clusters for the given tenant. */
     getCabinetScopes(request: Contracts.CabinetScopesCriteria, options?: IRepoOptions): Promise<ListResult<Contracts.EnterpriseScope>>;

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

@@ -133,35 +133,42 @@ let CodiacNatsClient = CodiacNatsClient_1 = class CodiacNatsClient {
         }
     }
     connect() {
-        var _a, _b, _c;
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            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[CodiacNatsClient_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
-            };
-            if (this.clientType === "websockets") {
-                CodiacNatsClient_1._nc = yield Nats.wsconnect(opts);
+        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[CodiacNatsClient_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
+                };
+                if (this.clientType === "websockets") {
+                    CodiacNatsClient_1._nc = yield Nats.wsconnect(opts);
+                }
+                else {
+                    CodiacNatsClient_1._nc = yield Transport.connect(opts);
+                }
+                this.logger.write(`Connected to ${this.settings.baseUrl}`);
+                return (_c = CodiacNatsClient_1.nc) === null || _c === void 0 ? void 0 : _c.info;
             }
-            else {
-                CodiacNatsClient_1._nc = yield Transport.connect(opts);
+            catch (err) {
+                this.logger.error((_d = err.message) !== null && _d !== void 0 ? _d : "Error connecting to nats: (no error message available)");
+                throw err;
             }
-            this.logger.write(`Connected to ${this.settings.baseUrl}`);
-            return (_c = CodiacNatsClient_1.nc) === null || _c === void 0 ? void 0 : _c.info;
         });
     }
     isConnected() {
@@ -200,7 +207,7 @@ let CodiacNatsClient = CodiacNatsClient_1 = class CodiacNatsClient {
                 // const values = isGet ? this.getValues(req) : { ...req };
                 const loadedSubject = Utils.hydrateSubjectParams(subject, req);
                 const headers = options ? Utils.headersFrom(options) : undefined;
-                return this.makeRequest(loadedSubject, req, headers);
+                return yield this.makeRequest(loadedSubject, req, headers);
             }
             catch (error) {
                 if (noThrow) {
@@ -213,31 +220,42 @@ let CodiacNatsClient = CodiacNatsClient_1 = class CodiacNatsClient {
     }
     makeRequest(subject, req, headers) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                try {
-                    // this.logger.detail(`Api client making request: ${httpVerb}  ${url?.split("?")[0]}`);
-                    let reqHeaders = Nats.headers();
-                    reqHeaders.append("content-type", "application/json");
-                    if (this.tokenCredentials) {
-                        reqHeaders.append(CodiacNatsClient_1.DEFAULT_TOKEN_HEADER_PARAM, this.tokenCredentials.jwtToken);
-                    }
-                    if (headers) {
-                        for (let headerKey in headers) {
-                            if (headers[headerKey])
-                                reqHeaders.append(headerKey, headers[headerKey]);
-                        }
+            // return new Promise<TResponse>(async (resolve, reject) => {
+            try {
+                // this.logger.detail(`Api client making request: ${httpVerb}  ${url?.split("?")[0]}`);
+                let reqHeaders = Nats.headers();
+                reqHeaders.append("content-type", "application/json");
+                if (this.tokenCredentials) {
+                    reqHeaders.append(CodiacNatsClient_1.DEFAULT_TOKEN_HEADER_PARAM, this.tokenCredentials.jwtToken);
+                }
+                if (headers) {
+                    for (let headerKey in headers) {
+                        if (headers[headerKey])
+                            reqHeaders.append(headerKey, headers[headerKey]);
                     }
-                    if (!this.isConnected())
-                        yield this.connect();
-                    const res = yield CodiacNatsClient_1.nc.request(subject, JSON.stringify(req), { headers: reqHeaders, timeout: 5000 });
-                    resolve(res.json());
                 }
-                catch (err) {
-                    this.logger.error(`Error making call: ${err.message}`, { subject: subject, error: err });
-                    this.logger.debug(err);
-                    reject(err);
+                /** Determines whether a connection needs to be
+                 * opened (and closed) just for this request. */
+                // let disconnectNow = false;
+                if (!this.isConnected()) {
+                    yield this.connect();
+                    // disconnectNow = true;
                 }
-            }));
+                const res = yield CodiacNatsClient_1.nc.request(subject, JSON.stringify(req), { headers: reqHeaders, timeout: 5000 });
+                let output = res.json();
+                // COMMENTED OUT BC: disconnect() needs to get invoked from the caller so that it can stay open for many executions.
+                // We could build some config to enable different connection paradigms, but its not necessary at the moment.
+                // if (disconnectNow) {
+                //   await this.disconnect();
+                // }
+                return output;
+            }
+            catch (err) {
+                this.logger.error(`Error making call: ${err.message}`, { subject: subject, error: err });
+                this.logger.debug(err);
+                throw (err);
+            }
+            // });
         });
     }
 }; // end class CodiacNatsClient
@@ -15693,10 +15711,10 @@ class OtherOperations {
         });
     }
     /** Retrieves the enterprise configuration currently in play in a single given cabinet,
-      in terms of versions of the enterprise and its assets.
-      This is a composite/hybrid object made up of a Cabinet, EnterpriseVersionConfig and an EnterpriseRunState.
-      Compares versions of each asset between the version specified in the assigned enterprise version config
-      and the version that is actually physically running in the cabinet. */
+        in terms of versions of the enterprise and its assets.
+        This is a composite/hybrid object made up of a Cabinet, EnterpriseVersionConfig and an EnterpriseRunState.
+        Compares versions of each asset between the version specified in the assigned enterprise version config
+        and the version that is actually physically running in the cabinet. */
     getCabinetConfigState(request, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             return yield this.core.request("get.enterprise.:enterprise.cabinet.:cabinet.config-state", request, options);