zephyr-agent 0.1.6-next.2 → 0.1.7-next.2
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/lib/build-context/ci-branch-detection.d.ts +33 -0
- package/dist/lib/build-context/ci-branch-detection.js +204 -0
- package/dist/lib/build-context/ci-branch-detection.js.map +1 -0
- package/dist/lib/build-context/ze-util-get-git-info.js +20 -1
- package/dist/lib/build-context/ze-util-get-git-info.js.map +1 -1
- package/dist/lib/edge-actions/ze-upload-assets.js +4 -12
- package/dist/lib/edge-actions/ze-upload-assets.js.map +1 -1
- package/dist/lib/http/fetch-with-retries.js +4 -7
- package/dist/lib/http/fetch-with-retries.js.map +1 -1
- package/dist/lib/node-persist/session-lock.js +1 -11
- package/dist/lib/node-persist/session-lock.js.map +1 -1
- package/dist/lib/node-persist/storage-keys.d.ts +1 -0
- package/dist/lib/node-persist/storage-keys.js +5 -4
- package/dist/lib/node-persist/storage-keys.js.map +1 -1
- package/dist/lib/node-persist/storage.js +3 -3
- package/dist/lib/node-persist/storage.js.map +1 -1
- package/dist/package.json +1 -1
- package/package.json +2 -2
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* CI/CD Branch Detection Utility
|
|
3
|
+
*
|
|
4
|
+
* Detects branch names from CI/CD environment variables across major platforms. Used to
|
|
5
|
+
* handle detached HEAD state in CI environments where git commands fail.
|
|
6
|
+
*/
|
|
7
|
+
export interface CIBranchInfo {
|
|
8
|
+
/** The detected CI platform name */
|
|
9
|
+
platform: string;
|
|
10
|
+
/** Whether running in a CI environment */
|
|
11
|
+
isCI: boolean;
|
|
12
|
+
/** The branch name extracted from CI environment variables */
|
|
13
|
+
branch: string | undefined;
|
|
14
|
+
/** Whether this is a pull/merge request build */
|
|
15
|
+
isPR: boolean;
|
|
16
|
+
/** Source branch for PRs (the branch being merged from) */
|
|
17
|
+
sourceBranch?: string;
|
|
18
|
+
/** Target branch for PRs (the branch being merged into) */
|
|
19
|
+
targetBranch?: string;
|
|
20
|
+
/** Tag name if this is a tag build */
|
|
21
|
+
tag?: string;
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* Detects the current CI environment and extracts branch information. Supports: GitHub
|
|
25
|
+
* Actions, GitLab CI, Jenkins, Bitbucket, CircleCI, Travis CI, Azure Pipelines, TeamCity,
|
|
26
|
+
* Drone CI, Buildkite
|
|
27
|
+
*/
|
|
28
|
+
export declare function detectCIBranch(): CIBranchInfo;
|
|
29
|
+
/**
|
|
30
|
+
* Gets the branch name with CI detection priority. Returns undefined if not in CI or
|
|
31
|
+
* branch cannot be detected.
|
|
32
|
+
*/
|
|
33
|
+
export declare function getCIBranchName(): string | undefined;
|
|
@@ -0,0 +1,204 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* CI/CD Branch Detection Utility
|
|
4
|
+
*
|
|
5
|
+
* Detects branch names from CI/CD environment variables across major platforms. Used to
|
|
6
|
+
* handle detached HEAD state in CI environments where git commands fail.
|
|
7
|
+
*/
|
|
8
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
exports.detectCIBranch = detectCIBranch;
|
|
10
|
+
exports.getCIBranchName = getCIBranchName;
|
|
11
|
+
/**
|
|
12
|
+
* Detects the current CI environment and extracts branch information. Supports: GitHub
|
|
13
|
+
* Actions, GitLab CI, Jenkins, Bitbucket, CircleCI, Travis CI, Azure Pipelines, TeamCity,
|
|
14
|
+
* Drone CI, Buildkite
|
|
15
|
+
*/
|
|
16
|
+
function detectCIBranch() {
|
|
17
|
+
var _a, _b;
|
|
18
|
+
const env = process.env;
|
|
19
|
+
// GitHub Actions
|
|
20
|
+
if (env['GITHUB_ACTIONS'] === 'true' || env['GITHUB_WORKFLOW']) {
|
|
21
|
+
const isPR = !!env['GITHUB_HEAD_REF'];
|
|
22
|
+
return {
|
|
23
|
+
platform: 'GitHub Actions',
|
|
24
|
+
isCI: true,
|
|
25
|
+
branch: env['GITHUB_HEAD_REF'] ||
|
|
26
|
+
env['GITHUB_REF_NAME'] ||
|
|
27
|
+
extractBranchFromRef(env['GITHUB_REF']),
|
|
28
|
+
isPR,
|
|
29
|
+
sourceBranch: env['GITHUB_HEAD_REF'],
|
|
30
|
+
targetBranch: env['GITHUB_BASE_REF'],
|
|
31
|
+
tag: ((_a = env['GITHUB_REF']) === null || _a === void 0 ? void 0 : _a.startsWith('refs/tags/'))
|
|
32
|
+
? env['GITHUB_REF_NAME']
|
|
33
|
+
: undefined,
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
// GitLab CI
|
|
37
|
+
if (env['GITLAB_CI'] === 'true' || env['CI_SERVER_NAME'] === 'GitLab') {
|
|
38
|
+
const isPR = !!env['CI_MERGE_REQUEST_ID'];
|
|
39
|
+
return {
|
|
40
|
+
platform: 'GitLab CI',
|
|
41
|
+
isCI: true,
|
|
42
|
+
branch: env['CI_MERGE_REQUEST_SOURCE_BRANCH_NAME'] ||
|
|
43
|
+
env['CI_COMMIT_BRANCH'] ||
|
|
44
|
+
env['CI_COMMIT_REF_NAME'],
|
|
45
|
+
isPR,
|
|
46
|
+
sourceBranch: env['CI_MERGE_REQUEST_SOURCE_BRANCH_NAME'],
|
|
47
|
+
targetBranch: env['CI_MERGE_REQUEST_TARGET_BRANCH_NAME'],
|
|
48
|
+
tag: !env['CI_COMMIT_BRANCH'] ? env['CI_COMMIT_REF_NAME'] : undefined,
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
// Jenkins
|
|
52
|
+
if (env['JENKINS_URL'] || env['JENKINS_HOME']) {
|
|
53
|
+
const isPR = !!env['CHANGE_ID'];
|
|
54
|
+
const gitBranch = (_b = env['GIT_BRANCH']) === null || _b === void 0 ? void 0 : _b.replace(/^origin\//, '');
|
|
55
|
+
return {
|
|
56
|
+
platform: 'Jenkins',
|
|
57
|
+
isCI: true,
|
|
58
|
+
branch: env['CHANGE_BRANCH'] ||
|
|
59
|
+
env['BRANCH_NAME'] ||
|
|
60
|
+
gitBranch ||
|
|
61
|
+
env['GIT_LOCAL_BRANCH'],
|
|
62
|
+
isPR,
|
|
63
|
+
sourceBranch: env['CHANGE_BRANCH'],
|
|
64
|
+
targetBranch: env['CHANGE_TARGET'],
|
|
65
|
+
};
|
|
66
|
+
}
|
|
67
|
+
// Bitbucket Pipelines
|
|
68
|
+
if (env['BITBUCKET_BUILD_NUMBER'] || env['BITBUCKET_COMMIT']) {
|
|
69
|
+
const isPR = !!env['BITBUCKET_PR_ID'];
|
|
70
|
+
return {
|
|
71
|
+
platform: 'Bitbucket Pipelines',
|
|
72
|
+
isCI: true,
|
|
73
|
+
branch: env['BITBUCKET_BRANCH'] || env['BITBUCKET_TAG'],
|
|
74
|
+
isPR,
|
|
75
|
+
targetBranch: env['BITBUCKET_PR_DESTINATION_BRANCH'],
|
|
76
|
+
tag: env['BITBUCKET_TAG'],
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
// CircleCI
|
|
80
|
+
if (env['CIRCLECI'] === 'true' || env['CIRCLE_BUILD_NUM']) {
|
|
81
|
+
// Note: CIRCLE_PULL_REQUEST not available with GitHub Apps integration
|
|
82
|
+
// CIRCLE_PR_NUMBER available for forked PRs, CIRCLE_PULL_REQUESTS is comma-separated list
|
|
83
|
+
const isPR = !!(env['CIRCLE_PULL_REQUEST'] ||
|
|
84
|
+
env['CIRCLE_PR_NUMBER'] ||
|
|
85
|
+
env['CIRCLE_PULL_REQUESTS']);
|
|
86
|
+
return {
|
|
87
|
+
platform: 'CircleCI',
|
|
88
|
+
isCI: true,
|
|
89
|
+
branch: env['CIRCLE_BRANCH'] || env['CIRCLE_TAG'],
|
|
90
|
+
isPR,
|
|
91
|
+
tag: env['CIRCLE_TAG'],
|
|
92
|
+
};
|
|
93
|
+
}
|
|
94
|
+
// Travis CI
|
|
95
|
+
if (env['TRAVIS'] === 'true' || (env['CI'] === 'true' && env['TRAVIS_BUILD_ID'])) {
|
|
96
|
+
const isPR = env['TRAVIS_PULL_REQUEST'] !== 'false';
|
|
97
|
+
return {
|
|
98
|
+
platform: 'Travis CI',
|
|
99
|
+
isCI: true,
|
|
100
|
+
branch: env['TRAVIS_PULL_REQUEST_BRANCH'] || env['TRAVIS_BRANCH'] || env['TRAVIS_TAG'],
|
|
101
|
+
isPR,
|
|
102
|
+
sourceBranch: env['TRAVIS_PULL_REQUEST_BRANCH'],
|
|
103
|
+
targetBranch: env['TRAVIS_PULL_REQUEST_BRANCH'] ? env['TRAVIS_BRANCH'] : undefined,
|
|
104
|
+
tag: env['TRAVIS_TAG'],
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
// Azure Pipelines
|
|
108
|
+
// Note: TF_BUILD is the official detection variable; AZURE_PIPELINES is not documented
|
|
109
|
+
if (env['TF_BUILD'] === 'True') {
|
|
110
|
+
const isPR = !!env['SYSTEM_PULLREQUEST_PULLREQUESTID'];
|
|
111
|
+
const prSourceBranch = extractBranchFromRef(env['SYSTEM_PULLREQUEST_SOURCEBRANCH']);
|
|
112
|
+
const regularBranch = env['BUILD_SOURCEBRANCHNAME'] !== 'merge'
|
|
113
|
+
? env['BUILD_SOURCEBRANCHNAME']
|
|
114
|
+
: extractBranchFromRef(env['BUILD_SOURCEBRANCH']);
|
|
115
|
+
return {
|
|
116
|
+
platform: 'Azure Pipelines',
|
|
117
|
+
isCI: true,
|
|
118
|
+
branch: prSourceBranch || regularBranch,
|
|
119
|
+
isPR,
|
|
120
|
+
sourceBranch: prSourceBranch,
|
|
121
|
+
targetBranch: extractBranchFromRef(env['SYSTEM_PULLREQUEST_TARGETBRANCH']),
|
|
122
|
+
};
|
|
123
|
+
}
|
|
124
|
+
// TeamCity
|
|
125
|
+
if (env['TEAMCITY_VERSION']) {
|
|
126
|
+
// TeamCity requires custom environment variable setup
|
|
127
|
+
// Users need to set env.GIT_BRANCH from teamcity.build.vcs.branch
|
|
128
|
+
const branch = env['GIT_BRANCH'] || env['BRANCH_NAME'];
|
|
129
|
+
return {
|
|
130
|
+
platform: 'TeamCity',
|
|
131
|
+
isCI: true,
|
|
132
|
+
branch: branch === '<default>' ? undefined : branch,
|
|
133
|
+
isPR: false, // TeamCity requires custom configuration for PR detection
|
|
134
|
+
};
|
|
135
|
+
}
|
|
136
|
+
// Drone CI
|
|
137
|
+
if (env['DRONE'] === 'true' || env['DRONE_BRANCH']) {
|
|
138
|
+
const isPR = env['DRONE_BUILD_EVENT'] === 'pull_request';
|
|
139
|
+
return {
|
|
140
|
+
platform: 'Drone CI',
|
|
141
|
+
isCI: true,
|
|
142
|
+
branch: env['DRONE_SOURCE_BRANCH'] || env['DRONE_BRANCH'] || env['DRONE_COMMIT_BRANCH'],
|
|
143
|
+
isPR,
|
|
144
|
+
sourceBranch: env['DRONE_SOURCE_BRANCH'],
|
|
145
|
+
targetBranch: env['DRONE_TARGET_BRANCH'],
|
|
146
|
+
tag: env['DRONE_TAG'],
|
|
147
|
+
};
|
|
148
|
+
}
|
|
149
|
+
// Buildkite
|
|
150
|
+
if (env['BUILDKITE'] === 'true' || env['BUILDKITE_BUILD_ID']) {
|
|
151
|
+
const isPR = !!env['BUILDKITE_PULL_REQUEST'] && env['BUILDKITE_PULL_REQUEST'] !== 'false';
|
|
152
|
+
return {
|
|
153
|
+
platform: 'Buildkite',
|
|
154
|
+
isCI: true,
|
|
155
|
+
branch: env['BUILDKITE_BRANCH'] || env['BUILDKITE_TAG'],
|
|
156
|
+
isPR,
|
|
157
|
+
targetBranch: env['BUILDKITE_PULL_REQUEST_BASE_BRANCH'],
|
|
158
|
+
tag: env['BUILDKITE_TAG'],
|
|
159
|
+
};
|
|
160
|
+
}
|
|
161
|
+
// Generic CI detection (fallback)
|
|
162
|
+
if (env['CI'] === 'true' || env['CONTINUOUS_INTEGRATION'] === 'true') {
|
|
163
|
+
return {
|
|
164
|
+
platform: 'Generic CI',
|
|
165
|
+
isCI: true,
|
|
166
|
+
branch: undefined, // No standard env var, will fall back to git
|
|
167
|
+
isPR: false,
|
|
168
|
+
};
|
|
169
|
+
}
|
|
170
|
+
// Not in CI
|
|
171
|
+
return {
|
|
172
|
+
platform: 'None',
|
|
173
|
+
isCI: false,
|
|
174
|
+
branch: undefined,
|
|
175
|
+
isPR: false,
|
|
176
|
+
};
|
|
177
|
+
}
|
|
178
|
+
/** Extracts branch name from git refs like "refs/heads/main" or "refs/pull/123/merge" */
|
|
179
|
+
function extractBranchFromRef(ref) {
|
|
180
|
+
if (!ref)
|
|
181
|
+
return undefined;
|
|
182
|
+
// Remove refs/heads/ prefix
|
|
183
|
+
if (ref.startsWith('refs/heads/')) {
|
|
184
|
+
return ref.replace(/^refs\/heads\//, '');
|
|
185
|
+
}
|
|
186
|
+
// Remove refs/tags/ prefix
|
|
187
|
+
if (ref.startsWith('refs/tags/')) {
|
|
188
|
+
return ref.replace(/^refs\/tags\//, '');
|
|
189
|
+
}
|
|
190
|
+
// Remove refs/pull/ or refs/merge-requests/ (keep as-is for now)
|
|
191
|
+
return ref;
|
|
192
|
+
}
|
|
193
|
+
/**
|
|
194
|
+
* Gets the branch name with CI detection priority. Returns undefined if not in CI or
|
|
195
|
+
* branch cannot be detected.
|
|
196
|
+
*/
|
|
197
|
+
function getCIBranchName() {
|
|
198
|
+
const ciInfo = detectCIBranch();
|
|
199
|
+
if (!ciInfo.isCI) {
|
|
200
|
+
return undefined;
|
|
201
|
+
}
|
|
202
|
+
return ciInfo.branch;
|
|
203
|
+
}
|
|
204
|
+
//# sourceMappingURL=ci-branch-detection.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ci-branch-detection.js","sourceRoot":"","sources":["../../../src/lib/build-context/ci-branch-detection.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ const logging_1 = require("../logging");
|
|
|
14
14
|
const ze_log_event_1 = require("../logging/ze-log-event");
|
|
15
15
|
const secret_token_1 = require("../node-persist/secret-token");
|
|
16
16
|
const token_1 = require("../node-persist/token");
|
|
17
|
+
const ci_branch_detection_1 = require("./ci-branch-detection");
|
|
17
18
|
const git_provider_utils_1 = require("./git-provider-utils");
|
|
18
19
|
const detect_monorepo_1 = require("./detect-monorepo");
|
|
19
20
|
const ze_util_read_package_json_1 = require("./ze-util-read-package-json");
|
|
@@ -98,12 +99,30 @@ async function loadGitInfo(hasSecretToken) {
|
|
|
98
99
|
].join(` && echo ${GIT_OUTPUT_DELIMITER} && `);
|
|
99
100
|
try {
|
|
100
101
|
const { stdout } = await exec(command);
|
|
101
|
-
const [name, email, remoteOrigin,
|
|
102
|
+
const [name, email, remoteOrigin, gitBranch, commit, tagsOutput] = stdout
|
|
102
103
|
.trim()
|
|
103
104
|
.split(GIT_OUTPUT_DELIMITER)
|
|
104
105
|
.map((x) => x.trim());
|
|
105
106
|
// Parse tags - if multiple tags point to HEAD, they'll be on separate lines
|
|
106
107
|
const tags = tagsOutput ? tagsOutput.split('\n').filter(Boolean) : [];
|
|
108
|
+
// In CI environments with detached HEAD, git returns "HEAD" as branch name
|
|
109
|
+
// Try to get branch from CI environment variables first
|
|
110
|
+
let branch = gitBranch;
|
|
111
|
+
if (is_ci_1.default && (gitBranch === 'HEAD' || !gitBranch)) {
|
|
112
|
+
const ciInfo = (0, ci_branch_detection_1.detectCIBranch)();
|
|
113
|
+
if (ciInfo.branch) {
|
|
114
|
+
branch = ciInfo.branch;
|
|
115
|
+
logging_1.ze_log.git(`Detected branch from ${ciInfo.platform} environment variables: ${branch}`, {
|
|
116
|
+
platform: ciInfo.platform,
|
|
117
|
+
branch,
|
|
118
|
+
isPR: ciInfo.isPR,
|
|
119
|
+
gitBranch,
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
else {
|
|
123
|
+
logging_1.ze_log.git(`Branch detection in CI failed. Git returned: "${gitBranch}", no CI env vars available`, { platform: ciInfo.platform, gitBranch });
|
|
124
|
+
}
|
|
125
|
+
}
|
|
107
126
|
return {
|
|
108
127
|
name,
|
|
109
128
|
email,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-util-get-git-info.js","sourceRoot":"","sources":["../../../src/lib/build-context/ze-util-get-git-info.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ze-util-get-git-info.js","sourceRoot":"","sources":["../../../src/lib/build-context/ze-util-get-git-info.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.zeUploadAssets = zeUploadAssets;
|
|
4
4
|
const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
5
|
+
const get_missing_assets_1 = require("../edge-hash-list/get-missing-assets");
|
|
6
|
+
const get_application_hash_list_1 = require("../edge-requests/get-application-hash-list");
|
|
5
7
|
const upload_file_1 = require("../http/upload-file");
|
|
6
8
|
const logging_1 = require("../logging");
|
|
7
9
|
const picocolor_1 = require("../logging/picocolor");
|
|
8
|
-
const
|
|
9
|
-
const get_missing_assets_1 = require("../edge-hash-list/get-missing-assets");
|
|
10
|
-
const CLOUDFLARE_BATCH_SIZE = 6;
|
|
10
|
+
const MAX_MATCH_SIZE = 6;
|
|
11
11
|
async function zeUploadAssets(zephyr_engine, { missingAssets, assetsMap }) {
|
|
12
12
|
const count = Object.keys(assetsMap).length;
|
|
13
13
|
const logger = await zephyr_engine.logger;
|
|
@@ -29,15 +29,7 @@ async function zeUploadAssets(zephyr_engine, { missingAssets, assetsMap }) {
|
|
|
29
29
|
}
|
|
30
30
|
const start = Date.now();
|
|
31
31
|
let totalSize = 0;
|
|
32
|
-
|
|
33
|
-
// Reference: https://developers.cloudflare.com/workers/platform/limits/#simultaneous-open-connections:~:text=Once%20an%20invocation%20has%20six%20connections%20open%2C%20it%20can%20still%20attempt%20to%20open%20additional%20connections.
|
|
34
|
-
if (zephyr_engine.env.target !== 'ios' && zephyr_engine.env.target !== 'android') {
|
|
35
|
-
await Promise.all(missingAssets.map(upload_missing_asset));
|
|
36
|
-
}
|
|
37
|
-
else {
|
|
38
|
-
logging_1.ze_log.upload("The target platform is 'ios' and 'android' so we are switching to batch upload.");
|
|
39
|
-
await (0, zephyr_edge_contract_1.forEachLimit)(missingAssets.map((asset) => () => upload_missing_asset(asset)), CLOUDFLARE_BATCH_SIZE);
|
|
40
|
-
}
|
|
32
|
+
await (0, zephyr_edge_contract_1.forEachLimit)(missingAssets.map((asset) => () => upload_missing_asset(asset)), MAX_MATCH_SIZE);
|
|
41
33
|
logger({
|
|
42
34
|
level: 'info',
|
|
43
35
|
action: 'snapshot:assets:upload:done',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-upload-assets.js","sourceRoot":"","sources":["../../../src/lib/edge-actions/ze-upload-assets.ts"],"names":[],"mappings":";;AAmBA,
|
|
1
|
+
{"version":3,"file":"ze-upload-assets.js","sourceRoot":"","sources":["../../../src/lib/edge-actions/ze-upload-assets.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,10 +16,9 @@ const RETRY_ERROR_CODES = [
|
|
|
16
16
|
'EPIPE',
|
|
17
17
|
];
|
|
18
18
|
/**
|
|
19
|
-
* Gets HTTPS proxy URL from environment variables.
|
|
20
|
-
*
|
|
21
|
-
*
|
|
22
|
-
* Returns undefined if no proxy is configured.
|
|
19
|
+
* Gets HTTPS proxy URL from environment variables. Checks both uppercase and lowercase
|
|
20
|
+
* variants. Falls back to HTTP_PROXY if HTTPS_PROXY is not set. Returns undefined if no
|
|
21
|
+
* proxy is configured.
|
|
23
22
|
*/
|
|
24
23
|
function getHttpsProxyUrl() {
|
|
25
24
|
const envVars = ['HTTPS_PROXY', 'https_proxy', 'HTTP_PROXY', 'http_proxy'];
|
|
@@ -53,9 +52,7 @@ function shouldBypassProxy(hostname) {
|
|
|
53
52
|
return hostLower === noProxyHost || hostLower.endsWith(`.${noProxyHost}`);
|
|
54
53
|
});
|
|
55
54
|
}
|
|
56
|
-
/**
|
|
57
|
-
* Creates HTTPS agent with proxy support if configured via environment variables.
|
|
58
|
-
*/
|
|
55
|
+
/** Creates HTTPS agent with proxy support if configured via environment variables. */
|
|
59
56
|
function getHttpsProxyAgent(url) {
|
|
60
57
|
// Check if this host should bypass the proxy
|
|
61
58
|
if (shouldBypassProxy(url.hostname)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-with-retries.js","sourceRoot":"","sources":["../../../src/lib/http/fetch-with-retries.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"fetch-with-retries.js","sourceRoot":"","sources":["../../../src/lib/http/fetch-with-retries.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,17 +48,7 @@ function getSessionKey() {
|
|
|
48
48
|
session: session.toString('base64url'),
|
|
49
49
|
// If we are the holder of the lock, unlock it and clean up the lockfile
|
|
50
50
|
[Symbol.dispose]() {
|
|
51
|
-
|
|
52
|
-
unlock();
|
|
53
|
-
// TODO: Remove this in the future, once >=0.0.48 is the minimum version
|
|
54
|
-
//
|
|
55
|
-
// Removes the lockfile to prevent older plugin versions (<0.0.48) from crashing
|
|
56
|
-
// because `node-persist#forgiveParseErrors` wasn't set to true yet.
|
|
57
|
-
setTimeout(fs.unlink, UNLOCK_INTERVAL, storage_keys_1.ZE_SESSION_LOCK, () => {
|
|
58
|
-
// no need to care about errors here, if the file is not there, it's fine
|
|
59
|
-
logging_1.ze_log.misc('Lock released and lockfile removed');
|
|
60
|
-
});
|
|
61
|
-
}
|
|
51
|
+
unlock === null || unlock === void 0 ? void 0 : unlock();
|
|
62
52
|
},
|
|
63
53
|
};
|
|
64
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-lock.js","sourceRoot":"","sources":["../../../src/lib/node-persist/session-lock.ts"],"names":[],"mappings":";;AAqBA,
|
|
1
|
+
{"version":3,"file":"session-lock.js","sourceRoot":"","sources":["../../../src/lib/node-persist/session-lock.ts"],"names":[],"mappings":";;AAqBA,sCAkCC;AAgCD,sCAQC;;AA/FD,6CAA0C;AAC1C,oDAA8B;AAC9B,mDAAmD;AACnD,qDAAsD;AACtD,mDAAwE;AACxE,wCAAoC;AACpC,iDAAiD;AAEjD,sEAAsE;AACtE,MAAM,cAAc,GAAG,CAAC,CAAC;AAEzB,wFAAwF;AACxF,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,QAAQ;AAE1C;;;;;;GAMG;AACH,SAAgB,aAAa;IAC3B,iFAAiF;IACjF,uFAAuF;IACvF,2BAA2B;IAC3B,IAAI,OAAO,GAAG,IAAA,yBAAW,EAAC,cAAc,CAAC,CAAC;IAE1C,MAAM,MAAM,GAAG,YAAY,EAAE,CAAC;IAE9B,kEAAkE;IAClE,+BAA+B;IAC/B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,gBAAM,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;QACnF,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,8BAAe,CAAC,CAAC;QAE3C,8EAA8E;QAC9E,0EAA0E;QAC1E,IAAI,OAAO,CAAC,MAAM,KAAK,cAAc,EAAE,CAAC;YACtC,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,8BAAe,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;SAAM,CAAC;QACN,gBAAM,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;QAC9D,iCAAiC;QACjC,EAAE,CAAC,aAAa,CAAC,8BAAe,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO;QACL,KAAK,EAAE,CAAC,CAAC,MAAM;QACf,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;QAEtC,wEAAwE;QACxE,CAAC,MAAM,CAAC,OAAO,CAAC;YACd,MAAM,aAAN,MAAM,uBAAN,MAAM,EAAI,CAAC;QACb,CAAC;KACF,CAAC;AACJ,CAAC;AAOD,8FAA8F;AAC9F,SAAS,YAAY,CAAC,iBAAiB,GAAG,IAAI;IAC5C,IAAI,CAAC;QACH,kGAAkG;QAClG,OAAO,IAAA,0BAAQ,EAAC,8BAAe,EAAE,EAAE,KAAK,EAAE,+CAAkC,EAAE,CAAC,CAAC;IAClF,CAAC;IAAC,OAAO,EAAW,EAAE,CAAC;QACrB,MAAM,KAAK,GAAG,EAAsB,CAAC;QACrC,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,wCAAwC;QACxC,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,iBAAiB,EAAE,CAAC;YACjD,EAAE,CAAC,aAAa,CAAC,8BAAe,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;YAC9C,OAAO,YAAY,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC;QAED,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,aAAa,CAAC,MAAoB;;;QACtD,6DAA6D;QAC7D,KAAsB,eAAA,KAAA,sBAAA,IAAA,sBAAW,EAAC,eAAe,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA,IAAA,sDAAE,CAAC;YAA7D,cAA0D;YAA1D,WAA0D;YAArE,MAAM,CAAC,KAAA,CAAA;YAChB,wCAAwC;YACxC,IAAI,CAAC,IAAA,2BAAS,EAAC,8BAAe,EAAE,EAAE,KAAK,EAAE,+CAAkC,EAAE,CAAC,EAAE,CAAC;gBAC/E,OAAO;YACT,CAAC;QACH,CAAC;;;;;;;;;AACH,CAAC"}
|
|
@@ -1,18 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.StorageKeys = exports.ZE_SESSION_LOCK = exports.ZE_PATH = void 0;
|
|
3
|
+
exports.StorageKeys = exports.ZE_SESSION_LOCK = exports.ZE_STORAGE_PATH = exports.ZE_PATH = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const fs = tslib_1.__importStar(require("node:fs"));
|
|
6
6
|
const os = tslib_1.__importStar(require("node:os"));
|
|
7
7
|
const path = tslib_1.__importStar(require("node:path"));
|
|
8
8
|
exports.ZE_PATH = path.resolve(os.homedir(), '.zephyr');
|
|
9
|
+
exports.ZE_STORAGE_PATH = path.resolve(exports.ZE_PATH, 'storage');
|
|
9
10
|
exports.ZE_SESSION_LOCK = path.resolve(exports.ZE_PATH, 'session');
|
|
10
11
|
try {
|
|
11
|
-
//
|
|
12
|
-
fs.mkdirSync(exports.
|
|
12
|
+
// Dedicated node-persist directory to avoid clashes with other .zephyr assets (logs, etc).
|
|
13
|
+
fs.mkdirSync(exports.ZE_STORAGE_PATH, { recursive: true });
|
|
13
14
|
}
|
|
14
15
|
catch (error) {
|
|
15
|
-
console.error('error', `Could not create ~/.zephyr directory. Please check your permissions
|
|
16
|
+
console.error('error', `Could not create ~/.zephyr/storage directory. Please check your permissions.`, error);
|
|
16
17
|
}
|
|
17
18
|
var StorageKeys;
|
|
18
19
|
(function (StorageKeys) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage-keys.js","sourceRoot":"","sources":["../../../src/lib/node-persist/storage-keys.ts"],"names":[],"mappings":";;;;AAAA,oDAA8B;AAC9B,oDAA8B;AAC9B,wDAAkC;AAErB,QAAA,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,CAAC;AAChD,QAAA,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,eAAO,EAAE,SAAS,CAAC,CAAC;AAEhE,IAAI,CAAC;IACH,
|
|
1
|
+
{"version":3,"file":"storage-keys.js","sourceRoot":"","sources":["../../../src/lib/node-persist/storage-keys.ts"],"names":[],"mappings":";;;;AAAA,oDAA8B;AAC9B,oDAA8B;AAC9B,wDAAkC;AAErB,QAAA,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,CAAC;AAChD,QAAA,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,eAAO,EAAE,SAAS,CAAC,CAAC;AACnD,QAAA,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,eAAO,EAAE,SAAS,CAAC,CAAC;AAEhE,IAAI,CAAC;IACH,2FAA2F;IAC3F,EAAE,CAAC,SAAS,CAAC,uBAAe,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AACrD,CAAC;AAAC,OAAO,KAAK,EAAE,CAAC;IACf,OAAO,CAAC,KAAK,CACX,OAAO,EACP,8EAA8E,EAC9E,KAAK,CACN,CAAC;AACJ,CAAC;AAED,IAAY,WAUX;AAVD,WAAY,WAAW;IACrB,oEAAqD,CAAA;IACrD,mEAAoD,CAAA;IACpD,8CAA+B,CAAA;IAC/B,kDAAmC,CAAA;IACnC,0CAA2B,CAAA;IAC3B,8CAA+B,CAAA;IAC/B,4DAA6C,CAAA;IAC7C,kDAAmC,CAAA;IACnC,8CAA+B,CAAA;AACjC,CAAC,EAVW,WAAW,2BAAX,WAAW,QAUtB"}
|
|
@@ -5,9 +5,9 @@ const node_persist_1 = require("node-persist");
|
|
|
5
5
|
const storage_keys_1 = require("./storage-keys");
|
|
6
6
|
/** @internal */
|
|
7
7
|
exports.storage = (0, node_persist_1.init)({
|
|
8
|
-
dir: storage_keys_1.
|
|
9
|
-
// node-persist thinks every file in
|
|
10
|
-
// since we
|
|
8
|
+
dir: storage_keys_1.ZE_STORAGE_PATH,
|
|
9
|
+
// node-persist thinks every file in its folder is a JSON valid file,
|
|
10
|
+
// since we may colocate non-json files, we need to set this to true
|
|
11
11
|
forgiveParseErrors: true,
|
|
12
12
|
});
|
|
13
13
|
//# sourceMappingURL=storage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../src/lib/node-persist/storage.ts"],"names":[],"mappings":";;;AAAA,+CAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../src/lib/node-persist/storage.ts"],"names":[],"mappings":";;;AAAA,+CAAoC;AACpC,iDAAiD;AAEjD,gBAAgB;AACH,QAAA,OAAO,GAAG,IAAA,mBAAI,EAAC;IAC1B,GAAG,EAAE,8BAAe;IACpB,qEAAqE;IACrE,oEAAoE;IACpE,kBAAkB,EAAE,IAAI;CACzB,CAAC,CAAC"}
|
package/dist/package.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "zephyr-agent",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.7-next.2",
|
|
4
4
|
"description": "Zephyr plugin agent",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
"open": "^10.1.0",
|
|
41
41
|
"proper-lockfile": "^4.1.2",
|
|
42
42
|
"tslib": "^2.8.1",
|
|
43
|
-
"zephyr-edge-contract": "0.1.
|
|
43
|
+
"zephyr-edge-contract": "0.1.7-next.2"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
46
|
"@jest/globals": "^29.7.0",
|