zephyr-edge-contract 0.0.10 → 0.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zephyr-edge-contract",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "license": "Apache-2.0",
   "scripts": {
     "build": "nx build zephyr-edge-contract"
@@ -15,8 +15,6 @@
     "@types/node-persist": "^3.1.8",
     "@types/debug": "^4.1.12"
   },
-  "type": "commonjs",
   "main": "./src/index.js",
-  "module": "./src/index.js",
-  "typings": "./src/index.d.ts"
+  "type": "commonjs"
 }

package/src/index.d.ts

@@ -5,12 +5,14 @@ export { ZeApplicationList } from './lib/ze-api/app-list';
 export { Snapshot, SnapshotAsset } from './lib/snapshot';
 export { ZeEnvs, ZeUploadBuildStats } from './lib/edge-api/ze-envs-request';
 export * from './lib/zephyr-edge-contract';
-export { saveToken, getToken, removeToken, cleanTokens, } from './lib/node-persist/token';
 export { ZeApplicationConfig, getAppConfig, remoteAppConfig, saveAppConfig, } from './lib/node-persist/application-configuration';
+export { getPartialAssetMap, removePartialAssetMap, savePartialAssetMap, } from './lib/node-persist/partial-assets-map';
+export { saveToken, getToken, removeToken, cleanTokens, } from './lib/node-persist/token';
 export { ZeWebpackPluginOptions } from './lib/plugin-options/ze-webpack-plugin-options';
 export { ZephyrPluginOptions } from './lib/plugin-options/zephyr-plugin-options';
 export { ZEPHYR_API_ENDPOINT, v2_api_paths, } from './lib/api-contract-negotiation/get-api-contract';
 export { ze_log, ze_error, is_debug_enabled } from './lib/utils/debug';
+export { safe_json_parse } from './lib/utils/safe-json-parse';
 export { request } from './lib/utils/ze-http-request';
 export { LocalPackageJson } from './lib/ze-api/local-package-json';
 export { ConvertedGraph } from './lib/ze-api/converted-graph';

package/src/index.js

@@ -1,21 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.request = exports.is_debug_enabled = exports.ze_error = exports.ze_log = exports.v2_api_paths = exports.ZEPHYR_API_ENDPOINT = exports.saveAppConfig = exports.remoteAppConfig = exports.getAppConfig = exports.cleanTokens = exports.removeToken = exports.getToken = exports.saveToken = exports.createSnapshotId = exports.createFullAppName = void 0;
+exports.request = exports.safe_json_parse = exports.is_debug_enabled = exports.ze_error = exports.ze_log = exports.v2_api_paths = exports.ZEPHYR_API_ENDPOINT = exports.cleanTokens = exports.removeToken = exports.getToken = exports.saveToken = exports.savePartialAssetMap = exports.removePartialAssetMap = exports.getPartialAssetMap = exports.saveAppConfig = exports.remoteAppConfig = exports.getAppConfig = exports.createSnapshotId = exports.createFullAppName = void 0;
 const tslib_1 = require("tslib");
 var create_full_app_name_1 = require("./lib/utils/create-full-app-name");
 Object.defineProperty(exports, "createFullAppName", { enumerable: true, get: function () { return create_full_app_name_1.createFullAppName; } });
 var create_snapshot_id_1 = require("./lib/utils/create-snapshot-id");
 Object.defineProperty(exports, "createSnapshotId", { enumerable: true, get: function () { return create_snapshot_id_1.createSnapshotId; } });
 tslib_1.__exportStar(require("./lib/zephyr-edge-contract"), exports);
+var application_configuration_1 = require("./lib/node-persist/application-configuration");
+Object.defineProperty(exports, "getAppConfig", { enumerable: true, get: function () { return application_configuration_1.getAppConfig; } });
+Object.defineProperty(exports, "remoteAppConfig", { enumerable: true, get: function () { return application_configuration_1.remoteAppConfig; } });
+Object.defineProperty(exports, "saveAppConfig", { enumerable: true, get: function () { return application_configuration_1.saveAppConfig; } });
+var partial_assets_map_1 = require("./lib/node-persist/partial-assets-map");
+Object.defineProperty(exports, "getPartialAssetMap", { enumerable: true, get: function () { return partial_assets_map_1.getPartialAssetMap; } });
+Object.defineProperty(exports, "removePartialAssetMap", { enumerable: true, get: function () { return partial_assets_map_1.removePartialAssetMap; } });
+Object.defineProperty(exports, "savePartialAssetMap", { enumerable: true, get: function () { return partial_assets_map_1.savePartialAssetMap; } });
 var token_1 = require("./lib/node-persist/token");
 Object.defineProperty(exports, "saveToken", { enumerable: true, get: function () { return token_1.saveToken; } });
 Object.defineProperty(exports, "getToken", { enumerable: true, get: function () { return token_1.getToken; } });
 Object.defineProperty(exports, "removeToken", { enumerable: true, get: function () { return token_1.removeToken; } });
 Object.defineProperty(exports, "cleanTokens", { enumerable: true, get: function () { return token_1.cleanTokens; } });
-var application_configuration_1 = require("./lib/node-persist/application-configuration");
-Object.defineProperty(exports, "getAppConfig", { enumerable: true, get: function () { return application_configuration_1.getAppConfig; } });
-Object.defineProperty(exports, "remoteAppConfig", { enumerable: true, get: function () { return application_configuration_1.remoteAppConfig; } });
-Object.defineProperty(exports, "saveAppConfig", { enumerable: true, get: function () { return application_configuration_1.saveAppConfig; } });
 var get_api_contract_1 = require("./lib/api-contract-negotiation/get-api-contract");
 Object.defineProperty(exports, "ZEPHYR_API_ENDPOINT", { enumerable: true, get: function () { return get_api_contract_1.ZEPHYR_API_ENDPOINT; } });
 Object.defineProperty(exports, "v2_api_paths", { enumerable: true, get: function () { return get_api_contract_1.v2_api_paths; } });
@@ -23,6 +27,8 @@ var debug_1 = require("./lib/utils/debug");
 Object.defineProperty(exports, "ze_log", { enumerable: true, get: function () { return debug_1.ze_log; } });
 Object.defineProperty(exports, "ze_error", { enumerable: true, get: function () { return debug_1.ze_error; } });
 Object.defineProperty(exports, "is_debug_enabled", { enumerable: true, get: function () { return debug_1.is_debug_enabled; } });
+var safe_json_parse_1 = require("./lib/utils/safe-json-parse");
+Object.defineProperty(exports, "safe_json_parse", { enumerable: true, get: function () { return safe_json_parse_1.safe_json_parse; } });
 var ze_http_request_1 = require("./lib/utils/ze-http-request");
 Object.defineProperty(exports, "request", { enumerable: true, get: function () { return ze_http_request_1.request; } });
 //# sourceMappingURL=index.js.map

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/zephyr-edge-contract/src/index.ts"],"names":[],"mappings":";;;;AAAA,yEAAqE;AAA5D,yHAAA,iBAAiB,OAAA;AAC1B,qEAAkE;AAAzD,sHAAA,gBAAgB,OAAA;AAOzB,qEAA2C;AAE3C,kDAKkC;AAJhC,kGAAA,SAAS,OAAA;AACT,iGAAA,QAAQ,OAAA;AACR,oGAAA,WAAW,OAAA;AACX,oGAAA,WAAW,OAAA;AAGb,0FAKsD;AAHpD,yHAAA,YAAY,OAAA;AACZ,4HAAA,eAAe,OAAA;AACf,0HAAA,aAAa,OAAA;AAMf,oFAGyD;AAFvD,uHAAA,mBAAmB,OAAA;AACnB,gHAAA,YAAY,OAAA;AAGd,2CAAuE;AAA9D,+FAAA,MAAM,OAAA;AAAE,iGAAA,QAAQ,OAAA;AAAE,yGAAA,gBAAgB,OAAA;AAC3C,+DAAsD;AAA7C,0GAAA,OAAO,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/zephyr-edge-contract/src/index.ts"],"names":[],"mappings":";;;;AAAA,yEAAqE;AAA5D,yHAAA,iBAAiB,OAAA;AAC1B,qEAAkE;AAAzD,sHAAA,gBAAgB,OAAA;AAOzB,qEAA2C;AAE3C,0FAKsD;AAHpD,yHAAA,YAAY,OAAA;AACZ,4HAAA,eAAe,OAAA;AACf,0HAAA,aAAa,OAAA;AAGf,4EAI+C;AAH7C,wHAAA,kBAAkB,OAAA;AAClB,2HAAA,qBAAqB,OAAA;AACrB,yHAAA,mBAAmB,OAAA;AAGrB,kDAKkC;AAJhC,kGAAA,SAAS,OAAA;AACT,iGAAA,QAAQ,OAAA;AACR,oGAAA,WAAW,OAAA;AACX,oGAAA,WAAW,OAAA;AAMb,oFAGyD;AAFvD,uHAAA,mBAAmB,OAAA;AACnB,gHAAA,YAAY,OAAA;AAGd,2CAAuE;AAA9D,+FAAA,MAAM,OAAA;AAAE,iGAAA,QAAQ,OAAA;AAAE,yGAAA,gBAAgB,OAAA;AAC3C,+DAA8D;AAArD,kHAAA,eAAe,OAAA;AACxB,+DAAsD;AAA7C,0GAAA,OAAO,OAAA"}

package/src/lib/api-contract-negotiation/get-api-contract.d.ts

@@ -1,5 +1,6 @@
-export declare const ZEPHYR_API_ENDPOINT: string;
+export declare const ZEPHYR_API_ENDPOINT: () => string;
 export declare const v2_api_paths: {
+    application_logs: string;
     dashboard_path: string;
     resolve_dependency_path: string;
     authorize_link: string;

package/src/lib/api-contract-negotiation/get-api-contract.js

@@ -1,9 +1,10 @@
 "use strict";
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.v2_api_paths = exports.ZEPHYR_API_ENDPOINT = void 0;
-exports.ZEPHYR_API_ENDPOINT = (_a = process.env['ZE_API']) !== null && _a !== void 0 ? _a : 'https://api.zephyr-cloud.io';
+const ZEPHYR_API_ENDPOINT = () => { var _a; return (_a = process.env['ZE_API']) !== null && _a !== void 0 ? _a : 'https://api.zephyr-cloud.io'; };
+exports.ZEPHYR_API_ENDPOINT = ZEPHYR_API_ENDPOINT;
 exports.v2_api_paths = {
+    application_logs: '/v2/application/logs',
     dashboard_path: '/v2/builder-packages-api/upload-from-dashboard-plugin',
     resolve_dependency_path: '/v2/builder-public-api/resolve',
     authorize_link: '/v2/authorize-link',

package/src/lib/api-contract-negotiation/get-api-contract.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-api-contract.js","sourceRoot":"","sources":["../../../../../../libs/zephyr-edge-contract/src/lib/api-contract-negotiation/get-api-contract.ts"],"names":[],"mappings":";;;;AAAa,QAAA,mBAAmB,GAC9B,MAAA,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,mCAAI,6BAA6B,CAAC;AAE5C,QAAA,YAAY,GAAG;IAC1B,cAAc,EAAE,uDAAuD;IACvE,uBAAuB,EAAE,gCAAgC;IACzD,cAAc,EAAE,oBAAoB;IACpC,yBAAyB,EAAE,6CAA6C;CACzE,CAAC"}
+{"version":3,"file":"get-api-contract.js","sourceRoot":"","sources":["../../../../../../libs/zephyr-edge-contract/src/lib/api-contract-negotiation/get-api-contract.ts"],"names":[],"mappings":";;;AAAO,MAAM,mBAAmB,GAAG,GAAG,EAAE,WACtC,OAAA,MAAA,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,mCAAI,6BAA6B,CAAA,EAAA,CAAC;AAD5C,QAAA,mBAAmB,uBACyB;AAE5C,QAAA,YAAY,GAAG;IAC1B,gBAAgB,EAAE,sBAAsB;IACxC,cAAc,EAAE,uDAAuD;IACvE,uBAAuB,EAAE,gCAAgC;IACzD,cAAc,EAAE,oBAAoB;IACpC,yBAAyB,EAAE,6CAA6C;CACzE,CAAC"}

package/src/lib/node-persist/application-configuration.d.ts

@@ -8,6 +8,6 @@ export interface ZeApplicationConfig {
     EDGE_URL: string;
     jwt: string;
 }
-export declare function saveAppConfig(json: ZeApplicationConfig): Promise<void>;
-export declare function getAppConfig(): Promise<ZeApplicationConfig | undefined>;
-export declare function remoteAppConfig(): Promise<void>;
+export declare function saveAppConfig(application_uid: string, json: ZeApplicationConfig): Promise<void>;
+export declare function getAppConfig(application_uid: string): Promise<ZeApplicationConfig | undefined>;
+export declare function remoteAppConfig(application_uid: string): Promise<void>;

package/src/lib/node-persist/application-configuration.js

@@ -9,24 +9,27 @@ const storage_keys_1 = require("./storage-keys");
 const storage = (0, node_persist_1.init)({
     dir: (0, node_path_1.join)((0, node_os_1.homedir)(), storage_keys_1.ZE_PATH),
 });
-function saveAppConfig(json) {
+function get_key(application_uid) {
+    return ["ze-application-configuration" /* StorageKeys.ze_app_config_token */, application_uid].join('.');
+}
+function saveAppConfig(application_uid, json) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         yield storage;
-        void (yield (0, node_persist_1.setItem)("ze-application-configuration" /* StorageKeys.ze_app_config_token */, json));
+        void (yield (0, node_persist_1.setItem)(get_key(application_uid), json));
     });
 }
 exports.saveAppConfig = saveAppConfig;
-function getAppConfig() {
+function getAppConfig(application_uid) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         yield storage;
-        return (0, node_persist_1.getItem)("ze-application-configuration" /* StorageKeys.ze_app_config_token */);
+        return (0, node_persist_1.getItem)(get_key(application_uid));
     });
 }
 exports.getAppConfig = getAppConfig;
-function remoteAppConfig() {
+function remoteAppConfig(application_uid) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         yield storage;
-        yield (0, node_persist_1.removeItem)("ze-application-configuration" /* StorageKeys.ze_app_config_token */);
+        yield (0, node_persist_1.removeItem)(get_key(application_uid));
     });
 }
 exports.remoteAppConfig = remoteAppConfig;

package/src/lib/node-persist/application-configuration.js.map

@@ -1 +1 @@
-{"version":3,"file":"application-configuration.js","sourceRoot":"","sources":["../../../../../../libs/zephyr-edge-contract/src/lib/node-persist/application-configuration.ts"],"names":[],"mappings":";;;;AAAA,+CAAkE;AAClE,qCAAkC;AAClC,yCAAiC;AACjC,iDAAsD;AAatD,MAAM,OAAO,GAAG,IAAA,mBAAI,EAAC;IACnB,GAAG,EAAE,IAAA,gBAAI,EAAC,IAAA,iBAAO,GAAE,EAAE,sBAAO,CAAC;CAC9B,CAAC,CAAC;AAEH,SAAsB,aAAa,CAAC,IAAyB;;QAC3D,MAAM,OAAO,CAAC;QACd,KAAK,CAAC,MAAM,IAAA,sBAAO,wEAAkC,IAAI,CAAC,CAAC,CAAC;IAC9D,CAAC;CAAA;AAHD,sCAGC;AAED,SAAsB,YAAY;;QAChC,MAAM,OAAO,CAAC;QACd,OAAO,IAAA,sBAAO,uEAAiC,CAAC;IAClD,CAAC;CAAA;AAHD,oCAGC;AAED,SAAsB,eAAe;;QACnC,MAAM,OAAO,CAAC;QACd,MAAM,IAAA,yBAAU,uEAAiC,CAAC;IACpD,CAAC;CAAA;AAHD,0CAGC"}
+{"version":3,"file":"application-configuration.js","sourceRoot":"","sources":["../../../../../../libs/zephyr-edge-contract/src/lib/node-persist/application-configuration.ts"],"names":[],"mappings":";;;;AAAA,+CAAkE;AAClE,qCAAkC;AAClC,yCAAiC;AACjC,iDAAsD;AAatD,MAAM,OAAO,GAAG,IAAA,mBAAI,EAAC;IACnB,GAAG,EAAE,IAAA,gBAAI,EAAC,IAAA,iBAAO,GAAE,EAAE,sBAAO,CAAC;CAC9B,CAAC,CAAC;AAEH,SAAS,OAAO,CAAC,eAAuB;IACtC,OAAO,uEAAkC,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACtE,CAAC;AAED,SAAsB,aAAa,CACjC,eAAuB,EACvB,IAAyB;;QAEzB,MAAM,OAAO,CAAC;QACd,KAAK,CAAC,MAAM,IAAA,sBAAO,EAAC,OAAO,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;IACvD,CAAC;CAAA;AAND,sCAMC;AAED,SAAsB,YAAY,CAChC,eAAuB;;QAEvB,MAAM,OAAO,CAAC;QACd,OAAO,IAAA,sBAAO,EAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IAC3C,CAAC;CAAA;AALD,oCAKC;AAED,SAAsB,eAAe,CAAC,eAAuB;;QAC3D,MAAM,OAAO,CAAC;QACd,MAAM,IAAA,yBAAU,EAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IAC7C,CAAC;CAAA;AAHD,0CAGC"}

package/src/lib/node-persist/partial-assets-map.d.ts

@@ -0,0 +1,4 @@
+import { ZeBuildAssetsMap } from '../zephyr-edge-contract';
+export declare function savePartialAssetMap(application_uid: string, partial_key: string, assetMap: ZeBuildAssetsMap): Promise<void>;
+export declare function getPartialAssetMap(application_uid: string): Promise<ZeBuildAssetsMap | undefined>;
+export declare function removePartialAssetMap(application_uid: string): Promise<void>;

package/src/lib/node-persist/partial-assets-map.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.removePartialAssetMap = exports.getPartialAssetMap = exports.savePartialAssetMap = void 0;
+const tslib_1 = require("tslib");
+const node_persist_1 = require("node-persist");
+const node_os_1 = require("node:os");
+const node_path_1 = require("node:path");
+const storage_keys_1 = require("./storage-keys");
+const storage = (0, node_persist_1.init)({
+    dir: (0, node_path_1.join)((0, node_os_1.homedir)(), storage_keys_1.ZE_PATH),
+});
+function get_key(application_uid) {
+    return ["ze_app_partial_asset_map" /* StorageKeys.ze_app_partial_asset_map */, application_uid].join('.');
+}
+function savePartialAssetMap(application_uid, partial_key, assetMap) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        yield storage;
+        const key = get_key(application_uid);
+        const partial_asset_map = yield (0, node_persist_1.getItem)(key);
+        void (yield (0, node_persist_1.setItem)(key, Object.assign({}, partial_asset_map || {}, { [partial_key]: assetMap })));
+    });
+}
+exports.savePartialAssetMap = savePartialAssetMap;
+function getPartialAssetMap(application_uid) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        yield storage;
+        return (0, node_persist_1.getItem)(get_key(application_uid));
+    });
+}
+exports.getPartialAssetMap = getPartialAssetMap;
+function removePartialAssetMap(application_uid) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        yield storage;
+        yield (0, node_persist_1.removeItem)(get_key(application_uid));
+    });
+}
+exports.removePartialAssetMap = removePartialAssetMap;
+//# sourceMappingURL=partial-assets-map.js.map

package/src/lib/node-persist/partial-assets-map.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"partial-assets-map.js","sourceRoot":"","sources":["../../../../../../libs/zephyr-edge-contract/src/lib/node-persist/partial-assets-map.ts"],"names":[],"mappings":";;;;AAAA,+CAAkE;AAClE,qCAAkC;AAClC,yCAAiC;AACjC,iDAAsD;AAGtD,MAAM,OAAO,GAAG,IAAA,mBAAI,EAAC;IACnB,GAAG,EAAE,IAAA,gBAAI,EAAC,IAAA,iBAAO,GAAE,EAAE,sBAAO,CAAC;CAC9B,CAAC,CAAC;AAEH,SAAS,OAAO,CAAC,eAAuB;IACtC,OAAO,wEAAuC,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC3E,CAAC;AAED,SAAsB,mBAAmB,CACvC,eAAuB,EACvB,WAAmB,EACnB,QAA0B;;QAE1B,MAAM,OAAO,CAAC;QACd,MAAM,GAAG,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;QACrC,MAAM,iBAAiB,GAAG,MAAM,IAAA,sBAAO,EAAC,GAAG,CAAC,CAAC;QAC7C,KAAK,CAAC,MAAM,IAAA,sBAAO,EACjB,GAAG,EACH,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,iBAAiB,IAAI,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,CAAC,CACxE,CAAC,CAAC;IACL,CAAC;CAAA;AAZD,kDAYC;AAED,SAAsB,kBAAkB,CACtC,eAAuB;;QAEvB,MAAM,OAAO,CAAC;QACd,OAAO,IAAA,sBAAO,EAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IAC3C,CAAC;CAAA;AALD,gDAKC;AAED,SAAsB,qBAAqB,CACzC,eAAuB;;QAEvB,MAAM,OAAO,CAAC;QACd,MAAM,IAAA,yBAAU,EAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IAC7C,CAAC;CAAA;AALD,sDAKC"}

package/src/lib/node-persist/storage-keys.d.ts

@@ -1,5 +1,6 @@
 export declare const ZE_PATH = ".zephyr";
 export declare const enum StorageKeys {
+    ze_app_partial_asset_map = "ze_app_partial_asset_map",
     ze_app_config_token = "ze-application-configuration",
     zetoken = "ze-token"
 }

package/src/lib/utils/safe-json-parse.d.ts

@@ -0,0 +1 @@
+export declare function safe_json_parse<T = Record<string, unknown>>(str: string): T | undefined;

package/src/lib/utils/safe-json-parse.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.safe_json_parse = void 0;
+function safe_json_parse(str) {
+    try {
+        return JSON.parse(str);
+    }
+    catch (_a) {
+        return;
+    }
+}
+exports.safe_json_parse = safe_json_parse;
+//# sourceMappingURL=safe-json-parse.js.map

package/src/lib/utils/safe-json-parse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"safe-json-parse.js","sourceRoot":"","sources":["../../../../../../libs/zephyr-edge-contract/src/lib/utils/safe-json-parse.ts"],"names":[],"mappings":";;;AAAA,SAAgB,eAAe,CAC7B,GAAW;IAEX,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAAC,WAAM,CAAC;QACP,OAAO;IACT,CAAC;AACH,CAAC;AARD,0CAQC"}

package/src/lib/utils/ze-http-request.d.ts

@@ -1,3 +1,5 @@
 /// <reference types="node" />
 import type { ClientRequestArgs } from 'node:http';
-export declare function request<T = unknown>(url: URL, options?: ClientRequestArgs, data?: unknown): Promise<T | string>;
+export declare function request<T = unknown>(url: URL, options?: ClientRequestArgs, data?: unknown & {
+    length: number | undefined;
+}): Promise<T | string>;

package/src/lib/utils/ze-http-request.js

@@ -6,11 +6,18 @@ const http = tslib_1.__importStar(require("node:http"));
 const https = tslib_1.__importStar(require("node:https"));
 const debug_1 = require("./debug");
 const token_1 = require("../node-persist/token");
+const safe_json_parse_1 = require("./safe-json-parse");
+function _redact(str) {
+    return str
+        .replace(/Bearer ([^"]+)/gi, 'Bearer [REDACTED]')
+        .replace(/jwt":"([^"]+)/gi, 'jwt":"[REDACTED]');
+}
 function request(url, options, data) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const _https = url.protocol !== 'https:' ? http : https;
         return new Promise((resolve, reject) => {
-            (0, debug_1.ze_log)(`Requesting ${url}`, `with options: ${JSON.stringify(options)}`);
+            const req_start = Date.now();
+            const _options_str = _redact(JSON.stringify(options));
             const req = _https.request(url, options !== null && options !== void 0 ? options : {}, (res) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 if (res.statusCode === 401 || res.statusCode === 403) {
                     yield (0, token_1.cleanTokens)();
@@ -21,21 +28,29 @@ function request(url, options, data) {
                 const response = [];
                 res.on('data', (d) => response.push(d));
                 res.on('end', () => {
-                    var _a;
+                    var _a, _b, _c, _d;
                     const _response = (_a = Buffer.concat(response)) === null || _a === void 0 ? void 0 : _a.toString();
+                    const message = _redact(`[${(options === null || options === void 0 ? void 0 : options.method) || 'GET'}][${url}]: ${Date.now() - req_start}ms` +
+                        ((data === null || data === void 0 ? void 0 : data.length)
+                            ? ` - ${(((_b = data.length) !== null && _b !== void 0 ? _b : 0) / 1024).toFixed(2)}kb`
+                            : '') +
+                        (_response ? `\n response: ${_response}` : '') +
+                        ((data === null || data === void 0 ? void 0 : data.length) ? `\n payload: ${data}` : '') +
+                        (_options_str ? `\n options: ${_options_str}` : ''));
                     if (_response === 'Not Implemented')
-                        return reject(`Response for ${url} is ${_response}`);
-                    (0, debug_1.ze_log)(`Response from ${url}`, _response);
-                    try {
-                        resolve(JSON.parse(_response));
-                    }
-                    catch (_b) {
-                        resolve(_response);
+                        return reject(message);
+                    const parsed_response = (0, safe_json_parse_1.safe_json_parse)(_response);
+                    if ((typeof res.statusCode === 'number' && res.statusCode > 299) ||
+                        (typeof (parsed_response === null || parsed_response === void 0 ? void 0 : parsed_response.status) === 'number' &&
+                            (parsed_response === null || parsed_response === void 0 ? void 0 : parsed_response.status) > 299)) {
+                        return reject(`[zephyr]: Error from ${url}: \n ${(_c = parsed_response === null || parsed_response === void 0 ? void 0 : parsed_response.message) !== null && _c !== void 0 ? _c : _response}`);
                     }
+                    (0, debug_1.ze_log)(message);
+                    resolve((_d = parsed_response) !== null && _d !== void 0 ? _d : _response);
                 });
             }));
             req.on('error', (e) => {
-                (0, debug_1.ze_error)(`Failed to request ${url.toString()}`, e);
+                (0, debug_1.ze_error)(`[${(options === null || options === void 0 ? void 0 : options.method) || 'GET'}][${url}]: ${Date.now() - req_start}ms \n ${_options_str}`, e);
                 reject(e);
             });
             if (data) {

package/src/lib/utils/ze-http-request.js.map

@@ -1 +1 @@
-{"version":3,"file":"ze-http-request.js","sourceRoot":"","sources":["../../../../../../libs/zephyr-edge-contract/src/lib/utils/ze-http-request.ts"],"names":[],"mappings":";;;;AAAA,wDAAkC;AAClC,0DAAoC;AAEpC,mCAA2C;AAC3C,iDAAoD;AAEpD,SAAsB,OAAO,CAC3B,GAAQ,EACR,OAA2B,EAC3B,IAAc;;QAEd,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;QACxD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAA,cAAM,EAAC,cAAc,GAAG,EAAE,EAAE,iBAAiB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACxE,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CACxB,GAAG,EACH,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,EACb,CAAO,GAAyB,EAAE,EAAE;gBAClC,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,EAAE,CAAC;oBACrD,MAAM,IAAA,mBAAW,GAAE,CAAC;oBACpB,MAAM,GAAG,GAAG,IAAI,KAAK,CACnB,iDAAiD,CAClD,CAAC;oBACF,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC;oBACnB,MAAM,GAAG,CAAC;gBACZ,CAAC;gBAED,MAAM,QAAQ,GAAa,EAAE,CAAC;gBAC9B,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;gBAEhD,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;;oBACjB,MAAM,SAAS,GAAG,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,0CAAE,QAAQ,EAAE,CAAC;oBACtD,IAAI,SAAS,KAAK,iBAAiB;wBACjC,OAAO,MAAM,CAAC,gBAAgB,GAAG,OAAO,SAAS,EAAE,CAAC,CAAC;oBACvD,IAAA,cAAM,EAAC,iBAAiB,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC;oBAC1C,IAAI,CAAC;wBACH,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;oBACjC,CAAC;oBAAC,WAAM,CAAC;wBACP,OAAO,CAAC,SAAS,CAAC,CAAC;oBACrB,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAA,CACF,CAAC;YAEF,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAU,EAAE,EAAE;gBAC7B,IAAA,gBAAQ,EAAC,qBAAqB,GAAG,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;gBACnD,MAAM,CAAC,CAAC,CAAC,CAAC;YACZ,CAAC,CAAC,CAAC;YAEH,IAAI,IAAI,EAAE,CAAC;gBACT,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC;YAED,GAAG,CAAC,GAAG,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAjDD,0BAiDC"}
+{"version":3,"file":"ze-http-request.js","sourceRoot":"","sources":["../../../../../../libs/zephyr-edge-contract/src/lib/utils/ze-http-request.ts"],"names":[],"mappings":"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"}