zephyr-agent 0.0.16 → 0.0.18

package/dist/lib/auth/login.js

@@ -1,39 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isTokenStillValid = exports.checkAuth = exports.getAuthenticationURL = exports.getPersonalAccessTokenFromWebsocket = exports.generateSessionKey = void 0;
+exports.isTokenStillValid = exports.checkAuth = void 0;
 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 ze_log_event_1 = require("../remote-logs/ze-log-event");
+const promise_1 = require("../util/promise");
 const websocket_1 = require("./websocket");
-const open = (str) => new Function(`return import("open")`)().then(({ default: open }) => open(str));
-function generateSessionKey() {
-    return (0, uuid_1.v4)().replace(/-/g, '');
-}
-exports.generateSessionKey = generateSessionKey;
-function getPersonalAccessTokenFromWebsocket() {
-    return tslib_1.__awaiter(this, arguments, void 0, function* ({ openBrowser } = {
-        openBrowser: true,
-    }) {
-        const sessionKey = generateSessionKey();
-        if (openBrowser) {
-            const authUrl = yield getAuthenticationURL({ state: sessionKey });
-            yield open(authUrl);
-        }
-        return yield subscribeToWsEvents(sessionKey);
-    });
-}
-exports.getPersonalAccessTokenFromWebsocket = getPersonalAccessTokenFromWebsocket;
-function getAuthenticationURL(options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { state } = options;
-        // 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_1.request)(loginUrl);
-    });
-}
-exports.getAuthenticationURL = getAuthenticationURL;
 /**
  * Check if the user is already authenticated. If not, open a browser window to authenticate.
  * Display a message to the console.
@@ -41,14 +14,14 @@ exports.getAuthenticationURL = getAuthenticationURL;
  */
 function checkAuth() {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const secret_token = yield (0, zephyr_edge_contract_1.getSecretToken)();
+        const secret_token = (0, zephyr_edge_contract_1.getSecretToken)();
         if (secret_token) {
             return secret_token;
         }
         const token = yield (0, zephyr_edge_contract_1.getToken)();
         if (token) {
             // Check if the token has a valid expiration date.
-            if (isTokenStillValid(token)) {
+            if (isTokenStillValid(token, 60)) {
                 (0, zephyr_edge_contract_1.ze_log)('You are already logged in');
                 return token;
             }
@@ -64,16 +37,69 @@ exports.checkAuth = checkAuth;
 /**
  * Decides whether the token is still valid based on its expiration time.
  * @param token The token to check.
+ * @param gap in seconds
  * @return boolean indicating if the token is still valid.
  */
-function isTokenStillValid(token) {
-    const decodedToken = jose.decodeJwt(token);
-    if (!decodedToken.exp) {
+function isTokenStillValid(token, gap = 0) {
+    // Attempts to decode the token
+    try {
+        const decodedToken = jose.decodeJwt(token);
+        if (decodedToken.exp) {
+            return new Date(decodedToken.exp * 1000) > new Date(Date.now() + gap * 1000);
+        }
+        // No expiration date found, invalid token.
+        return false;
+    }
+    catch (_a) {
+        // If the token is invalid, return false.
         return false;
     }
-    return new Date(decodedToken.exp * 1000) > new Date();
 }
 exports.isTokenStillValid = isTokenStillValid;
+/**
+ * Opens the given URL in the default browser.
+ */
+function openUrl(url) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        // Lazy loads `open` module
+        const openModule = (yield eval(`import('open')`));
+        yield openModule.default(url);
+    });
+}
+/**
+ * Generates a URL-safe random string to use as a session key.
+ */
+function generateSessionKey() {
+    return encodeURIComponent(Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15));
+}
+/**
+ * Tries to log in the user and get back the websocket reply containing the access token.
+ */
+function getPersonalAccessTokenFromWebsocket() {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const sessionKey = generateSessionKey();
+        // Attempts to open the browser to authenticate the user.
+        const authUrl = yield getAuthenticationURL(sessionKey);
+        try {
+            yield openUrl(authUrl);
+            (0, ze_log_event_1.logFn)('debug', 'Opening browser for authentication...');
+        }
+        catch (error) {
+            (0, ze_log_event_1.logFn)('debug', `Could not open browser to authenticate with ZephyrCloud. Please open the link below to authenticate:\n\n${(0, zephyr_edge_contract_1.white)(authUrl)}\n`);
+        }
+        return yield waitForAccessToken(sessionKey);
+    });
+}
+/**
+ * Generates the URL to authenticate the user.
+ */
+function getAuthenticationURL(state) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        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_1.request)(loginUrl);
+    });
+}
 /**
  * Initiates user authentication and handles token storage.
  * @return The new token as a string.
@@ -85,26 +111,27 @@ function authenticateUser() {
         return token;
     });
 }
-function subscribeToWsEvents(sessionKey) {
-    return new Promise((resolve, reject) => {
+/**
+ * Waits for the access token to be received from the websocket.
+ */
+function waitForAccessToken(sessionKey) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { promise, resolve, reject } = (0, promise_1.PromiseWithResolvers)();
         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');
-        });
-        socket.on('disconnect', () => cleanup());
-        const roomSocket = socket.emit('joinAccessTokenRoom', {
-            state: sessionKey,
-        });
-        roomSocket.on('access-token', (token) => {
-            cleanup();
-            resolve(token);
-        });
-        roomSocket.on('access-token-error', (msg) => {
-            console.error('ERROR:', msg);
-            cleanup();
-            reject(new Error(msg));
-        });
+        try {
+            socket.once('access-token', resolve);
+            // Creating errors outside of the listener closure makes the stack trace point
+            // to waitForAccessToken fn instead of socket.io internals event emitter code.
+            socket.once('access-token-error', reject.bind(new Error('Error getting access token')));
+            socket.once('connect_error', reject);
+            socket.emit('joinAccessTokenRoom', { state: sessionKey });
+            // The user has 60 seconds to log in through the browser.
+            setTimeout(reject, 60000, new Error('Login timeout.'));
+            return yield promise;
+        }
+        finally {
+            socket.close();
+        }
     });
 }
 //# sourceMappingURL=login.js.map

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,+DAU8B;AAC9B,2CAA0D;AAE1D,MAAM,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE,CAC3B,IAAI,QAAQ,CAAC,uBAAuB,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAA+C,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE9H,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,CAAC,OAAoB;;QAC7D,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;QAC1B,yEAAyE;QACzE,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,qCAAc,CAAC,SAAS,EAAE,IAAA,sCAAe,GAAE,CAAC,CAAC;QACtE,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAE7C,OAAO,IAAA,8BAAO,EAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC;CAAA;AAPD,oDAOC;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/auth/websocket.d.ts

@@ -1,4 +1,4 @@
-import { Socket } from 'socket.io-client';
+import { type Socket } from 'socket.io-client';
 interface ClientToServerEvents {
     joinAccessTokenRoom: (props: {
         state: string;
@@ -9,5 +9,4 @@ interface ServerToClientEvents {
     'access-token-error': (msg: string) => void;
 }
 export declare function createSocket(endpoint: string): Socket<ServerToClientEvents, ClientToServerEvents>;
-export declare function disposeSocket(socket: Socket): void;
 export {};

package/dist/lib/auth/websocket.js

@@ -1,14 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.disposeSocket = exports.createSocket = void 0;
+exports.createSocket = void 0;
 const socket_io_client_1 = require("socket.io-client");
 function createSocket(endpoint) {
     return (0, socket_io_client_1.io)(endpoint);
 }
 exports.createSocket = createSocket;
-function disposeSocket(socket) {
-    socket.disconnect();
-    socket.close();
-}
-exports.disposeSocket = disposeSocket;
 //# sourceMappingURL=websocket.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"websocket.js","sourceRoot":"","sources":["../../../src/lib/auth/websocket.ts"],"names":[],"mappings":";;;AAAA,uDAA0D;AAW1D,SAAgB,YAAY,CAC1B,QAAgB;IAEhB,OAAO,IAAA,qBAAQ,EAAC,QAAQ,CAAC,CAAC;AAC5B,CAAC;AAJD,oCAIC;AAED,SAAgB,aAAa,CAAC,MAAc;IAC1C,MAAM,CAAC,UAAU,EAAE,CAAC;IACpB,MAAM,CAAC,KAAK,EAAE,CAAC;AACjB,CAAC;AAHD,sCAGC"}
+{"version":3,"file":"websocket.js","sourceRoot":"","sources":["../../../src/lib/auth/websocket.ts"],"names":[],"mappings":";;;AAAA,uDAA+D;AAW/D,SAAgB,YAAY,CAAC,QAAgB;IAC3C,OAAO,IAAA,qBAAQ,EAAC,QAAQ,CAAC,CAAC;AAC5B,CAAC;AAFD,oCAEC"}

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

@@ -1,4 +1,4 @@
-import { ZephyrPluginOptions } from 'zephyr-edge-contract';
+import { type ZephyrPluginOptions } from 'zephyr-edge-contract';
 export interface GitInfo {
     app: Pick<ZephyrPluginOptions['app'], 'org' | 'project'>;
     git: ZephyrPluginOptions['git'];

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

@@ -39,7 +39,7 @@ function getGitInfo() {
         if (!organization || !repositoryName) {
             throw new git_remote_configuration_error_1.GitRemoteConfigurationError();
         }
-        const has_secret_token = yield hasSecretToken();
+        const has_secret_token = yield (0, zephyr_edge_contract_1.hasSecretToken)();
         if (!has_secret_token && (!username || !email)) {
             throw new git_user_identity_error_1.GitUserIdentityError();
         }
@@ -61,14 +61,9 @@ 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();
+        const has_secret_token = (0, zephyr_edge_contract_1.hasSecretToken)();
         if (is_ci_1.default || has_secret_token) {
             return exec("git log -1 --pretty=format:'%an'").then((res) => res.stdout.trim());
         }
@@ -77,7 +72,7 @@ function getGitUsername() {
 }
 function getGitEmail() {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const has_secret_token = yield hasSecretToken();
+        const has_secret_token = (0, zephyr_edge_contract_1.hasSecretToken)();
         if (is_ci_1.default || has_secret_token) {
             return exec("git log -1 --pretty=format:'%ae'").then((res) => res.stdout.trim());
         }

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":";;;;AAAA,yCAAsC;AACtC,2DAAoD;AACpD,0DAAyB;AACzB,+DAA8F;AAE9F,oGAA8F;AAC9F,sFAAgF;AAEhF,MAAM,IAAI,GAAG,IAAA,qBAAS,EAAC,yBAAM,CAAC,CAAC;AAC/B,MAAM,YAAY,GAAG,UAAU,CAAC;AAOhC,SAAsB,UAAU;;;QAC9B,MAAM,SAAS,GAAG,GAAG,YAAY,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;QACrD,MAAM,MAAM,GAAG,MAAM,gCAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACnD,IAAI,MAAM;YAAE,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAEtC,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC5E,cAAc,EAAE;YAChB,WAAW,EAAE;YACb,kBAAkB,EAAE;YACpB,YAAY,EAAE;YACd,gBAAgB,EAAE;SACnB,CAAC,CAAC;QAEH,sEAAsE;QACtE,MAAM,QAAQ,GAAG,MAAA,YAAY;YAC3B,oDAAoD;aACnD,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;YACnB,6BAA6B;aAC5B,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YACrB,kDAAkD;aACjD,KAAK,CAAC,GAAG,CAAC;YACX,wCAAwC;aACvC,GAAG,EAAE,0CAEJ,KAAK,CAAC,GAAG,CAAC,CAAC;QAEf,MAAM,YAAY,GAAG,QAAQ,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,IAAG,CAAC,CAAC,CAAC,CAAC,MAAA,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,0CAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QACvH,MAAM,cAAc,GAAG,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAA,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,0CAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAExH,IAAI,CAAC,YAAY,IAAI,CAAC,cAAc,EAAE,CAAC;YACrC,MAAM,IAAI,4DAA2B,EAAE,CAAC;QAC1C,CAAC;QAED,MAAM,gBAAgB,GAAG,MAAM,cAAc,EAAE,CAAC;QAChD,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/C,MAAM,IAAI,8CAAoB,EAAE,CAAC;QACnC,CAAC;QAED,MAAM,OAAO,GAAG;YACd,GAAG,EAAE;gBACH,IAAI,EAAE,QAAQ;gBACd,KAAK;gBACL,MAAM;gBACN,MAAM,EAAE,UAAU;aACnB;YACD,GAAG,EAAE;gBACH,GAAG,EAAE,YAAY;gBACjB,OAAO,EAAE,cAAc;aACxB;SACF,CAAC;QACF,IAAA,6BAAM,EAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QACnC,MAAM,gCAAS,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QAC9D,OAAO,OAAO,CAAC;IACjB,CAAC;CAAA;AArDD,gCAqDC;AAED,SAAe,cAAc;;QAC3B,OAAO,IAAA,qCAAc,GAAE,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAC/C,CAAC;CAAA;AAED,SAAe,cAAc;;QAC3B,MAAM,gBAAgB,GAAG,MAAM,cAAc,EAAE,CAAC;QAChD,IAAI,eAAI,IAAI,gBAAgB,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC,kCAAkC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QACnF,CAAC;QACD,OAAO,IAAI,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IACvE,CAAC;CAAA;AAED,SAAe,WAAW;;QACxB,MAAM,gBAAgB,GAAG,MAAM,cAAc,EAAE,CAAC;QAChD,IAAI,eAAI,IAAI,gBAAgB,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC,kCAAkC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QACnF,CAAC;QACD,OAAO,IAAI,CAAC,uBAAuB,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IACxE,CAAC;CAAA;AAED,SAAe,kBAAkB;;QAC/B,OAAO,IAAI,CAAC,oCAAoC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IACrF,CAAC;CAAA;AAED,SAAe,YAAY;;QACzB,OAAO,IAAI,CAAC,iCAAiC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IAClF,CAAC;CAAA;AAED,SAAe,gBAAgB;;QAC7B,OAAO,IAAI,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IACrE,CAAC;CAAA"}
+{"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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"}

package/dist/lib/dvcs/distributed-hash-control.js

@@ -4,15 +4,17 @@ exports.update_hash_list = exports.get_hash_list = void 0;
 const tslib_1 = require("tslib");
 const zephyr_edge_contract_1 = require("zephyr-edge-contract");
 const get_application_hash_list_1 = require("../ze-api-requests/get-application-hash-list");
+const get_cache_key_1 = require("./get-cache-key");
 function get_hash_list(application_uid) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const local_hash_list = yield zephyr_edge_contract_1._hash_cache.getAppHashCache(application_uid);
+        const cacheKey = yield (0, get_cache_key_1.getCacheKey)(application_uid);
+        const local_hash_list = yield zephyr_edge_contract_1._hash_cache.getAppHashCache(cacheKey);
         if (local_hash_list) {
             return { hash_set: new Set(local_hash_list.hashes) };
         }
         const remote_hash_list = yield (0, get_application_hash_list_1.getApplicationHashList)({ application_uid });
         if (remote_hash_list) {
-            yield zephyr_edge_contract_1._hash_cache.setAppHashCache(application_uid, remote_hash_list);
+            yield zephyr_edge_contract_1._hash_cache.setAppHashCache(cacheKey, remote_hash_list);
             return { hash_set: new Set(remote_hash_list.hashes) };
         }
         return { hash_set: new Set() };
@@ -21,8 +23,9 @@ function get_hash_list(application_uid) {
 exports.get_hash_list = get_hash_list;
 function update_hash_list(application_uid, assetsMap) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const cacheKey = yield (0, get_cache_key_1.getCacheKey)(application_uid);
         const hashes = Object.values(assetsMap).map(({ hash }) => hash);
-        yield zephyr_edge_contract_1._hash_cache.setAppHashCache(application_uid, { hashes });
+        yield zephyr_edge_contract_1._hash_cache.setAppHashCache(cacheKey, { hashes });
     });
 }
 exports.update_hash_list = update_hash_list;

package/dist/lib/dvcs/distributed-hash-control.js.map

@@ -1 +1 @@
-{"version":3,"file":"distributed-hash-control.js","sourceRoot":"","sources":["../../../src/lib/dvcs/distributed-hash-control.ts"],"names":[],"mappings":";;;;AAAA,+DAA0E;AAC1E,4FAAsF;AAEtF,SAAsB,aAAa,CACjC,eAAuB;;QAEvB,MAAM,eAAe,GAAG,MAAM,kCAAW,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;QAC3E,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,EAAE,QAAQ,EAAE,IAAI,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;QACvD,CAAC;QACD,MAAM,gBAAgB,GAAG,MAAM,IAAA,kDAAsB,EAAC,EAAE,eAAe,EAAE,CAAC,CAAC;QAC3E,IAAI,gBAAgB,EAAE,CAAC;YACrB,MAAM,kCAAW,CAAC,eAAe,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;YACrE,OAAO,EAAE,QAAQ,EAAE,IAAI,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC;QACxD,CAAC;QAED,OAAO,EAAE,QAAQ,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC;IACjC,CAAC;CAAA;AAdD,sCAcC;AAED,SAAsB,gBAAgB,CACpC,eAAuB,EACvB,SAA6C;;QAE7C,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QAChE,MAAM,kCAAW,CAAC,eAAe,CAAC,eAAe,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IACjE,CAAC;CAAA;AAND,4CAMC"}
+{"version":3,"file":"distributed-hash-control.js","sourceRoot":"","sources":["../../../src/lib/dvcs/distributed-hash-control.ts"],"names":[],"mappings":";;;;AAAA,+DAA0E;AAC1E,4FAAsF;AACtF,mDAA8C;AAE9C,SAAsB,aAAa,CAAC,eAAuB;;QACzD,MAAM,QAAQ,GAAG,MAAM,IAAA,2BAAW,EAAC,eAAe,CAAC,CAAC;QACpD,MAAM,eAAe,GAAG,MAAM,kCAAW,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QACpE,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,EAAE,QAAQ,EAAE,IAAI,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;QACvD,CAAC;QACD,MAAM,gBAAgB,GAAG,MAAM,IAAA,kDAAsB,EAAC,EAAE,eAAe,EAAE,CAAC,CAAC;QAC3E,IAAI,gBAAgB,EAAE,CAAC;YACrB,MAAM,kCAAW,CAAC,eAAe,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;YAC9D,OAAO,EAAE,QAAQ,EAAE,IAAI,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC;QACxD,CAAC;QAED,OAAO,EAAE,QAAQ,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC;IACjC,CAAC;CAAA;AAbD,sCAaC;AAED,SAAsB,gBAAgB,CAAC,eAAuB,EAAE,SAA6C;;QAC3G,MAAM,QAAQ,GAAG,MAAM,IAAA,2BAAW,EAAC,eAAe,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QAChE,MAAM,kCAAW,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAC1D,CAAC;CAAA;AAJD,4CAIC"}

package/dist/lib/dvcs/get-cache-key.d.ts

@@ -0,0 +1 @@
+export declare function getCacheKey(application_uid: string): Promise<string>;

package/dist/lib/dvcs/get-cache-key.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCacheKey = void 0;
+const tslib_1 = require("tslib");
+const get_application_configuration_1 = require("../application-configuration/get-application-configuration");
+function getCacheKey(application_uid) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        var _a;
+        let edgeUrl = ((_a = (yield (0, get_application_configuration_1.getApplicationConfiguration)({ application_uid }))) === null || _a === void 0 ? void 0 : _a.EDGE_URL) || '';
+        if (edgeUrl) {
+            edgeUrl = new URL(edgeUrl).host;
+        }
+        return `${application_uid}-${edgeUrl}`;
+    });
+}
+exports.getCacheKey = getCacheKey;
+//# sourceMappingURL=get-cache-key.js.map

package/dist/lib/dvcs/get-cache-key.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-cache-key.js","sourceRoot":"","sources":["../../../src/lib/dvcs/get-cache-key.ts"],"names":[],"mappings":";;;;AAAA,8GAAyG;AAEzG,SAAsB,WAAW,CAAC,eAAuB;;;QACvD,IAAI,OAAO,GAAG,CAAA,MAAA,CAAC,MAAM,IAAA,2DAA2B,EAAC,EAAE,eAAe,EAAE,CAAC,CAAC,0CAAE,QAAQ,KAAI,EAAE,CAAC;QACvF,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC;QAClC,CAAC;QAED,OAAO,GAAG,eAAe,IAAI,OAAO,EAAE,CAAC;IACzC,CAAC;CAAA;AAPD,kCAOC"}

package/dist/lib/remote-logs/ze-log-event.d.ts

@@ -1,9 +1,12 @@
-import { ZephyrPluginOptions } from 'zephyr-edge-contract';
+import type { ZephyrPluginOptions } from 'zephyr-edge-contract';
+export declare const logFn: (level: string, msg: unknown) => void;
 export interface LogEventOptions {
     level: string;
     action: string;
     message: string;
+    ignore?: boolean;
     meta?: Record<string, unknown>;
 }
 export type LogEvent = (options: LogEventOptions) => void;
-export declare function logger(options: ZephyrPluginOptions): (...logs: LogEventOptions[]) => void;
+export type ZeLogger = (...logs: LogEventOptions[]) => void;
+export declare function logger(options: ZephyrPluginOptions): ZeLogger;

package/dist/lib/remote-logs/ze-log-event.js

@@ -1,63 +1,86 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logger = void 0;
+exports.logger = exports.logFn = void 0;
 const zephyr_edge_contract_1 = require("zephyr-edge-contract");
 const get_application_configuration_1 = require("../application-configuration/get-application-configuration");
+const promise_1 = require("../util/promise");
 const strip_ansi_1 = require("../util/strip-ansi");
-const log = (level, msg) => {
+const logFn = (level, msg) => {
     if (zephyr_edge_contract_1.is_debug_enabled) {
         (0, zephyr_edge_contract_1.ze_log)(msg);
         return;
     }
+    const str = String(msg);
+    const padded = str
+        .split('\n')
+        .map((m) => `${toLevelPrefix(level)}  ${m.trim()}`)
+        .join('\n');
     switch (level) {
         case 'warn':
-            console.warn(`${zephyr_edge_contract_1.brightYellowBgName}  ${msg}`);
+            console.warn(padded);
+            break;
+        case 'debug':
+            console.debug(padded);
             break;
         case 'error':
-            console.error(`${zephyr_edge_contract_1.brightRedBgName}  ${msg}`);
+            console.error(padded);
             break;
         default:
-            console.log(`${zephyr_edge_contract_1.brightBlueBgName}  ${msg}`);
+            console.log(padded);
     }
 };
+exports.logFn = logFn;
+function toLevelPrefix(level) {
+    switch (level) {
+        case 'warn':
+            return zephyr_edge_contract_1.brightYellowBgName;
+        case 'debug':
+            return zephyr_edge_contract_1.brightGreenBgName;
+        case 'error':
+            return zephyr_edge_contract_1.brightRedBgName;
+        default:
+            return zephyr_edge_contract_1.brightBlueBgName;
+    }
+}
 function logger(options) {
+    // lazy loads the application configuration and token
+    const loadLogData = (0, promise_1.PromiseLazyLoad)(() => {
+        return Promise.all([(0, get_application_configuration_1.getApplicationConfiguration)({ application_uid: options.application_uid }), (0, zephyr_edge_contract_1.getToken)()]);
+    });
+    const url = new URL(zephyr_edge_contract_1.ze_api_gateway.logs, (0, zephyr_edge_contract_1.ZE_API_ENDPOINT)());
     return function logEvent(...logs) {
-        Promise.all([(0, get_application_configuration_1.getApplicationConfiguration)({ application_uid: options.application_uid }), (0, zephyr_edge_contract_1.getToken)()]).then(([{ username, user_uuid }, token]) => {
-            for (const { level, action, message, meta } of logs) {
-                if (!level && !action) {
-                    throw new Error('log level and action type must be provided');
-                }
-                const newMeta = Object.assign({}, meta, {
-                    isCI: options.isCI,
-                    app: options.app,
-                    git: options.git,
-                });
-                const newMessage = message.trim();
-                const data = JSON.stringify({
-                    application_uid: options.application_uid,
-                    userId: user_uuid,
-                    username,
-                    zeBuildId: options.zeConfig.buildId,
-                    logLevel: level,
-                    actionType: action,
-                    git: options.git,
-                    message: (0, strip_ansi_1.stripAnsi)(newMessage),
-                    meta: newMeta,
-                    createdAt: Date.now(),
-                });
-                const reqOptions = {
-                    method: 'POST',
-                    headers: {
-                        Authorization: `Bearer ${token}`,
-                        'Content-Type': 'application/json',
-                        'Content-Length': data.length,
-                    },
-                };
-                log(level, newMessage);
-                const url = new URL(zephyr_edge_contract_1.ze_api_gateway.logs, (0, zephyr_edge_contract_1.ZE_API_ENDPOINT)());
-                void (0, zephyr_edge_contract_1.request)(url, reqOptions, data).catch(() => void 0);
+        // Prints logs to the console as fast as possible
+        for (const log of logs) {
+            if (!log.level && !log.action) {
+                throw new Error('log level and action type must be provided');
             }
-        });
+            (0, exports.logFn)(log.level, log.message);
+        }
+        // Then attempt to upload logs,
+        loadLogData()
+            .then(([config, token]) => (0, zephyr_edge_contract_1.request)(url, {
+            method: 'POST',
+            headers: {
+                Authorization: `Bearer ${token}`,
+                'Content-Type': 'application/json',
+            },
+        }, JSON.stringify(logs
+            // some logs are empty to give newline effect in terminal
+            .filter((l) => l.message.length && !l.ignore)
+            .map((log) => ({
+            application_uid: options.application_uid,
+            userId: config.user_uuid,
+            username: config.username,
+            zeBuildId: options.zeConfig.buildId,
+            logLevel: log.level,
+            actionType: log.action,
+            git: options.git,
+            message: (0, strip_ansi_1.stripAnsi)(log.message.trim()),
+            meta: Object.assign({}, log.meta, { isCI: options.isCI, app: options.app, git: options.git }),
+            createdAt: Date.now(),
+        })))))
+            // This is ok to fail silently
+            .catch(() => void 0);
     };
 }
 exports.logger = logger;

package/dist/lib/remote-logs/ze-log-event.js.map

@@ -1 +1 @@
-{"version":3,"file":"ze-log-event.js","sourceRoot":"","sources":["../../../src/lib/remote-logs/ze-log-event.ts"],"names":[],"mappings":";;;AAAA,+DAU8B;AAC9B,8GAAyG;AACzG,mDAA+C;AAG/C,MAAM,GAAG,GAAG,CAAC,KAAa,EAAE,GAAY,EAAQ,EAAE;IAChD,IAAI,uCAAgB,EAAE,CAAC;QACrB,IAAA,6BAAM,EAAC,GAAG,CAAC,CAAC;QACZ,OAAO;IACT,CAAC;IAED,QAAQ,KAAK,EAAE,CAAC;QACd,KAAK,MAAM;YACT,OAAO,CAAC,IAAI,CAAC,GAAG,yCAAkB,KAAK,GAAG,EAAE,CAAC,CAAC;YAC9C,MAAM;QACR,KAAK,OAAO;YACV,OAAO,CAAC,KAAK,CAAC,GAAG,sCAAe,KAAK,GAAG,EAAE,CAAC,CAAC;YAC5C,MAAM;QACR;YACE,OAAO,CAAC,GAAG,CAAC,GAAG,uCAAgB,KAAK,GAAG,EAAE,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC,CAAC;AAWF,SAAgB,MAAM,CAAC,OAA4B;IACjD,OAAO,SAAS,QAAQ,CAAC,GAAG,IAAuB;QACjD,OAAO,CAAC,GAAG,CAAC,CAAC,IAAA,2DAA2B,EAAC,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE,CAAC,EAAE,IAAA,+BAAQ,GAAE,CAAC,CAAC,CAAC,IAAI,CACvG,CAAC,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE;YACnC,KAAK,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;gBACpD,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;oBACtB,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;gBAChE,CAAC;gBAED,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE;oBACtC,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,GAAG,EAAE,OAAO,CAAC,GAAG;oBAChB,GAAG,EAAE,OAAO,CAAC,GAAG;iBACjB,CAAC,CAAC;gBAEH,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;gBAClC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;oBAC1B,eAAe,EAAE,OAAO,CAAC,eAAe;oBACxC,MAAM,EAAE,SAAS;oBACjB,QAAQ;oBACR,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,OAAO;oBACnC,QAAQ,EAAE,KAAK;oBACf,UAAU,EAAE,MAAM;oBAClB,GAAG,EAAE,OAAO,CAAC,GAAG;oBAChB,OAAO,EAAE,IAAA,sBAAS,EAAC,UAAU,CAAC;oBAC9B,IAAI,EAAE,OAAO;oBACb,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;iBACtB,CAAC,CAAC;gBAEH,MAAM,UAAU,GAAG;oBACjB,MAAM,EAAE,MAAM;oBACd,OAAO,EAAE;wBACP,aAAa,EAAE,UAAU,KAAK,EAAE;wBAChC,cAAc,EAAE,kBAAkB;wBAClC,gBAAgB,EAAE,IAAI,CAAC,MAAM;qBAC9B;iBACF,CAAC;gBAEF,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;gBAEvB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,qCAAc,CAAC,IAAI,EAAE,IAAA,sCAAe,GAAE,CAAC,CAAC;gBAE5D,KAAK,IAAA,8BAAO,EAAC,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AA/CD,wBA+CC"}
+{"version":3,"file":"ze-log-event.js","sourceRoot":"","sources":["../../../src/lib/remote-logs/ze-log-event.ts"],"names":[],"mappings":"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"}

package/dist/lib/upload/strategies/cloudflare/upload-build-stats-and-enable-envs.d.ts

@@ -6,7 +6,5 @@ interface UploadBuildStatsAndEnableEnvsOptions {
     getDashData: (options: GetDashDataOptions) => ZephyrBuildStats;
     versionUrl: string;
 }
-export declare function uploadBuildStatsAndEnableEnvs({ appConfig, pluginOptions, getDashData, versionUrl, }: UploadBuildStatsAndEnableEnvsOptions): Promise<void | {
-    value: import("zephyr-edge-contract").ZeUploadBuildStats;
-}>;
+export declare function uploadBuildStatsAndEnableEnvs({ appConfig, pluginOptions, getDashData, versionUrl, }: UploadBuildStatsAndEnableEnvsOptions): Promise<boolean>;
 export {};

package/dist/lib/upload/strategies/cloudflare/upload.d.ts

@@ -1,2 +1,9 @@
-import { CloudflareOptions } from 'zephyr-edge-contract';
+interface CloudflareOptions {
+    edgeUrl: string;
+    api_token: string;
+    accountId: string;
+    projectName?: string;
+}
+/** @deprecated */
 export declare function upload(outputPath: string, { api_token, accountId, projectName }: CloudflareOptions): Promise<string>;
+export {};

package/dist/lib/upload/strategies/cloudflare/upload.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.upload = void 0;
 const tslib_1 = require("tslib");
 const zephyr_edge_contract_1 = require("zephyr-edge-contract");
-const process_1 = tslib_1.__importDefault(require("process"));
+const node_process_1 = tslib_1.__importDefault(require("node:process"));
+/** @deprecated */
 function upload(outputPath_1, _a) {
     return tslib_1.__awaiter(this, arguments, void 0, function* (outputPath, { api_token, accountId, projectName }) {
-        process_1.default.env['CLOUDFLARE_API_TOKEN'] = api_token;
+        node_process_1.default.env['CLOUDFLARE_API_TOKEN'] = api_token;
         // eslint-disable-next-line @typescript-eslint/no-var-requires
         const wrangler = require('wrangler');
         if (!wrangler) {
@@ -18,7 +19,7 @@ function upload(outputPath_1, _a) {
             accountId,
             projectName: projectName,
         });
-        process_1.default.env['CLOUDFLARE_API_TOKEN'] = undefined;
+        node_process_1.default.env['CLOUDFLARE_API_TOKEN'] = undefined;
         return result.url;
     });
 }

package/dist/lib/upload/strategies/cloudflare/upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../../../src/lib/upload/strategies/cloudflare/upload.ts"],"names":[],"mappings":";;;;AAAA,+DAAmE;AACnE,8DAA8B;AAE9B,SAAsB,MAAM;iEAAC,UAAkB,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAqB;QACvG,iBAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,GAAG,SAAS,CAAC;QAEhD,8DAA8D;QAC9D,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;QAErC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,IAAA,+BAAQ,EACN,iBAAiB,EACjB,kHAAkH,CACnH,CAAC;YACF,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACxD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC;YAClD,SAAS,EAAE,UAAU;YACrB,SAAS;YACT,WAAW,EAAE,WAAqB;SACnC,CAAC,CAAC;QAEH,iBAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,GAAG,SAAS,CAAC;QAEhD,OAAO,MAAM,CAAC,GAAG,CAAC;IACpB,CAAC;CAAA;AAvBD,wBAuBC"}
+{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../../../src/lib/upload/strategies/cloudflare/upload.ts"],"names":[],"mappings":";;;;AAAA,+DAAgD;AAChD,wEAAmC;AASnC,kBAAkB;AAClB,SAAsB,MAAM;iEAAC,UAAkB,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAqB;QACvG,sBAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,GAAG,SAAS,CAAC;QAEhD,8DAA8D;QAC9D,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;QAErC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,IAAA,+BAAQ,EACN,iBAAiB,EACjB,kHAAkH,CACnH,CAAC;YACF,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACxD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC;YAClD,SAAS,EAAE,UAAU;YACrB,SAAS;YACT,WAAW,EAAE,WAAqB;SACnC,CAAC,CAAC;QAEH,sBAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,GAAG,SAAS,CAAC;QAEhD,OAAO,MAAM,CAAC,GAAG,CAAC;IACpB,CAAC;CAAA;AAvBD,wBAuBC"}

package/dist/lib/upload/strategies/cloudflare.strategy.d.ts

@@ -1,3 +1,2 @@
-import { ZeUploadBuildStats } from 'zephyr-edge-contract';
-import { UploadOptions } from '../upload';
-export declare function cloudflareStrategy({ pluginOptions, getDashData, appConfig, zeStart, assets: { assetsMap, missingAssets, count }, }: UploadOptions): Promise<ZeUploadBuildStats | undefined>;
+import type { UploadOptions } from '../upload';
+export declare function cloudflareStrategy({ pluginOptions, getDashData, appConfig, assets: { assetsMap, missingAssets, count }, }: UploadOptions): Promise<string>;