zephyr-agent 0.0.44 → 0.0.46

package/dist/lib/build-context/fs-cache-for-package-json.js

@@ -5,6 +5,9 @@ exports.setPackageJsonCache = setPackageJsonCache;
 const zephyr_edge_contract_1 = require("zephyr-edge-contract");
 const fs_cache_1 = require("../node-persist/fs-cache");
 const cache_prefix = 'package_json';
+// todo: persisting package.json cache should be done in a way it stores path to package.json file
+// and not the content of the package.json file
+// or store last modified time of the file
 async function getPackageJsonCache(startingPath) {
     const cache_key = `${cache_prefix}:${startingPath}`;
     const cached = await (0, fs_cache_1.getCache)(cache_key);

package/dist/lib/build-context/fs-cache-for-package-json.js.map

@@ -1 +1 @@
-{"version":3,"file":"fs-cache-for-package-json.js","sourceRoot":"","sources":["../../../src/lib/build-context/fs-cache-for-package-json.ts"],"names":[],"mappings":";;AAMA,kDAOC;AAED,kDAMC;AArBD,+DAAuD;AAEvD,uDAA+D;AAE/D,MAAM,YAAY,GAAG,cAAc,CAAC;AAE7B,KAAK,UAAU,mBAAmB,CACvC,YAAoB;IAEpB,MAAM,SAAS,GAAG,GAAG,YAAY,IAAI,YAAY,EAAE,CAAC;IACpD,MAAM,MAAM,GAAG,MAAM,IAAA,mBAAQ,EAAC,SAAS,CAAC,CAAC;IACzC,IAAI,CAAC,MAAM;QAAE,OAAO;IACpB,OAAO,IAAA,sCAAe,EAAgB,MAAM,CAAC,CAAC;AAChD,CAAC;AAEM,KAAK,UAAU,mBAAmB,CACvC,YAAoB,EACpB,mBAAkC;IAElC,MAAM,SAAS,GAAG,GAAG,YAAY,IAAI,YAAY,EAAE,CAAC;IACpD,MAAM,IAAA,oBAAS,EAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC,CAAC;AAClE,CAAC"}
+{"version":3,"file":"fs-cache-for-package-json.js","sourceRoot":"","sources":["../../../src/lib/build-context/fs-cache-for-package-json.ts"],"names":[],"mappings":";;AASA,kDAOC;AAED,kDAMC;AAxBD,+DAAuD;AAEvD,uDAA+D;AAE/D,MAAM,YAAY,GAAG,cAAc,CAAC;AAEpC,kGAAkG;AAClG,+CAA+C;AAC/C,0CAA0C;AACnC,KAAK,UAAU,mBAAmB,CACvC,YAAoB;IAEpB,MAAM,SAAS,GAAG,GAAG,YAAY,IAAI,YAAY,EAAE,CAAC;IACpD,MAAM,MAAM,GAAG,MAAM,IAAA,mBAAQ,EAAC,SAAS,CAAC,CAAC;IACzC,IAAI,CAAC,MAAM;QAAE,OAAO;IACpB,OAAO,IAAA,sCAAe,EAAgB,MAAM,CAAC,CAAC;AAChD,CAAC;AAEM,KAAK,UAAU,mBAAmB,CACvC,YAAoB,EACpB,mBAAkC;IAElC,MAAM,SAAS,GAAG,GAAG,YAAY,IAAI,YAAY,EAAE,CAAC;IACpD,MAAM,IAAA,oBAAS,EAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC,CAAC;AAClE,CAAC"}

package/dist/lib/build-context/ze-package-json.type.d.ts

@@ -7,6 +7,8 @@ export interface ZePackageJson {
     name: string;
     version: string;
     dependencies?: Record<string, string>;
+    /** Zephyr:dependencies in package.json */
+    ['zephyr:dependencies']?: Record<string, string>;
     zephyrDependencies?: Record<string, ZeDependency>;
     /** OptionalDependencies in package.json */
     optionalDependencies?: Record<string, string>;

package/dist/lib/build-context/ze-util-read-package-json.js

@@ -8,7 +8,6 @@ const zephyr_edge_contract_1 = require("zephyr-edge-contract");
 const errors_1 = require("../errors");
 const logging_1 = require("../logging");
 const find_nearest_package_json_1 = require("./find-nearest-package-json");
-const fs_cache_for_package_json_1 = require("./fs-cache-for-package-json");
 const ze_util_parse_ze_dependencies_1 = require("./ze-util-parse-ze-dependencies");
 /**
  * Retrieves and parses the package.json file from the given context path or current
@@ -36,18 +35,6 @@ async function getPackageJson(context) {
     catch (error) {
         throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_PACKAGE_JSON_NOT_FOUND, `Invalid starting path: ${context}. Error: ${error}`);
     }
-    // Check the cache first
-    try {
-        const cached = await (0, fs_cache_for_package_json_1.getPackageJsonCache)(startingPath);
-        if (cached) {
-            (0, logging_1.ze_log)('Using cached package.json for path', startingPath);
-            return cached;
-        }
-    }
-    catch (error) {
-        // Cache errors are not fatal, just log and continue
-        (0, logging_1.ze_log)('Cache retrieval error', error);
-    }
     // Find nearest package.json
     let nearest_package_json;
     try {
@@ -66,7 +53,6 @@ async function getPackageJson(context) {
     // Parse and validate package.json
     try {
         const { json, path: packageJsonPath } = nearest_package_json;
-        // todo: split parsed package json into parsed and resulting, where resulting is of type ZePackageJson
         const parsed_package_json = (0, zephyr_edge_contract_1.safe_json_parse)(json);
         if (!parsed_package_json) {
             throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_PACKAGE_JSON_NOT_VALID, `Invalid JSON in package.json at: ${packageJsonPath}`);
@@ -78,16 +64,9 @@ async function getPackageJson(context) {
         if (!parsed_package_json.version) {
             throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_PACKAGE_JSON_MUST_HAVE_NAME_VERSION, `Missing 'version' field in package.json at: ${packageJsonPath}`);
         }
-        if (parsed_package_json.zephyrDependencies) {
-            parsed_package_json.zephyrDependencies = (0, ze_util_parse_ze_dependencies_1.parseZeDependencies)(parsed_package_json.zephyrDependencies);
-        }
-        // Cache the result
-        try {
-            await (0, fs_cache_for_package_json_1.setPackageJsonCache)(startingPath, parsed_package_json);
-        }
-        catch (cacheError) {
-            // Cache errors are not fatal, just log and continue
-            (0, logging_1.ze_log)('Cache storage error', cacheError);
+        const zephyr_dependencies = parsed_package_json['zephyr:dependencies'];
+        if (zephyr_dependencies) {
+            parsed_package_json.zephyrDependencies = (0, ze_util_parse_ze_dependencies_1.parseZeDependencies)(zephyr_dependencies);
         }
         (0, logging_1.ze_log)('Successfully parsed package.json', {
             name: parsed_package_json.name,

package/dist/lib/build-context/ze-util-read-package-json.js.map

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

package/dist/lib/http/fetch-with-retries.js

@@ -1,41 +1,100 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchWithRetries = fetchWithRetries;
+const tslib_1 = require("tslib");
 const errors_1 = require("../errors");
+const axios_1 = require("axios");
+const axios_2 = tslib_1.__importDefault(require("axios"));
+const axios_retry_1 = tslib_1.__importDefault(require("axios-retry"));
 async function fetchWithRetries(url, options = {}, retries = 3) {
-    var _a, _b, _c, _d, _e, _f, _g;
-    for (let retry = 0; retry < retries; retry++) {
-        const response = await fetch(url, options).catch((error) => ({ ok: false, error }));
-        if (response.ok) {
-            return response;
-        }
-        // Network failure, retry until attempts are exhausted
-        if ('error' in response) {
-            if (((_a = response.error) === null || _a === void 0 ? void 0 : _a.code) === 'EPIPE' ||
-                ((_c = (_b = response.error) === null || _b === void 0 ? void 0 : _b.message) === null || _c === void 0 ? void 0 : _c.includes('network'))) {
-                continue;
+    var _a, _b, _c, _d, _e;
+    try {
+        // Create a custom axios instance for this request
+        const axiosInstance = axios_2.default.create();
+        // Configure axios-retry
+        (0, axios_retry_1.default)(axiosInstance, {
+            retries,
+            retryDelay: axios_retry_1.default.exponentialDelay,
+            retryCondition: (error) => {
+                // Retry on network errors
+                if (!error.response) {
+                    const networkError = error.code || error.message || '';
+                    return networkError === 'EPIPE' || networkError.includes('network');
+                }
+                // Retry on server errors (5xx)
+                return error.response.status >= 500;
+            },
+        });
+        // Convert fetch options to axios options
+        const axiosConfig = Object.assign({ method: (_a = options.method) !== null && _a !== void 0 ? _a : 'GET', data: options.body }, (options.signal ? { signal: options.signal } : {}));
+        if (options.headers) {
+            // Convert HeadersInit to a format compatible with axios headers
+            if (options.headers instanceof Headers) {
+                // Convert Headers object to record
+                const headersRecord = {};
+                options.headers.forEach((value, key) => {
+                    headersRecord[key] = value;
+                });
+                axiosConfig.headers = headersRecord;
+            }
+            else if (Array.isArray(options.headers)) {
+                // Convert header entries array to record
+                const headersRecord = {};
+                options.headers.forEach(([key, value]) => {
+                    headersRecord[key] = value;
+                });
+                axiosConfig.headers = headersRecord;
             }
-            throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_UNKNOWN, {
-                message: 'Unknown error occurred',
-                cause: response.error,
+            else {
+                // Already a record object
+                axiosConfig.headers = options.headers;
+            }
+        }
+        // Make the request with retries
+        const response = await axiosInstance(url.toString(), axiosConfig);
+        // Convert axios response to fetch Response interface
+        return {
+            ok: response.status >= 200 && response.status < 300,
+            status: response.status,
+            headers: new Headers(Object.entries(response.headers).reduce((acc, [key, value]) => {
+                if (value !== undefined) {
+                    acc[key] = typeof value === 'string' ? value : String(value);
+                }
+                return acc;
+            }, {})),
+            text: async () => typeof response.data === 'string'
+                ? response.data
+                : JSON.stringify(response.data) || '',
+            json: async () => response.data,
+        };
+    }
+    catch (error) {
+        // Handle errors after all retries have been exhausted
+        if (error instanceof axios_1.AxiosError && error.response) {
+            // Client errors (4xx)
+            throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_HTTP_ERROR, {
+                status: error.response.status,
+                url: url.toString(),
+                content: error.response.data,
+                method: (_c = (_b = options.method) === null || _b === void 0 ? void 0 : _b.toUpperCase()) !== null && _c !== void 0 ? _c : 'GET',
             });
         }
-        // Retry on server failures
-        if (response.status >= 500) {
-            continue;
+        // Unknown errors
+        if (error instanceof axios_1.AxiosError &&
+            (error.code === 'EPIPE' || (error.message && error.message.includes('network')))) {
+            // Max retries reached for network error
+            throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_HTTP_ERROR, {
+                status: -1,
+                url: url.toString(),
+                content: 'Max retries reached for network error',
+                method: (_e = (_d = options.method) === null || _d === void 0 ? void 0 : _d.toUpperCase()) !== null && _e !== void 0 ? _e : 'GET',
+            });
         }
-        throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_HTTP_ERROR, {
-            status: response.status,
-            url: url.toString(),
-            content: await response.text(),
-            method: (_e = (_d = options.method) === null || _d === void 0 ? void 0 : _d.toUpperCase()) !== null && _e !== void 0 ? _e : 'GET',
+        // Other unknown errors
+        throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_UNKNOWN, {
+            message: 'Unknown error occurred',
+            cause: error,
         });
     }
-    throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_HTTP_ERROR, {
-        status: -1,
-        url: url.toString(),
-        content: 'Max retries reached',
-        method: (_g = (_f = options.method) === null || _f === void 0 ? void 0 : _f.toUpperCase()) !== null && _g !== void 0 ? _g : 'GET',
-    });
 }
 //# sourceMappingURL=fetch-with-retries.js.map

package/dist/lib/http/fetch-with-retries.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-with-retries.js","sourceRoot":"","sources":["../../../src/lib/http/fetch-with-retries.ts"],"names":[],"mappings":";;AAEA,4CAgDC;AAlDD,sCAAkD;AAE3C,KAAK,UAAU,gBAAgB,CACpC,GAAQ,EACR,UAAuB,EAAE,EACzB,OAAO,GAAG,CAAC;;IAEX,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC;QAC7C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,KAAK,CAC9C,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAU,CAC3C,CAAC;QAEF,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;YAChB,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,sDAAsD;QACtD,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;YACxB,IACE,CAAA,MAAA,QAAQ,CAAC,KAAK,0CAAE,IAAI,MAAK,OAAO;iBAChC,MAAA,MAAA,QAAQ,CAAC,KAAK,0CAAE,OAAO,0CAAE,QAAQ,CAAC,SAAS,CAAC,CAAA,EAC5C,CAAC;gBACD,SAAS;YACX,CAAC;YAED,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,WAAW,EAAE;gBAC1C,OAAO,EAAE,wBAAwB;gBACjC,KAAK,EAAE,QAAQ,CAAC,KAAK;aACtB,CAAC,CAAC;QACL,CAAC;QAED,2BAA2B;QAC3B,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;YAC3B,SAAS;QACX,CAAC;QAED,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,cAAc,EAAE;YAC7C,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;YACnB,OAAO,EAAE,MAAM,QAAQ,CAAC,IAAI,EAAE;YAC9B,MAAM,EAAE,MAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,WAAW,EAAE,mCAAI,KAAK;SAC/C,CAAC,CAAC;IACL,CAAC;IAED,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,cAAc,EAAE;QAC7C,MAAM,EAAE,CAAC,CAAC;QACV,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;QACnB,OAAO,EAAE,qBAAqB;QAC9B,MAAM,EAAE,MAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,WAAW,EAAE,mCAAI,KAAK;KAC/C,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"fetch-with-retries.js","sourceRoot":"","sources":["../../../src/lib/http/fetch-with-retries.ts"],"names":[],"mappings":"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"}

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zephyr-agent",
-  "version": "0.0.44",
+  "version": "0.0.46",
   "description": "Zephyr plugin agent",
   "repository": {
     "type": "git",
@@ -33,6 +33,8 @@
     "test": "nx test zephyr-agent"
   },
   "dependencies": {
+    "axios": "^1.9.0",
+    "axios-retry": "^4.5.0",
     "cloudflare": "^3.4.0",
     "debug": "^4.3.4",
     "git-url-parse": "^15.0.0",

package/dist/zephyr-engine/resolve_remote_dependency.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolve_remote_dependency = resolve_remote_dependency;
+const tslib_1 = require("tslib");
 const zephyr_edge_contract_1 = require("zephyr-edge-contract");
 const token_1 = require("../lib/node-persist/token");
 const errors_1 = require("../lib/errors");
 const logging_1 = require("../lib/logging");
+const axios_1 = tslib_1.__importDefault(require("axios"));
 async function resolve_remote_dependency({ application_uid, version, platform, }) {
     const resolveDependency = new URL(`${zephyr_edge_contract_1.ze_api_gateway.resolve}/${encodeURIComponent(application_uid)}/${encodeURIComponent(version)}`, (0, zephyr_edge_contract_1.ZE_API_ENDPOINT)());
     if (platform) {
@@ -13,8 +15,7 @@ async function resolve_remote_dependency({ application_uid, version, platform, }
     try {
         (0, logging_1.ze_log)('URL for resolving dependency:', resolveDependency.toString());
         const token = await (0, token_1.getToken)();
-        const res = await fetch(resolveDependency, {
-            method: 'GET',
+        const res = await axios_1.default.get(resolveDependency.toString(), {
             headers: {
                 'Content-Type': 'application/json',
                 Authorization: `Bearer ${token}`,
@@ -22,7 +23,8 @@ async function resolve_remote_dependency({ application_uid, version, platform, }
             },
         });
         const [appName, projectName, orgName] = application_uid.split('.');
-        if (!res.ok) {
+        // Check response status
+        if (res.status < 200 || res.status >= 300) {
             throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_RESOLVE_REMOTES, {
                 appUid: application_uid,
                 appName,
@@ -31,11 +33,11 @@ async function resolve_remote_dependency({ application_uid, version, platform, }
                 data: {
                     url: resolveDependency.toString(),
                     version,
-                    error: await res.json().catch(() => res.text()),
+                    error: res.data,
                 },
             });
         }
-        const response = await res.json();
+        const response = res.data;
         if (response.value) {
             (0, logging_1.ze_log)('resolved dependency:', response.value, 'application_uid: ', application_uid, 'version: ', version);
             return Object.assign({}, response.value, { version, platform });

package/dist/zephyr-engine/resolve_remote_dependency.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve_remote_dependency.js","sourceRoot":"","sources":["../../src/zephyr-engine/resolve_remote_dependency.ts"],"names":[],"mappings":";;AAgBA,8DA4EC;AA5FD,+DAAuE;AACvE,qDAAqD;AACrD,0CAAsD;AACtD,4CAAwC;AAajC,KAAK,UAAU,yBAAyB,CAAC,EAC9C,eAAe,EACf,OAAO,EACP,QAAQ,GAKT;IACC,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAC/B,GAAG,qCAAc,CAAC,OAAO,IAAI,kBAAkB,CAAC,eAAe,CAAC,IAAI,kBAAkB,CAAC,OAAO,CAAC,EAAE,EACjG,IAAA,sCAAe,GAAE,CAClB,CAAC;IAEF,IAAI,QAAQ,EAAE,CAAC;QACb,iBAAiB,CAAC,YAAY,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IAClE,CAAC;IAED,IAAI,CAAC;QACH,IAAA,gBAAM,EAAC,+BAA+B,EAAE,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEtE,MAAM,KAAK,GAAG,MAAM,IAAA,gBAAQ,GAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,iBAAiB,EAAE;YACzC,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,UAAU,KAAK,EAAE;gBAChC,MAAM,EAAE,kBAAkB;aAC3B;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEnE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YACZ,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,mBAAmB,EAAE;gBAClD,MAAM,EAAE,eAAe;gBACvB,OAAO;gBACP,WAAW;gBACX,OAAO;gBACP,IAAI,EAAE;oBACJ,GAAG,EAAE,iBAAiB,CAAC,QAAQ,EAAE;oBACjC,OAAO;oBACP,KAAK,EAAE,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;iBAChD;aACF,CAAC,CAAC;QACL,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAElC,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;YACnB,IAAA,gBAAM,EACJ,sBAAsB,EACtB,QAAQ,CAAC,KAAK,EACd,mBAAmB,EACnB,eAAe,EACf,WAAW,EACX,OAAO,CACR,CAAC;YACF,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,mBAAmB,EAAE;YAClD,MAAM,EAAE,eAAe;YACvB,OAAO;YACP,WAAW;YACX,OAAO;YACP,IAAI,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE;SAC5B,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,oBAAW;YAAE,MAAM,KAAK,CAAC;QAE9C,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,wCAAwC,EAAE;YACvE,IAAI,EAAE,EAAE,OAAO,EAAE;YACjB,KAAK;SACN,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
+{"version":3,"file":"resolve_remote_dependency.js","sourceRoot":"","sources":["../../src/zephyr-engine/resolve_remote_dependency.ts"],"names":[],"mappings":";;AAgBA,8DA4EC;;AA5FD,+DAAuE;AACvE,qDAAqD;AACrD,0CAAsD;AACtD,4CAAwC;AACxC,0DAA0B;AAYnB,KAAK,UAAU,yBAAyB,CAAC,EAC9C,eAAe,EACf,OAAO,EACP,QAAQ,GAKT;IACC,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAC/B,GAAG,qCAAc,CAAC,OAAO,IAAI,kBAAkB,CAAC,eAAe,CAAC,IAAI,kBAAkB,CAAC,OAAO,CAAC,EAAE,EACjG,IAAA,sCAAe,GAAE,CAClB,CAAC;IAEF,IAAI,QAAQ,EAAE,CAAC;QACb,iBAAiB,CAAC,YAAY,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IAClE,CAAC;IAED,IAAI,CAAC;QACH,IAAA,gBAAM,EAAC,+BAA+B,EAAE,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEtE,MAAM,KAAK,GAAG,MAAM,IAAA,gBAAQ,GAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,QAAQ,EAAE,EAAE;YACxD,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,UAAU,KAAK,EAAE;gBAChC,MAAM,EAAE,kBAAkB;aAC3B;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEnE,wBAAwB;QACxB,IAAI,GAAG,CAAC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;YAC1C,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,mBAAmB,EAAE;gBAClD,MAAM,EAAE,eAAe;gBACvB,OAAO;gBACP,WAAW;gBACX,OAAO;gBACP,IAAI,EAAE;oBACJ,GAAG,EAAE,iBAAiB,CAAC,QAAQ,EAAE;oBACjC,OAAO;oBACP,KAAK,EAAE,GAAG,CAAC,IAAI;iBAChB;aACF,CAAC,CAAC;QACL,CAAC;QAED,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC;QAE1B,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;YACnB,IAAA,gBAAM,EACJ,sBAAsB,EACtB,QAAQ,CAAC,KAAK,EACd,mBAAmB,EACnB,eAAe,EACf,WAAW,EACX,OAAO,CACR,CAAC;YACF,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,mBAAmB,EAAE;YAClD,MAAM,EAAE,eAAe;YACvB,OAAO;YACP,WAAW;YACX,OAAO;YACP,IAAI,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE;SAC5B,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,oBAAW;YAAE,MAAM,KAAK,CAAC;QAE9C,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,wCAAwC,EAAE;YACvE,IAAI,EAAE,EAAE,OAAO,EAAE;YACjB,KAAK;SACN,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zephyr-agent",
-  "version": "0.0.44",
+  "version": "0.0.46",
   "description": "Zephyr plugin agent",
   "repository": {
     "type": "git",
@@ -28,6 +28,8 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
+    "axios": "^1.9.0",
+    "axios-retry": "^4.5.0",
     "cloudflare": "^3.4.0",
     "debug": "^4.3.4",
     "git-url-parse": "^15.0.0",
@@ -38,7 +40,7 @@
     "socket.io-client": "^4.7.5",
     "tslib": "^2.8.1",
     "uuid": "^8.3.2",
-    "zephyr-edge-contract": "0.0.44"
+    "zephyr-edge-contract": "0.0.46"
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",