zephyr-agent 0.0.0-canary.3 → 0.0.0-canary.31

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.
Files changed (79) hide show
  1. package/dist/index.d.ts +7 -4
  2. package/dist/index.js +28 -3
  3. package/dist/index.js.map +1 -1
  4. package/dist/lib/auth/login.d.ts +2 -1
  5. package/dist/lib/auth/login.js +8 -3
  6. package/dist/lib/auth/login.js.map +1 -1
  7. package/dist/lib/build-context/ze-util-parse-ze-dependencies.js +1 -4
  8. package/dist/lib/build-context/ze-util-parse-ze-dependencies.js.map +1 -1
  9. package/dist/lib/deployment/aws-upload.strategy.js +106 -9
  10. package/dist/lib/deployment/aws-upload.strategy.js.map +1 -1
  11. package/dist/lib/edge-actions/generate-manifest-asset.js +4 -4
  12. package/dist/lib/edge-actions/generate-manifest-asset.js.map +1 -1
  13. package/dist/lib/edge-actions/ze-upload-assets.js +38 -0
  14. package/dist/lib/edge-actions/ze-upload-assets.js.map +1 -1
  15. package/dist/lib/edge-requests/get-application-hash-list.d.ts +2 -1
  16. package/dist/lib/edge-requests/get-application-hash-list.js +8 -4
  17. package/dist/lib/edge-requests/get-application-hash-list.js.map +1 -1
  18. package/dist/lib/env-variables/env-var-rewrites.d.ts +19 -0
  19. package/dist/lib/env-variables/env-var-rewrites.js +189 -0
  20. package/dist/lib/env-variables/env-var-rewrites.js.map +1 -0
  21. package/dist/lib/env-variables/index.d.ts +4 -2
  22. package/dist/lib/env-variables/index.js +19 -6
  23. package/dist/lib/env-variables/index.js.map +1 -1
  24. package/dist/lib/errors/handle-global-error.d.ts +8 -0
  25. package/dist/lib/errors/handle-global-error.js +19 -0
  26. package/dist/lib/errors/handle-global-error.js.map +1 -0
  27. package/dist/lib/errors/index.d.ts +1 -0
  28. package/dist/lib/errors/index.js +1 -0
  29. package/dist/lib/errors/index.js.map +1 -1
  30. package/dist/lib/http/http-request.js.map +1 -1
  31. package/dist/lib/http/upload-file.js +1 -1
  32. package/dist/lib/http/upload-file.js.map +1 -1
  33. package/dist/lib/http/upload-snapshot.js +13 -6
  34. package/dist/lib/http/upload-snapshot.js.map +1 -1
  35. package/dist/lib/logging/cli-format.d.ts +20 -0
  36. package/dist/lib/logging/cli-format.js +56 -0
  37. package/dist/lib/logging/cli-format.js.map +1 -0
  38. package/dist/lib/logging/debug.js +61 -18
  39. package/dist/lib/logging/debug.js.map +1 -1
  40. package/dist/lib/logging/file-logger.d.ts +39 -0
  41. package/dist/lib/logging/file-logger.js +180 -0
  42. package/dist/lib/logging/file-logger.js.map +1 -0
  43. package/dist/lib/logging/success-animation.d.ts +1 -0
  44. package/dist/lib/logging/success-animation.js +44 -0
  45. package/dist/lib/logging/success-animation.js.map +1 -0
  46. package/dist/lib/logging/ze-log-event.d.ts +2 -2
  47. package/dist/lib/logging/ze-log-event.js +16 -4
  48. package/dist/lib/logging/ze-log-event.js.map +1 -1
  49. package/dist/lib/node-persist/server-token.d.ts +2 -0
  50. package/dist/lib/node-persist/server-token.js +13 -0
  51. package/dist/lib/node-persist/server-token.js.map +1 -0
  52. package/dist/lib/node-persist/storage-keys.d.ts +3 -1
  53. package/dist/lib/node-persist/storage-keys.js +2 -0
  54. package/dist/lib/node-persist/storage-keys.js.map +1 -1
  55. package/dist/lib/node-persist/token.d.ts +2 -1
  56. package/dist/lib/node-persist/token.js +43 -2
  57. package/dist/lib/node-persist/token.js.map +1 -1
  58. package/dist/lib/node-persist/upload-provider-options.d.ts +7 -0
  59. package/dist/lib/node-persist/upload-provider-options.js.map +1 -1
  60. package/dist/lib/node-persist/user-email.d.ts +2 -0
  61. package/dist/lib/node-persist/user-email.js +13 -0
  62. package/dist/lib/node-persist/user-email.js.map +1 -0
  63. package/dist/lib/transformers/ze-build-assets-map.d.ts +1 -1
  64. package/dist/lib/transformers/ze-build-assets-map.js +2 -2
  65. package/dist/lib/transformers/ze-build-assets-map.js.map +1 -1
  66. package/dist/lib/transformers/ze-build-snapshot.d.ts +3 -1
  67. package/dist/lib/transformers/ze-build-snapshot.js +12 -16
  68. package/dist/lib/transformers/ze-build-snapshot.js.map +1 -1
  69. package/dist/lib/transformers/ze-create-manifest.js +2 -2
  70. package/dist/lib/transformers/ze-create-manifest.js.map +1 -1
  71. package/dist/lib/utils/get-global.d.ts +12 -0
  72. package/dist/lib/utils/get-global.js +11 -0
  73. package/dist/lib/utils/get-global.js.map +1 -0
  74. package/dist/package.json +3 -7
  75. package/dist/zephyr-engine/index.d.ts +16 -1
  76. package/dist/zephyr-engine/index.js +38 -3
  77. package/dist/zephyr-engine/index.js.map +1 -1
  78. package/eslint.config.mjs +11 -0
  79. package/package.json +3 -7
package/dist/index.d.ts CHANGED
@@ -1,16 +1,19 @@
1
1
  export { onIndexHtmlResolved, resolveIndexHtml } from './lib/hacks/resolve-index-html';
2
2
  export { getPartialAssetMap, removePartialAssetMap, savePartialAssetMap, } from './lib/node-persist/partial-assets-map';
3
+ export { getGlobal } from './lib/utils/get-global';
3
4
  export { ZeErrors, ZephyrError } from './lib/errors';
5
+ export { handleGlobalError } from './lib/errors';
4
6
  export { getAllAppDeployResults, getAllDeployedApps, getAppDeployResult, type DeployResult, } from './lib/node-persist/app-deploy-result-cache';
5
7
  export { ze_log } from './lib/logging';
6
8
  export { logFn } from './lib/logging/ze-log-event';
9
+ export { initializeLogRun, getCurrentRunDir, resetLogRun, writeLogToFile, writeRunSummary, isFileLoggingEnabled, getLogBasePath, getLogFormat, type StructuredLogData, } from './lib/logging/file-logger';
7
10
  export { applyBaseHrefToAssets, normalizeBasePath, } from './lib/transformers/ze-basehref-handler';
8
11
  export { zeBuildAssets } from './lib/transformers/ze-build-assets';
9
- export { buildAssetsMap, type ZeBuildAssetsMap, } from './lib/transformers/ze-build-assets-map';
12
+ export { buildAssetsMapMock as buildAssetsMap, type ZeBuildAssetsMap, } from './lib/transformers/ze-build-assets-map';
10
13
  export { zeBuildDashData } from './lib/transformers/ze-build-dash-data';
11
14
  export { convertResolvedDependencies, createManifestAsset, createManifestContent, createZephyrManifest, } from './lib/transformers/ze-create-manifest';
12
15
  export { DEFAULT_AUTH_COMPLETION_TIMEOUT_MS, TOKEN_EXPIRY } from './lib/auth/auth-flags';
13
- export { is_zephyr_dependency_pair, readPackageJson, ZephyrEngine, type ZeDependencyPair, type ZephyrDependencies, type ZephyrEngineOptions, } from './zephyr-engine';
14
- export type { Platform } from './zephyr-engine';
16
+ export { ZephyrEngine, is_zephyr_dependency_pair, readPackageJson, type ZeDependencyPair, type ZephyrDependencies, type ZephyrEngineOptions, } from './zephyr-engine';
17
+ export type { Platform, ZephyrBuildHooks, DeploymentInfo } from './zephyr-engine';
15
18
  export type { ZeResolvedDependency } from './zephyr-engine/resolve_remote_dependency';
16
- export { buildEnvImportMap, buildEnvImportMapScript, buildEnvModuleSource, type RemoteEntry, } from './lib/env-variables';
19
+ export { buildEnvImportMap, buildEnvImportMapScript, buildEnvModuleSource, rewriteEnvReadsToVirtualModule, type RemoteEntry, VIRTUAL_SPECIFIER, detectEnvReads, buildImportMap, injectImportMap, buildModulePreload, injectBeforeHeadClose, buildEnvJsonAsset, generateManifestContent, calculateManifestHash, collectZEPublicVars, } from './lib/env-variables';
package/dist/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.buildEnvModuleSource = exports.buildEnvImportMapScript = exports.buildEnvImportMap = exports.ZephyrEngine = exports.readPackageJson = exports.is_zephyr_dependency_pair = exports.TOKEN_EXPIRY = exports.DEFAULT_AUTH_COMPLETION_TIMEOUT_MS = exports.createZephyrManifest = exports.createManifestContent = exports.createManifestAsset = exports.convertResolvedDependencies = exports.zeBuildDashData = exports.buildAssetsMap = exports.zeBuildAssets = exports.normalizeBasePath = exports.applyBaseHrefToAssets = exports.logFn = exports.ze_log = exports.getAppDeployResult = exports.getAllDeployedApps = exports.getAllAppDeployResults = exports.ZephyrError = exports.ZeErrors = exports.savePartialAssetMap = exports.removePartialAssetMap = exports.getPartialAssetMap = exports.resolveIndexHtml = exports.onIndexHtmlResolved = void 0;
3
+ exports.collectZEPublicVars = exports.calculateManifestHash = exports.generateManifestContent = exports.buildEnvJsonAsset = exports.injectBeforeHeadClose = exports.buildModulePreload = exports.injectImportMap = exports.buildImportMap = exports.detectEnvReads = exports.VIRTUAL_SPECIFIER = exports.rewriteEnvReadsToVirtualModule = exports.buildEnvModuleSource = exports.buildEnvImportMapScript = exports.buildEnvImportMap = exports.readPackageJson = exports.is_zephyr_dependency_pair = exports.ZephyrEngine = exports.TOKEN_EXPIRY = exports.DEFAULT_AUTH_COMPLETION_TIMEOUT_MS = exports.createZephyrManifest = exports.createManifestContent = exports.createManifestAsset = exports.convertResolvedDependencies = exports.zeBuildDashData = exports.buildAssetsMap = exports.zeBuildAssets = exports.normalizeBasePath = exports.applyBaseHrefToAssets = exports.getLogFormat = exports.getLogBasePath = exports.isFileLoggingEnabled = exports.writeRunSummary = exports.writeLogToFile = exports.resetLogRun = exports.getCurrentRunDir = exports.initializeLogRun = exports.logFn = exports.ze_log = exports.getAppDeployResult = exports.getAllDeployedApps = exports.getAllAppDeployResults = exports.handleGlobalError = exports.ZephyrError = exports.ZeErrors = exports.getGlobal = exports.savePartialAssetMap = exports.removePartialAssetMap = exports.getPartialAssetMap = exports.resolveIndexHtml = exports.onIndexHtmlResolved = void 0;
4
4
  // hack for angular
5
5
  var resolve_index_html_1 = require("./lib/hacks/resolve-index-html");
6
6
  Object.defineProperty(exports, "onIndexHtmlResolved", { enumerable: true, get: function () { return resolve_index_html_1.onIndexHtmlResolved; } });
@@ -10,10 +10,15 @@ var partial_assets_map_1 = require("./lib/node-persist/partial-assets-map");
10
10
  Object.defineProperty(exports, "getPartialAssetMap", { enumerable: true, get: function () { return partial_assets_map_1.getPartialAssetMap; } });
11
11
  Object.defineProperty(exports, "removePartialAssetMap", { enumerable: true, get: function () { return partial_assets_map_1.removePartialAssetMap; } });
12
12
  Object.defineProperty(exports, "savePartialAssetMap", { enumerable: true, get: function () { return partial_assets_map_1.savePartialAssetMap; } });
13
+ // global utilities
14
+ var get_global_1 = require("./lib/utils/get-global");
15
+ Object.defineProperty(exports, "getGlobal", { enumerable: true, get: function () { return get_global_1.getGlobal; } });
13
16
  // errors
14
17
  var errors_1 = require("./lib/errors");
15
18
  Object.defineProperty(exports, "ZeErrors", { enumerable: true, get: function () { return errors_1.ZeErrors; } });
16
19
  Object.defineProperty(exports, "ZephyrError", { enumerable: true, get: function () { return errors_1.ZephyrError; } });
20
+ var errors_2 = require("./lib/errors");
21
+ Object.defineProperty(exports, "handleGlobalError", { enumerable: true, get: function () { return errors_2.handleGlobalError; } });
17
22
  // deploy result
18
23
  var app_deploy_result_cache_1 = require("./lib/node-persist/app-deploy-result-cache");
19
24
  Object.defineProperty(exports, "getAllAppDeployResults", { enumerable: true, get: function () { return app_deploy_result_cache_1.getAllAppDeployResults; } });
@@ -24,6 +29,15 @@ var logging_1 = require("./lib/logging");
24
29
  Object.defineProperty(exports, "ze_log", { enumerable: true, get: function () { return logging_1.ze_log; } });
25
30
  var ze_log_event_1 = require("./lib/logging/ze-log-event");
26
31
  Object.defineProperty(exports, "logFn", { enumerable: true, get: function () { return ze_log_event_1.logFn; } });
32
+ var file_logger_1 = require("./lib/logging/file-logger");
33
+ Object.defineProperty(exports, "initializeLogRun", { enumerable: true, get: function () { return file_logger_1.initializeLogRun; } });
34
+ Object.defineProperty(exports, "getCurrentRunDir", { enumerable: true, get: function () { return file_logger_1.getCurrentRunDir; } });
35
+ Object.defineProperty(exports, "resetLogRun", { enumerable: true, get: function () { return file_logger_1.resetLogRun; } });
36
+ Object.defineProperty(exports, "writeLogToFile", { enumerable: true, get: function () { return file_logger_1.writeLogToFile; } });
37
+ Object.defineProperty(exports, "writeRunSummary", { enumerable: true, get: function () { return file_logger_1.writeRunSummary; } });
38
+ Object.defineProperty(exports, "isFileLoggingEnabled", { enumerable: true, get: function () { return file_logger_1.isFileLoggingEnabled; } });
39
+ Object.defineProperty(exports, "getLogBasePath", { enumerable: true, get: function () { return file_logger_1.getLogBasePath; } });
40
+ Object.defineProperty(exports, "getLogFormat", { enumerable: true, get: function () { return file_logger_1.getLogFormat; } });
27
41
  // default transformers
28
42
  var ze_basehref_handler_1 = require("./lib/transformers/ze-basehref-handler");
29
43
  Object.defineProperty(exports, "applyBaseHrefToAssets", { enumerable: true, get: function () { return ze_basehref_handler_1.applyBaseHrefToAssets; } });
@@ -31,7 +45,7 @@ Object.defineProperty(exports, "normalizeBasePath", { enumerable: true, get: fun
31
45
  var ze_build_assets_1 = require("./lib/transformers/ze-build-assets");
32
46
  Object.defineProperty(exports, "zeBuildAssets", { enumerable: true, get: function () { return ze_build_assets_1.zeBuildAssets; } });
33
47
  var ze_build_assets_map_1 = require("./lib/transformers/ze-build-assets-map");
34
- Object.defineProperty(exports, "buildAssetsMap", { enumerable: true, get: function () { return ze_build_assets_map_1.buildAssetsMap; } });
48
+ Object.defineProperty(exports, "buildAssetsMap", { enumerable: true, get: function () { return ze_build_assets_map_1.buildAssetsMapMock; } });
35
49
  var ze_build_dash_data_1 = require("./lib/transformers/ze-build-dash-data");
36
50
  Object.defineProperty(exports, "zeBuildDashData", { enumerable: true, get: function () { return ze_build_dash_data_1.zeBuildDashData; } });
37
51
  var ze_create_manifest_1 = require("./lib/transformers/ze-create-manifest");
@@ -45,12 +59,23 @@ Object.defineProperty(exports, "DEFAULT_AUTH_COMPLETION_TIMEOUT_MS", { enumerabl
45
59
  Object.defineProperty(exports, "TOKEN_EXPIRY", { enumerable: true, get: function () { return auth_flags_1.TOKEN_EXPIRY; } });
46
60
  // Zephyr Edge is the main class which should be used
47
61
  var zephyr_engine_1 = require("./zephyr-engine");
62
+ Object.defineProperty(exports, "ZephyrEngine", { enumerable: true, get: function () { return zephyr_engine_1.ZephyrEngine; } });
48
63
  Object.defineProperty(exports, "is_zephyr_dependency_pair", { enumerable: true, get: function () { return zephyr_engine_1.is_zephyr_dependency_pair; } });
49
64
  Object.defineProperty(exports, "readPackageJson", { enumerable: true, get: function () { return zephyr_engine_1.readPackageJson; } });
50
- Object.defineProperty(exports, "ZephyrEngine", { enumerable: true, get: function () { return zephyr_engine_1.ZephyrEngine; } });
51
65
  // Environment variable utilities
52
66
  var env_variables_1 = require("./lib/env-variables");
53
67
  Object.defineProperty(exports, "buildEnvImportMap", { enumerable: true, get: function () { return env_variables_1.buildEnvImportMap; } });
54
68
  Object.defineProperty(exports, "buildEnvImportMapScript", { enumerable: true, get: function () { return env_variables_1.buildEnvImportMapScript; } });
55
69
  Object.defineProperty(exports, "buildEnvModuleSource", { enumerable: true, get: function () { return env_variables_1.buildEnvModuleSource; } });
70
+ Object.defineProperty(exports, "rewriteEnvReadsToVirtualModule", { enumerable: true, get: function () { return env_variables_1.rewriteEnvReadsToVirtualModule; } });
71
+ Object.defineProperty(exports, "VIRTUAL_SPECIFIER", { enumerable: true, get: function () { return env_variables_1.VIRTUAL_SPECIFIER; } });
72
+ Object.defineProperty(exports, "detectEnvReads", { enumerable: true, get: function () { return env_variables_1.detectEnvReads; } });
73
+ Object.defineProperty(exports, "buildImportMap", { enumerable: true, get: function () { return env_variables_1.buildImportMap; } });
74
+ Object.defineProperty(exports, "injectImportMap", { enumerable: true, get: function () { return env_variables_1.injectImportMap; } });
75
+ Object.defineProperty(exports, "buildModulePreload", { enumerable: true, get: function () { return env_variables_1.buildModulePreload; } });
76
+ Object.defineProperty(exports, "injectBeforeHeadClose", { enumerable: true, get: function () { return env_variables_1.injectBeforeHeadClose; } });
77
+ Object.defineProperty(exports, "buildEnvJsonAsset", { enumerable: true, get: function () { return env_variables_1.buildEnvJsonAsset; } });
78
+ Object.defineProperty(exports, "generateManifestContent", { enumerable: true, get: function () { return env_variables_1.generateManifestContent; } });
79
+ Object.defineProperty(exports, "calculateManifestHash", { enumerable: true, get: function () { return env_variables_1.calculateManifestHash; } });
80
+ Object.defineProperty(exports, "collectZEPublicVars", { enumerable: true, get: function () { return env_variables_1.collectZEPublicVars; } });
56
81
  //# 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":";;;AAAA,mBAAmB;AACnB,qEAAuF;AAA9E,yHAAA,mBAAmB,OAAA;AAAE,sHAAA,gBAAgB,OAAA;AAC9C,sBAAsB;AACtB,4EAI+C;AAH7C,wHAAA,kBAAkB,OAAA;AAClB,2HAAA,qBAAqB,OAAA;AACrB,yHAAA,mBAAmB,OAAA;AAGrB,SAAS;AACT,uCAAqD;AAA5C,kGAAA,QAAQ,OAAA;AAAE,qGAAA,WAAW,OAAA;AAE9B,gBAAgB;AAChB,sFAKoD;AAJlD,iIAAA,sBAAsB,OAAA;AACtB,6HAAA,kBAAkB,OAAA;AAClB,6HAAA,kBAAkB,OAAA;AAIpB,SAAS;AACT,yCAAuC;AAA9B,iGAAA,MAAM,OAAA;AACf,2DAAmD;AAA1C,qGAAA,KAAK,OAAA;AAEd,uBAAuB;AACvB,8EAGgD;AAF9C,4HAAA,qBAAqB,OAAA;AACrB,wHAAA,iBAAiB,OAAA;AAEnB,sEAAmE;AAA1D,gHAAA,aAAa,OAAA;AACtB,8EAGgD;AAF9C,qHAAA,cAAc,OAAA;AAGhB,4EAAwE;AAA/D,qHAAA,eAAe,OAAA;AACxB,4EAK+C;AAJ7C,iIAAA,2BAA2B,OAAA;AAC3B,yHAAA,mBAAmB,OAAA;AACnB,2HAAA,qBAAqB,OAAA;AACrB,0HAAA,oBAAoB,OAAA;AAGtB,uBAAuB;AACvB,oDAAyF;AAAhF,gIAAA,kCAAkC,OAAA;AAAE,0GAAA,YAAY,OAAA;AAEzD,qDAAqD;AACrD,iDAOyB;AANvB,0HAAA,yBAAyB,OAAA;AACzB,gHAAA,eAAe,OAAA;AACf,6GAAA,YAAY,OAAA;AAQd,iCAAiC;AACjC,qDAK6B;AAJ3B,kHAAA,iBAAiB,OAAA;AACjB,wHAAA,uBAAuB,OAAA;AACvB,qHAAA,oBAAoB,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,mBAAmB;AACnB,qEAAuF;AAA9E,yHAAA,mBAAmB,OAAA;AAAE,sHAAA,gBAAgB,OAAA;AAC9C,sBAAsB;AACtB,4EAI+C;AAH7C,wHAAA,kBAAkB,OAAA;AAClB,2HAAA,qBAAqB,OAAA;AACrB,yHAAA,mBAAmB,OAAA;AAGrB,mBAAmB;AACnB,qDAAmD;AAA1C,uGAAA,SAAS,OAAA;AAElB,SAAS;AACT,uCAAqD;AAA5C,kGAAA,QAAQ,OAAA;AAAE,qGAAA,WAAW,OAAA;AAC9B,uCAAiD;AAAxC,2GAAA,iBAAiB,OAAA;AAE1B,gBAAgB;AAChB,sFAKoD;AAJlD,iIAAA,sBAAsB,OAAA;AACtB,6HAAA,kBAAkB,OAAA;AAClB,6HAAA,kBAAkB,OAAA;AAIpB,SAAS;AACT,yCAAuC;AAA9B,iGAAA,MAAM,OAAA;AACf,2DAAmD;AAA1C,qGAAA,KAAK,OAAA;AACd,yDAUmC;AATjC,+GAAA,gBAAgB,OAAA;AAChB,+GAAA,gBAAgB,OAAA;AAChB,0GAAA,WAAW,OAAA;AACX,6GAAA,cAAc,OAAA;AACd,8GAAA,eAAe,OAAA;AACf,mHAAA,oBAAoB,OAAA;AACpB,6GAAA,cAAc,OAAA;AACd,2GAAA,YAAY,OAAA;AAId,uBAAuB;AACvB,8EAGgD;AAF9C,4HAAA,qBAAqB,OAAA;AACrB,wHAAA,iBAAiB,OAAA;AAEnB,sEAAmE;AAA1D,gHAAA,aAAa,OAAA;AACtB,8EAGgD;AAF9C,qHAAA,kBAAkB,OAAkB;AAGtC,4EAAwE;AAA/D,qHAAA,eAAe,OAAA;AACxB,4EAK+C;AAJ7C,iIAAA,2BAA2B,OAAA;AAC3B,yHAAA,mBAAmB,OAAA;AACnB,2HAAA,qBAAqB,OAAA;AACrB,0HAAA,oBAAoB,OAAA;AAGtB,uBAAuB;AACvB,oDAAyF;AAAhF,gIAAA,kCAAkC,OAAA;AAAE,0GAAA,YAAY,OAAA;AAEzD,qDAAqD;AACrD,iDAOyB;AANvB,6GAAA,YAAY,OAAA;AACZ,0HAAA,yBAAyB,OAAA;AACzB,gHAAA,eAAe,OAAA;AAQjB,iCAAiC;AACjC,qDAgB6B;AAf3B,kHAAA,iBAAiB,OAAA;AACjB,wHAAA,uBAAuB,OAAA;AACvB,qHAAA,oBAAoB,OAAA;AACpB,+HAAA,8BAA8B,OAAA;AAE9B,kHAAA,iBAAiB,OAAA;AACjB,+GAAA,cAAc,OAAA;AACd,+GAAA,cAAc,OAAA;AACd,gHAAA,eAAe,OAAA;AACf,mHAAA,kBAAkB,OAAA;AAClB,sHAAA,qBAAqB,OAAA;AACrB,kHAAA,iBAAiB,OAAA;AACjB,wHAAA,uBAAuB,OAAA;AACvB,sHAAA,qBAAqB,OAAA;AACrB,oHAAA,mBAAmB,OAAA"}
@@ -1,10 +1,11 @@
1
+ import { type ZeGitInfo } from '../build-context/ze-util-get-git-info';
1
2
  /**
2
3
  * Check if the user is already authenticated. If not, ask if they want to open a browser
3
4
  * to authenticate. Display a message to the console.
4
5
  *
5
6
  * @returns The token as a string.
6
7
  */
7
- export declare function checkAuth(): Promise<void>;
8
+ export declare function checkAuth(git_config: ZeGitInfo): Promise<void>;
8
9
  /**
9
10
  * Decides whether the token is still valid based on its expiration time.
10
11
  *
@@ -17,21 +17,26 @@ const storage_keys_1 = require("../node-persist/storage-keys");
17
17
  const token_1 = require("../node-persist/token");
18
18
  const sse_1 = require("./sse");
19
19
  const auth_flags_1 = require("./auth-flags");
20
+ const server_token_1 = require("../node-persist/server-token");
20
21
  /**
21
22
  * Check if the user is already authenticated. If not, ask if they want to open a browser
22
23
  * to authenticate. Display a message to the console.
23
24
  *
24
25
  * @returns The token as a string.
25
26
  */
26
- async function checkAuth() {
27
+ async function checkAuth(git_config) {
27
28
  const env_1 = { stack: [], error: void 0, hasError: false };
28
29
  try {
29
30
  const secret_token = (0, secret_token_1.getSecretToken)();
31
+ const server_token = (0, server_token_1.getServerToken)();
30
32
  if (secret_token) {
31
33
  (0, ze_log_event_1.logFn)('debug', 'Token found in environment. Using secret token for authentication.');
32
34
  return;
33
35
  }
34
- const existingToken = await (0, token_1.getToken)();
36
+ if (server_token) {
37
+ (0, ze_log_event_1.logFn)('debug', 'Server token found in environment. Using server token for authentication.');
38
+ }
39
+ const existingToken = await (0, token_1.getToken)(git_config);
35
40
  if (existingToken) {
36
41
  // Check if the token has a valid expiration date.
37
42
  if (isTokenStillValid(existingToken, auth_flags_1.TOKEN_EXPIRY.SHORT_VALIDITY_CHECK_SEC)) {
@@ -69,7 +74,7 @@ async function checkAuth() {
69
74
  // before next readToken() calls can happen
70
75
  // https://github.com/simonlast/node-persist/issues/108#issuecomment-1442305246
71
76
  await (0, session_lock_1.waitForUnlock)(browserController.signal);
72
- const token = await (0, token_1.getToken)();
77
+ const token = await (0, token_1.getToken)(git_config);
73
78
  // Unlock also happens on timeout, so we need to check if the token was
74
79
  // actually saved or not
75
80
  if (!token) {
@@ -1 +1 @@
1
- {"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/lib/auth/login.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/lib/auth/login.ts"],"names":[],"mappings":"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"}
@@ -23,11 +23,8 @@ function parseZeDependency(key, value) {
23
23
  app_uid: key,
24
24
  };
25
25
  let reference = value;
26
- if (reference === 'workspace:*') {
27
- return dependency;
28
- }
29
26
  // if reference variable has ':' then cut it off and store dependency.registry
30
- if (reference.includes(':')) {
27
+ if (reference.includes(':') && !reference.includes('workspace:*')) {
31
28
  const reference_parts = reference.split(':');
32
29
  dependency.registry = reference_parts[0];
33
30
  reference = reference_parts[1];
@@ -1 +1 @@
1
- {"version":3,"file":"ze-util-parse-ze-dependencies.js","sourceRoot":"","sources":["../../../src/lib/build-context/ze-util-parse-ze-dependencies.ts"],"names":[],"mappings":";;AAeA,kDASC;AASD,8CAmCC;AArDD,SAAgB,mBAAmB,CACjC,eAAuC;IAEvC,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QACpD,GAAG;QACH,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC;KAC9B,CAAC,CACH,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAAC,GAAW,EAAE,KAAa;IAC1D,+BAA+B;IAC/B,MAAM,UAAU,GAAiB;QAC/B,OAAO,EAAE,KAAK;QACd,QAAQ,EAAE,QAAQ;QAClB,OAAO,EAAE,GAAG;KACb,CAAC;IAEF,IAAI,SAAS,GAAG,KAAK,CAAC;IAEtB,IAAI,SAAS,KAAK,aAAa,EAAE,CAAC;QAChC,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,8EAA8E;IAC9E,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5B,MAAM,eAAe,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7C,UAAU,CAAC,QAAQ,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;QACzC,SAAS,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;IACjC,CAAC;IAED,mFAAmF;IACnF,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5B,MAAM,eAAe,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7C,oCAAoC;QACpC,gCAAgC;QAChC,UAAU,CAAC,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpF,UAAU,CAAC,OAAO,GAAG,eAAe,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACnE,CAAC;IACD,6DAA6D;SACxD,CAAC;QACJ,UAAU,CAAC,OAAO,GAAG,SAAS,CAAC;IACjC,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC"}
1
+ {"version":3,"file":"ze-util-parse-ze-dependencies.js","sourceRoot":"","sources":["../../../src/lib/build-context/ze-util-parse-ze-dependencies.ts"],"names":[],"mappings":";;AAeA,kDASC;AASD,8CA+BC;AAjDD,SAAgB,mBAAmB,CACjC,eAAuC;IAEvC,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QACpD,GAAG;QACH,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC;KAC9B,CAAC,CACH,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAAC,GAAW,EAAE,KAAa;IAC1D,+BAA+B;IAC/B,MAAM,UAAU,GAAiB;QAC/B,OAAO,EAAE,KAAK;QACd,QAAQ,EAAE,QAAQ;QAClB,OAAO,EAAE,GAAG;KACb,CAAC;IAEF,IAAI,SAAS,GAAG,KAAK,CAAC;IAEtB,8EAA8E;IAC9E,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QAClE,MAAM,eAAe,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7C,UAAU,CAAC,QAAQ,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;QACzC,SAAS,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;IACjC,CAAC;IAED,mFAAmF;IACnF,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5B,MAAM,eAAe,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7C,oCAAoC;QACpC,gCAAgC;QAChC,UAAU,CAAC,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpF,UAAU,CAAC,OAAO,GAAG,eAAe,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACnE,CAAC;IACD,6DAA6D;SACxD,CAAC;QACJ,UAAU,CAAC,OAAO,GAAG,SAAS,CAAC;IACjC,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC"}
@@ -2,35 +2,46 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.awsUploadStrategy = awsUploadStrategy;
4
4
  exports.createBucket = createBucket;
5
- const logging_1 = require("../logging");
6
- const errors_1 = require("../errors");
5
+ const edge_actions_1 = require("../edge-actions");
6
+ const distributed_hash_control_1 = require("../edge-hash-list/distributed-hash-control");
7
7
  const get_application_configuration_1 = require("../edge-requests/get-application-configuration");
8
+ const errors_1 = require("../errors");
8
9
  const http_request_1 = require("../http/http-request");
9
- const edge_actions_1 = require("../edge-actions");
10
+ const logging_1 = require("../logging");
11
+ const picocolor_1 = require("../logging/picocolor");
10
12
  const upload_base_1 = require("./upload-base");
11
- const EDGE_LAMBDA_MAX_BODY_SIZE = 788403; // floor(1024 * 1024 / 1.33), where 1.33 is size overhead of base64 encoding
13
+ const AWS_MAX_BODY_SIZE = 20971520;
12
14
  async function awsUploadStrategy(zephyr_engine, { snapshot, getDashData, assets: { assetsMap, missingAssets } }) {
13
15
  const snapshotSize = Buffer.byteLength(JSON.stringify(snapshot), 'utf8');
14
- if (snapshotSize > EDGE_LAMBDA_MAX_BODY_SIZE) {
16
+ if (snapshotSize > AWS_MAX_BODY_SIZE) {
15
17
  const opts = {
16
18
  entity_name: 'snapshot',
17
19
  entity_size: snapshotSize,
18
- max_allowed_size: EDGE_LAMBDA_MAX_BODY_SIZE,
20
+ max_allowed_size: AWS_MAX_BODY_SIZE,
19
21
  };
20
22
  throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_MAX_PAYLOAD_SIZE_EXCEEDED, opts);
21
23
  }
22
24
  for (const missingAsset of missingAssets) {
23
- if (missingAsset.size > EDGE_LAMBDA_MAX_BODY_SIZE) {
25
+ if (missingAsset.size > AWS_MAX_BODY_SIZE) {
24
26
  const opts = {
25
27
  entity_name: missingAsset.path,
26
28
  entity_size: missingAsset.size,
27
- max_allowed_size: EDGE_LAMBDA_MAX_BODY_SIZE,
29
+ max_allowed_size: AWS_MAX_BODY_SIZE,
28
30
  };
29
31
  throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_MAX_PAYLOAD_SIZE_EXCEEDED, opts);
30
32
  }
31
33
  }
32
34
  await createBucket(zephyr_engine.application_uid);
33
- await (0, upload_base_1.uploadAssets)(zephyr_engine, { assetsMap, missingAssets });
35
+ await uploadAssets(zephyr_engine, { assetsMap, missingAssets }).catch((error) => {
36
+ var _a, _b;
37
+ // Backwards compatibility after new AWS integration workflow to
38
+ // enable bigger body size upload.
39
+ // It can be removed after new AWS integration gets stabilized
40
+ if (((_b = (_a = error.cause) === null || _a === void 0 ? void 0 : _a.template) === null || _b === void 0 ? void 0 : _b.content) === 'Not Implemented') {
41
+ return (0, upload_base_1.uploadAssets)(zephyr_engine, { assetsMap, missingAssets });
42
+ }
43
+ throw error;
44
+ });
34
45
  const versionUrl = await (0, edge_actions_1.zeUploadSnapshot)(zephyr_engine, { snapshot });
35
46
  // Waits for the reply to check upload problems, but the reply is a simply
36
47
  // 200 OK sent before any processing
@@ -58,4 +69,90 @@ async function createBucket(application_uid) {
58
69
  }
59
70
  logging_1.ze_log.snapshot('Done: bucket initialized...');
60
71
  }
72
+ async function uploadAssets(zephyr_engine, { assetsMap, missingAssets }) {
73
+ const upload_success = await zeUploadAssets(zephyr_engine, {
74
+ missingAssets,
75
+ assetsMap,
76
+ });
77
+ if (upload_success && missingAssets.length) {
78
+ const application_uid = zephyr_engine.application_uid;
79
+ await (0, distributed_hash_control_1.update_hash_list)(application_uid, assetsMap);
80
+ }
81
+ return upload_success;
82
+ }
83
+ async function zeUploadAssets(zephyr_engine, { missingAssets, assetsMap }) {
84
+ const count = Object.keys(assetsMap).length;
85
+ const logger = await zephyr_engine.logger;
86
+ const appConfig = await zephyr_engine.application_configuration;
87
+ if (missingAssets.length === 0) {
88
+ logger({
89
+ level: 'info',
90
+ action: 'snapshot:assets:upload:empty',
91
+ message: `No assets to upload, ${(0, picocolor_1.white)('skipping')}...`,
92
+ });
93
+ return true;
94
+ }
95
+ const start = Date.now();
96
+ let totalSize = 0;
97
+ await Promise.all(missingAssets.map(upload_missing_asset));
98
+ logger({
99
+ level: 'info',
100
+ action: 'snapshot:assets:upload:done',
101
+ message: (0, picocolor_1.white)(`(${(0, picocolor_1.whiteBright)(missingAssets.length.toString())}/${(0, picocolor_1.white)(count.toString())} assets uploaded in ${(0, picocolor_1.whiteBright)((Date.now() - start).toString())}ms, ${(0, picocolor_1.whiteBright)(totalSize.toFixed(2))}kb)`),
102
+ });
103
+ return true;
104
+ async function upload_missing_asset(asset) {
105
+ var _a;
106
+ const start = Date.now();
107
+ const assetWithBuffer = assetsMap[asset.hash];
108
+ const assetSize = ((_a = assetWithBuffer === null || assetWithBuffer === void 0 ? void 0 : assetWithBuffer.buffer) === null || _a === void 0 ? void 0 : _a.length) / 1024;
109
+ const result = await getUploadUrl({
110
+ hash: asset.hash,
111
+ asset: assetWithBuffer,
112
+ }, appConfig);
113
+ if (result.message) {
114
+ // File exists
115
+ return;
116
+ }
117
+ const [ok, cause] = await (0, http_request_1.makeRequest)(result.url, {
118
+ method: 'PUT',
119
+ headers: {
120
+ 'Content-Type': result.contentType,
121
+ },
122
+ }, asset.buffer);
123
+ if (!ok) {
124
+ throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_FAILED_UPLOAD, {
125
+ type: 'file',
126
+ cause,
127
+ });
128
+ }
129
+ const fileUploaded = Date.now() - start;
130
+ totalSize += assetSize;
131
+ logging_1.ze_log.upload(`file ${asset.path} uploaded in ${fileUploaded}ms (${assetSize.toFixed(2)}kb)`);
132
+ }
133
+ async function getUploadUrl({ hash, asset }, { EDGE_URL, jwt }) {
134
+ const type = 'uploadUrl';
135
+ const options = {
136
+ method: 'POST',
137
+ headers: {
138
+ 'x-file-size': asset.size.toString(),
139
+ 'x-file-path': asset.path,
140
+ can_write_jwt: jwt,
141
+ 'Content-Type': 'application/octet-stream',
142
+ },
143
+ };
144
+ const [ok, cause, data] = await (0, http_request_1.makeRequest)({
145
+ path: '/upload',
146
+ base: EDGE_URL,
147
+ query: { type, hash, filename: asset.path },
148
+ }, options, asset.buffer);
149
+ if (!ok) {
150
+ throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_FAILED_UPLOAD, {
151
+ type,
152
+ cause,
153
+ });
154
+ }
155
+ return data;
156
+ }
157
+ }
61
158
  //# sourceMappingURL=aws-upload.strategy.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"aws-upload.strategy.js","sourceRoot":"","sources":["../../../src/lib/deployment/aws-upload.strategy.ts"],"names":[],"mappings":";;AAUA,8CAkCC;AAED,oCAyBC;AAvED,wCAAoC;AAEpC,sCAAkD;AAClD,kGAA6F;AAC7F,uDAAmD;AACnD,kDAAmD;AACnD,+CAA4E;AAE5E,MAAM,yBAAyB,GAAG,MAAM,CAAC,CAAC,4EAA4E;AAE/G,KAAK,UAAU,iBAAiB,CACrC,aAA2B,EAC3B,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,EAAiB;IAE9E,MAAM,YAAY,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;IACzE,IAAI,YAAY,GAAG,yBAAyB,EAAE,CAAC;QAC7C,MAAM,IAAI,GAAG;YACX,WAAW,EAAE,UAAU;YACvB,WAAW,EAAE,YAAY;YACzB,gBAAgB,EAAE,yBAAyB;SAC5C,CAAC;QACF,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,6BAA6B,EAAE,IAAI,CAAC,CAAC;IACtE,CAAC;IAED,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;QACzC,IAAI,YAAY,CAAC,IAAI,GAAG,yBAAyB,EAAE,CAAC;YAClD,MAAM,IAAI,GAAG;gBACX,WAAW,EAAE,YAAY,CAAC,IAAI;gBAC9B,WAAW,EAAE,YAAY,CAAC,IAAI;gBAC9B,gBAAgB,EAAE,yBAAyB;aAC5C,CAAC;YACF,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,6BAA6B,EAAE,IAAI,CAAC,CAAC;QACtE,CAAC;IACH,CAAC;IAED,MAAM,YAAY,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;IAClD,MAAM,IAAA,0BAAY,EAAC,aAAa,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC,CAAC;IAChE,MAAM,UAAU,GAAG,MAAM,IAAA,+BAAgB,EAAC,aAAa,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEvE,0EAA0E;IAC1E,oCAAoC;IACpC,MAAM,IAAA,2CAA6B,EAAC,aAAa,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAC;IAEhF,OAAO,UAAU,CAAC;AACpB,CAAC;AAEM,KAAK,UAAU,YAAY,CAAC,eAAuB;IACxD,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,2DAA2B,EAAC;QAC1D,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,OAAO,GAAgB;QAC3B,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,aAAa,EAAE,GAAG;SACnB;KACF,CAAC;IAEF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACzC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAE1C,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,GAAG,MAAM,IAAA,0BAAW,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAEpD,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,iBAAiB,EAAE;YAChD,IAAI,EAAE,QAAQ;YACd,KAAK;SACN,CAAC,CAAC;IACL,CAAC;IAED,gBAAM,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC;AACjD,CAAC"}
1
+ {"version":3,"file":"aws-upload.strategy.js","sourceRoot":"","sources":["../../../src/lib/deployment/aws-upload.strategy.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.generateEnvironmentManifest = generateEnvironmentManifest;
4
4
  exports.extractManifestVars = extractManifestVars;
5
- const zephyr_environment_variables_1 = require("zephyr-environment-variables");
5
+ const env_variables_1 = require("../env-variables");
6
6
  /**
7
7
  * Generate a zephyr-manifest.json asset for an environment Merges version-level and
8
8
  * environment-level variables
@@ -15,17 +15,17 @@ async function generateEnvironmentManifest(versionVars, envVars) {
15
15
  // Merge variables with environment taking priority
16
16
  const mergedVars = Object.assign(Object.assign({}, versionVars), envVars);
17
17
  // Generate manifest content
18
- const content = (0, zephyr_environment_variables_1.generateManifestContent)(mergedVars);
18
+ const content = (0, env_variables_1.generateManifestContent)(mergedVars);
19
19
  if (!content) {
20
20
  // Return empty manifest if no variables
21
21
  const emptyContent = JSON.stringify({ zeVars: {} }, null, 2);
22
22
  return {
23
23
  content: emptyContent,
24
- hash: (0, zephyr_environment_variables_1.calculateManifestHash)(emptyContent),
24
+ hash: (0, env_variables_1.calculateManifestHash)(emptyContent),
25
25
  size: Buffer.byteLength(emptyContent, 'utf8'),
26
26
  };
27
27
  }
28
- const hash = (0, zephyr_environment_variables_1.calculateManifestHash)(content);
28
+ const hash = (0, env_variables_1.calculateManifestHash)(content);
29
29
  const size = Buffer.byteLength(content, 'utf8');
30
30
  return {
31
31
  content,
@@ -1 +1 @@
1
- {"version":3,"file":"generate-manifest-asset.js","sourceRoot":"","sources":["../../../src/lib/edge-actions/generate-manifest-asset.ts"],"names":[],"mappings":";;AAmBA,kEA4BC;AAQD,kDAQC;AA/DD,+EAGsC;AAQtC;;;;;;;GAOG;AACI,KAAK,UAAU,2BAA2B,CAC/C,WAAmC,EACnC,OAA+B;IAE/B,mDAAmD;IACnD,MAAM,UAAU,mCAAQ,WAAW,GAAK,OAAO,CAAE,CAAC;IAElD,4BAA4B;IAC5B,MAAM,OAAO,GAAG,IAAA,sDAAuB,EAAC,UAAU,CAAC,CAAC;IAEpD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,wCAAwC;QACxC,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAC7D,OAAO;YACL,OAAO,EAAE,YAAY;YACrB,IAAI,EAAE,IAAA,oDAAqB,EAAC,YAAY,CAAC;YACzC,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,YAAY,EAAE,MAAM,CAAC;SAC9C,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,IAAA,oDAAqB,EAAC,OAAO,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAEhD,OAAO;QACL,OAAO;QACP,IAAI;QACJ,IAAI;KACL,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAgB,mBAAmB,CAAC,eAAuB;IACzD,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC7C,OAAO,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC;IAC/B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;QAC1D,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"generate-manifest-asset.js","sourceRoot":"","sources":["../../../src/lib/edge-actions/generate-manifest-asset.ts"],"names":[],"mappings":";;AAgBA,kEA4BC;AAQD,kDAQC;AA5DD,oDAAkF;AAQlF;;;;;;;GAOG;AACI,KAAK,UAAU,2BAA2B,CAC/C,WAAmC,EACnC,OAA+B;IAE/B,mDAAmD;IACnD,MAAM,UAAU,mCAAQ,WAAW,GAAK,OAAO,CAAE,CAAC;IAElD,4BAA4B;IAC5B,MAAM,OAAO,GAAG,IAAA,uCAAuB,EAAC,UAAU,CAAC,CAAC;IAEpD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,wCAAwC;QACxC,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAC7D,OAAO;YACL,OAAO,EAAE,YAAY;YACrB,IAAI,EAAE,IAAA,qCAAqB,EAAC,YAAY,CAAC;YACzC,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,YAAY,EAAE,MAAM,CAAC;SAC9C,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,IAAA,qCAAqB,EAAC,OAAO,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAEhD,OAAO;QACL,OAAO;QACP,IAAI;QACJ,IAAI;KACL,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAgB,mBAAmB,CAAC,eAAuB;IACzD,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC7C,OAAO,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC;IAC/B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;QAC1D,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC"}
@@ -5,11 +5,20 @@ const zephyr_edge_contract_1 = require("zephyr-edge-contract");
5
5
  const upload_file_1 = require("../http/upload-file");
6
6
  const logging_1 = require("../logging");
7
7
  const picocolor_1 = require("../logging/picocolor");
8
+ const get_application_hash_list_1 = require("../edge-requests/get-application-hash-list");
9
+ const get_missing_assets_1 = require("../edge-hash-list/get-missing-assets");
8
10
  const CLOUDFLARE_BATCH_SIZE = 6;
9
11
  async function zeUploadAssets(zephyr_engine, { missingAssets, assetsMap }) {
10
12
  const count = Object.keys(assetsMap).length;
11
13
  const logger = await zephyr_engine.logger;
12
14
  const appConfig = await zephyr_engine.application_configuration;
15
+ const envs = appConfig.ENVIRONMENTS;
16
+ if (envs != null) {
17
+ await Promise.all(Object.entries(envs)
18
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
19
+ .filter(([_, envCfg]) => envCfg.edgeUrl !== appConfig.EDGE_URL)
20
+ .map(([env, envCfg]) => zeUploadAssetsForEnv(env, envCfg, appConfig, assetsMap)));
21
+ }
13
22
  if (missingAssets.length === 0) {
14
23
  logger({
15
24
  level: 'info',
@@ -48,5 +57,34 @@ async function zeUploadAssets(zephyr_engine, { missingAssets, assetsMap }) {
48
57
  totalSize += assetSize;
49
58
  logging_1.ze_log.upload(`file ${asset.path} uploaded in ${fileUploaded}ms (${assetSize.toFixed(2)}kb)`);
50
59
  }
60
+ async function zeUploadAssetsForEnv(env, envCfg, appConfig, assetsMap) {
61
+ const hash_set = await (0, get_application_hash_list_1.getApplicationHashList)({
62
+ application_uid: zephyr_engine.application_uid,
63
+ edge_url: envCfg.edgeUrl,
64
+ });
65
+ const missingAssets = (0, get_missing_assets_1.get_missing_assets)({
66
+ assetsMap,
67
+ hash_set: { hash_set: new Set(hash_set.hashes) },
68
+ });
69
+ if (missingAssets.length === 0) {
70
+ return;
71
+ }
72
+ let totalSize = 0;
73
+ await Promise.all(missingAssets.map(async (asset) => {
74
+ var _a;
75
+ logging_1.ze_log.upload(`Uploading file ${asset.path} to env: ${(0, picocolor_1.whiteBright)(env)}`);
76
+ const start = Date.now();
77
+ const assetWithBuffer = assetsMap[asset.hash];
78
+ const assetSize = ((_a = assetWithBuffer === null || assetWithBuffer === void 0 ? void 0 : assetWithBuffer.buffer) === null || _a === void 0 ? void 0 : _a.length) / 1024;
79
+ await (0, upload_file_1.uploadFile)({
80
+ hash: asset.hash,
81
+ asset: assetWithBuffer,
82
+ }, Object.assign(Object.assign({}, appConfig), { EDGE_URL: envCfg.edgeUrl }));
83
+ const fileUploaded = Date.now() - start;
84
+ totalSize += assetSize;
85
+ logging_1.ze_log.upload(`file ${asset.path} uploaded in ${fileUploaded}ms (${assetSize.toFixed(2)}kb) for env: ${(0, picocolor_1.whiteBright)(env)}`);
86
+ }));
87
+ logging_1.ze_log.upload(`Total size uploaded for env: ${(0, picocolor_1.whiteBright)(env)}: ${totalSize.toFixed(2)}kb`);
88
+ }
51
89
  }
52
90
  //# sourceMappingURL=ze-upload-assets.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ze-upload-assets.js","sourceRoot":"","sources":["../../../src/lib/edge-actions/ze-upload-assets.ts"],"names":[],"mappings":";;AAYA,wCAoEC;AAhFD,+DAI8B;AAE9B,qDAAiD;AACjD,wCAAoC;AACpC,oDAA0D;AAE1D,MAAM,qBAAqB,GAAG,CAAC,CAAC;AAEzB,KAAK,UAAU,cAAc,CAClC,aAA2B,EAC3B,EAAE,aAAa,EAAE,SAAS,EAAyB;IAEnD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;IAC5C,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC;IAC1C,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,yBAAyB,CAAC;IAEhE,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,MAAM,CAAC;YACL,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,8BAA8B;YACtC,OAAO,EAAE,wBAAwB,IAAA,iBAAK,EAAC,UAAU,CAAC,KAAK;SACxD,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,uHAAuH;IACvH,6OAA6O;IAC7O,IAAI,aAAa,CAAC,GAAG,CAAC,MAAM,KAAK,KAAK,IAAI,aAAa,CAAC,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACjF,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAC7D,CAAC;SAAM,CAAC;QACN,gBAAM,CAAC,MAAM,CACX,iFAAiF,CAClF,CAAC;QACF,MAAM,IAAA,mCAAY,EAChB,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,EAC/D,qBAAqB,CACtB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC;QACL,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,6BAA6B;QACrC,OAAO,EAAE,IAAA,iBAAK,EACZ,IAAI,IAAA,uBAAW,EACb,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,CAChC,IAAI,IAAA,iBAAK,EAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,uBAAuB,IAAA,uBAAW,EAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC,OAAO,IAAA,uBAAW,EAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAC7I;KACF,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;IAEZ,KAAK,UAAU,oBAAoB,CAAC,KAAmB;;QACrD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACzB,MAAM,eAAe,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9C,MAAM,SAAS,GAAG,CAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,0CAAE,MAAM,IAAG,IAAI,CAAC;QAEzD,MAAM,IAAA,wBAAU,EACd;YACE,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,KAAK,EAAE,eAAe;SACvB,EACD,SAAS,CACV,CAAC;QAEF,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;QAExC,SAAS,IAAI,SAAS,CAAC;QAEvB,gBAAM,CAAC,MAAM,CACX,QAAQ,KAAK,CAAC,IAAI,gBAAgB,YAAY,OAAO,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAC/E,CAAC;IACJ,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"ze-upload-assets.js","sourceRoot":"","sources":["../../../src/lib/edge-actions/ze-upload-assets.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,8 @@
1
1
  interface GetApplicationHashListProps {
2
2
  application_uid: string;
3
+ edge_url?: string;
3
4
  }
4
- export declare function getApplicationHashList({ application_uid, }: GetApplicationHashListProps): Promise<{
5
+ export declare function getApplicationHashList({ application_uid, edge_url, }: GetApplicationHashListProps): Promise<{
5
6
  hashes: string[];
6
7
  }>;
7
8
  export {};
@@ -4,10 +4,14 @@ exports.getApplicationHashList = getApplicationHashList;
4
4
  const get_application_configuration_1 = require("./get-application-configuration");
5
5
  const http_request_1 = require("../http/http-request");
6
6
  const errors_1 = require("../errors");
7
- async function getApplicationHashList({ application_uid, }) {
8
- const { EDGE_URL } = await (0, get_application_configuration_1.getApplicationConfiguration)({
9
- application_uid,
10
- });
7
+ async function getApplicationHashList({ application_uid, edge_url, }) {
8
+ let EDGE_URL = edge_url;
9
+ if (!EDGE_URL) {
10
+ const cfg = await (0, get_application_configuration_1.getApplicationConfiguration)({
11
+ application_uid,
12
+ });
13
+ EDGE_URL = cfg.EDGE_URL;
14
+ }
11
15
  const url = new URL('/__get_application_hash_list__', EDGE_URL);
12
16
  url.searchParams.append('application_uid', application_uid);
13
17
  const [ok, cause, data] = await (0, http_request_1.makeRequest)(url, { method: 'GET' });
@@ -1 +1 @@
1
- {"version":3,"file":"get-application-hash-list.js","sourceRoot":"","sources":["../../../src/lib/edge-requests/get-application-hash-list.ts"],"names":[],"mappings":";;AAQA,wDA8BC;AAtCD,mFAA8E;AAC9E,uDAAmD;AACnD,sCAAkD;AAM3C,KAAK,UAAU,sBAAsB,CAAC,EAC3C,eAAe,GACa;IAG5B,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,2DAA2B,EAAC;QACrD,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,gCAAgC,EAAE,QAAQ,CAAC,CAAC;IAChE,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;IAE5D,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,MAAM,IAAA,0BAAW,EAExC,GAAG,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAE3B,qEAAqE;IACrE,wEAAwE;IACxE,gBAAgB;IAChB,IAAI,CAAC,EAAE,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAA,EAAE,CAAC;QACzB,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,6BAA6B,EAAE;YAC5D,KAAK;YACL,IAAI,kCACC,IAAI,KACP,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE,GACpB;SACF,CAAC,CAAC;IACL,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
1
+ {"version":3,"file":"get-application-hash-list.js","sourceRoot":"","sources":["../../../src/lib/edge-requests/get-application-hash-list.ts"],"names":[],"mappings":";;AASA,wDAmCC;AA5CD,mFAA8E;AAC9E,uDAAmD;AACnD,sCAAkD;AAO3C,KAAK,UAAU,sBAAsB,CAAC,EAC3C,eAAe,EACf,QAAQ,GACoB;IAG5B,IAAI,QAAQ,GAAG,QAAQ,CAAC;IACxB,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,GAAG,GAAG,MAAM,IAAA,2DAA2B,EAAC;YAC5C,eAAe;SAChB,CAAC,CAAC;QACH,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;IAC1B,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,gCAAgC,EAAE,QAAQ,CAAC,CAAC;IAChE,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;IAE5D,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,MAAM,IAAA,0BAAW,EAExC,GAAG,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAE3B,qEAAqE;IACrE,wEAAwE;IACxE,gBAAgB;IAChB,IAAI,CAAC,EAAE,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAA,EAAE,CAAC;QACzB,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,6BAA6B,EAAE;YAC5D,KAAK;YACL,IAAI,kCACC,IAAI,KACP,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE,GACpB;SACF,CAAC,CAAC;IACL,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
@@ -0,0 +1,19 @@
1
+ export declare const VIRTUAL_SPECIFIER = "env:vars";
2
+ export declare function detectEnvReads(source: string): Set<string>;
3
+ export declare function rewriteEnvReadsToVirtualModule(source: string, specifier?: string): {
4
+ code: string;
5
+ used: Set<string>;
6
+ };
7
+ export declare function buildImportMap(specifier: string, url: string): string;
8
+ export declare function injectImportMap(html: string, importMapJson: string, opts?: {
9
+ injectTo?: 'head-prepend' | 'head' | 'body';
10
+ }): string;
11
+ export declare function buildModulePreload(url: string): string;
12
+ export declare function injectBeforeHeadClose(html: string, snippet: string): string;
13
+ export declare function buildEnvJsonAsset(env: Record<string, string | undefined>): {
14
+ fileName: string;
15
+ source: string;
16
+ };
17
+ export declare function generateManifestContent(envVars: Record<string, string>, dependencies?: Record<string, unknown>): string;
18
+ export declare function calculateManifestHash(content: string): string;
19
+ export declare function collectZEPublicVars(env: NodeJS.ProcessEnv | Record<string, string | undefined>): Record<string, string>;