zephyr-agent 0.0.0-canary.2 → 0.0.0-canary.20
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 +5 -4
- package/dist/index.js +23 -3
- package/dist/index.js.map +1 -1
- package/dist/lib/auth/login.d.ts +2 -1
- package/dist/lib/auth/login.js +8 -3
- package/dist/lib/auth/login.js.map +1 -1
- package/dist/lib/edge-actions/generate-manifest-asset.js +4 -4
- package/dist/lib/edge-actions/generate-manifest-asset.js.map +1 -1
- package/dist/lib/edge-actions/ze-upload-assets.js +38 -0
- package/dist/lib/edge-actions/ze-upload-assets.js.map +1 -1
- package/dist/lib/edge-requests/get-application-hash-list.d.ts +2 -1
- package/dist/lib/edge-requests/get-application-hash-list.js +8 -4
- package/dist/lib/edge-requests/get-application-hash-list.js.map +1 -1
- package/dist/lib/env-variables/env-var-rewrites.d.ts +19 -0
- package/dist/lib/env-variables/env-var-rewrites.js +189 -0
- package/dist/lib/env-variables/env-var-rewrites.js.map +1 -0
- package/dist/lib/env-variables/index.d.ts +4 -2
- package/dist/lib/env-variables/index.js +19 -6
- package/dist/lib/env-variables/index.js.map +1 -1
- package/dist/lib/http/http-request.js.map +1 -1
- package/dist/lib/http/upload-file.js +1 -1
- package/dist/lib/http/upload-file.js.map +1 -1
- package/dist/lib/http/upload-snapshot.js +13 -6
- package/dist/lib/http/upload-snapshot.js.map +1 -1
- package/dist/lib/logging/debug.js +61 -18
- package/dist/lib/logging/debug.js.map +1 -1
- package/dist/lib/logging/file-logger.d.ts +39 -0
- package/dist/lib/logging/file-logger.js +180 -0
- package/dist/lib/logging/file-logger.js.map +1 -0
- package/dist/lib/logging/ze-log-event.d.ts +2 -2
- package/dist/lib/logging/ze-log-event.js +16 -4
- package/dist/lib/logging/ze-log-event.js.map +1 -1
- package/dist/lib/node-persist/server-token.d.ts +2 -0
- package/dist/lib/node-persist/server-token.js +13 -0
- package/dist/lib/node-persist/server-token.js.map +1 -0
- package/dist/lib/node-persist/storage-keys.d.ts +3 -1
- package/dist/lib/node-persist/storage-keys.js +2 -0
- package/dist/lib/node-persist/storage-keys.js.map +1 -1
- package/dist/lib/node-persist/token.d.ts +2 -1
- package/dist/lib/node-persist/token.js +43 -2
- package/dist/lib/node-persist/token.js.map +1 -1
- package/dist/lib/node-persist/upload-provider-options.d.ts +7 -0
- package/dist/lib/node-persist/upload-provider-options.js.map +1 -1
- package/dist/lib/node-persist/user-email.d.ts +2 -0
- package/dist/lib/node-persist/user-email.js +13 -0
- package/dist/lib/node-persist/user-email.js.map +1 -0
- package/dist/lib/transformers/ze-build-assets-map.d.ts +1 -1
- package/dist/lib/transformers/ze-build-assets-map.js +2 -2
- package/dist/lib/transformers/ze-build-assets-map.js.map +1 -1
- package/dist/lib/transformers/ze-create-manifest.js +2 -2
- package/dist/lib/transformers/ze-create-manifest.js.map +1 -1
- package/dist/package.json +3 -3
- package/dist/zephyr-engine/index.d.ts +12 -1
- package/dist/zephyr-engine/index.js +20 -1
- package/dist/zephyr-engine/index.js.map +1 -1
- package/package.json +3 -3
package/dist/index.d.ts
CHANGED
|
@@ -4,13 +4,14 @@ export { ZeErrors, ZephyrError } from './lib/errors';
|
|
|
4
4
|
export { getAllAppDeployResults, getAllDeployedApps, getAppDeployResult, type DeployResult, } from './lib/node-persist/app-deploy-result-cache';
|
|
5
5
|
export { ze_log } from './lib/logging';
|
|
6
6
|
export { logFn } from './lib/logging/ze-log-event';
|
|
7
|
+
export { initializeLogRun, getCurrentRunDir, resetLogRun, writeLogToFile, writeRunSummary, isFileLoggingEnabled, getLogBasePath, getLogFormat, type StructuredLogData, } from './lib/logging/file-logger';
|
|
7
8
|
export { applyBaseHrefToAssets, normalizeBasePath, } from './lib/transformers/ze-basehref-handler';
|
|
8
9
|
export { zeBuildAssets } from './lib/transformers/ze-build-assets';
|
|
9
|
-
export { buildAssetsMap, type ZeBuildAssetsMap, } from './lib/transformers/ze-build-assets-map';
|
|
10
|
+
export { buildAssetsMapMock as buildAssetsMap, type ZeBuildAssetsMap, } from './lib/transformers/ze-build-assets-map';
|
|
10
11
|
export { zeBuildDashData } from './lib/transformers/ze-build-dash-data';
|
|
11
12
|
export { convertResolvedDependencies, createManifestAsset, createManifestContent, createZephyrManifest, } from './lib/transformers/ze-create-manifest';
|
|
12
13
|
export { DEFAULT_AUTH_COMPLETION_TIMEOUT_MS, TOKEN_EXPIRY } from './lib/auth/auth-flags';
|
|
13
|
-
export { is_zephyr_dependency_pair, readPackageJson,
|
|
14
|
-
export type { Platform } from './zephyr-engine';
|
|
14
|
+
export { ZephyrEngine, is_zephyr_dependency_pair, readPackageJson, type ZeDependencyPair, type ZephyrDependencies, type ZephyrEngineOptions, } from './zephyr-engine';
|
|
15
|
+
export type { Platform, ZephyrBuildHooks, DeploymentInfo } from './zephyr-engine';
|
|
15
16
|
export type { ZeResolvedDependency } from './zephyr-engine/resolve_remote_dependency';
|
|
16
|
-
export { buildEnvImportMap, buildEnvImportMapScript, buildEnvModuleSource, type RemoteEntry, } from './lib/env-variables';
|
|
17
|
+
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.
|
|
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.ZephyrError = exports.ZeErrors = 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; } });
|
|
@@ -24,6 +24,15 @@ var logging_1 = require("./lib/logging");
|
|
|
24
24
|
Object.defineProperty(exports, "ze_log", { enumerable: true, get: function () { return logging_1.ze_log; } });
|
|
25
25
|
var ze_log_event_1 = require("./lib/logging/ze-log-event");
|
|
26
26
|
Object.defineProperty(exports, "logFn", { enumerable: true, get: function () { return ze_log_event_1.logFn; } });
|
|
27
|
+
var file_logger_1 = require("./lib/logging/file-logger");
|
|
28
|
+
Object.defineProperty(exports, "initializeLogRun", { enumerable: true, get: function () { return file_logger_1.initializeLogRun; } });
|
|
29
|
+
Object.defineProperty(exports, "getCurrentRunDir", { enumerable: true, get: function () { return file_logger_1.getCurrentRunDir; } });
|
|
30
|
+
Object.defineProperty(exports, "resetLogRun", { enumerable: true, get: function () { return file_logger_1.resetLogRun; } });
|
|
31
|
+
Object.defineProperty(exports, "writeLogToFile", { enumerable: true, get: function () { return file_logger_1.writeLogToFile; } });
|
|
32
|
+
Object.defineProperty(exports, "writeRunSummary", { enumerable: true, get: function () { return file_logger_1.writeRunSummary; } });
|
|
33
|
+
Object.defineProperty(exports, "isFileLoggingEnabled", { enumerable: true, get: function () { return file_logger_1.isFileLoggingEnabled; } });
|
|
34
|
+
Object.defineProperty(exports, "getLogBasePath", { enumerable: true, get: function () { return file_logger_1.getLogBasePath; } });
|
|
35
|
+
Object.defineProperty(exports, "getLogFormat", { enumerable: true, get: function () { return file_logger_1.getLogFormat; } });
|
|
27
36
|
// default transformers
|
|
28
37
|
var ze_basehref_handler_1 = require("./lib/transformers/ze-basehref-handler");
|
|
29
38
|
Object.defineProperty(exports, "applyBaseHrefToAssets", { enumerable: true, get: function () { return ze_basehref_handler_1.applyBaseHrefToAssets; } });
|
|
@@ -31,7 +40,7 @@ Object.defineProperty(exports, "normalizeBasePath", { enumerable: true, get: fun
|
|
|
31
40
|
var ze_build_assets_1 = require("./lib/transformers/ze-build-assets");
|
|
32
41
|
Object.defineProperty(exports, "zeBuildAssets", { enumerable: true, get: function () { return ze_build_assets_1.zeBuildAssets; } });
|
|
33
42
|
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.
|
|
43
|
+
Object.defineProperty(exports, "buildAssetsMap", { enumerable: true, get: function () { return ze_build_assets_map_1.buildAssetsMapMock; } });
|
|
35
44
|
var ze_build_dash_data_1 = require("./lib/transformers/ze-build-dash-data");
|
|
36
45
|
Object.defineProperty(exports, "zeBuildDashData", { enumerable: true, get: function () { return ze_build_dash_data_1.zeBuildDashData; } });
|
|
37
46
|
var ze_create_manifest_1 = require("./lib/transformers/ze-create-manifest");
|
|
@@ -45,12 +54,23 @@ Object.defineProperty(exports, "DEFAULT_AUTH_COMPLETION_TIMEOUT_MS", { enumerabl
|
|
|
45
54
|
Object.defineProperty(exports, "TOKEN_EXPIRY", { enumerable: true, get: function () { return auth_flags_1.TOKEN_EXPIRY; } });
|
|
46
55
|
// Zephyr Edge is the main class which should be used
|
|
47
56
|
var zephyr_engine_1 = require("./zephyr-engine");
|
|
57
|
+
Object.defineProperty(exports, "ZephyrEngine", { enumerable: true, get: function () { return zephyr_engine_1.ZephyrEngine; } });
|
|
48
58
|
Object.defineProperty(exports, "is_zephyr_dependency_pair", { enumerable: true, get: function () { return zephyr_engine_1.is_zephyr_dependency_pair; } });
|
|
49
59
|
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
60
|
// Environment variable utilities
|
|
52
61
|
var env_variables_1 = require("./lib/env-variables");
|
|
53
62
|
Object.defineProperty(exports, "buildEnvImportMap", { enumerable: true, get: function () { return env_variables_1.buildEnvImportMap; } });
|
|
54
63
|
Object.defineProperty(exports, "buildEnvImportMapScript", { enumerable: true, get: function () { return env_variables_1.buildEnvImportMapScript; } });
|
|
55
64
|
Object.defineProperty(exports, "buildEnvModuleSource", { enumerable: true, get: function () { return env_variables_1.buildEnvModuleSource; } });
|
|
65
|
+
Object.defineProperty(exports, "rewriteEnvReadsToVirtualModule", { enumerable: true, get: function () { return env_variables_1.rewriteEnvReadsToVirtualModule; } });
|
|
66
|
+
Object.defineProperty(exports, "VIRTUAL_SPECIFIER", { enumerable: true, get: function () { return env_variables_1.VIRTUAL_SPECIFIER; } });
|
|
67
|
+
Object.defineProperty(exports, "detectEnvReads", { enumerable: true, get: function () { return env_variables_1.detectEnvReads; } });
|
|
68
|
+
Object.defineProperty(exports, "buildImportMap", { enumerable: true, get: function () { return env_variables_1.buildImportMap; } });
|
|
69
|
+
Object.defineProperty(exports, "injectImportMap", { enumerable: true, get: function () { return env_variables_1.injectImportMap; } });
|
|
70
|
+
Object.defineProperty(exports, "buildModulePreload", { enumerable: true, get: function () { return env_variables_1.buildModulePreload; } });
|
|
71
|
+
Object.defineProperty(exports, "injectBeforeHeadClose", { enumerable: true, get: function () { return env_variables_1.injectBeforeHeadClose; } });
|
|
72
|
+
Object.defineProperty(exports, "buildEnvJsonAsset", { enumerable: true, get: function () { return env_variables_1.buildEnvJsonAsset; } });
|
|
73
|
+
Object.defineProperty(exports, "generateManifestContent", { enumerable: true, get: function () { return env_variables_1.generateManifestContent; } });
|
|
74
|
+
Object.defineProperty(exports, "calculateManifestHash", { enumerable: true, get: function () { return env_variables_1.calculateManifestHash; } });
|
|
75
|
+
Object.defineProperty(exports, "collectZEPublicVars", { enumerable: true, get: function () { return env_variables_1.collectZEPublicVars; } });
|
|
56
76
|
//# 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;
|
|
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;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"}
|
package/dist/lib/auth/login.d.ts
CHANGED
|
@@ -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
|
*
|
package/dist/lib/auth/login.js
CHANGED
|
@@ -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
|
-
|
|
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":";;
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/lib/auth/login.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
|
|
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,
|
|
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,
|
|
24
|
+
hash: (0, env_variables_1.calculateManifestHash)(emptyContent),
|
|
25
25
|
size: Buffer.byteLength(emptyContent, 'utf8'),
|
|
26
26
|
};
|
|
27
27
|
}
|
|
28
|
-
const hash = (0,
|
|
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":";;
|
|
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":";;
|
|
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
|
-
|
|
9
|
-
|
|
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":";;
|
|
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,EACoB;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>;
|
|
@@ -0,0 +1,189 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Shared helpers for virtual env module + import map
|
|
3
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
+
exports.VIRTUAL_SPECIFIER = void 0;
|
|
5
|
+
exports.detectEnvReads = detectEnvReads;
|
|
6
|
+
exports.rewriteEnvReadsToVirtualModule = rewriteEnvReadsToVirtualModule;
|
|
7
|
+
exports.buildImportMap = buildImportMap;
|
|
8
|
+
exports.injectImportMap = injectImportMap;
|
|
9
|
+
exports.buildModulePreload = buildModulePreload;
|
|
10
|
+
exports.injectBeforeHeadClose = injectBeforeHeadClose;
|
|
11
|
+
exports.buildEnvJsonAsset = buildEnvJsonAsset;
|
|
12
|
+
exports.generateManifestContent = generateManifestContent;
|
|
13
|
+
exports.calculateManifestHash = calculateManifestHash;
|
|
14
|
+
exports.collectZEPublicVars = collectZEPublicVars;
|
|
15
|
+
exports.VIRTUAL_SPECIFIER = 'env:vars';
|
|
16
|
+
// Only match ZE_PUBLIC_* keys
|
|
17
|
+
const ZE_REGEX_SIMPLE = /\bprocess\.env\.(ZE_PUBLIC_[A-Z0-9_]+)/g;
|
|
18
|
+
const ZE_REGEX_QUOTED = /\bprocess\.env\[["'`](ZE_PUBLIC_[A-Z0-9_]+)["'`]\]/g;
|
|
19
|
+
const ZE_REGEX_IMPORT_META_SIMPLE = /\bimport\.meta\.env\.(ZE_PUBLIC_[A-Z0-9_]+)/g;
|
|
20
|
+
const ZE_REGEX_IMPORT_META_QUOTED = /\bimport\.meta\.env\[["'`](ZE_PUBLIC_[A-Z0-9_]+)["'`]\]/g;
|
|
21
|
+
// Destructuring patterns (declarations): const { ... } = process.env | import.meta.env
|
|
22
|
+
const ZE_DESTRUCT_DECL = /(const|let|var)\s*\{([^}]+)\}\s*=\s*(process\.env|import\.meta\.env)/g;
|
|
23
|
+
// Destructuring patterns (assignment): ({ ... } = process.env) or { ... } = import.meta.env
|
|
24
|
+
const ZE_DESTRUCT_ASSIGN = /\{([^}]+)\}\s*=\s*(process\.env|import\.meta\.env)/g;
|
|
25
|
+
function extractDestructuredKeys(raw) {
|
|
26
|
+
// raw is the inside of {...}
|
|
27
|
+
return raw
|
|
28
|
+
.split(',')
|
|
29
|
+
.map((s) => s.trim())
|
|
30
|
+
.filter(Boolean)
|
|
31
|
+
.map((frag) => {
|
|
32
|
+
// Handle patterns:
|
|
33
|
+
// ZE_PUBLIC_FOO
|
|
34
|
+
// ZE_PUBLIC_FOO: ALIAS
|
|
35
|
+
// ZE_PUBLIC_FOO = 'x'
|
|
36
|
+
// ZE_PUBLIC_FOO: ALIAS = 'x'
|
|
37
|
+
const colonIdx = frag.indexOf(':');
|
|
38
|
+
const eqIdx = frag.indexOf('=');
|
|
39
|
+
let base = frag;
|
|
40
|
+
if (colonIdx !== -1)
|
|
41
|
+
base = frag.slice(0, colonIdx).trim();
|
|
42
|
+
else if (eqIdx !== -1)
|
|
43
|
+
base = frag.slice(0, eqIdx).trim();
|
|
44
|
+
return base;
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
function detectEnvReads(source) {
|
|
48
|
+
const names = new Set();
|
|
49
|
+
const regs = [
|
|
50
|
+
ZE_REGEX_SIMPLE,
|
|
51
|
+
ZE_REGEX_QUOTED,
|
|
52
|
+
ZE_REGEX_IMPORT_META_SIMPLE,
|
|
53
|
+
ZE_REGEX_IMPORT_META_QUOTED,
|
|
54
|
+
];
|
|
55
|
+
for (const r of regs) {
|
|
56
|
+
source.replace(r, (_m, name) => {
|
|
57
|
+
names.add(String(name));
|
|
58
|
+
return _m;
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
// Detect destructuring keys and add only ZE_PUBLIC_*
|
|
62
|
+
source.replace(ZE_DESTRUCT_DECL, (_m, _decl, inner) => {
|
|
63
|
+
for (const k of extractDestructuredKeys(String(inner))) {
|
|
64
|
+
if (k.startsWith('ZE_PUBLIC_'))
|
|
65
|
+
names.add(k);
|
|
66
|
+
}
|
|
67
|
+
return _m;
|
|
68
|
+
});
|
|
69
|
+
source.replace(ZE_DESTRUCT_ASSIGN, (_m, inner) => {
|
|
70
|
+
for (const k of extractDestructuredKeys(String(inner))) {
|
|
71
|
+
if (k.startsWith('ZE_PUBLIC_'))
|
|
72
|
+
names.add(k);
|
|
73
|
+
}
|
|
74
|
+
return _m;
|
|
75
|
+
});
|
|
76
|
+
return names;
|
|
77
|
+
}
|
|
78
|
+
function rewriteEnvReadsToVirtualModule(source, specifier = exports.VIRTUAL_SPECIFIER) {
|
|
79
|
+
const used = detectEnvReads(source);
|
|
80
|
+
if (used.size === 0)
|
|
81
|
+
return { code: source, used };
|
|
82
|
+
// Replace all env var references with __ZE_MANIFEST__.zeVars.VAR_NAME
|
|
83
|
+
let code = source
|
|
84
|
+
.replace(ZE_REGEX_SIMPLE, (_m, name) => `__ZE_MANIFEST__.zeVars.${name}`)
|
|
85
|
+
.replace(ZE_REGEX_QUOTED, (_m, name) => `__ZE_MANIFEST__.zeVars.${name}`)
|
|
86
|
+
.replace(ZE_REGEX_IMPORT_META_SIMPLE, (_m, name) => `__ZE_MANIFEST__.zeVars.${name}`)
|
|
87
|
+
.replace(ZE_REGEX_IMPORT_META_QUOTED, (_m, name) => `__ZE_MANIFEST__.zeVars.${name}`);
|
|
88
|
+
// Replace destructuring RHS env object with __ZE_MANIFEST__.zeVars when ZE_PUBLIC_* keys are present
|
|
89
|
+
code = code.replace(ZE_DESTRUCT_DECL, (m, decl, inner) => {
|
|
90
|
+
const keys = extractDestructuredKeys(String(inner));
|
|
91
|
+
if (!keys.some((k) => k.startsWith('ZE_PUBLIC_')))
|
|
92
|
+
return m;
|
|
93
|
+
return `${decl} {${inner}} = __ZE_MANIFEST__.zeVars`;
|
|
94
|
+
});
|
|
95
|
+
code = code.replace(ZE_DESTRUCT_ASSIGN, (m, inner) => {
|
|
96
|
+
const keys = extractDestructuredKeys(String(inner));
|
|
97
|
+
if (!keys.some((k) => k.startsWith('ZE_PUBLIC_')))
|
|
98
|
+
return m;
|
|
99
|
+
return `{${inner}} = __ZE_MANIFEST__.zeVars`;
|
|
100
|
+
});
|
|
101
|
+
// Ensure an import of the virtual module exists; avoid duplicating if already present
|
|
102
|
+
const escaped = specifier.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
103
|
+
const importRe = new RegExp(`from\\s+['"]${escaped}['"];?|require\\(['"]${escaped}['"]\\)`, 'm');
|
|
104
|
+
if (!importRe.test(code)) {
|
|
105
|
+
// Simple default import of the JSON manifest
|
|
106
|
+
code = `import __ZE_MANIFEST__ from '${specifier}' with { type: 'json' };\n` + code;
|
|
107
|
+
}
|
|
108
|
+
return { code, used };
|
|
109
|
+
}
|
|
110
|
+
function buildImportMap(specifier, url) {
|
|
111
|
+
return JSON.stringify({ imports: { [specifier]: url } }, null, 0);
|
|
112
|
+
}
|
|
113
|
+
function injectImportMap(html, importMapJson, opts) {
|
|
114
|
+
var _a;
|
|
115
|
+
const scriptTag = `<script type="importmap">${importMapJson}</script>`;
|
|
116
|
+
if (html.includes(scriptTag))
|
|
117
|
+
return html;
|
|
118
|
+
const injectTo = (_a = opts === null || opts === void 0 ? void 0 : opts.injectTo) !== null && _a !== void 0 ? _a : 'head-prepend';
|
|
119
|
+
if (injectTo === 'body')
|
|
120
|
+
return html.replace('</body>', `${scriptTag}</body>`);
|
|
121
|
+
return html.replace('</head>', `${scriptTag}</head>`);
|
|
122
|
+
}
|
|
123
|
+
function buildModulePreload(url) {
|
|
124
|
+
return `<link rel="modulepreload" href="${url}">`;
|
|
125
|
+
}
|
|
126
|
+
function injectBeforeHeadClose(html, snippet) {
|
|
127
|
+
if (html.includes(snippet))
|
|
128
|
+
return html;
|
|
129
|
+
return html.replace('</head>', `${snippet}</head>`);
|
|
130
|
+
}
|
|
131
|
+
function buildEnvJsonAsset(env) {
|
|
132
|
+
const safe = {};
|
|
133
|
+
for (const [k, v] of Object.entries(env)) {
|
|
134
|
+
if (!k.startsWith('ZE_PUBLIC_'))
|
|
135
|
+
continue;
|
|
136
|
+
if (typeof v === 'string')
|
|
137
|
+
safe[k] = v;
|
|
138
|
+
}
|
|
139
|
+
const source = JSON.stringify(safe);
|
|
140
|
+
// djb2
|
|
141
|
+
let h = 5381;
|
|
142
|
+
for (let i = 0; i < source.length; i++)
|
|
143
|
+
h = ((h << 5) + h) ^ source.charCodeAt(i);
|
|
144
|
+
const short = (h >>> 0).toString(36);
|
|
145
|
+
return { fileName: `ze-env.${short}.json`, source };
|
|
146
|
+
}
|
|
147
|
+
// New functions for zephyr-manifest.json generation
|
|
148
|
+
function generateManifestContent(envVars, dependencies = {}) {
|
|
149
|
+
// Filter for ZE_PUBLIC_* variables
|
|
150
|
+
const publicVars = {};
|
|
151
|
+
for (const [key, value] of Object.entries(envVars)) {
|
|
152
|
+
if (key.startsWith('ZE_PUBLIC_')) {
|
|
153
|
+
publicVars[key] = value;
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
// Build manifest with unified structure
|
|
157
|
+
const manifest = {
|
|
158
|
+
version: '1.0.0',
|
|
159
|
+
timestamp: new Date().toISOString(),
|
|
160
|
+
dependencies: dependencies,
|
|
161
|
+
zeVars: publicVars,
|
|
162
|
+
};
|
|
163
|
+
return JSON.stringify(manifest, null, 2);
|
|
164
|
+
}
|
|
165
|
+
function calculateManifestHash(content) {
|
|
166
|
+
// Try to use Node.js crypto module if available
|
|
167
|
+
try {
|
|
168
|
+
const crypto = require('crypto');
|
|
169
|
+
return crypto.createHash('sha256').update(content).digest('hex');
|
|
170
|
+
}
|
|
171
|
+
catch (_a) {
|
|
172
|
+
// Fallback to djb2 hash for environments without crypto
|
|
173
|
+
let h = 5381;
|
|
174
|
+
for (let i = 0; i < content.length; i++) {
|
|
175
|
+
h = ((h << 5) + h) ^ content.charCodeAt(i);
|
|
176
|
+
}
|
|
177
|
+
return (h >>> 0).toString(36);
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
function collectZEPublicVars(env) {
|
|
181
|
+
const vars = {};
|
|
182
|
+
for (const [key, value] of Object.entries(env)) {
|
|
183
|
+
if (key.startsWith('ZE_PUBLIC_') && typeof value === 'string') {
|
|
184
|
+
vars[key] = value;
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
return vars;
|
|
188
|
+
}
|
|
189
|
+
//# sourceMappingURL=env-var-rewrites.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env-var-rewrites.js","sourceRoot":"","sources":["../../../src/lib/env-variables/env-var-rewrites.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
export interface RemoteEntry {
|
|
2
2
|
name: string;
|
|
3
|
+
application_uid: string;
|
|
3
4
|
remote_entry_url: string;
|
|
4
5
|
}
|
|
5
|
-
export
|
|
6
|
+
export { VIRTUAL_SPECIFIER, detectEnvReads, rewriteEnvReadsToVirtualModule, buildImportMap, injectImportMap, buildModulePreload, injectBeforeHeadClose, buildEnvJsonAsset, generateManifestContent, calculateManifestHash, collectZEPublicVars, } from './env-var-rewrites';
|
|
7
|
+
export declare function buildEnvImportMap(appUid: string, remotes: RemoteEntry[]): Record<string, string>;
|
|
6
8
|
export declare function buildEnvModuleSource(applicationUid: string): string;
|
|
7
|
-
export declare function buildEnvImportMapScript(
|
|
9
|
+
export declare function buildEnvImportMapScript(appUid: string, remotes: RemoteEntry[]): string;
|
|
@@ -1,23 +1,36 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.collectZEPublicVars = exports.calculateManifestHash = exports.generateManifestContent = exports.buildEnvJsonAsset = exports.injectBeforeHeadClose = exports.buildModulePreload = exports.injectImportMap = exports.buildImportMap = exports.rewriteEnvReadsToVirtualModule = exports.detectEnvReads = exports.VIRTUAL_SPECIFIER = void 0;
|
|
3
4
|
exports.buildEnvImportMap = buildEnvImportMap;
|
|
4
5
|
exports.buildEnvModuleSource = buildEnvModuleSource;
|
|
5
6
|
exports.buildEnvImportMapScript = buildEnvImportMapScript;
|
|
6
|
-
|
|
7
|
+
var env_var_rewrites_1 = require("./env-var-rewrites");
|
|
8
|
+
Object.defineProperty(exports, "VIRTUAL_SPECIFIER", { enumerable: true, get: function () { return env_var_rewrites_1.VIRTUAL_SPECIFIER; } });
|
|
9
|
+
Object.defineProperty(exports, "detectEnvReads", { enumerable: true, get: function () { return env_var_rewrites_1.detectEnvReads; } });
|
|
10
|
+
Object.defineProperty(exports, "rewriteEnvReadsToVirtualModule", { enumerable: true, get: function () { return env_var_rewrites_1.rewriteEnvReadsToVirtualModule; } });
|
|
11
|
+
Object.defineProperty(exports, "buildImportMap", { enumerable: true, get: function () { return env_var_rewrites_1.buildImportMap; } });
|
|
12
|
+
Object.defineProperty(exports, "injectImportMap", { enumerable: true, get: function () { return env_var_rewrites_1.injectImportMap; } });
|
|
13
|
+
Object.defineProperty(exports, "buildModulePreload", { enumerable: true, get: function () { return env_var_rewrites_1.buildModulePreload; } });
|
|
14
|
+
Object.defineProperty(exports, "injectBeforeHeadClose", { enumerable: true, get: function () { return env_var_rewrites_1.injectBeforeHeadClose; } });
|
|
15
|
+
Object.defineProperty(exports, "buildEnvJsonAsset", { enumerable: true, get: function () { return env_var_rewrites_1.buildEnvJsonAsset; } });
|
|
16
|
+
Object.defineProperty(exports, "generateManifestContent", { enumerable: true, get: function () { return env_var_rewrites_1.generateManifestContent; } });
|
|
17
|
+
Object.defineProperty(exports, "calculateManifestHash", { enumerable: true, get: function () { return env_var_rewrites_1.calculateManifestHash; } });
|
|
18
|
+
Object.defineProperty(exports, "collectZEPublicVars", { enumerable: true, get: function () { return env_var_rewrites_1.collectZEPublicVars; } });
|
|
19
|
+
function buildEnvImportMap(appUid, remotes) {
|
|
7
20
|
const imports = {};
|
|
8
21
|
// Add the main env module mapping - now points to zephyr-manifest.json
|
|
9
|
-
imports[`env:vars:${
|
|
22
|
+
imports[`env:vars:${appUid}`] = '/zephyr-manifest.json';
|
|
10
23
|
// Add environment variable manifest entries for remotes
|
|
11
24
|
// Note: Module Federation remotes are loaded by MF runtime, not through import maps
|
|
12
25
|
remotes.forEach((remote) => {
|
|
13
|
-
if (remote.
|
|
26
|
+
if (remote.application_uid && remote.remote_entry_url) {
|
|
14
27
|
// Environment variables manifest for the remote
|
|
15
28
|
try {
|
|
16
29
|
const urlStr = remote.remote_entry_url.includes('@')
|
|
17
30
|
? remote.remote_entry_url.split('@')[1]
|
|
18
31
|
: remote.remote_entry_url;
|
|
19
32
|
const origin = new URL(urlStr).origin;
|
|
20
|
-
imports[`env:vars:${remote.
|
|
33
|
+
imports[`env:vars:${remote.application_uid}`] = `${origin}/zephyr-manifest.json`;
|
|
21
34
|
}
|
|
22
35
|
catch (_a) {
|
|
23
36
|
// If URL parsing fails, skip the env:vars entry
|
|
@@ -53,9 +66,9 @@ ${exports}
|
|
|
53
66
|
${defaultExport}
|
|
54
67
|
`;
|
|
55
68
|
}
|
|
56
|
-
function buildEnvImportMapScript(
|
|
69
|
+
function buildEnvImportMapScript(appUid, remotes) {
|
|
57
70
|
const importMap = {
|
|
58
|
-
imports: buildEnvImportMap(
|
|
71
|
+
imports: buildEnvImportMap(appUid, remotes),
|
|
59
72
|
};
|
|
60
73
|
return `<script type="importmap">${JSON.stringify(importMap, null, 2)}</script>`;
|
|
61
74
|
}
|