zephyr-agent 0.0.21 → 0.0.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +1 -2
- package/dist/index.js +2 -4
- package/dist/index.js.map +1 -1
- package/dist/lib/actions/ze-enable-snapshot-on-edge.js +2 -9
- package/dist/lib/actions/ze-enable-snapshot-on-edge.js.map +1 -1
- package/dist/lib/actions/ze-enable-snapshot-on-pages.js +8 -8
- package/dist/lib/actions/ze-enable-snapshot-on-pages.js.map +1 -1
- package/dist/lib/actions/ze-upload-assets.js +14 -35
- package/dist/lib/actions/ze-upload-assets.js.map +1 -1
- package/dist/lib/actions/ze-upload-build-stats.d.ts +1 -3
- package/dist/lib/actions/ze-upload-build-stats.js +18 -27
- package/dist/lib/actions/ze-upload-build-stats.js.map +1 -1
- package/dist/lib/actions/ze-upload-snapshot.js +4 -14
- package/dist/lib/actions/ze-upload-snapshot.js.map +1 -1
- package/dist/lib/application-configuration/get-application-configuration.d.ts +3 -2
- package/dist/lib/application-configuration/get-application-configuration.js +16 -21
- package/dist/lib/application-configuration/get-application-configuration.js.map +1 -1
- package/dist/lib/auth/login.d.ts +6 -5
- package/dist/lib/auth/login.js +26 -27
- package/dist/lib/auth/login.js.map +1 -1
- package/dist/lib/payload-builders/ze-build-assets-map.js +1 -0
- package/dist/lib/payload-builders/ze-build-assets-map.js.map +1 -1
- package/dist/lib/remote-logs/ze-log-event.js +3 -3
- package/dist/lib/remote-logs/ze-log-event.js.map +1 -1
- package/dist/lib/upload/upload-envs.d.ts +4 -2
- package/dist/lib/upload/upload-envs.js +16 -7
- package/dist/lib/upload/upload-envs.js.map +1 -1
- package/dist/lib/upload/upload-file.d.ts +1 -1
- package/dist/lib/upload/upload-file.js +11 -5
- package/dist/lib/upload/upload-file.js.map +1 -1
- package/dist/lib/upload/upload-snapshot.d.ts +2 -2
- package/dist/lib/upload/upload-snapshot.js +16 -11
- package/dist/lib/upload/upload-snapshot.js.map +1 -1
- package/dist/lib/upload/upload.js +0 -2
- package/dist/lib/upload/upload.js.map +1 -1
- package/dist/lib/util/promise.d.ts +0 -6
- package/dist/lib/util/promise.js +1 -26
- package/dist/lib/util/promise.js.map +1 -1
- package/dist/lib/ze-api-requests/get-application-hash-list.d.ts +1 -1
- package/dist/lib/ze-api-requests/get-application-hash-list.js +12 -9
- package/dist/lib/ze-api-requests/get-application-hash-list.js.map +1 -1
- package/dist/lib/ze-api-requests/get-build-id.d.ts +1 -1
- package/dist/lib/ze-api-requests/get-build-id.js +11 -15
- package/dist/lib/ze-api-requests/get-build-id.js.map +1 -1
- package/dist/package.json +1 -1
- package/package.json +2 -2
package/dist/index.d.ts
CHANGED
|
@@ -10,10 +10,9 @@ export { onIndexHtmlResolved, resolveIndexHtml } from './lib/hacks/resolve-index
|
|
|
10
10
|
export { zeBuildAssetsMap, buildAssetsMap } from './lib/payload-builders/ze-build-assets-map';
|
|
11
11
|
export { createSnapshot } from './lib/payload-builders/ze-build-snapshot';
|
|
12
12
|
export { zeGetDashData, GetDashDataOptions } from './lib/payload-builders/ze-get-dash-data';
|
|
13
|
-
export { logger } from './lib/remote-logs/ze-log-event';
|
|
13
|
+
export { logger, logFn } from './lib/remote-logs/ze-log-event';
|
|
14
14
|
export { getZeBuildAsset } from './lib/sync-utils/get-ze-build-asset';
|
|
15
15
|
export { getBuildId } from './lib/ze-api-requests/get-build-id';
|
|
16
16
|
export { upload } from './lib/upload/upload';
|
|
17
17
|
export { get_hash_list, update_hash_list } from './lib/dvcs/distributed-hash-control';
|
|
18
18
|
export { get_missing_assets } from './lib/dvcs/get-missing-assets';
|
|
19
|
-
export * from './lib/custom-errors';
|
package/dist/index.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
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;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
3
|
+
exports.get_missing_assets = exports.update_hash_list = exports.get_hash_list = exports.upload = exports.getBuildId = exports.getZeBuildAsset = exports.logFn = 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;
|
|
5
4
|
var ze_enable_snapshot_on_edge_1 = require("./lib/actions/ze-enable-snapshot-on-edge");
|
|
6
5
|
Object.defineProperty(exports, "zeEnableSnapshotOnEdge", { enumerable: true, get: function () { return ze_enable_snapshot_on_edge_1.zeEnableSnapshotOnEdge; } });
|
|
7
6
|
var ze_upload_assets_1 = require("./lib/actions/ze-upload-assets");
|
|
@@ -31,6 +30,7 @@ var ze_get_dash_data_1 = require("./lib/payload-builders/ze-get-dash-data");
|
|
|
31
30
|
Object.defineProperty(exports, "zeGetDashData", { enumerable: true, get: function () { return ze_get_dash_data_1.zeGetDashData; } });
|
|
32
31
|
var ze_log_event_1 = require("./lib/remote-logs/ze-log-event");
|
|
33
32
|
Object.defineProperty(exports, "logger", { enumerable: true, get: function () { return ze_log_event_1.logger; } });
|
|
33
|
+
Object.defineProperty(exports, "logFn", { enumerable: true, get: function () { return ze_log_event_1.logFn; } });
|
|
34
34
|
var get_ze_build_asset_1 = require("./lib/sync-utils/get-ze-build-asset");
|
|
35
35
|
Object.defineProperty(exports, "getZeBuildAsset", { enumerable: true, get: function () { return get_ze_build_asset_1.getZeBuildAsset; } });
|
|
36
36
|
var get_build_id_1 = require("./lib/ze-api-requests/get-build-id");
|
|
@@ -42,6 +42,4 @@ Object.defineProperty(exports, "get_hash_list", { enumerable: true, get: functio
|
|
|
42
42
|
Object.defineProperty(exports, "update_hash_list", { enumerable: true, get: function () { return distributed_hash_control_1.update_hash_list; } });
|
|
43
43
|
var get_missing_assets_1 = require("./lib/dvcs/get-missing-assets");
|
|
44
44
|
Object.defineProperty(exports, "get_missing_assets", { enumerable: true, get: function () { return get_missing_assets_1.get_missing_assets; } });
|
|
45
|
-
// Errors related
|
|
46
|
-
tslib_1.__exportStar(require("./lib/custom-errors"), exports);
|
|
47
45
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
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,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,+DAA+D;AAAtD,sGAAA,MAAM,OAAA;AAAE,qGAAA,KAAK,OAAA;AACtB,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"}
|
|
@@ -10,18 +10,11 @@ function zeEnableSnapshotOnEdge(props) {
|
|
|
10
10
|
const { pluginOptions, envs_jwt, zeStart } = props;
|
|
11
11
|
(0, zephyr_edge_contract_1.ze_log)('Enabling snapshot on edge...');
|
|
12
12
|
const logEvent = (0, ze_log_event_1.logger)(pluginOptions);
|
|
13
|
-
|
|
13
|
+
yield (0, upload_envs_1.uploadEnvs)({
|
|
14
14
|
body: envs_jwt,
|
|
15
15
|
application_uid: pluginOptions.application_uid,
|
|
16
|
+
logEvent,
|
|
16
17
|
});
|
|
17
|
-
if (!latest) {
|
|
18
|
-
logEvent({
|
|
19
|
-
level: 'error',
|
|
20
|
-
action: 'deploy:edge:failed',
|
|
21
|
-
message: 'failed deploying local build to edge',
|
|
22
|
-
});
|
|
23
|
-
return;
|
|
24
|
-
}
|
|
25
18
|
const urls = envs_jwt.urls
|
|
26
19
|
.reverse()
|
|
27
20
|
.map((url, i) => `${zephyr_edge_contract_1.brightBlueBgName} -> ${i === 0 ? (0, zephyr_edge_contract_1.cyanBright)(url) : (0, zephyr_edge_contract_1.blackBright)(url)}`)
|
|
@@ -1 +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,+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,
|
|
1
|
+
{"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,IAAA,wBAAU,EAAC;YACf,IAAI,EAAE,QAAQ;YACd,eAAe,EAAE,aAAa,CAAC,eAAe;YAC9C,QAAQ;SACT,CAAC,CAAC;QAEH,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,mBAAmB,IAAA,6BAAM,EAAC,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC,IAAI;SAClE,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;AA/BD,wDA+BC"}
|
|
@@ -13,20 +13,20 @@ function zeEnableSnapshotOnPages(_a) {
|
|
|
13
13
|
const { EDGE_URL, jwt } = yield (0, get_application_configuration_1.getApplicationConfiguration)({
|
|
14
14
|
application_uid,
|
|
15
15
|
});
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
const [ok, cause] = yield zephyr_edge_contract_1.ZeHttpRequest.from({
|
|
17
|
+
path: '/upload',
|
|
18
|
+
base: EDGE_URL,
|
|
19
|
+
query: { type },
|
|
20
|
+
}, {
|
|
19
21
|
method: 'POST',
|
|
20
22
|
headers: {
|
|
21
23
|
can_write_jwt: jwt,
|
|
22
24
|
'Content-Type': 'application/json',
|
|
23
25
|
'Content-Length': data.length.toString(),
|
|
24
26
|
},
|
|
25
|
-
};
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
(0, zephyr_edge_contract_1.ze_error)('ERR_DEPLOY_LOCAL_BUILD');
|
|
29
|
-
return;
|
|
27
|
+
}, data);
|
|
28
|
+
if (!ok) {
|
|
29
|
+
throw new zephyr_edge_contract_1.ZephyrError(zephyr_edge_contract_1.ZeErrors.ERR_DEPLOY_LOCAL_BUILD, { cause });
|
|
30
30
|
}
|
|
31
31
|
(0, zephyr_edge_contract_1.ze_log)('Build successfully deployed.');
|
|
32
32
|
});
|
|
@@ -1 +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,+
|
|
1
|
+
{"version":3,"file":"ze-enable-snapshot-on-pages.js","sourceRoot":"","sources":["../../../src/lib/actions/ze-enable-snapshot-on-pages.ts"],"names":[],"mappings":";;;;AAAA,+DAAwG;AACxG,8GAAyG;AAQzG,SAAsB,uBAAuB;iEAAC,EAC5C,aAAa,EAAE,EAAE,eAAe,EAAE,EAClC,QAAQ,EACR,SAAS,GACmB;QAC5B,IAAA,6BAAM,EAAC,uCAAuC,CAAC,CAAC;QAChD,IAAA,6BAAM,EAAC,iCAAiC,eAAe,EAAE,CAAC,CAAC;QAE3D,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,CAAC,EAAE,EAAE,KAAK,CAAC,GAAG,MAAM,oCAAa,CAAC,IAAI,CAC1C;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,EAAE,IAAI,EAAE;SAChB,EACD;YACE,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,EACD,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,MAAM,IAAI,kCAAW,CAAC,+BAAQ,CAAC,sBAAsB,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QACpE,CAAC;QAED,IAAA,6BAAM,EAAC,8BAA8B,CAAC,CAAC;IACzC,CAAC;CAAA;AAxCD,0DAwCC"}
|
|
@@ -22,47 +22,26 @@ function zeUploadAssets(pluginOptions_1, _a) {
|
|
|
22
22
|
const appConfig = yield (0, get_application_configuration_1.getApplicationConfiguration)({
|
|
23
23
|
application_uid: pluginOptions.application_uid,
|
|
24
24
|
});
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
return true;
|
|
33
|
-
}
|
|
34
|
-
catch (error) {
|
|
35
|
-
logEvent({
|
|
36
|
-
level: 'error',
|
|
37
|
-
action: 'snapshot:assets:upload:failed',
|
|
38
|
-
message: `Failed uploading missing assets to zephyr\n${String(error)}`,
|
|
39
|
-
});
|
|
40
|
-
(0, zephyr_edge_contract_1.ze_error)('ERR_FAILED_UPLOAD_ASSETS', error);
|
|
41
|
-
return false;
|
|
42
|
-
}
|
|
25
|
+
yield Promise.all(missingAssets.map(upload_missing_asset));
|
|
26
|
+
logEvent({
|
|
27
|
+
level: 'info',
|
|
28
|
+
action: 'snapshot:assets:upload:done',
|
|
29
|
+
message: (0, zephyr_edge_contract_1.white)(`(${(0, zephyr_edge_contract_1.whiteBright)(missingAssets.length.toString())}/${(0, zephyr_edge_contract_1.white)(count.toString())} assets uploaded in ${(0, zephyr_edge_contract_1.whiteBright)((Date.now() - start).toString())}ms, ${(0, zephyr_edge_contract_1.whiteBright)(totalSize.toFixed(2))}kb)`),
|
|
30
|
+
});
|
|
31
|
+
return true;
|
|
43
32
|
function upload_missing_asset(asset) {
|
|
44
33
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
45
34
|
var _a;
|
|
46
35
|
const start = Date.now();
|
|
47
36
|
const assetWithBuffer = assetsMap[asset.hash];
|
|
48
37
|
const assetSize = ((_a = assetWithBuffer === null || assetWithBuffer === void 0 ? void 0 : assetWithBuffer.buffer) === null || _a === void 0 ? void 0 : _a.length) / 1024;
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
(0, zephyr_edge_contract_1.ze_log)(`file ${asset.path} uploaded in ${fileUploaded}ms (${assetSize.toFixed(2)}kb)`);
|
|
57
|
-
}
|
|
58
|
-
catch (err) {
|
|
59
|
-
logEvent({
|
|
60
|
-
level: 'error',
|
|
61
|
-
action: 'snapshot:assets:upload:file:failed',
|
|
62
|
-
message: `failed to upload file ${asset.path}\n${String(err)}`,
|
|
63
|
-
});
|
|
64
|
-
throw err;
|
|
65
|
-
}
|
|
38
|
+
yield (0, upload_file_1.uploadFile)({
|
|
39
|
+
hash: asset.hash,
|
|
40
|
+
asset: assetWithBuffer,
|
|
41
|
+
}, appConfig);
|
|
42
|
+
const fileUploaded = Date.now() - start;
|
|
43
|
+
totalSize += assetSize;
|
|
44
|
+
(0, zephyr_edge_contract_1.ze_log)(`file ${asset.path} uploaded in ${fileUploaded}ms (${assetSize.toFixed(2)}kb)`);
|
|
66
45
|
});
|
|
67
46
|
}
|
|
68
47
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-upload-assets.js","sourceRoot":"","sources":["../../../src/lib/actions/ze-upload-assets.ts"],"names":[],"mappings":";;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"ze-upload-assets.js","sourceRoot":"","sources":["../../../src/lib/actions/ze-upload-assets.ts"],"names":[],"mappings":";;;;AAAA,+DAS8B;AAC9B,8GAAyG;AACzG,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,wBAAwB,IAAA,4BAAK,EAAC,UAAU,CAAC,KAAK;aACxD,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACzB,IAAI,SAAS,GAAG,CAAC,CAAC;QAElB,MAAM,SAAS,GAAG,MAAM,IAAA,2DAA2B,EAAC;YAClD,eAAe,EAAE,aAAa,CAAC,eAAe;SAC/C,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC;QAE3D,QAAQ,CAAC;YACP,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,6BAA6B;YACrC,OAAO,EAAE,IAAA,4BAAK,EACZ,IAAI,IAAA,kCAAW,EACb,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,CAChC,IAAI,IAAA,4BAAK,EAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,uBAAuB,IAAA,kCAAW,EAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC,OAAO,IAAA,kCAAW,EAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAC7I;SACF,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;QAEZ,SAAe,oBAAoB,CAAC,KAAmB;;;gBACrD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBACzB,MAAM,eAAe,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC9C,MAAM,SAAS,GAAG,CAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,0CAAE,MAAM,IAAG,IAAI,CAAC;gBAEzD,MAAM,IAAA,wBAAU,EACd;oBACE,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,KAAK,EAAE,eAAe;iBACvB,EACD,SAAS,CACV,CAAC;gBAEF,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;gBAExC,SAAS,IAAI,SAAS,CAAC;gBAEvB,IAAA,6BAAM,EAAC,QAAQ,KAAK,CAAC,IAAI,gBAAgB,YAAY,OAAO,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACzF,CAAC;SAAA;IACH,CAAC;CAAA;AAxDD,wCAwDC"}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
1
|
import { type ZephyrBuildStats } from 'zephyr-edge-contract';
|
|
2
|
-
/**
|
|
3
|
-
* Returns true if build stats are uploaded successfully, false otherwise.
|
|
4
|
-
*/
|
|
2
|
+
/** Returns true if build stats are uploaded successfully, false otherwise. */
|
|
5
3
|
export declare function zeUploadBuildStats(dashData: ZephyrBuildStats): Promise<boolean>;
|
|
@@ -3,41 +3,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.zeUploadBuildStats = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
If you believe this is a mistake please make sure you have access to the organization for this application in Zephyr.
|
|
9
|
-
Could not complete deployment...
|
|
10
|
-
|
|
11
|
-
`.trim();
|
|
12
|
-
/**
|
|
13
|
-
* Returns true if build stats are uploaded successfully, false otherwise.
|
|
14
|
-
*/
|
|
6
|
+
/** Returns true if build stats are uploaded successfully, false otherwise. */
|
|
15
7
|
function zeUploadBuildStats(dashData) {
|
|
16
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
17
9
|
// Add dots here to indicate this is an async operation
|
|
18
10
|
(0, zephyr_edge_contract_1.ze_log)(`${zephyr_edge_contract_1.dimmedName} Uploading build stats to Zephyr...`);
|
|
19
11
|
const token = yield (0, zephyr_edge_contract_1.getToken)();
|
|
20
12
|
const url = new URL(zephyr_edge_contract_1.ze_api_gateway.build_stats, (0, zephyr_edge_contract_1.ZE_API_ENDPOINT)());
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
13
|
+
const [ok, cause, res] = yield zephyr_edge_contract_1.ZeHttpRequest.from(url, {
|
|
14
|
+
method: 'POST',
|
|
15
|
+
headers: {
|
|
16
|
+
'Content-Type': 'application/json',
|
|
17
|
+
Authorization: `Bearer ${token}`,
|
|
18
|
+
Accept: 'application/json',
|
|
19
|
+
},
|
|
20
|
+
}, JSON.stringify(dashData));
|
|
21
|
+
if (!ok || res.status !== 'ok') {
|
|
22
|
+
throw new zephyr_edge_contract_1.ZephyrError(zephyr_edge_contract_1.ZeErrors.ERR_FAILED_UPLOAD, {
|
|
23
|
+
type: 'build stats',
|
|
24
|
+
cause,
|
|
25
|
+
data: {
|
|
26
|
+
url: url.toString(),
|
|
28
27
|
},
|
|
29
|
-
}
|
|
30
|
-
// Check for invalid responses
|
|
31
|
-
if (typeof res === 'string' || res.status !== 'ok') {
|
|
32
|
-
throw res; // throw the error to be caught by the catch block
|
|
33
|
-
}
|
|
34
|
-
(0, zephyr_edge_contract_1.ze_log)('Build stats uploaded to Zephyr...');
|
|
35
|
-
return true;
|
|
36
|
-
}
|
|
37
|
-
catch (err) {
|
|
38
|
-
(0, zephyr_edge_contract_1.ze_error)('ERR_FAILED_UPLOAD_BUILD_STATS', ERR_FAILED_UPLOAD_BUILD_STATS_MSG, err);
|
|
39
|
-
return false;
|
|
28
|
+
});
|
|
40
29
|
}
|
|
30
|
+
(0, zephyr_edge_contract_1.ze_log)('Build stats uploaded to Zephyr...');
|
|
31
|
+
return true;
|
|
41
32
|
});
|
|
42
33
|
}
|
|
43
34
|
exports.zeUploadBuildStats = zeUploadBuildStats;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-upload-build-stats.js","sourceRoot":"","sources":["../../../src/lib/actions/ze-upload-build-stats.ts"],"names":[],"mappings":";;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"ze-upload-build-stats.js","sourceRoot":"","sources":["../../../src/lib/actions/ze-upload-build-stats.ts"],"names":[],"mappings":";;;;AAAA,+DAU8B;AAE9B,8EAA8E;AAC9E,SAAsB,kBAAkB,CAAC,QAA0B;;QACjE,uDAAuD;QACvD,IAAA,6BAAM,EAAC,GAAG,iCAAU,qCAAqC,CAAC,CAAC;QAE3D,MAAM,KAAK,GAAG,MAAM,IAAA,+BAAQ,GAAE,CAAC;QAE/B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,qCAAc,CAAC,WAAW,EAAE,IAAA,sCAAe,GAAE,CAAC,CAAC;QAEnE,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,GAAG,MAAM,oCAAa,CAAC,IAAI,CAC/C,GAAG,EACH;YACE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,UAAU,KAAK,EAAE;gBAChC,MAAM,EAAE,kBAAkB;aAC3B;SACF,EACD,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CACzB,CAAC;QAEF,IAAI,CAAC,EAAE,IAAI,GAAG,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;YAC/B,MAAM,IAAI,kCAAW,CAAC,+BAAQ,CAAC,iBAAiB,EAAE;gBAChD,IAAI,EAAE,aAAa;gBACnB,KAAK;gBACL,IAAI,EAAE;oBACJ,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;iBACpB;aACF,CAAC,CAAC;QACL,CAAC;QAED,IAAA,6BAAM,EAAC,mCAAmC,CAAC,CAAC;QAE5C,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AAlCD,gDAkCC"}
|
|
@@ -3,10 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.zeUploadSnapshot = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
6
|
-
const snapshot_uploads_1 = require("../custom-errors/snapshot-uploads");
|
|
7
6
|
const ze_log_event_1 = require("../remote-logs/ze-log-event");
|
|
8
7
|
const upload_snapshot_1 = require("../upload/upload-snapshot");
|
|
9
|
-
const promise_1 = require("../util/promise");
|
|
10
8
|
function zeUploadSnapshot(props) {
|
|
11
9
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
12
10
|
var _a;
|
|
@@ -14,32 +12,24 @@ function zeUploadSnapshot(props) {
|
|
|
14
12
|
const { buildEnv } = pluginOptions;
|
|
15
13
|
const logEvent = (0, ze_log_event_1.logger)(pluginOptions);
|
|
16
14
|
const snapUploadMs = Date.now();
|
|
17
|
-
const
|
|
15
|
+
const edgeTodo = yield (0, upload_snapshot_1.uploadSnapshot)({
|
|
18
16
|
body: snapshot,
|
|
19
17
|
application_uid: pluginOptions.application_uid,
|
|
20
|
-
})
|
|
18
|
+
});
|
|
21
19
|
const versionUrl = (_a = edgeTodo === null || edgeTodo === void 0 ? void 0 : edgeTodo.urls) === null || _a === void 0 ? void 0 : _a.version;
|
|
22
|
-
if (!versionUrl
|
|
20
|
+
if (!versionUrl) {
|
|
23
21
|
logEvent({
|
|
24
22
|
level: 'error',
|
|
25
23
|
action: 'snapshot:upload:failed',
|
|
26
24
|
message: `failed uploading of ${buildEnv} snapshot to zephyr`,
|
|
27
25
|
});
|
|
28
|
-
|
|
29
|
-
(0, zephyr_edge_contract_1.ze_error)('ERR_SNAPSHOT_UPLOADS_NO_RESULTS');
|
|
30
|
-
throw new snapshot_uploads_1.SnapshotUploadNoResultError();
|
|
31
|
-
}
|
|
32
|
-
(0, zephyr_edge_contract_1.ze_error)('ERR_FAILED_UPLOAD_SNAPSHOTS', 'Failed to upload snapshot.', error);
|
|
33
|
-
throw new snapshot_uploads_1.SnapshotUploadFailureError();
|
|
26
|
+
throw new zephyr_edge_contract_1.ZephyrError(zephyr_edge_contract_1.ZeErrors.ERR_SNAPSHOT_UPLOADS_NO_RESULTS);
|
|
34
27
|
}
|
|
35
28
|
logEvent({
|
|
36
29
|
level: 'info',
|
|
37
30
|
action: 'snapshot:upload:done',
|
|
38
31
|
message: `Uploaded ${(0, zephyr_edge_contract_1.green)(buildEnv)} snapshot in ${(0, zephyr_edge_contract_1.yellow)(`${Date.now() - snapUploadMs}`)}ms`,
|
|
39
32
|
});
|
|
40
|
-
if (!edgeTodo) {
|
|
41
|
-
(0, zephyr_edge_contract_1.ze_error)('ERR_SNAPSHOT_UPLOADS_NO_RESULTS', 'Snapshot upload gave no result, exiting...\n');
|
|
42
|
-
}
|
|
43
33
|
return versionUrl;
|
|
44
34
|
});
|
|
45
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-upload-snapshot.js","sourceRoot":"","sources":["../../../src/lib/actions/ze-upload-snapshot.ts"],"names":[],"mappings":";;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"ze-upload-snapshot.js","sourceRoot":"","sources":["../../../src/lib/actions/ze-upload-snapshot.ts"],"names":[],"mappings":";;;;AAAA,+DAQ8B;AAC9B,8DAAqD;AACrD,+DAA2D;AAE3D,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,MAAM,QAAQ,GAAG,MAAM,IAAA,gCAAc,EAAC;YACpC,IAAI,EAAE,QAAQ;YACd,eAAe,EAAE,aAAa,CAAC,eAAe;SAC/C,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,0CAAE,OAAO,CAAC;QAE3C,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,QAAQ,CAAC;gBACP,KAAK,EAAE,OAAO;gBACd,MAAM,EAAE,wBAAwB;gBAChC,OAAO,EAAE,uBAAuB,QAAQ,qBAAqB;aAC9D,CAAC,CAAC;YAEH,MAAM,IAAI,kCAAW,CAAC,+BAAQ,CAAC,+BAA+B,CAAC,CAAC;QAClE,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,OAAO,UAAU,CAAC;IACpB,CAAC;CAAA;AAlCD,4CAkCC"}
|
|
@@ -4,8 +4,9 @@ interface GetApplicationConfigurationProps {
|
|
|
4
4
|
}
|
|
5
5
|
/**
|
|
6
6
|
* Gather all calls until the first returns result:
|
|
7
|
-
*
|
|
8
|
-
* -
|
|
7
|
+
*
|
|
8
|
+
* - No parallel requests to api
|
|
9
|
+
* - Almost all actual data
|
|
9
10
|
*
|
|
10
11
|
* Note: not the best solution, but works until we use the same application_uid during execution
|
|
11
12
|
*/
|
|
@@ -4,35 +4,33 @@ exports.getApplicationConfiguration = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
6
6
|
const login_1 = require("../auth/login");
|
|
7
|
-
const configuration_error_1 = require("../custom-errors/configuration-error");
|
|
8
7
|
function loadApplicationConfiguration(_a) {
|
|
9
|
-
return tslib_1.__awaiter(this, arguments, void 0, function* ({ application_uid
|
|
8
|
+
return tslib_1.__awaiter(this, arguments, void 0, function* ({ application_uid }) {
|
|
10
9
|
if (!application_uid) {
|
|
11
|
-
throw new
|
|
10
|
+
throw new zephyr_edge_contract_1.ZephyrError(zephyr_edge_contract_1.ZeErrors.ERR_MISSING_APPLICATION_UID);
|
|
12
11
|
}
|
|
13
12
|
const token = yield (0, zephyr_edge_contract_1.getToken)();
|
|
14
13
|
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)());
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
14
|
+
const [ok, cause, data] = yield zephyr_edge_contract_1.ZeHttpRequest.from(application_config_url, {
|
|
15
|
+
headers: { Authorization: `Bearer ${token}` },
|
|
16
|
+
});
|
|
17
|
+
if (!ok || !(data === null || data === void 0 ? void 0 : data.value)) {
|
|
18
|
+
throw new zephyr_edge_contract_1.ZephyrError(zephyr_edge_contract_1.ZeErrors.ERR_LOAD_APP_CONFIG, {
|
|
19
|
+
application_uid,
|
|
20
|
+
cause,
|
|
21
|
+
data: {
|
|
22
|
+
url: application_config_url.toString(),
|
|
23
|
+
},
|
|
18
24
|
});
|
|
19
|
-
if (typeof response !== 'string' && response.value) {
|
|
20
|
-
(0, zephyr_edge_contract_1.ze_log)('Application Configuration loaded...', response);
|
|
21
|
-
return Object.assign(Object.assign({}, response.value), { fetched_at: Date.now() });
|
|
22
|
-
}
|
|
23
|
-
(0, zephyr_edge_contract_1.ze_error)('ERR_LOAD_APP_CONFIG', 'Invalid application configuration.', response);
|
|
24
|
-
return;
|
|
25
|
-
}
|
|
26
|
-
catch (v) {
|
|
27
|
-
(0, zephyr_edge_contract_1.ze_error)('ERR_LOAD_APP_CONFIG', 'Failed to load application configuration', v);
|
|
28
|
-
return;
|
|
29
25
|
}
|
|
26
|
+
return Object.assign(Object.assign({}, data.value), { fetched_at: Date.now() });
|
|
30
27
|
});
|
|
31
28
|
}
|
|
32
29
|
/**
|
|
33
30
|
* Gather all calls until the first returns result:
|
|
34
|
-
*
|
|
35
|
-
* -
|
|
31
|
+
*
|
|
32
|
+
* - No parallel requests to api
|
|
33
|
+
* - Almost all actual data
|
|
36
34
|
*
|
|
37
35
|
* Note: not the best solution, but works until we use the same application_uid during execution
|
|
38
36
|
*/
|
|
@@ -48,9 +46,6 @@ function getApplicationConfiguration(_a) {
|
|
|
48
46
|
(0, zephyr_edge_contract_1.ze_log)('Loading Application Configuration from API...');
|
|
49
47
|
yield loadApplicationConfiguration({ application_uid })
|
|
50
48
|
.then((loadedAppConfig) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
51
|
-
if (!loadedAppConfig) {
|
|
52
|
-
throw new configuration_error_1.ConfigurationError(`ZE20014`, `Failed to load application configuration...`, `critical`);
|
|
53
|
-
}
|
|
54
49
|
(0, zephyr_edge_contract_1.ze_log)('Saving Application Configuration to node-persist...');
|
|
55
50
|
yield (0, zephyr_edge_contract_1.saveAppConfig)(application_uid, loadedAppConfig);
|
|
56
51
|
return loadedAppConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-application-configuration.js","sourceRoot":"","sources":["../../../src/lib/application-configuration/get-application-configuration.ts"],"names":[],"mappings":";;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"get-application-configuration.js","sourceRoot":"","sources":["../../../src/lib/application-configuration/get-application-configuration.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/auth/login.d.ts
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Check if the user is already authenticated. If not, open a browser window to authenticate.
|
|
3
|
-
*
|
|
4
|
-
* @
|
|
2
|
+
* Check if the user is already authenticated. If not, open a browser window to authenticate. Display a message to the console.
|
|
3
|
+
*
|
|
4
|
+
* @returns The token as a string.
|
|
5
5
|
*/
|
|
6
6
|
export declare function checkAuth(): Promise<string>;
|
|
7
7
|
/**
|
|
8
8
|
* Decides whether the token is still valid based on its expiration time.
|
|
9
|
+
*
|
|
9
10
|
* @param token The token to check.
|
|
10
|
-
* @param gap
|
|
11
|
-
* @
|
|
11
|
+
* @param gap In seconds
|
|
12
|
+
* @returns Boolean indicating if the token is still valid.
|
|
12
13
|
*/
|
|
13
14
|
export declare function isTokenStillValid(token: string, gap?: number): boolean;
|
package/dist/lib/auth/login.js
CHANGED
|
@@ -8,9 +8,9 @@ const ze_log_event_1 = require("../remote-logs/ze-log-event");
|
|
|
8
8
|
const promise_1 = require("../util/promise");
|
|
9
9
|
const websocket_1 = require("./websocket");
|
|
10
10
|
/**
|
|
11
|
-
* Check if the user is already authenticated. If not, open a browser window to authenticate.
|
|
12
|
-
*
|
|
13
|
-
* @
|
|
11
|
+
* Check if the user is already authenticated. If not, open a browser window to authenticate. Display a message to the console.
|
|
12
|
+
*
|
|
13
|
+
* @returns The token as a string.
|
|
14
14
|
*/
|
|
15
15
|
function checkAuth() {
|
|
16
16
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -36,9 +36,10 @@ function checkAuth() {
|
|
|
36
36
|
exports.checkAuth = checkAuth;
|
|
37
37
|
/**
|
|
38
38
|
* Decides whether the token is still valid based on its expiration time.
|
|
39
|
+
*
|
|
39
40
|
* @param token The token to check.
|
|
40
|
-
* @param gap
|
|
41
|
-
* @
|
|
41
|
+
* @param gap In seconds
|
|
42
|
+
* @returns Boolean indicating if the token is still valid.
|
|
42
43
|
*/
|
|
43
44
|
function isTokenStillValid(token, gap = 0) {
|
|
44
45
|
// Attempts to decode the token
|
|
@@ -56,9 +57,7 @@ function isTokenStillValid(token, gap = 0) {
|
|
|
56
57
|
}
|
|
57
58
|
}
|
|
58
59
|
exports.isTokenStillValid = isTokenStillValid;
|
|
59
|
-
/**
|
|
60
|
-
* Opens the given URL in the default browser.
|
|
61
|
-
*/
|
|
60
|
+
/** Opens the given URL in the default browser. */
|
|
62
61
|
function openUrl(url) {
|
|
63
62
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
64
63
|
// Lazy loads `open` module
|
|
@@ -66,15 +65,11 @@ function openUrl(url) {
|
|
|
66
65
|
yield openModule.default(url);
|
|
67
66
|
});
|
|
68
67
|
}
|
|
69
|
-
/**
|
|
70
|
-
* Generates a URL-safe random string to use as a session key.
|
|
71
|
-
*/
|
|
68
|
+
/** Generates a URL-safe random string to use as a session key. */
|
|
72
69
|
function generateSessionKey() {
|
|
73
70
|
return encodeURIComponent(Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15));
|
|
74
71
|
}
|
|
75
|
-
/**
|
|
76
|
-
* Tries to log in the user and get back the websocket reply containing the access token.
|
|
77
|
-
*/
|
|
72
|
+
/** Tries to log in the user and get back the websocket reply containing the access token. */
|
|
78
73
|
function getPersonalAccessTokenFromWebsocket() {
|
|
79
74
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
80
75
|
const sessionKey = generateSessionKey();
|
|
@@ -85,24 +80,30 @@ function getPersonalAccessTokenFromWebsocket() {
|
|
|
85
80
|
(0, ze_log_event_1.logFn)('debug', 'Opening browser for authentication...');
|
|
86
81
|
}
|
|
87
82
|
catch (error) {
|
|
83
|
+
(0, zephyr_edge_contract_1.ze_log)(error);
|
|
88
84
|
(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`);
|
|
89
85
|
}
|
|
90
86
|
return yield waitForAccessToken(sessionKey);
|
|
91
87
|
});
|
|
92
88
|
}
|
|
93
|
-
/**
|
|
94
|
-
* Generates the URL to authenticate the user.
|
|
95
|
-
*/
|
|
89
|
+
/** Generates the URL to authenticate the user. */
|
|
96
90
|
function getAuthenticationURL(state) {
|
|
97
91
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
98
|
-
const
|
|
99
|
-
|
|
100
|
-
|
|
92
|
+
const [ok, cause, data] = yield zephyr_edge_contract_1.ZeHttpRequest.from({
|
|
93
|
+
path: zephyr_edge_contract_1.ze_api_gateway.auth_link,
|
|
94
|
+
base: (0, zephyr_edge_contract_1.ZE_API_ENDPOINT)(),
|
|
95
|
+
query: { state },
|
|
96
|
+
});
|
|
97
|
+
if (!ok) {
|
|
98
|
+
throw new zephyr_edge_contract_1.ZephyrError(zephyr_edge_contract_1.ZeErrors.ERR_AUTH_ERROR, { cause, message: 'Could not get authentication URL' });
|
|
99
|
+
}
|
|
100
|
+
return data;
|
|
101
101
|
});
|
|
102
102
|
}
|
|
103
103
|
/**
|
|
104
104
|
* Initiates user authentication and handles token storage.
|
|
105
|
-
*
|
|
105
|
+
*
|
|
106
|
+
* @returns The new token as a string.
|
|
106
107
|
*/
|
|
107
108
|
function authenticateUser() {
|
|
108
109
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -111,9 +112,7 @@ function authenticateUser() {
|
|
|
111
112
|
return token;
|
|
112
113
|
});
|
|
113
114
|
}
|
|
114
|
-
/**
|
|
115
|
-
* Waits for the access token to be received from the websocket.
|
|
116
|
-
*/
|
|
115
|
+
/** Waits for the access token to be received from the websocket. */
|
|
117
116
|
function waitForAccessToken(sessionKey) {
|
|
118
117
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
119
118
|
const { promise, resolve, reject } = (0, promise_1.PromiseWithResolvers)();
|
|
@@ -122,11 +121,11 @@ function waitForAccessToken(sessionKey) {
|
|
|
122
121
|
socket.once('access-token', resolve);
|
|
123
122
|
// Creating errors outside of the listener closure makes the stack trace point
|
|
124
123
|
// to waitForAccessToken fn instead of socket.io internals event emitter code.
|
|
125
|
-
socket.once('access-token-error', reject
|
|
126
|
-
socket.once('connect_error', reject);
|
|
124
|
+
socket.once('access-token-error', (cause) => reject(new zephyr_edge_contract_1.ZephyrError(zephyr_edge_contract_1.ZeErrors.ERR_AUTH_ERROR, { cause, message: 'Error getting access token' })));
|
|
125
|
+
socket.once('connect_error', (cause) => reject(new zephyr_edge_contract_1.ZephyrError(zephyr_edge_contract_1.ZeErrors.ERR_AUTH_ERROR, { message: 'Could not connect to socket.', cause })));
|
|
127
126
|
socket.emit('joinAccessTokenRoom', { state: sessionKey });
|
|
128
127
|
// The user has 60 seconds to log in through the browser.
|
|
129
|
-
setTimeout(reject, 60000, new
|
|
128
|
+
setTimeout(reject, 60000, new zephyr_edge_contract_1.ZephyrError(zephyr_edge_contract_1.ZeErrors.ERR_AUTH_ERROR, { message: "Couldn't receive access token in 1 minute." }));
|
|
130
129
|
return yield promise;
|
|
131
130
|
}
|
|
132
131
|
finally {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/lib/auth/login.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAC7B,+
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/lib/auth/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ function extractBuffer(asset) {
|
|
|
15
15
|
case 'CompatSource':
|
|
16
16
|
case 'RawSource':
|
|
17
17
|
case 'ConcatSource':
|
|
18
|
+
case 'SourceMapSource':
|
|
18
19
|
return (asset === null || asset === void 0 ? void 0 : asset.buffer) && asset.buffer();
|
|
19
20
|
case 'ReplaceSource':
|
|
20
21
|
return asset.source();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-build-assets-map.js","sourceRoot":"","sources":["../../../src/lib/payload-builders/ze-build-assets-map.ts"],"names":[],"mappings":";;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"ze-build-assets-map.js","sourceRoot":"","sources":["../../../src/lib/payload-builders/ze-build-assets-map.ts"],"names":[],"mappings":";;;;AAAA,+DAA6F;AAE7F,yEAAmE;AACnE,oEAAkE;AAElE,SAAS,YAAY,CAAI,KAAa;IACpC,OAAO,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC;AAChC,CAAC;AAUD,SAAS,aAAa,CAAC,KAAa;IAClC,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;IACtC,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,cAAc,CAAC;QACpB,KAAK,cAAc,CAAC;QACpB,KAAK,WAAW,CAAC;QACjB,KAAK,cAAc,CAAC;QACpB,KAAK,iBAAiB;YACpB,OAAO,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,KAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACzC,KAAK,eAAe;YAClB,OAAO,KAAK,CAAC,MAAM,EAAE,CAAC;QACxB;YACE,OAAO,KAAK,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED,SAAsB,gBAAgB,CAAC,aAAkC,EAAE,MAA8B;;QACvG,IAAA,6BAAM,EAAC,0CAA0C,CAAC,CAAC;QAEnD,MAAM,aAAa,GAAG,cAAc,CAAC,MAAM,EAAE,aAAa,EAAE,YAAY,CAAC,CAAC;QAE1E,IAAA,6BAAM,EAAC,mDAAmD,CAAC,CAAC;QAC5D,IAAI,aAAa,CAAC,mBAAmB,EAAE,CAAC;YACtC,MAAM,kBAAkB,GAAG,MAAM,IAAA,wCAAmB,GAAE,CAAC;YACvD,MAAM,gBAAgB,GAAG,IAAA,oCAAe,EAAC;gBACvC,QAAQ,EAAE,YAAY;gBACtB,OAAO,EAAE,kBAAkB;aAC5B,CAAC,CAAC;YACH,aAAa,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC;YACxD,IAAA,6BAAM,EAAC,iCAAiC,CAAC,CAAC;QAC5C,CAAC;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;CAAA;AAjBD,4CAiBC;AAED,SAAgB,cAAc,CAAI,MAAyB,EAAE,aAA+B,EAAE,YAA6B;IACzH,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;QACnD,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;QAEpC,IAAI,CAAC,MAAM,IAAI,MAAM,KAAK,EAAE,EAAE,CAAC;YAC7B,IAAA,6BAAM,EAAC,uBAAuB,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACrD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,QAAQ,GAAG,IAAA,oCAAe,EAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QAE/B,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,EAAsB,CAAC,CAAC;AAC7B,CAAC;AAfD,wCAeC"}
|
|
@@ -13,7 +13,7 @@ const logFn = (level, msg) => {
|
|
|
13
13
|
const str = String(msg);
|
|
14
14
|
const padded = str
|
|
15
15
|
.split('\n')
|
|
16
|
-
.map((m) => `${toLevelPrefix(level)} ${m.
|
|
16
|
+
.map((m) => `${toLevelPrefix(level)} ${m.trimEnd()}`)
|
|
17
17
|
.join('\n');
|
|
18
18
|
switch (level) {
|
|
19
19
|
case 'warn':
|
|
@@ -58,7 +58,7 @@ function logger(options) {
|
|
|
58
58
|
}
|
|
59
59
|
// Then attempt to upload logs,
|
|
60
60
|
loadLogData()
|
|
61
|
-
.then(([config, token]) =>
|
|
61
|
+
.then(([config, token]) => zephyr_edge_contract_1.ZeHttpRequest.from(url, {
|
|
62
62
|
method: 'POST',
|
|
63
63
|
headers: {
|
|
64
64
|
Authorization: `Bearer ${token}`,
|
|
@@ -78,7 +78,7 @@ function logger(options) {
|
|
|
78
78
|
message: (0, strip_ansi_1.stripAnsi)(log.message.trim()),
|
|
79
79
|
meta: Object.assign({}, log.meta, { isCI: options.isCI, app: options.app, git: options.git }),
|
|
80
80
|
createdAt: Date.now(),
|
|
81
|
-
})))))
|
|
81
|
+
})))).unwrap())
|
|
82
82
|
// This is ok to fail silently
|
|
83
83
|
.catch(() => void 0);
|
|
84
84
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-log-event.js","sourceRoot":"","sources":["../../../src/lib/remote-logs/ze-log-event.ts"],"names":[],"mappings":";;;AACA,+DAW8B;AAC9B,8GAAyG;AACzG,6CAAkD;AAClD,mDAA+C;AAExC,MAAM,KAAK,GAAG,CAAC,KAAa,EAAE,GAAY,EAAQ,EAAE;IACzD,IAAI,uCAAgB,EAAE,CAAC;QACrB,IAAA,6BAAM,EAAC,GAAG,CAAC,CAAC;QACZ,OAAO;IACT,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IACxB,MAAM,MAAM,GAAG,GAAG;SACf,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"ze-log-event.js","sourceRoot":"","sources":["../../../src/lib/remote-logs/ze-log-event.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { ZeUploadBuildStats } from 'zephyr-edge-contract';
|
|
2
|
-
|
|
2
|
+
import { LogEvent } from '../remote-logs/ze-log-event';
|
|
3
|
+
export declare function uploadEnvs({ body, application_uid, logEvent, }: {
|
|
3
4
|
body: ZeUploadBuildStats;
|
|
4
5
|
application_uid: string;
|
|
5
|
-
|
|
6
|
+
logEvent: LogEvent;
|
|
7
|
+
}): Promise<void>;
|
|
@@ -5,24 +5,33 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
6
6
|
const get_application_configuration_1 = require("../application-configuration/get-application-configuration");
|
|
7
7
|
function uploadEnvs(_a) {
|
|
8
|
-
return tslib_1.__awaiter(this, arguments, void 0, function* ({ body, application_uid, }) {
|
|
8
|
+
return tslib_1.__awaiter(this, arguments, void 0, function* ({ body, application_uid, logEvent, }) {
|
|
9
9
|
(0, zephyr_edge_contract_1.ze_log)(`Uploading envs to Zephyr, for ${application_uid}`);
|
|
10
|
-
const type = 'envs';
|
|
11
|
-
const data = JSON.stringify(body);
|
|
12
10
|
const { EDGE_URL, jwt } = yield (0, get_application_configuration_1.getApplicationConfiguration)({
|
|
13
11
|
application_uid,
|
|
14
12
|
});
|
|
15
|
-
const
|
|
16
|
-
url.searchParams.append('type', type);
|
|
13
|
+
const json = JSON.stringify(body);
|
|
17
14
|
const options = {
|
|
18
15
|
method: 'POST',
|
|
19
16
|
headers: {
|
|
20
17
|
can_write_jwt: jwt,
|
|
21
18
|
'Content-Type': 'application/json',
|
|
22
|
-
'Content-Length':
|
|
19
|
+
'Content-Length': Buffer.byteLength(json),
|
|
23
20
|
},
|
|
24
21
|
};
|
|
25
|
-
|
|
22
|
+
const [ok, cause, data] = yield zephyr_edge_contract_1.ZeHttpRequest.from({
|
|
23
|
+
path: '/upload',
|
|
24
|
+
base: EDGE_URL,
|
|
25
|
+
query: { type: 'envs' },
|
|
26
|
+
}, options, JSON.stringify(body));
|
|
27
|
+
if (!ok || !data) {
|
|
28
|
+
logEvent({
|
|
29
|
+
level: 'error',
|
|
30
|
+
action: 'deploy:edge:failed',
|
|
31
|
+
message: 'failed deploying local build to edge',
|
|
32
|
+
});
|
|
33
|
+
throw new zephyr_edge_contract_1.ZephyrError(zephyr_edge_contract_1.ZeErrors.ERR_FAILED_UPLOAD, { type: 'envs', cause: cause });
|
|
34
|
+
}
|
|
26
35
|
});
|
|
27
36
|
}
|
|
28
37
|
exports.uploadEnvs = uploadEnvs;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-envs.js","sourceRoot":"","sources":["../../../src/lib/upload/upload-envs.ts"],"names":[],"mappings":";;;;AACA,+
|
|
1
|
+
{"version":3,"file":"upload-envs.js","sourceRoot":"","sources":["../../../src/lib/upload/upload-envs.ts"],"names":[],"mappings":";;;;AACA,+DAAwG;AACxG,8GAAyG;AAGzG,SAAsB,UAAU;iEAAC,EAC/B,IAAI,EACJ,eAAe,EACf,QAAQ,GAKT;QACC,IAAA,6BAAM,EAAC,iCAAiC,eAAe,EAAE,CAAC,CAAC;QAE3D,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,2DAA2B,EAAC;YAC1D,eAAe;SAChB,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAElC,MAAM,OAAO,GAAsB;YACjC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,aAAa,EAAE,GAAG;gBAClB,cAAc,EAAE,kBAAkB;gBAClC,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC;aAC1C;SACF,CAAC;QAEF,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,MAAM,oCAAa,CAAC,IAAI,CAChD;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;SACxB,EACD,OAAO,EACP,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CACrB,CAAC;QAEF,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;YACjB,QAAQ,CAAC;gBACP,KAAK,EAAE,OAAO;gBACd,MAAM,EAAE,oBAAoB;gBAC5B,OAAO,EAAE,sCAAsC;aAChD,CAAC,CAAC;YAEH,MAAM,IAAI,kCAAW,CAAC,+BAAQ,CAAC,iBAAiB,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QACpF,CAAC;IACH,CAAC;CAAA;AA7CD,gCA6CC"}
|
|
@@ -3,4 +3,4 @@ export interface UploadFileProps {
|
|
|
3
3
|
hash: string;
|
|
4
4
|
asset: UploadableAsset;
|
|
5
5
|
}
|
|
6
|
-
export declare function uploadFile({ hash, asset }: UploadFileProps, { EDGE_URL, jwt }: ZeApplicationConfig): Promise<
|
|
6
|
+
export declare function uploadFile({ hash, asset }: UploadFileProps, { EDGE_URL, jwt }: ZeApplicationConfig): Promise<void>;
|
|
@@ -15,11 +15,17 @@ function uploadFile(_a, _b) {
|
|
|
15
15
|
'Content-Type': 'application/octet-stream',
|
|
16
16
|
},
|
|
17
17
|
};
|
|
18
|
-
const
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
18
|
+
const [ok, cause] = yield zephyr_edge_contract_1.ZeHttpRequest.from({
|
|
19
|
+
path: '/upload',
|
|
20
|
+
base: EDGE_URL,
|
|
21
|
+
query: { type, hash, filename: asset.path },
|
|
22
|
+
}, options, asset.buffer);
|
|
23
|
+
if (!ok) {
|
|
24
|
+
throw new zephyr_edge_contract_1.ZephyrError(zephyr_edge_contract_1.ZeErrors.ERR_FAILED_UPLOAD, {
|
|
25
|
+
type: 'file',
|
|
26
|
+
cause,
|
|
27
|
+
});
|
|
28
|
+
}
|
|
23
29
|
});
|
|
24
30
|
}
|
|
25
31
|
exports.uploadFile = uploadFile;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-file.js","sourceRoot":"","sources":["../../../src/lib/upload/upload-file.ts"],"names":[],"mappings":";;;;AACA,+
|
|
1
|
+
{"version":3,"file":"upload-file.js","sourceRoot":"","sources":["../../../src/lib/upload/upload-file.ts"],"names":[],"mappings":";;;;AACA,+DAA4H;AAO5H,SAAsB,UAAU;iEAAC,EAAE,IAAI,EAAE,KAAK,EAAmB,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAuB;QACvG,MAAM,IAAI,GAAG,MAAM,CAAC;QAEpB,MAAM,OAAO,GAAsB;YACjC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,aAAa,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACpC,aAAa,EAAE,KAAK,CAAC,IAAI;gBACzB,aAAa,EAAE,GAAG;gBAClB,cAAc,EAAE,0BAA0B;aAC3C;SACF,CAAC;QAEF,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,GAAG,MAAM,oCAAa,CAAC,IAAI,CAC1C;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE;SAC5C,EACD,OAAO,EACP,KAAK,CAAC,MAAM,CACb,CAAC;QAEF,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,MAAM,IAAI,kCAAW,CAAC,+BAAQ,CAAC,iBAAiB,EAAE;gBAChD,IAAI,EAAE,MAAM;gBACZ,KAAK;aACN,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CAAA;AA7BD,gCA6BC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Snapshot, SnapshotUploadRes } from 'zephyr-edge-contract';
|
|
2
|
-
export declare function uploadSnapshot({ body, application_uid
|
|
2
|
+
export declare function uploadSnapshot({ body, application_uid }: {
|
|
3
3
|
body: Snapshot;
|
|
4
4
|
application_uid: string;
|
|
5
|
-
}): Promise<SnapshotUploadRes
|
|
5
|
+
}): Promise<SnapshotUploadRes>;
|
|
@@ -5,15 +5,11 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
6
6
|
const get_application_configuration_1 = require("../application-configuration/get-application-configuration");
|
|
7
7
|
function uploadSnapshot(_a) {
|
|
8
|
-
return tslib_1.__awaiter(this, arguments, void 0, function* ({ body, application_uid
|
|
8
|
+
return tslib_1.__awaiter(this, arguments, void 0, function* ({ body, application_uid }) {
|
|
9
9
|
const { EDGE_URL, jwt } = yield (0, get_application_configuration_1.getApplicationConfiguration)({
|
|
10
10
|
application_uid,
|
|
11
11
|
});
|
|
12
|
-
const type = 'snapshot';
|
|
13
12
|
const data = JSON.stringify(body);
|
|
14
|
-
const url = new URL('/upload', EDGE_URL);
|
|
15
|
-
url.searchParams.append('type', type);
|
|
16
|
-
url.searchParams.append('skip_assets', 'true');
|
|
17
13
|
const options = {
|
|
18
14
|
method: 'POST',
|
|
19
15
|
headers: {
|
|
@@ -22,13 +18,22 @@ function uploadSnapshot(_a) {
|
|
|
22
18
|
can_write_jwt: jwt,
|
|
23
19
|
},
|
|
24
20
|
};
|
|
25
|
-
const
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
21
|
+
const [ok, cause, resp] = yield zephyr_edge_contract_1.ZeHttpRequest.from({
|
|
22
|
+
path: '/upload',
|
|
23
|
+
base: EDGE_URL,
|
|
24
|
+
query: {
|
|
25
|
+
type: 'snapshot',
|
|
26
|
+
skip_assets: true,
|
|
27
|
+
},
|
|
28
|
+
}, options, data);
|
|
29
|
+
if (!ok) {
|
|
30
|
+
throw new zephyr_edge_contract_1.ZephyrError(zephyr_edge_contract_1.ZeErrors.ERR_FAILED_UPLOAD, {
|
|
31
|
+
type: 'snapshot',
|
|
32
|
+
cause,
|
|
33
|
+
});
|
|
30
34
|
}
|
|
31
|
-
|
|
35
|
+
(0, zephyr_edge_contract_1.ze_log)('Snapshot uploaded...');
|
|
36
|
+
return resp;
|
|
32
37
|
});
|
|
33
38
|
}
|
|
34
39
|
exports.uploadSnapshot = uploadSnapshot;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-snapshot.js","sourceRoot":"","sources":["../../../src/lib/upload/upload-snapshot.ts"],"names":[],"mappings":";;;;AACA,+
|
|
1
|
+
{"version":3,"file":"upload-snapshot.js","sourceRoot":"","sources":["../../../src/lib/upload/upload-snapshot.ts"],"names":[],"mappings":";;;;AACA,+DAAiH;AACjH,8GAAyG;AAEzG,SAAsB,cAAc;iEAAC,EAAE,IAAI,EAAE,eAAe,EAA+C;QACzG,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,2DAA2B,EAAC;YAC1D,eAAe;SAChB,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAElC,MAAM,OAAO,GAAsB;YACjC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;gBACxC,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,GAAG;aACnB;SACF,CAAC;QAEF,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,MAAM,oCAAa,CAAC,IAAI,CAChD;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE;gBACL,IAAI,EAAE,UAAU;gBAChB,WAAW,EAAE,IAAI;aAClB;SACF,EACD,OAAO,EACP,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,MAAM,IAAI,kCAAW,CAAC,+BAAQ,CAAC,iBAAiB,EAAE;gBAChD,IAAI,EAAE,UAAU;gBAChB,KAAK;aACN,CAAC,CAAC;QACL,CAAC;QAED,IAAA,6BAAM,EAAC,sBAAsB,CAAC,CAAC;QAE/B,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AAvCD,wCAuCC"}
|
|
@@ -29,8 +29,6 @@ function upload(options) {
|
|
|
29
29
|
// if (deployResult) {
|
|
30
30
|
// await appDeployResultCache.setAppDeployResult(result.app_version.application_uid, { urls: result.urls });
|
|
31
31
|
// }
|
|
32
|
-
// empty line to separate logs from other plugins
|
|
33
|
-
console.log();
|
|
34
32
|
});
|
|
35
33
|
}
|
|
36
34
|
exports.upload = upload;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/lib/upload/upload.ts"],"names":[],"mappings":";;;;AAAA,+DAS8B;AAE9B,8DAAqD;AACrD,6CAAmE;AAEnE,SAAsB,MAAM,CAAC,OAAsB;;QACjD,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAE/C,IAAI,UAAkB,CAAC;QAEvB,QAAQ,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;YACnC,KAAK,yCAAkB,CAAC,UAAU;gBAChC,UAAU,GAAG,MAAM,IAAA,+BAAkB,EAAC,OAAO,CAAC,CAAC;gBAC/C,MAAM;YACR,KAAK,yCAAkB,CAAC,OAAO;gBAC7B,UAAU,GAAG,MAAM,IAAA,4BAAe,EAAC,OAAO,CAAC,CAAC;gBAC5C,MAAM;YACR;gBACE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QACpD,CAAC;QAED,QAAQ,CAAC;YACP,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,YAAY;YACpB,OAAO,EAAE,eAAe,IAAA,iCAAU,EAAC,QAAQ,CAAC,cAAc,IAAA,6BAAM,EAAC,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,UAAU,IAAA,iCAAU,EAAC,UAAU,CAAC,EAAE;SACtI,CAAC,CAAC;QAEH,+BAA+B;QAC/B,wEAAwE;QACxE,sBAAsB;QACtB,8GAA8G;QAC9G,IAAI;
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/lib/upload/upload.ts"],"names":[],"mappings":";;;;AAAA,+DAS8B;AAE9B,8DAAqD;AACrD,6CAAmE;AAEnE,SAAsB,MAAM,CAAC,OAAsB;;QACjD,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAE/C,IAAI,UAAkB,CAAC;QAEvB,QAAQ,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;YACnC,KAAK,yCAAkB,CAAC,UAAU;gBAChC,UAAU,GAAG,MAAM,IAAA,+BAAkB,EAAC,OAAO,CAAC,CAAC;gBAC/C,MAAM;YACR,KAAK,yCAAkB,CAAC,OAAO;gBAC7B,UAAU,GAAG,MAAM,IAAA,4BAAe,EAAC,OAAO,CAAC,CAAC;gBAC5C,MAAM;YACR;gBACE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QACpD,CAAC;QAED,QAAQ,CAAC;YACP,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,YAAY;YACpB,OAAO,EAAE,eAAe,IAAA,iCAAU,EAAC,QAAQ,CAAC,cAAc,IAAA,6BAAM,EAAC,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,UAAU,IAAA,iCAAU,EAAC,UAAU,CAAC,EAAE;SACtI,CAAC,CAAC;QAEH,+BAA+B;QAC/B,wEAAwE;QACxE,sBAAsB;QACtB,8GAA8G;QAC9G,IAAI;IACN,CAAC;CAAA;AA3BD,wBA2BC"}
|
|
@@ -8,12 +8,6 @@ export declare function PromiseWithResolvers<T>(): {
|
|
|
8
8
|
resolve: (value: T | PromiseLike<T>) => void;
|
|
9
9
|
reject: (reason?: unknown) => void;
|
|
10
10
|
};
|
|
11
|
-
/**
|
|
12
|
-
* Creates a `[error, value]` tuple from a promise.
|
|
13
|
-
*
|
|
14
|
-
* @link https://www.npmjs.com/package/tuple-it
|
|
15
|
-
*/
|
|
16
|
-
export declare function PromiseTuple<P>(maybePromise: PromiseLike<P> | P): Promise<[Error] | [null, P]>;
|
|
17
11
|
/**
|
|
18
12
|
* Lazy loads a promise.
|
|
19
13
|
*
|
package/dist/lib/util/promise.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.PromiseLazyLoad = exports.
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
3
|
+
exports.PromiseLazyLoad = exports.PromiseWithResolvers = void 0;
|
|
5
4
|
/**
|
|
6
5
|
* ES 2023 Promise.withResolvers() polyfill
|
|
7
6
|
*
|
|
@@ -17,30 +16,6 @@ function PromiseWithResolvers() {
|
|
|
17
16
|
return { promise, resolve, reject };
|
|
18
17
|
}
|
|
19
18
|
exports.PromiseWithResolvers = PromiseWithResolvers;
|
|
20
|
-
/**
|
|
21
|
-
* Creates a `[error, value]` tuple from a promise.
|
|
22
|
-
*
|
|
23
|
-
* @link https://www.npmjs.com/package/tuple-it
|
|
24
|
-
*/
|
|
25
|
-
function PromiseTuple(maybePromise) {
|
|
26
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
27
|
-
try {
|
|
28
|
-
// await because then is not present on non-Promise objects
|
|
29
|
-
return [null, yield maybePromise];
|
|
30
|
-
}
|
|
31
|
-
catch (err) {
|
|
32
|
-
// Wrapping into Error avoids the need to check
|
|
33
|
-
// `if (error !== undefined)` in favor of a simpler `if (error)`
|
|
34
|
-
if (err instanceof Error) {
|
|
35
|
-
return [err];
|
|
36
|
-
}
|
|
37
|
-
const error = new Error('Promise rejected without an error');
|
|
38
|
-
error.data = err;
|
|
39
|
-
return [error];
|
|
40
|
-
}
|
|
41
|
-
});
|
|
42
|
-
}
|
|
43
|
-
exports.PromiseTuple = PromiseTuple;
|
|
44
19
|
/**
|
|
45
20
|
* Lazy loads a promise.
|
|
46
21
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promise.js","sourceRoot":"","sources":["../../../src/lib/util/promise.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"promise.js","sourceRoot":"","sources":["../../../src/lib/util/promise.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,SAAgB,oBAAoB;IAClC,IAAI,OAA6C,CAAC;IAClD,IAAI,MAAmC,CAAC;IAExC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAI,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAC1C,OAAO,GAAG,GAAG,CAAC;QACd,MAAM,GAAG,GAAG,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;AACtC,CAAC;AAVD,oDAUC;AAED;;;;GAIG;AACH,SAAgB,eAAe,CAA0B,OAAkC;IACzF,IAAI,KAA6B,CAAC;IAElC,OAAO,CAAC,MAAS,EAAE,EAAE;QACnB,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1B,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AAVD,0CAUC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
interface GetApplicationHashListProps {
|
|
2
2
|
application_uid: string;
|
|
3
3
|
}
|
|
4
|
-
export declare function getApplicationHashList(
|
|
4
|
+
export declare function getApplicationHashList({ application_uid }: GetApplicationHashListProps): Promise<{
|
|
5
5
|
hashes: string[];
|
|
6
6
|
}>;
|
|
7
7
|
export {};
|
|
@@ -4,21 +4,24 @@ exports.getApplicationHashList = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
6
6
|
const get_application_configuration_1 = require("../application-configuration/get-application-configuration");
|
|
7
|
-
function getApplicationHashList(
|
|
8
|
-
return tslib_1.__awaiter(this,
|
|
9
|
-
const { application_uid } = props;
|
|
7
|
+
function getApplicationHashList(_a) {
|
|
8
|
+
return tslib_1.__awaiter(this, arguments, void 0, function* ({ application_uid }) {
|
|
10
9
|
const { EDGE_URL } = yield (0, get_application_configuration_1.getApplicationConfiguration)({
|
|
11
10
|
application_uid,
|
|
12
11
|
});
|
|
13
12
|
const url = new URL('/__get_application_hash_list__', EDGE_URL);
|
|
14
13
|
url.searchParams.append('application_uid', application_uid);
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
14
|
+
const [ok, cause, data] = yield zephyr_edge_contract_1.ZeHttpRequest.from(url, { method: 'GET' });
|
|
15
|
+
// No point into returning an empty array since if this request fails
|
|
16
|
+
// means the edge is not working properly and we won't be able to upload
|
|
17
|
+
// things anyway
|
|
18
|
+
if (!ok || !(data === null || data === void 0 ? void 0 : data.hashes)) {
|
|
19
|
+
throw new zephyr_edge_contract_1.ZephyrError(zephyr_edge_contract_1.ZeErrors.ERR_GET_APPLICATION_HASH_LIST, {
|
|
20
|
+
cause,
|
|
21
|
+
data: Object.assign(Object.assign({}, data), { url: url.toString() }),
|
|
22
|
+
});
|
|
20
23
|
}
|
|
21
|
-
return
|
|
24
|
+
return data;
|
|
22
25
|
});
|
|
23
26
|
}
|
|
24
27
|
exports.getApplicationHashList = getApplicationHashList;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-application-hash-list.js","sourceRoot":"","sources":["../../../src/lib/ze-api-requests/get-application-hash-list.ts"],"names":[],"mappings":";;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"get-application-hash-list.js","sourceRoot":"","sources":["../../../src/lib/ze-api-requests/get-application-hash-list.ts"],"names":[],"mappings":";;;;AAAA,+DAA4E;AAC5E,8GAAyG;AAMzG,SAAsB,sBAAsB;iEAAC,EAAE,eAAe,EAA+B;QAC3F,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,2DAA2B,EAAC;YACrD,eAAe;SAChB,CAAC,CAAC;QAEH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,gCAAgC,EAAE,QAAQ,CAAC,CAAC;QAChE,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;QAE5D,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,MAAM,oCAAa,CAAC,IAAI,CAAuB,GAAG,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAEjG,qEAAqE;QACrE,wEAAwE;QACxE,gBAAgB;QAChB,IAAI,CAAC,EAAE,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAA,EAAE,CAAC;YACzB,MAAM,IAAI,kCAAW,CAAC,+BAAQ,CAAC,6BAA6B,EAAE;gBAC5D,KAAK;gBACL,IAAI,kCACC,IAAI,KACP,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE,GACpB;aACF,CAAC,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AAxBD,wDAwBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function getBuildId(application_uid: string): Promise<string
|
|
1
|
+
export declare function getBuildId(application_uid: string): Promise<string>;
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getBuildId = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const get_application_configuration_1 = require("../application-configuration/get-application-configuration");
|
|
6
5
|
const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
6
|
+
const get_application_configuration_1 = require("../application-configuration/get-application-configuration");
|
|
7
7
|
function getBuildId(application_uid) {
|
|
8
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
-
const { BUILD_ID_ENDPOINT, user_uuid, jwt } = yield (0, get_application_configuration_1.getApplicationConfiguration)({
|
|
9
|
+
const { BUILD_ID_ENDPOINT, user_uuid, jwt, username } = yield (0, get_application_configuration_1.getApplicationConfiguration)({
|
|
10
10
|
application_uid,
|
|
11
11
|
});
|
|
12
12
|
const token = yield (0, zephyr_edge_contract_1.getToken)();
|
|
@@ -16,20 +16,16 @@ function getBuildId(application_uid) {
|
|
|
16
16
|
Authorization: 'Bearer ' + token,
|
|
17
17
|
},
|
|
18
18
|
};
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
}
|
|
27
|
-
return resp[user_uuid];
|
|
28
|
-
}
|
|
29
|
-
catch (err) {
|
|
30
|
-
// TODO: this error log doesn't print useful information
|
|
31
|
-
(0, zephyr_edge_contract_1.ze_error)('ERR_GET_BUILD_ID', err);
|
|
19
|
+
const [ok, cause, data] = yield zephyr_edge_contract_1.ZeHttpRequest.from(BUILD_ID_ENDPOINT, options);
|
|
20
|
+
if (!ok || !data[user_uuid]) {
|
|
21
|
+
throw new zephyr_edge_contract_1.ZephyrError(zephyr_edge_contract_1.ZeErrors.ERR_GET_BUILD_ID, {
|
|
22
|
+
application_uid,
|
|
23
|
+
username,
|
|
24
|
+
cause,
|
|
25
|
+
data,
|
|
26
|
+
});
|
|
32
27
|
}
|
|
28
|
+
return data[user_uuid];
|
|
33
29
|
});
|
|
34
30
|
}
|
|
35
31
|
exports.getBuildId = getBuildId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-build-id.js","sourceRoot":"","sources":["../../../src/lib/ze-api-requests/get-build-id.ts"],"names":[],"mappings":";;;;AAAA,8GAAyG;
|
|
1
|
+
{"version":3,"file":"get-build-id.js","sourceRoot":"","sources":["../../../src/lib/ze-api-requests/get-build-id.ts"],"names":[],"mappings":";;;;AAAA,+DAAsF;AACtF,8GAAyG;AAEzG,SAAsB,UAAU,CAAC,eAAuB;;QACtD,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,2DAA2B,EAAC;YACxF,eAAe;SAChB,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,MAAM,IAAA,+BAAQ,GAAE,CAAC;QAE/B,MAAM,OAAO,GAAG;YACd,OAAO,EAAE;gBACP,aAAa,EAAE,GAAG;gBAClB,aAAa,EAAE,SAAS,GAAG,KAAK;aACjC;SACF,CAAC;QAEF,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,MAAM,oCAAa,CAAC,IAAI,CAAyB,iBAAiB,EAAE,OAAO,CAAC,CAAC;QAEvG,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,kCAAW,CAAC,+BAAQ,CAAC,gBAAgB,EAAE;gBAC/C,eAAe;gBACf,QAAQ;gBACR,KAAK;gBACL,IAAI;aACL,CAAC,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC;IACzB,CAAC;CAAA;AA1BD,gCA0BC"}
|
package/dist/package.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "zephyr-agent",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.23",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"socket.io-client": "^4.7.5",
|
|
14
14
|
"tslib": "^2.6.3",
|
|
15
15
|
"uuid": "^8.3.2",
|
|
16
|
-
"zephyr-edge-contract": "0.0.
|
|
16
|
+
"zephyr-edge-contract": "0.0.23"
|
|
17
17
|
},
|
|
18
18
|
"devDependencies": {
|
|
19
19
|
"@types/is-ci": "^3.0.4",
|