zephyr-agent 0.0.14 → 0.0.16

package/dist/index.d.ts

@@ -6,7 +6,7 @@ export { getApplicationConfiguration } from './lib/application-configuration/get
 export { checkAuth, isTokenStillValid } from './lib/auth/login';
 export { getGitInfo } from './lib/context-utils/ze-util-get-git-info';
 export { getPackageJson } from './lib/context-utils/ze-util-read-package-json';
-export { onIndexHtmlResolved, resolveIndexHtml, } from './lib/hacks/resolve-index-html';
+export { onIndexHtmlResolved, resolveIndexHtml } from './lib/hacks/resolve-index-html';
 export { zeBuildAssetsMap, buildAssetsMap } from './lib/payload-builders/ze-build-assets-map';
 export { createSnapshot } from './lib/payload-builders/ze-build-snapshot';
 export { zeGetDashData, GetDashDataOptions } from './lib/payload-builders/ze-get-dash-data';
@@ -14,5 +14,6 @@ export { logger } from './lib/remote-logs/ze-log-event';
 export { getZeBuildAsset } from './lib/sync-utils/get-ze-build-asset';
 export { getBuildId } from './lib/ze-api-requests/get-build-id';
 export { upload } from './lib/upload/upload';
-export { get_hash_list, update_hash_list, } from './lib/dvcs/distributed-hash-control';
+export { get_hash_list, update_hash_list } from './lib/dvcs/distributed-hash-control';
 export { get_missing_assets } from './lib/dvcs/get-missing-assets';
+export * from './lib/custom-errors';

package/dist/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.get_missing_assets = exports.update_hash_list = exports.get_hash_list = exports.upload = exports.getBuildId = exports.getZeBuildAsset = exports.logger = exports.zeGetDashData = exports.createSnapshot = exports.buildAssetsMap = exports.zeBuildAssetsMap = exports.resolveIndexHtml = exports.onIndexHtmlResolved = exports.getPackageJson = exports.getGitInfo = exports.isTokenStillValid = exports.checkAuth = exports.getApplicationConfiguration = exports.zeUploadSnapshot = exports.zeUploadBuildStats = exports.zeUploadAssets = exports.zeEnableSnapshotOnEdge = void 0;
+const tslib_1 = require("tslib");
 var ze_enable_snapshot_on_edge_1 = require("./lib/actions/ze-enable-snapshot-on-edge");
 Object.defineProperty(exports, "zeEnableSnapshotOnEdge", { enumerable: true, get: function () { return ze_enable_snapshot_on_edge_1.zeEnableSnapshotOnEdge; } });
 var ze_upload_assets_1 = require("./lib/actions/ze-upload-assets");
@@ -41,4 +42,6 @@ Object.defineProperty(exports, "get_hash_list", { enumerable: true, get: functio
 Object.defineProperty(exports, "update_hash_list", { enumerable: true, get: function () { return distributed_hash_control_1.update_hash_list; } });
 var get_missing_assets_1 = require("./lib/dvcs/get-missing-assets");
 Object.defineProperty(exports, "get_missing_assets", { enumerable: true, get: function () { return get_missing_assets_1.get_missing_assets; } });
+// Errors related
+tslib_1.__exportStar(require("./lib/custom-errors"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,uFAAkF;AAAzE,oIAAA,sBAAsB,OAAA;AAC/B,mEAAgE;AAAvD,kHAAA,cAAc,OAAA;AACvB,6EAAyE;AAAhE,2HAAA,kBAAkB,OAAA;AAC3B,uEAAoE;AAA3D,sHAAA,gBAAgB,OAAA;AAEzB,+GAA4G;AAAnG,4IAAA,2BAA2B,OAAA;AAEpC,0CAAgE;AAAvD,kGAAA,SAAS,OAAA;AAAE,0GAAA,iBAAiB,OAAA;AAErC,iFAAsE;AAA7D,kHAAA,UAAU,OAAA;AACnB,2FAA+E;AAAtE,2HAAA,cAAc,OAAA;AAEvB,qEAGwC;AAFtC,yHAAA,mBAAmB,OAAA;AACnB,sHAAA,gBAAgB,OAAA;AAGlB,kFAA8F;AAArF,uHAAA,gBAAgB,OAAA;AAAE,qHAAA,cAAc,OAAA;AACzC,8EAA0E;AAAjE,mHAAA,cAAc,OAAA;AACvB,4EAA4F;AAAnF,iHAAA,aAAa,OAAA;AAEtB,+DAAwD;AAA/C,sGAAA,MAAM,OAAA;AACf,0EAAsE;AAA7D,qHAAA,eAAe,OAAA;AACxB,mEAAgE;AAAvD,0GAAA,UAAU,OAAA;AACnB,8CAA6C;AAApC,gGAAA,MAAM,OAAA;AAEf,gFAG6C;AAF3C,yHAAA,aAAa,OAAA;AACb,4HAAA,gBAAgB,OAAA;AAElB,oEAAmE;AAA1D,wHAAA,kBAAkB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;AAEA,uFAAkF;AAAzE,oIAAA,sBAAsB,OAAA;AAC/B,mEAAgE;AAAvD,kHAAA,cAAc,OAAA;AACvB,6EAAyE;AAAhE,2HAAA,kBAAkB,OAAA;AAC3B,uEAAoE;AAA3D,sHAAA,gBAAgB,OAAA;AAEzB,+GAA4G;AAAnG,4IAAA,2BAA2B,OAAA;AAEpC,0CAAgE;AAAvD,kGAAA,SAAS,OAAA;AAAE,0GAAA,iBAAiB,OAAA;AAErC,iFAAsE;AAA7D,kHAAA,UAAU,OAAA;AACnB,2FAA+E;AAAtE,2HAAA,cAAc,OAAA;AAEvB,qEAAuF;AAA9E,yHAAA,mBAAmB,OAAA;AAAE,sHAAA,gBAAgB,OAAA;AAE9C,kFAA8F;AAArF,uHAAA,gBAAgB,OAAA;AAAE,qHAAA,cAAc,OAAA;AACzC,8EAA0E;AAAjE,mHAAA,cAAc,OAAA;AACvB,4EAA4F;AAAnF,iHAAA,aAAa,OAAA;AAEtB,+DAAwD;AAA/C,sGAAA,MAAM,OAAA;AACf,0EAAsE;AAA7D,qHAAA,eAAe,OAAA;AACxB,mEAAgE;AAAvD,0GAAA,UAAU,OAAA;AACnB,8CAA6C;AAApC,gGAAA,MAAM,OAAA;AAEf,gFAAsF;AAA7E,yHAAA,aAAa,OAAA;AAAE,4HAAA,gBAAgB,OAAA;AACxC,oEAAmE;AAA1D,wHAAA,kBAAkB,OAAA;AAE3B,iBAAiB;AACjB,8DAAoC"}

package/dist/lib/actions/ze-enable-snapshot-on-edge.d.ts

@@ -1,4 +1,4 @@
-import { ZeUploadBuildStats, ZephyrPluginOptions } from 'zephyr-edge-contract';
+import { type ZephyrPluginOptions, type ZeUploadBuildStats } from 'zephyr-edge-contract';
 interface ZeEnableSnapshotOnEdgeProps {
     pluginOptions: ZephyrPluginOptions;
     envs_jwt: ZeUploadBuildStats;

package/dist/lib/actions/ze-enable-snapshot-on-edge.js

@@ -8,15 +8,8 @@ const upload_envs_1 = require("../upload/upload-envs");
 function zeEnableSnapshotOnEdge(props) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const { pluginOptions, envs_jwt, zeStart } = props;
-        (0, zephyr_edge_contract_1.ze_log)('Enabling snapshot on edge');
+        (0, zephyr_edge_contract_1.ze_log)('Enabling snapshot on edge...');
         const logEvent = (0, ze_log_event_1.logger)(pluginOptions);
-        envs_jwt.urls.forEach((url) => {
-            logEvent({
-                level: 'trace',
-                action: 'deploy:url',
-                message: `deploying to ${url}`,
-            });
-        });
         const latest = yield (0, upload_envs_1.uploadEnvs)({
             body: envs_jwt,
             application_uid: pluginOptions.application_uid,
@@ -25,16 +18,24 @@ function zeEnableSnapshotOnEdge(props) {
             logEvent({
                 level: 'error',
                 action: 'deploy:edge:failed',
-                message: `failed deploying local build to edge`,
+                message: 'failed deploying local build to edge',
             });
             return;
         }
+        const urls = envs_jwt.urls
+            .reverse()
+            .map((url, i) => `${zephyr_edge_contract_1.brightBlueBgName}  -> ${i === 0 ? (0, zephyr_edge_contract_1.cyanBright)(url) : (0, zephyr_edge_contract_1.blackBright)(url)}`)
+            .join('\n');
         logEvent({
             level: 'info',
             action: 'build:deploy:done',
-            message: `build deployed in ${Date.now() - zeStart}ms`,
+            message: `Build deployed in ${(0, zephyr_edge_contract_1.yellow)(`${Date.now() - zeStart}`)}ms`,
+        }, {
+            level: 'trace',
+            action: 'deploy:url',
+            message: `Deploying to edge:\n${urls}\n`,
         });
-        (0, zephyr_edge_contract_1.ze_log)('Build successfully deployed to edge');
+        (0, zephyr_edge_contract_1.ze_log)('Build successfully deployed to edge...');
     });
 }
 exports.zeEnableSnapshotOnEdge = zeEnableSnapshotOnEdge;

package/dist/lib/actions/ze-enable-snapshot-on-edge.js.map

@@ -1 +1 @@
-{"version":3,"file":"ze-enable-snapshot-on-edge.js","sourceRoot":"","sources":["../../../src/lib/actions/ze-enable-snapshot-on-edge.ts"],"names":[],"mappings":";;;;AAAA,+DAK8B;AAC9B,8DAAqD;AACrD,uDAAmD;AAOnD,SAAsB,sBAAsB,CAAC,KAAkC;;QAC7E,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;QAEnD,IAAA,6BAAM,EAAC,2BAA2B,CAAC,CAAC;QACpC,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,aAAa,CAAC,CAAC;QAEvC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC5B,QAAQ,CAAC;gBACP,KAAK,EAAE,OAAO;gBACd,MAAM,EAAE,YAAY;gBACpB,OAAO,EAAE,gBAAgB,GAAG,EAAE;aAC/B,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAU,EAAC;YAC9B,IAAI,EAAE,QAAQ;YACd,eAAe,EAAE,aAAa,CAAC,eAAe;SAC/C,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,QAAQ,CAAC;gBACP,KAAK,EAAE,OAAO;gBACd,MAAM,EAAE,oBAAoB;gBAC5B,OAAO,EAAE,sCAAsC;aAChD,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAGD,QAAQ,CAAC;YACP,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,mBAAmB;YAC3B,OAAO,EAAE,qBAAqB,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,IAAI;SACvD,CAAC,CAAC;QAEH,IAAA,6BAAM,EAAC,qCAAqC,CAAC,CAAC;IAChD,CAAC;CAAA;AApCD,wDAoCC"}
+{"version":3,"file":"ze-enable-snapshot-on-edge.js","sourceRoot":"","sources":["../../../src/lib/actions/ze-enable-snapshot-on-edge.ts"],"names":[],"mappings":";;;;AAAA,+DAQ8B;AAC9B,8DAAqD;AACrD,uDAAmD;AAQnD,SAAsB,sBAAsB,CAAC,KAAkC;;QAC7E,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;QAEnD,IAAA,6BAAM,EAAC,8BAA8B,CAAC,CAAC;QACvC,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,aAAa,CAAC,CAAC;QAEvC,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAU,EAAC;YAC9B,IAAI,EAAE,QAAQ;YACd,eAAe,EAAE,aAAa,CAAC,eAAe;SAC/C,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,QAAQ,CAAC;gBACP,KAAK,EAAE,OAAO;gBACd,MAAM,EAAE,oBAAoB;gBAC5B,OAAO,EAAE,sCAAsC;aAChD,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI;aACvB,OAAO,EAAE;aACT,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,uCAAgB,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAA,iCAAU,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,kCAAW,EAAC,GAAG,CAAC,EAAE,CAAC;aAC1F,IAAI,CAAC,IAAI,CAAC,CAAC;QAEd,QAAQ,CACN;YACE,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,mBAAmB;YAC3B,OAAO,EAAE,qBAAqB,IAAA,6BAAM,EAAC,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC,IAAI;SACpE,EACD;YACE,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,YAAY;YACpB,OAAO,EAAE,uBAAuB,IAAI,IAAI;SACzC,CACF,CAAC;QAEF,IAAA,6BAAM,EAAC,wCAAwC,CAAC,CAAC;IACnD,CAAC;CAAA;AAvCD,wDAuCC"}

package/dist/lib/actions/ze-enable-snapshot-on-pages.d.ts

@@ -6,5 +6,5 @@ interface ZeEnableSnapshotOnEdgeProps {
     envs_jwt: ZeUploadBuildStats;
     pages_url: string;
 }
-export declare function zeEnableSnapshotOnPages({ pluginOptions: { application_uid }, envs_jwt, pages_url }: ZeEnableSnapshotOnEdgeProps): Promise<void>;
+export declare function zeEnableSnapshotOnPages({ pluginOptions: { application_uid }, envs_jwt, pages_url, }: ZeEnableSnapshotOnEdgeProps): Promise<void>;
 export {};

package/dist/lib/actions/ze-enable-snapshot-on-pages.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const zephyr_edge_contract_1 = require("zephyr-edge-contract");
 const get_application_configuration_1 = require("../application-configuration/get-application-configuration");
 function zeEnableSnapshotOnPages(_a) {
-    return tslib_1.__awaiter(this, arguments, void 0, function* ({ pluginOptions: { application_uid }, envs_jwt, pages_url }) {
+    return tslib_1.__awaiter(this, arguments, void 0, function* ({ pluginOptions: { application_uid }, envs_jwt, pages_url, }) {
         (0, zephyr_edge_contract_1.ze_log)('Enabling snapshot on cloudflare pages');
         (0, zephyr_edge_contract_1.ze_log)(`Uploading envs to Zephyr, for ${application_uid}`);
         const type = 'pages';
@@ -25,10 +25,10 @@ function zeEnableSnapshotOnPages(_a) {
         };
         const uploadResult = yield (0, zephyr_edge_contract_1.request)(url, options, data);
         if (!uploadResult) {
-            (0, zephyr_edge_contract_1.ze_error)('failed deploying local build to pages');
+            (0, zephyr_edge_contract_1.ze_error)('ERR_DEPLOY_LOCAL_BUILD');
             return;
         }
-        (0, zephyr_edge_contract_1.ze_log)('Build successfully deployed to pages');
+        (0, zephyr_edge_contract_1.ze_log)('Build successfully deployed.');
     });
 }
 exports.zeEnableSnapshotOnPages = zeEnableSnapshotOnPages;

package/dist/lib/actions/ze-enable-snapshot-on-pages.js.map

@@ -1 +1 @@
-{"version":3,"file":"ze-enable-snapshot-on-pages.js","sourceRoot":"","sources":["../../../src/lib/actions/ze-enable-snapshot-on-pages.ts"],"names":[],"mappings":";;;;AAAA,+DAAsF;AACtF,8GAAyG;AAQzG,SAAsB,uBAAuB;iEAC3C,EAAC,aAAa,EAAE,EAAC,eAAe,EAAC,EAAE,QAAQ,EAAE,SAAS,EAA8B;QAGpF,IAAA,6BAAM,EAAC,uCAAuC,CAAC,CAAC;QAEhD,IAAA,6BAAM,EAAC,iCAAiC,eAAe,EAAE,CAAC,CAAC;QAC3D,MAAM,IAAI,GAAG,OAAO,CAAC;QACrB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,iCACtB,QAAQ,KACX,SAAS,IACT,CAAC;QAEH,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,2DAA2B,EAAC;YAC1D,eAAe;SAChB,CAAC,CAAC;QAEH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACzC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACtC,MAAM,OAAO,GAAsB;YACjC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,aAAa,EAAE,GAAG;gBAClB,cAAc,EAAE,kBAAkB;gBAClC,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;aACzC;SACF,CAAC;QAEF,MAAM,YAAY,GAAG,MAAM,IAAA,8BAAO,EAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QACvD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,IAAA,+BAAQ,EAAC,uCAAuC,CAAC,CAAC;YAClD,OAAO;QACT,CAAC;QAED,IAAA,6BAAM,EAAC,sCAAsC,CAAC,CAAC;IACjD,CAAC;CAAA;AAnCD,0DAmCC"}
+{"version":3,"file":"ze-enable-snapshot-on-pages.js","sourceRoot":"","sources":["../../../src/lib/actions/ze-enable-snapshot-on-pages.ts"],"names":[],"mappings":";;;;AAAA,+DAAqF;AACrF,8GAAyG;AAQzG,SAAsB,uBAAuB;iEAAC,EAC5C,aAAa,EAAE,EAAE,eAAe,EAAE,EAClC,QAAQ,EACR,SAAS,GACmB;QAC5B,IAAA,6BAAM,EAAC,uCAAuC,CAAC,CAAC;QAEhD,IAAA,6BAAM,EAAC,iCAAiC,eAAe,EAAE,CAAC,CAAC;QAC3D,MAAM,IAAI,GAAG,OAAO,CAAC;QACrB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,iCACtB,QAAQ,KACX,SAAS,IACT,CAAC;QAEH,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,2DAA2B,EAAC;YAC1D,eAAe;SAChB,CAAC,CAAC;QAEH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACzC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACtC,MAAM,OAAO,GAAsB;YACjC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,aAAa,EAAE,GAAG;gBAClB,cAAc,EAAE,kBAAkB;gBAClC,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;aACzC;SACF,CAAC;QAEF,MAAM,YAAY,GAAG,MAAM,IAAA,8BAAO,EAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QACvD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,IAAA,+BAAQ,EAAC,wBAAwB,CAAC,CAAC;YACnC,OAAO;QACT,CAAC;QAED,IAAA,6BAAM,EAAC,8BAA8B,CAAC,CAAC;IACzC,CAAC;CAAA;AApCD,0DAoCC"}

package/dist/lib/actions/ze-upload-assets.d.ts

@@ -1,2 +1,2 @@
-import { ZephyrPluginOptions, ZeUploadAssetsOptions } from 'zephyr-edge-contract';
+import { type ZephyrPluginOptions, type ZeUploadAssetsOptions } from 'zephyr-edge-contract';
 export declare function zeUploadAssets(pluginOptions: ZephyrPluginOptions, { missingAssets, assetsMap, count }: ZeUploadAssetsOptions): Promise<boolean>;

package/dist/lib/actions/ze-upload-assets.js

@@ -12,7 +12,7 @@ function zeUploadAssets(pluginOptions_1, _a) {
             logEvent({
                 level: 'info',
                 action: 'snapshot:assets:upload:empty',
-                message: `no new assets to upload`,
+                message: 'No new assets to upload',
             });
             return true;
         }
@@ -52,7 +52,7 @@ function zeUploadAssets(pluginOptions_1, _a) {
             logEvent({
                 level: 'info',
                 action: 'snapshot:assets:upload:done',
-                message: `uploaded missing assets to zephyr (${missingAssets === null || missingAssets === void 0 ? void 0 : missingAssets.length} assets in ${totalTime}ms, ${totalSize.toFixed(2)}kb)`,
+                message: `Uploaded missing assets to zephyr (${(0, zephyr_edge_contract_1.yellow)(missingAssets.length.toString())} assets in ${(0, zephyr_edge_contract_1.yellow)(totalTime.toString())}ms, ${(0, zephyr_edge_contract_1.yellow)(totalSize.toFixed(2))}kb)`,
             });
             return true;
         })
@@ -60,12 +60,12 @@ function zeUploadAssets(pluginOptions_1, _a) {
             logEvent({
                 level: 'error',
                 action: 'snapshot:assets:upload:failed',
-                message: `failed uploading missing assets to zephyr \n ${err.message.toString()}`,
+                message: `Event: failed uploading missing assets to zephyr \n ${err.message}`,
             });
             return false;
         });
         if (!res) {
-            (0, zephyr_edge_contract_1.ze_error)("DE20017", res);
+            (0, zephyr_edge_contract_1.ze_error)('ERR_FAILED_UPLOAD_ASSETS', res);
         }
         return res;
     });

package/dist/lib/actions/ze-upload-assets.js.map

@@ -1 +1 @@
-{"version":3,"file":"ze-upload-assets.js","sourceRoot":"","sources":["../../../src/lib/actions/ze-upload-assets.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ze-upload-assets.js","sourceRoot":"","sources":["../../../src/lib/actions/ze-upload-assets.ts"],"names":[],"mappings":";;;;AAAA,+DAAsH;AACtH,8DAAqD;AACrD,uDAAmD;AAEnD,SAAsB,cAAc;iEAClC,aAAkC,EAClC,EAAE,aAAa,EAAE,SAAS,EAAE,KAAK,EAAyB;QAE1D,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,aAAa,CAAC,CAAC;QAEvC,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,QAAQ,CAAC;gBACP,KAAK,EAAE,MAAM;gBACb,MAAM,EAAE,8BAA8B;gBACtC,OAAO,EAAE,yBAAyB;aACnC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,QAAQ,CAAC;YACP,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,gCAAgC;YACxC,OAAO,EAAE,8CAA8C,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,WAAW,KAAK,GAAG;SAChG,CAAC,CAAC;QAEH,IAAI,SAAS,GAAG,CAAC,CAAC;QAClB,IAAI,SAAS,GAAG,CAAC,CAAC;QAElB,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAC3B,aAAa,CAAC,GAAG,CAAC,CAAO,KAAK,EAAE,EAAE;;YAChC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACzB,MAAM,eAAe,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC9C,MAAM,SAAS,GAAG,CAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,0CAAE,MAAM,IAAG,IAAI,CAAC;YACzD,OAAO,MAAM,IAAA,wBAAU,EAAC;gBACtB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,KAAK,EAAE,eAAe;gBACtB,eAAe,EAAE,aAAa,CAAC,eAAe;aAC/C,CAAC;iBACC,IAAI,CAAC,GAAG,EAAE;gBACT,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;gBACxC,SAAS,IAAI,YAAY,CAAC;gBAC1B,SAAS,IAAI,SAAS,CAAC;gBACvB,IAAA,6BAAM,EAAC,QAAQ,KAAK,CAAC,IAAI,gBAAgB,YAAY,OAAO,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACzF,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACb,QAAQ,CAAC;oBACP,KAAK,EAAE,OAAO;oBACd,MAAM,EAAE,oCAAoC;oBAC5C,OAAO,EAAE,yBAAyB,KAAK,CAAC,IAAI,OAAO,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE;iBAC5E,CAAC,CAAC;gBAEH,MAAM,GAAG,CAAC;YACZ,CAAC,CAAC,CAAC;QACP,CAAC,CAAA,CAAC,CACH;aACE,IAAI,CAAC,GAAG,EAAE;YACT,QAAQ,CAAC;gBACP,KAAK,EAAE,MAAM;gBACb,MAAM,EAAE,6BAA6B;gBACrC,OAAO,EAAE,sCAAsC,IAAA,6BAAM,EACnD,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,CAChC,cAAc,IAAA,6BAAM,EAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,OAAO,IAAA,6BAAM,EAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK;aACpF,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,QAAQ,CAAC;gBACP,KAAK,EAAE,OAAO;gBACd,MAAM,EAAE,+BAA+B;gBACvC,OAAO,EAAE,uDAAuD,GAAG,CAAC,OAAO,EAAE;aAC9E,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;QAEL,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,IAAA,+BAAQ,EAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC;QAC5C,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC;CAAA;AA5ED,wCA4EC"}

package/dist/lib/actions/ze-upload-build-stats.d.ts

@@ -1,4 +1,4 @@
-import { ZeUploadBuildStats } from 'zephyr-edge-contract';
-export declare function zeUploadBuildStats(dashData: unknown): Promise<{
+import { ZephyrBuildStats, ZeUploadBuildStats } from 'zephyr-edge-contract';
+export declare function zeUploadBuildStats(dashData: ZephyrBuildStats): Promise<{
     value: ZeUploadBuildStats;
 } | void>;

package/dist/lib/actions/ze-upload-build-stats.js

@@ -8,7 +8,7 @@ function zeUploadBuildStats(dashData) {
         // Add dots here to indicate this is an async operation
         (0, zephyr_edge_contract_1.ze_log)(`${zephyr_edge_contract_1.dimmedName} Uploading build stats to Zephyr...`);
         const token = yield (0, zephyr_edge_contract_1.getToken)();
-        const url = new URL(zephyr_edge_contract_1.v2_api_paths.dashboard_path, (0, zephyr_edge_contract_1.ZEPHYR_API_ENDPOINT)());
+        const url = new URL(zephyr_edge_contract_1.ze_api_gateway.build_stats, (0, zephyr_edge_contract_1.ZE_API_ENDPOINT)());
         const res = yield (0, zephyr_edge_contract_1.request)(url, {
             method: 'POST',
             headers: {
@@ -17,15 +17,15 @@ function zeUploadBuildStats(dashData) {
                 Accept: 'application/json',
             },
         }, JSON.stringify(dashData)).catch((err) => {
-            (0, zephyr_edge_contract_1.ze_error)("ZE10045", `If you believe this is a mistake please make sure you have access to the organization for this application in Zephyr. \n
-      Error uploading build stats, deployment is not completed. \n
-      Failed to upload build stats to Zephyr... \n
-      `, err);
+            (0, zephyr_edge_contract_1.ze_error)('ERR_FAILED_UPLOAD_BUILD_STATS', `
+If you believe this is a mistake please make sure you have access to the organization for this application in Zephyr.
+Error uploading build stats, deployment is not completed....
+      `.trim(), err);
         });
         if (!res)
-            return (0, zephyr_edge_contract_1.ze_error)('DE10046', 'Did not receive envs from build stats upload. Exiting...');
+            return (0, zephyr_edge_contract_1.ze_error)('ERR_NOT_RECEIVE_ENVS_FROM_BUILD_STATS', 'Did not receive envs from build stats upload. Exiting...');
         if (typeof res === 'string')
-            return (0, zephyr_edge_contract_1.ze_error)('ZE10045', 'Failed to upload build stats.', res);
+            return (0, zephyr_edge_contract_1.ze_error)('ERR_FAILED_UPLOAD_BUILD_STATS', 'Failed to upload build stats.', res);
         (0, zephyr_edge_contract_1.ze_log)(`Build stats uploaded to Zephyr...`);
         return res;
     });

package/dist/lib/actions/ze-upload-build-stats.js.map

@@ -1 +1 @@
-{"version":3,"file":"ze-upload-build-stats.js","sourceRoot":"","sources":["../../../src/lib/actions/ze-upload-build-stats.ts"],"names":[],"mappings":";;;;AAAA,+DAU8B;AAE9B,SAAsB,kBAAkB,CACtC,QAAiB;;QAEjB,uDAAuD;QACvD,IAAA,6BAAM,EAAC,GAAG,iCAAU,qCAAqC,CAAC,CAAC;QAC3D,MAAM,KAAK,GAAG,MAAM,IAAA,+BAAQ,GAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,mCAAY,CAAC,cAAc,EAAE,IAAA,0CAAmB,GAAE,CAAC,CAAC;QACxE,MAAM,GAAG,GAAG,MAAM,IAAA,8BAAO,EACvB,GAAG,EACH;YACE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,SAAS,GAAG,KAAK;gBAChC,MAAM,EAAE,kBAAkB;aAC3B;SACF,EACD,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CACzB,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACd,IAAA,+BAAQ,EACN,SAAS,EACT;;;OAGC,EAAE,GAAG,CACP,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG;YACN,OAAO,IAAA,+BAAQ,EAAC,SAAS,EAAE,0DAA0D,CAAC,CAAC;QAEzF,IAAI,OAAO,GAAG,KAAK,QAAQ;YACzB,OAAO,IAAA,+BAAQ,EAAC,SAAS,EAAE,+BAA+B,EAAE,GAAG,CAAC,CAAC;QAEnE,IAAA,6BAAM,EAAC,mCAAmC,CAAC,CAAC;QAC5C,OAAO,GAAG,CAAC;IACb,CAAC;CAAA;AApCD,gDAoCC"}
+{"version":3,"file":"ze-upload-build-stats.js","sourceRoot":"","sources":["../../../src/lib/actions/ze-upload-build-stats.ts"],"names":[],"mappings":";;;;AAAA,+DAU8B;AAE9B,SAAsB,kBAAkB,CAAC,QAA0B;;QACjE,uDAAuD;QACvD,IAAA,6BAAM,EAAC,GAAG,iCAAU,qCAAqC,CAAC,CAAC;QAC3D,MAAM,KAAK,GAAG,MAAM,IAAA,+BAAQ,GAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,qCAAc,CAAC,WAAW,EAAE,IAAA,sCAAe,GAAE,CAAC,CAAC;QACnE,MAAM,GAAG,GAAG,MAAM,IAAA,8BAAO,EACvB,GAAG,EACH;YACE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,SAAS,GAAG,KAAK;gBAChC,MAAM,EAAE,kBAAkB;aAC3B;SACF,EACD,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CACzB,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACd,IAAA,+BAAQ,EACN,+BAA+B,EAC/B;;;OAGC,CAAC,IAAI,EAAE,EACR,GAAG,CACJ,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG;YAAE,OAAO,IAAA,+BAAQ,EAAC,uCAAuC,EAAE,0DAA0D,CAAC,CAAC;QAE/H,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO,IAAA,+BAAQ,EAAC,+BAA+B,EAAE,+BAA+B,EAAE,GAAG,CAAC,CAAC;QAEpH,IAAA,6BAAM,EAAC,mCAAmC,CAAC,CAAC;QAC5C,OAAO,GAAG,CAAC;IACb,CAAC;CAAA;AAjCD,gDAiCC"}

package/dist/lib/actions/ze-upload-snapshot.d.ts

@@ -1,2 +1,6 @@
-import { Snapshot, SnapshotUploadRes, ZephyrPluginOptions } from 'zephyr-edge-contract';
-export declare function zeUploadSnapshot(pluginOptions: ZephyrPluginOptions, snapshot: Snapshot): Promise<SnapshotUploadRes | undefined>;
+import { type Snapshot, type ZephyrPluginOptions, ZeApplicationConfig } from 'zephyr-edge-contract';
+export declare function zeUploadSnapshot(props: {
+    pluginOptions: ZephyrPluginOptions;
+    snapshot: Snapshot;
+    appConfig: ZeApplicationConfig;
+}): Promise<string>;

package/dist/lib/actions/ze-upload-snapshot.js

@@ -5,8 +5,11 @@ const tslib_1 = require("tslib");
 const zephyr_edge_contract_1 = require("zephyr-edge-contract");
 const ze_log_event_1 = require("../remote-logs/ze-log-event");
 const upload_snapshot_1 = require("../upload/upload-snapshot");
-function zeUploadSnapshot(pluginOptions, snapshot) {
+const snapshot_uploads_1 = require("../custom-errors/snapshot-uploads");
+function zeUploadSnapshot(props) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const { pluginOptions, snapshot } = props;
         const { buildEnv } = pluginOptions;
         const logEvent = (0, ze_log_event_1.logger)(pluginOptions);
         const snapUploadMs = Date.now();
@@ -17,23 +20,33 @@ function zeUploadSnapshot(pluginOptions, snapshot) {
         }).catch((err) => {
             error = err;
         });
-        if (!edgeTodo || error) {
+        const versionUrl = (_a = edgeTodo === null || edgeTodo === void 0 ? void 0 : edgeTodo.urls) === null || _a === void 0 ? void 0 : _a.version;
+        if (!versionUrl || error) {
             logEvent({
                 level: 'error',
                 action: 'snapshot:upload:failed',
                 message: `failed uploading of ${buildEnv} snapshot to zephyr`,
             });
-            (0, zephyr_edge_contract_1.ze_error)("DE10018", 'Failed to upload snapshot.', error);
-            return;
+            if (error) {
+                (0, zephyr_edge_contract_1.ze_error)('ERR_SNAPSHOT_UPLOADS_NO_RESULTS');
+                throw new snapshot_uploads_1.SnapshotUploadNoResultError();
+            }
+            (0, zephyr_edge_contract_1.ze_error)('ERR_FAILED_UPLOAD_SNAPSHOTS', 'Failed to upload snapshot.', error);
+            throw new snapshot_uploads_1.SnapshotUploadFailureError();
         }
         logEvent({
             level: 'info',
             action: 'snapshot:upload:done',
-            message: `uploaded ${buildEnv} snapshot in ${Date.now() - snapUploadMs}ms`,
+            message: `Uploaded ${(0, zephyr_edge_contract_1.green)(buildEnv)} snapshot in ${(0, zephyr_edge_contract_1.yellow)(`${Date.now() - snapUploadMs}`)}ms`,
         });
         if (!edgeTodo)
-            (0, zephyr_edge_contract_1.ze_error)("DE10019", 'Snapshot upload gave no result, exiting...\n');
-        return edgeTodo;
+            (0, zephyr_edge_contract_1.ze_error)('ERR_SNAPSHOT_UPLOADS_NO_RESULTS', 'Snapshot upload gave no result, exiting...\n');
+        logEvent({
+            level: 'trace',
+            action: 'deploy:url',
+            message: `Deploying to edge: ${zephyr_edge_contract_1.brightBlueBgName}  -> ${(0, zephyr_edge_contract_1.cyanBright)(versionUrl)}`,
+        });
+        return versionUrl;
     });
 }
 exports.zeUploadSnapshot = zeUploadSnapshot;

package/dist/lib/actions/ze-upload-snapshot.js.map

@@ -1 +1 @@
-{"version":3,"file":"ze-upload-snapshot.js","sourceRoot":"","sources":["../../../src/lib/actions/ze-upload-snapshot.ts"],"names":[],"mappings":";;;;AAAA,+DAK8B;AAC9B,8DAAqD;AACrD,+DAA2D;AAE3D,SAAsB,gBAAgB,CACpC,aAAkC,EAClC,QAAkB;;QAElB,MAAM,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC;QACnC,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,aAAa,CAAC,CAAC;QACvC,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEhC,IAAI,KAAK,CAAC;QACV,MAAM,QAAQ,GAAG,MAAM,IAAA,gCAAc,EAAC;YACpC,IAAI,EAAE,QAAQ;YACd,eAAe,EAAE,aAAa,CAAC,eAAe;SAC/C,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACf,KAAK,GAAG,GAAG,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,IAAI,KAAK,EAAE,CAAC;YACvB,QAAQ,CAAC;gBACP,KAAK,EAAE,OAAO;gBACd,MAAM,EAAE,wBAAwB;gBAChC,OAAO,EAAE,uBAAuB,QAAQ,qBAAqB;aAC9D,CAAC,CAAC;YACH,IAAA,+BAAQ,EAAC,SAAS,EAAE,4BAA4B,EAAE,KAAK,CAAC,CAAC;YACzD,OAAO;QACT,CAAC;QAED,QAAQ,CAAC;YACP,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,sBAAsB;YAC9B,OAAO,EAAE,YAAY,QAAQ,gBAAgB,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY,IAAI;SAC3E,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ;YACX,IAAA,+BAAQ,EAAC,SAAS,EAAE,8CAA8C,CAAC,CAAA;QAErE,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AApCD,4CAoCC"}
+{"version":3,"file":"ze-upload-snapshot.js","sourceRoot":"","sources":["../../../src/lib/actions/ze-upload-snapshot.ts"],"names":[],"mappings":";;;;AAAA,+DAS8B;AAC9B,8DAAqD;AACrD,+DAA2D;AAE3D,wEAA4G;AAE5G,SAAsB,gBAAgB,CAAC,KAItC;;;QACC,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;QAC1C,MAAM,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC;QACnC,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,aAAa,CAAC,CAAC;QACvC,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEhC,IAAI,KAAK,CAAC;QACV,MAAM,QAAQ,GAAG,MAAM,IAAA,gCAAc,EAAC;YACpC,IAAI,EAAE,QAAQ;YACd,eAAe,EAAE,aAAa,CAAC,eAAe;SAC/C,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACf,KAAK,GAAG,GAAG,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,0CAAE,OAAO,CAAC;QAE3C,IAAI,CAAC,UAAU,IAAI,KAAK,EAAE,CAAC;YACzB,QAAQ,CAAC;gBACP,KAAK,EAAE,OAAO;gBACd,MAAM,EAAE,wBAAwB;gBAChC,OAAO,EAAE,uBAAuB,QAAQ,qBAAqB;aAC9D,CAAC,CAAC;YACH,IAAI,KAAK,EAAE,CAAC;gBACV,IAAA,+BAAQ,EAAC,iCAAiC,CAAC,CAAC;gBAC5C,MAAM,IAAI,8CAA2B,EAAE,CAAC;YAC1C,CAAC;YACD,IAAA,+BAAQ,EAAC,6BAA6B,EAAE,4BAA4B,EAAE,KAAK,CAAC,CAAC;YAC7E,MAAM,IAAI,6CAA0B,EAAE,CAAC;QACzC,CAAC;QAED,QAAQ,CAAC;YACP,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,sBAAsB;YAC9B,OAAO,EAAE,YAAY,IAAA,4BAAK,EAAC,QAAQ,CAAC,gBAAgB,IAAA,6BAAM,EAAC,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY,EAAE,CAAC,IAAI;SAC/F,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ;YAAE,IAAA,+BAAQ,EAAC,iCAAiC,EAAE,8CAA8C,CAAC,CAAC;QAE3G,QAAQ,CAAC;YACP,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,YAAY;YACpB,OAAO,EAAE,sBAAsB,uCAAgB,QAAQ,IAAA,iCAAU,EAAC,UAAU,CAAC,EAAE;SAChF,CAAC,CAAC;QAEH,OAAO,UAAU,CAAC;IACpB,CAAC;CAAA;AAjDD,4CAiDC"}

package/dist/lib/application-configuration/get-application-configuration.d.ts

@@ -1,6 +1,6 @@
-import { ZeApplicationConfig } from 'zephyr-edge-contract';
+import { type ZeApplicationConfig } from 'zephyr-edge-contract';
 interface GetApplicationConfigurationProps {
     application_uid: string;
 }
-export declare function getApplicationConfiguration({ application_uid, }: GetApplicationConfigurationProps): Promise<ZeApplicationConfig>;
+export declare function getApplicationConfiguration({ application_uid }: GetApplicationConfigurationProps): Promise<ZeApplicationConfig>;
 export {};

package/dist/lib/application-configuration/get-application-configuration.js

@@ -7,18 +7,21 @@ const zephyr_edge_contract_1 = require("zephyr-edge-contract");
 const login_1 = require("../auth/login");
 const configuration_error_1 = require("../custom-errors/configuration-error");
 function loadApplicationConfiguration(_a) {
-    return tslib_1.__awaiter(this, arguments, void 0, function* ({ application_uid, }) {
+    return tslib_1.__awaiter(this, arguments, void 0, function* ({ application_uid }) {
         if (!application_uid) {
-            throw new configuration_error_1.ConfigurationError(`BU10017`, `application_uid is missing...\n`, `critical`);
+            throw new configuration_error_1.ConfigurationError('ZE10017', 'application_uid is missing...\n', 'critical');
         }
         const token = yield (0, zephyr_edge_contract_1.getToken)();
-        const application_config_url = new URL(zephyr_edge_contract_1.v2_api_paths.application_configuration, (0, zephyr_edge_contract_1.ZEPHYR_API_ENDPOINT)());
-        application_config_url.searchParams.append('application-uid', application_uid);
+        const application_config_url = new URL(`${zephyr_edge_contract_1.ze_api_gateway.application_config}/${application_uid}`, (0, zephyr_edge_contract_1.ZE_API_ENDPOINT)());
         const response = yield (0, zephyr_edge_contract_1.request)(application_config_url, {
-            headers: { Authorization: 'Bearer ' + token },
-        }).catch((v) => (0, zephyr_edge_contract_1.ze_error)('DE20014', 'Failed to load application configuration', v));
-        if (!response || typeof response === 'string')
-            return (0, zephyr_edge_contract_1.ze_error)('DE20014', 'Failed to load application configuration.', response);
+            headers: { Authorization: `Bearer ${token}` },
+        }).catch((v) => (0, zephyr_edge_contract_1.ze_error)('ERR_LOAD_APP_CONFIG', 'Failed to load application configuration', v));
+        if (!response) {
+            return undefined;
+        }
+        if (typeof response === 'string') {
+            return (0, zephyr_edge_contract_1.ze_error)('ERR_LOAD_APP_CONFIG', 'Invalid application configuration.', response);
+        }
         (0, zephyr_edge_contract_1.ze_log)('Application Configuration loaded...', response);
         return Object.assign({}, response.value, {
             fetched_at: Date.now(),
@@ -28,13 +31,11 @@ function loadApplicationConfiguration(_a) {
 }
 let refetching_app_config = false;
 function getApplicationConfiguration(_a) {
-    return tslib_1.__awaiter(this, arguments, void 0, function* ({ application_uid, }) {
+    return tslib_1.__awaiter(this, arguments, void 0, function* ({ application_uid }) {
         (0, zephyr_edge_contract_1.ze_log)('Getting application configuration from node-persist');
         const storedAppConfig = yield (0, zephyr_edge_contract_1.getAppConfig)(application_uid);
         if (storedAppConfig && (0, login_1.isTokenStillValid)(storedAppConfig.jwt)) {
-            if (!refetching_app_config &&
-                (!(storedAppConfig === null || storedAppConfig === void 0 ? void 0 : storedAppConfig.fetched_at) ||
-                    Date.now() - storedAppConfig.fetched_at > 60 * 1000)) {
+            if (!refetching_app_config && (!(storedAppConfig === null || storedAppConfig === void 0 ? void 0 : storedAppConfig.fetched_at) || Date.now() - storedAppConfig.fetched_at > 60 * 1000)) {
                 refetching_app_config = true;
                 loadApplicationConfiguration({ application_uid }).then((reloadedAppConfig) => {
                     refetching_app_config = false;
@@ -51,7 +52,7 @@ function getApplicationConfiguration(_a) {
         });
         (0, zephyr_edge_contract_1.ze_log)('Saving Application Configuration to node-persist...');
         if (!loadedAppConfig)
-            throw new configuration_error_1.ConfigurationError(`DE20014`, `Failed to load application configuration...`, `critical`);
+            throw new configuration_error_1.ConfigurationError(`ZE20014`, `Failed to load application configuration...`, `critical`);
         yield (0, zephyr_edge_contract_1.saveAppConfig)(application_uid, loadedAppConfig);
         return loadedAppConfig;
     });

package/dist/lib/application-configuration/get-application-configuration.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-application-configuration.js","sourceRoot":"","sources":["../../../src/lib/application-configuration/get-application-configuration.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"get-application-configuration.js","sourceRoot":"","sources":["../../../src/lib/application-configuration/get-application-configuration.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAC7B,+DAU8B;AAC9B,yCAAkD;AAClD,8EAA0E;AAM1E,SAAe,4BAA4B;iEAAC,EAAE,eAAe,EAAoC;QAC/F,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,IAAI,wCAAkB,CAAC,SAAS,EAAE,iCAAiC,EAAE,UAAU,CAAC,CAAC;QACzF,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,IAAA,+BAAQ,GAAE,CAAC;QAC/B,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC,GAAG,qCAAc,CAAC,kBAAkB,IAAI,eAAe,EAAE,EAAE,IAAA,sCAAe,GAAE,CAAC,CAAC;QAErH,MAAM,QAAQ,GAAG,MAAM,IAAA,8BAAO,EAAiC,sBAAsB,EAAE;YACrF,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE;SAC9C,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,+BAAQ,EAAC,qBAAqB,EAAE,0CAA0C,EAAE,CAAC,CAAC,CAAC,CAAC;QAEhG,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACjC,OAAO,IAAA,+BAAQ,EAAC,qBAAqB,EAAE,oCAAoC,EAAE,QAAQ,CAAC,CAAC;QACzF,CAAC;QAED,IAAA,6BAAM,EAAC,qCAAqC,EAAE,QAAQ,CAAC,CAAC;QAExD,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,KAAK,EAAE;YACvC,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE;YACtB,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,kDAAkD;SACnG,CAAC,CAAC;IACL,CAAC;CAAA;AAED,IAAI,qBAAqB,GAAG,KAAK,CAAC;AAElC,SAAsB,2BAA2B;iEAAC,EAAE,eAAe,EAAoC;QACrG,IAAA,6BAAM,EAAC,qDAAqD,CAAC,CAAC;QAE9D,MAAM,eAAe,GAAG,MAAM,IAAA,mCAAY,EAAC,eAAe,CAAC,CAAC;QAE5D,IAAI,eAAe,IAAI,IAAA,yBAAiB,EAAC,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;YAC9D,IAAI,CAAC,qBAAqB,IAAI,CAAC,CAAC,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,UAAU,CAAA,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,eAAe,CAAC,UAAU,GAAG,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;gBACpH,qBAAqB,GAAG,IAAI,CAAC;gBAC7B,4BAA4B,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,iBAAiB,EAAE,EAAE;oBAC3E,qBAAqB,GAAG,KAAK,CAAC;oBAC9B,IAAI,CAAC,iBAAiB;wBAAE,OAAO;oBAC/B,IAAA,oCAAa,EAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;gBACpD,CAAC,CAAC,CAAC;YACL,CAAC;YACD,OAAO,eAAe,CAAC;QACzB,CAAC;QAED,IAAA,6BAAM,EAAC,+CAA+C,CAAC,CAAC;QACxD,MAAM,eAAe,GAAG,MAAM,4BAA4B,CAAC;YACzD,eAAe;SAChB,CAAC,CAAC;QACH,IAAA,6BAAM,EAAC,qDAAqD,CAAC,CAAC;QAC9D,IAAI,CAAC,eAAe;YAAE,MAAM,IAAI,wCAAkB,CAAC,SAAS,EAAE,6CAA6C,EAAE,UAAU,CAAC,CAAC;QAEzH,MAAM,IAAA,oCAAa,EAAC,eAAe,EAAE,eAAe,CAAC,CAAC;QAEtD,OAAO,eAAe,CAAC;IACzB,CAAC;CAAA;AA3BD,kEA2BC"}

package/dist/lib/auth/login.js

@@ -5,9 +5,8 @@ const tslib_1 = require("tslib");
 const jose = tslib_1.__importStar(require("jose"));
 const uuid_1 = require("uuid");
 const zephyr_edge_contract_1 = require("zephyr-edge-contract");
-const open = (str) => new Function(`return import("open")`)().then(({ default: open }) => open(str));
 const websocket_1 = require("./websocket");
-const zephyr_edge_contract_2 = require("zephyr-edge-contract");
+const open = (str) => new Function(`return import("open")`)().then(({ default: open }) => open(str));
 function generateSessionKey() {
     return (0, uuid_1.v4)().replace(/-/g, '');
 }
@@ -28,9 +27,10 @@ exports.getPersonalAccessTokenFromWebsocket = getPersonalAccessTokenFromWebsocke
 function getAuthenticationURL(options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const { state } = options;
-        const loginUrl = new URL(zephyr_edge_contract_2.v2_api_paths.authorize_link, (0, zephyr_edge_contract_2.ZEPHYR_API_ENDPOINT)());
+        // const loginUrl = new URL('/v2/authorize-link', ZEPHYR_API_ENDPOINT());
+        const loginUrl = new URL(zephyr_edge_contract_1.ze_api_gateway.auth_link, (0, zephyr_edge_contract_1.ZE_API_ENDPOINT)());
         loginUrl.searchParams.append('state', state);
-        return (0, zephyr_edge_contract_2.request)(loginUrl);
+        return (0, zephyr_edge_contract_1.request)(loginUrl);
     });
 }
 exports.getAuthenticationURL = getAuthenticationURL;
@@ -41,18 +41,18 @@ exports.getAuthenticationURL = getAuthenticationURL;
  */
 function checkAuth() {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const secret_token = yield (0, zephyr_edge_contract_2.getSecretToken)();
+        const secret_token = yield (0, zephyr_edge_contract_1.getSecretToken)();
         if (secret_token) {
             return secret_token;
         }
-        const token = yield (0, zephyr_edge_contract_2.getToken)();
+        const token = yield (0, zephyr_edge_contract_1.getToken)();
         if (token) {
             // Check if the token has a valid expiration date.
             if (isTokenStillValid(token)) {
                 (0, zephyr_edge_contract_1.ze_log)('You are already logged in');
                 return token;
             }
-            yield (0, zephyr_edge_contract_2.removeToken)();
+            yield (0, zephyr_edge_contract_1.removeToken)();
         }
         // No valid token found; initiate authentication.
         const newToken = yield authenticateUser();
@@ -81,13 +81,13 @@ exports.isTokenStillValid = isTokenStillValid;
 function authenticateUser() {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const token = yield getPersonalAccessTokenFromWebsocket();
-        yield (0, zephyr_edge_contract_2.saveToken)(token);
+        yield (0, zephyr_edge_contract_1.saveToken)(token);
         return token;
     });
 }
 function subscribeToWsEvents(sessionKey) {
     return new Promise((resolve, reject) => {
-        const socket = (0, websocket_1.createSocket)((0, zephyr_edge_contract_2.ZEPHYR_API_ENDPOINT)());
+        const socket = (0, websocket_1.createSocket)((0, zephyr_edge_contract_1.ZEPHYR_API_ENDPOINT)());
         const cleanup = () => (0, websocket_1.disposeSocket)(socket);
         socket.on('connect', () => {
             // console.debug('WS Connected');

package/dist/lib/auth/login.js.map

@@ -1 +1 @@
-{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/lib/auth/login.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAC7B,+BAAoC;AACpC,+DAA8C;AAC9C,MAAM,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE,CAC3B,IAAI,QAAQ,CAAC,uBAAuB,CAAC,EAAE,CAAC,IAAI,CAC1C,CAAC,EAAE,OAAO,EAAE,IAAI,EAA+C,EAAE,EAAE,CACjE,IAAI,CAAC,GAAG,CAAC,CACZ,CAAC;AAEJ,2CAA0D;AAC1D,+DAQ8B;AAE9B,SAAgB,kBAAkB;IAChC,OAAO,IAAA,SAAM,GAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AACpC,CAAC;AAFD,gDAEC;AAMD,SAAsB,mCAAmC;iEACvD,EAAE,WAAW,KAAiD;QAC5D,WAAW,EAAE,IAAI;KAClB;QAED,MAAM,UAAU,GAAG,kBAAkB,EAAE,CAAC;QACxC,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,OAAO,GAAG,MAAM,oBAAoB,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;YAClE,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC;QACtB,CAAC;QACD,OAAO,MAAM,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAC/C,CAAC;CAAA;AAXD,kFAWC;AAQD,SAAsB,oBAAoB,CACxC,OAAoB;;QAEpB,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;QAC1B,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,mCAAY,CAAC,cAAc,EAAE,IAAA,0CAAmB,GAAE,CAAC,CAAC;QAC7E,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAE7C,OAAO,IAAA,8BAAO,EAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC;CAAA;AARD,oDAQC;AAED;;;;GAIG;AACH,SAAsB,SAAS;;QAC7B,MAAM,YAAY,GAAG,MAAM,IAAA,qCAAc,GAAE,CAAC;QAC5C,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO,YAAY,CAAC;QACtB,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,IAAA,+BAAQ,GAAE,CAAC;QAE/B,IAAI,KAAK,EAAE,CAAC;YACV,kDAAkD;YAClD,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC7B,IAAA,6BAAM,EAAC,2BAA2B,CAAC,CAAC;gBACpC,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,IAAA,kCAAW,GAAE,CAAC;QACtB,CAAC;QAED,iDAAiD;QACjD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,EAAE,CAAC;QAC1C,IAAA,6BAAM,EAAC,mBAAmB,CAAC,CAAC;QAE5B,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AAtBD,8BAsBC;AAED;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,KAAa;IAC7C,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAE3C,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC;AACxD,CAAC;AARD,8CAQC;AAED;;;GAGG;AACH,SAAe,gBAAgB;;QAC7B,MAAM,KAAK,GAAG,MAAM,mCAAmC,EAAE,CAAC;QAC1D,MAAM,IAAA,gCAAS,EAAC,KAAK,CAAC,CAAC;QACvB,OAAO,KAAK,CAAC;IACf,CAAC;CAAA;AAED,SAAS,mBAAmB,CAAC,UAAkB;IAC7C,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7C,MAAM,MAAM,GAAG,IAAA,wBAAY,EAAC,IAAA,0CAAmB,GAAE,CAAC,CAAC;QAEnD,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,IAAA,yBAAa,EAAC,MAAM,CAAC,CAAC;QAE5C,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;YACxB,iCAAiC;QACnC,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;QAEzC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE;YACpD,KAAK,EAAE,UAAU;SAClB,CAAC,CAAC;QAEH,UAAU,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE;YACtC,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,UAAU,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,GAAG,EAAE,EAAE;YAC1C,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;YAC7B,OAAO,EAAE,CAAC;YACV,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/lib/auth/login.ts"],"names":[],"mappings":"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"}

package/dist/lib/context-utils/ze-util-get-git-info.d.ts

@@ -1,13 +1,6 @@
+import { ZephyrPluginOptions } from 'zephyr-edge-contract';
 export interface GitInfo {
-    git: {
-        name?: string;
-        email?: string;
-        branch: string;
-        commit: string;
-    };
-    app: {
-        org: string;
-        project: string;
-    };
+    app: Pick<ZephyrPluginOptions['app'], 'org' | 'project'>;
+    git: ZephyrPluginOptions['git'];
 }
 export declare function getGitInfo(): Promise<GitInfo>;

package/dist/lib/context-utils/ze-util-get-git-info.js

@@ -4,8 +4,8 @@ exports.getGitInfo = void 0;
 const tslib_1 = require("tslib");
 const node_util_1 = require("node:util");
 const node_child_process_1 = require("node:child_process");
+const is_ci_1 = tslib_1.__importDefault(require("is-ci"));
 const zephyr_edge_contract_1 = require("zephyr-edge-contract");
-const ze_user_token_1 = require("./ze-user-token");
 const git_remote_configuration_error_1 = require("../custom-errors/git-remote-configuration-error");
 const git_user_identity_error_1 = require("../custom-errors/git-user-identity-error");
 const exec = (0, node_util_1.promisify)(node_child_process_1.exec);
@@ -18,11 +18,11 @@ function getGitInfo() {
         if (cached)
             return JSON.parse(cached);
         const [username, email, remoteOrigin, branch, commitHash] = yield Promise.all([
-            exec('git config user.name').then((res) => res.stdout.trim()),
-            exec('git config user.email').then((res) => res.stdout.trim()),
-            exec('git config --get remote.origin.url').then((res) => res.stdout.trim()),
-            exec('git rev-parse --abbrev-ref HEAD').then((res) => res.stdout.trim()),
-            exec('git rev-parse HEAD').then((res) => res.stdout.trim()),
+            getGitUsername(),
+            getGitEmail(),
+            getGitRemoteOrigin(),
+            getGitBranch(),
+            getGitCommitHash(),
         ]);
         // parse remote origin url to get the organization and repository name
         const urlParts = (_a = remoteOrigin
@@ -34,16 +34,13 @@ function getGitInfo() {
             .split(':')
             // Take the last part, which is the path
             .pop()) === null || _a === void 0 ? void 0 : _a.split('/');
-        const organization = urlParts && (urlParts === null || urlParts === void 0 ? void 0 : urlParts.length) > 1
-            ? (_b = urlParts[urlParts.length - 2]) === null || _b === void 0 ? void 0 : _b.toLocaleLowerCase()
-            : undefined;
-        const repositoryName = urlParts && urlParts.length > 0
-            ? (_c = urlParts[urlParts.length - 1]) === null || _c === void 0 ? void 0 : _c.toLocaleLowerCase()
-            : undefined;
+        const organization = urlParts && (urlParts === null || urlParts === void 0 ? void 0 : urlParts.length) > 1 ? (_b = urlParts[urlParts.length - 2]) === null || _b === void 0 ? void 0 : _b.toLocaleLowerCase() : undefined;
+        const repositoryName = urlParts && urlParts.length > 0 ? (_c = urlParts[urlParts.length - 1]) === null || _c === void 0 ? void 0 : _c.toLocaleLowerCase() : undefined;
         if (!organization || !repositoryName) {
             throw new git_remote_configuration_error_1.GitRemoteConfigurationError();
         }
-        if (!ze_user_token_1.ze_user_token && (!username || !email)) {
+        const has_secret_token = yield hasSecretToken();
+        if (!has_secret_token && (!username || !email)) {
             throw new git_user_identity_error_1.GitUserIdentityError();
         }
         const gitInfo = {
@@ -64,4 +61,42 @@ function getGitInfo() {
     });
 }
 exports.getGitInfo = getGitInfo;
+function hasSecretToken() {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, zephyr_edge_contract_1.getSecretToken)().then((res) => !!res);
+    });
+}
+function getGitUsername() {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const has_secret_token = yield hasSecretToken();
+        if (is_ci_1.default || has_secret_token) {
+            return exec("git log -1 --pretty=format:'%an'").then((res) => res.stdout.trim());
+        }
+        return exec('git config user.name').then((res) => res.stdout.trim());
+    });
+}
+function getGitEmail() {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const has_secret_token = yield hasSecretToken();
+        if (is_ci_1.default || has_secret_token) {
+            return exec("git log -1 --pretty=format:'%ae'").then((res) => res.stdout.trim());
+        }
+        return exec('git config user.email').then((res) => res.stdout.trim());
+    });
+}
+function getGitRemoteOrigin() {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return exec('git config --get remote.origin.url').then((res) => res.stdout.trim());
+    });
+}
+function getGitBranch() {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return exec('git rev-parse --abbrev-ref HEAD').then((res) => res.stdout.trim());
+    });
+}
+function getGitCommitHash() {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return exec('git rev-parse HEAD').then((res) => res.stdout.trim());
+    });
+}
 //# sourceMappingURL=ze-util-get-git-info.js.map

package/dist/lib/context-utils/ze-util-get-git-info.js.map

@@ -1 +1 @@
-{"version":3,"file":"ze-util-get-git-info.js","sourceRoot":"","sources":["../../../src/lib/context-utils/ze-util-get-git-info.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ze-util-get-git-info.js","sourceRoot":"","sources":["../../../src/lib/context-utils/ze-util-get-git-info.ts"],"names":[],"mappings":"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"}