zephyr-agent 0.0.57 → 0.0.58
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/auth/login.js +9 -50
- package/dist/lib/auth/login.js.map +1 -1
- package/dist/lib/auth/sse.d.ts +8 -0
- package/dist/lib/auth/sse.js +61 -0
- package/dist/lib/auth/sse.js.map +1 -0
- package/dist/lib/deployment/aws-upload.strategy.d.ts +3 -0
- package/dist/lib/deployment/aws-upload.strategy.js +61 -0
- package/dist/lib/deployment/aws-upload.strategy.js.map +1 -0
- package/dist/lib/deployment/get-upload-strategy.js +3 -0
- package/dist/lib/deployment/get-upload-strategy.js.map +1 -1
- package/dist/lib/deployment/index.d.ts +1 -0
- package/dist/lib/deployment/index.js +3 -1
- package/dist/lib/deployment/index.js.map +1 -1
- package/dist/lib/errors/codes.d.ts +5 -0
- package/dist/lib/errors/codes.js +5 -0
- package/dist/lib/errors/codes.js.map +1 -1
- package/dist/lib/http/fetch-with-retries.js +31 -14
- package/dist/lib/http/fetch-with-retries.js.map +1 -1
- package/dist/lib/logging/debug.d.ts +4 -0
- package/dist/lib/logging/debug.js +5 -1
- package/dist/lib/logging/debug.js.map +1 -1
- package/dist/lib/logging/index.d.ts +1 -1
- package/dist/lib/logging/index.js +3 -1
- package/dist/lib/logging/index.js.map +1 -1
- package/dist/lib/node-persist/session-lock.js +2 -1
- package/dist/lib/node-persist/session-lock.js.map +1 -1
- package/dist/package.json +4 -2
- package/package.json +5 -3
- package/dist/lib/auth/websocket.d.ts +0 -18
- package/dist/lib/auth/websocket.js +0 -19
- package/dist/lib/auth/websocket.js.map +0 -1
package/dist/lib/auth/login.js
CHANGED
|
@@ -15,8 +15,8 @@ const secret_token_1 = require("../node-persist/secret-token");
|
|
|
15
15
|
const session_lock_1 = require("../node-persist/session-lock");
|
|
16
16
|
const storage_keys_1 = require("../node-persist/storage-keys");
|
|
17
17
|
const token_1 = require("../node-persist/token");
|
|
18
|
+
const sse_1 = require("./sse");
|
|
18
19
|
const auth_flags_1 = require("./auth-flags");
|
|
19
|
-
const websocket_1 = require("./websocket");
|
|
20
20
|
/**
|
|
21
21
|
* Check if the user is already authenticated. If not, ask if they want to open a browser
|
|
22
22
|
* to authenticate. Display a message to the console.
|
|
@@ -142,8 +142,9 @@ async function openUrl(url) {
|
|
|
142
142
|
}
|
|
143
143
|
/** Generates the URL to authenticate the user. */
|
|
144
144
|
async function getAuthenticationURL(state) {
|
|
145
|
+
logging_1.ze_log.auth('getAuthenticationURL', `${(0, zephyr_edge_contract_1.ZE_API_ENDPOINT)()}${zephyr_edge_contract_1.ze_api_gateway.authorize_link}?state=${state}`);
|
|
145
146
|
const [ok, cause, data] = await (0, http_request_1.makeRequest)({
|
|
146
|
-
path: zephyr_edge_contract_1.ze_api_gateway.
|
|
147
|
+
path: zephyr_edge_contract_1.ze_api_gateway.authorize_link,
|
|
147
148
|
base: (0, zephyr_edge_contract_1.ZE_API_ENDPOINT)(),
|
|
148
149
|
query: { state },
|
|
149
150
|
});
|
|
@@ -155,54 +156,12 @@ async function getAuthenticationURL(state) {
|
|
|
155
156
|
}
|
|
156
157
|
return data;
|
|
157
158
|
}
|
|
158
|
-
/** Waits for the access token to be received from the websocket. */
|
|
159
159
|
async function waitForAccessToken(sessionKey) {
|
|
160
|
-
const
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
clearTimeout(timeoutHandle);
|
|
167
|
-
timeoutHandle = null;
|
|
168
|
-
}
|
|
169
|
-
socket.removeAllListeners();
|
|
170
|
-
socket.disconnect();
|
|
171
|
-
socket.close();
|
|
172
|
-
};
|
|
173
|
-
try {
|
|
174
|
-
socket.once('access-token', (token) => {
|
|
175
|
-
cleanupSocket();
|
|
176
|
-
resolve(token);
|
|
177
|
-
});
|
|
178
|
-
// Creating errors outside of the listener closure makes the stack trace point
|
|
179
|
-
// to waitForAccessToken fn instead of socket.io internals event emitter code.
|
|
180
|
-
socket.once('access-token-error', (cause) => {
|
|
181
|
-
cleanupSocket();
|
|
182
|
-
reject(new errors_1.ZephyrError(errors_1.ZeErrors.ERR_AUTH_ERROR, {
|
|
183
|
-
cause,
|
|
184
|
-
message: 'Error getting access token',
|
|
185
|
-
}));
|
|
186
|
-
});
|
|
187
|
-
socket.once('connect_error', (cause) => {
|
|
188
|
-
cleanupSocket();
|
|
189
|
-
reject(new errors_1.ZephyrError(errors_1.ZeErrors.ERR_AUTH_ERROR, {
|
|
190
|
-
message: 'Could not connect to socket.',
|
|
191
|
-
cause,
|
|
192
|
-
}));
|
|
193
|
-
});
|
|
194
|
-
socket.emit('joinAccessTokenRoom', { state: sessionKey });
|
|
195
|
-
// The user has a specified amount of time to log in through the browser.
|
|
196
|
-
timeoutHandle = setTimeout(() => {
|
|
197
|
-
cleanupSocket();
|
|
198
|
-
reject(new errors_1.ZephyrError(errors_1.ZeErrors.ERR_AUTH_ERROR, {
|
|
199
|
-
message: `Authentication timed out. Couldn't receive access token in ${auth_flags_1.DEFAULT_AUTH_COMPLETION_TIMEOUT_MS / 1000} seconds. Please try again.`,
|
|
200
|
-
}));
|
|
201
|
-
}, auth_flags_1.DEFAULT_AUTH_COMPLETION_TIMEOUT_MS);
|
|
202
|
-
return await promise;
|
|
203
|
-
}
|
|
204
|
-
finally {
|
|
205
|
-
cleanupSocket();
|
|
206
|
-
}
|
|
160
|
+
const url = new URL(zephyr_edge_contract_1.ze_api_gateway.websocket, (0, zephyr_edge_contract_1.ZE_API_ENDPOINT)());
|
|
161
|
+
url.searchParams.set('sessionId', sessionKey);
|
|
162
|
+
const authListener = new sse_1.AuthListener(url);
|
|
163
|
+
const resp = await authListener.waitForToken();
|
|
164
|
+
(0, logging_1.ze_debug)('waitForAccessToken', `Received token for session ${resp.sessionId}`);
|
|
165
|
+
return resp.token;
|
|
207
166
|
}
|
|
208
167
|
//# sourceMappingURL=login.js.map
|
|
@@ -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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"}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AuthListener = void 0;
|
|
4
|
+
const eventsource_1 = require("eventsource");
|
|
5
|
+
const logging_1 = require("../logging");
|
|
6
|
+
const errors_1 = require("../errors");
|
|
7
|
+
class AuthListener {
|
|
8
|
+
constructor(workerUrl) {
|
|
9
|
+
workerUrl.pathname = '/sse';
|
|
10
|
+
this.workerUrl = workerUrl;
|
|
11
|
+
}
|
|
12
|
+
async waitForToken(timeoutMs = 5 * 60 * 1000) {
|
|
13
|
+
const sessionId = this.workerUrl.searchParams.get('sessionId');
|
|
14
|
+
if (!sessionId) {
|
|
15
|
+
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_UNKNOWN, {
|
|
16
|
+
message: 'Session ID is required',
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
return new Promise((resolve, reject) => {
|
|
20
|
+
const eventSource = new eventsource_1.EventSource(this.workerUrl);
|
|
21
|
+
const timeout = setTimeout(() => {
|
|
22
|
+
eventSource.close();
|
|
23
|
+
reject(new errors_1.ZephyrError(errors_1.ZeErrors.ERR_UNKNOWN, {
|
|
24
|
+
message: 'Auth timeout',
|
|
25
|
+
}));
|
|
26
|
+
}, timeoutMs);
|
|
27
|
+
eventSource.onmessage = (event) => {
|
|
28
|
+
var _a, _b;
|
|
29
|
+
try {
|
|
30
|
+
const data = JSON.parse(event.data);
|
|
31
|
+
if (data.type === 'token') {
|
|
32
|
+
clearTimeout(timeout);
|
|
33
|
+
eventSource.close();
|
|
34
|
+
const token = (_a = data.token) !== null && _a !== void 0 ? _a : (_b = data.tokens) === null || _b === void 0 ? void 0 : _b.access_token;
|
|
35
|
+
resolve({ sessionId, token });
|
|
36
|
+
}
|
|
37
|
+
else if (data.type === 'error') {
|
|
38
|
+
clearTimeout(timeout);
|
|
39
|
+
eventSource.close();
|
|
40
|
+
reject(new Error(data.message));
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
(0, logging_1.ze_debug)('AuthListener', `Unknown message type: ${data.type}`);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
catch (err) {
|
|
47
|
+
clearTimeout(timeout);
|
|
48
|
+
eventSource.close();
|
|
49
|
+
reject(err);
|
|
50
|
+
}
|
|
51
|
+
};
|
|
52
|
+
eventSource.onerror = (error) => {
|
|
53
|
+
clearTimeout(timeout);
|
|
54
|
+
eventSource.close();
|
|
55
|
+
reject(error);
|
|
56
|
+
};
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
exports.AuthListener = AuthListener;
|
|
61
|
+
//# sourceMappingURL=sse.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sse.js","sourceRoot":"","sources":["../../../src/lib/auth/sse.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAC1C,wCAAsC;AACtC,sCAAkD;AAElD,MAAa,YAAY;IAEvB,YAAY,SAAc;QACxB,SAAS,CAAC,QAAQ,GAAG,MAAM,CAAC;QAC5B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,SAAS,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI;QAEzB,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC/D,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,WAAW,EAAE;gBAC1C,OAAO,EAAE,wBAAwB;aAClC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,WAAW,GAAG,IAAI,yBAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAEpD,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC9B,WAAW,CAAC,KAAK,EAAE,CAAC;gBACpB,MAAM,CACJ,IAAI,oBAAW,CAAC,iBAAQ,CAAC,WAAW,EAAE;oBACpC,OAAO,EAAE,cAAc;iBACxB,CAAC,CACH,CAAC;YACJ,CAAC,EAAE,SAAS,CAAC,CAAC;YAEd,WAAW,CAAC,SAAS,GAAG,CAAC,KAAmB,EAAE,EAAE;;gBAC9C,IAAI,CAAC;oBACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBACpC,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;wBAC1B,YAAY,CAAC,OAAO,CAAC,CAAC;wBACtB,WAAW,CAAC,KAAK,EAAE,CAAC;wBACpB,MAAM,KAAK,GAAG,MAAA,IAAI,CAAC,KAAK,mCAAI,MAAA,IAAI,CAAC,MAAM,0CAAE,YAAY,CAAC;wBACtD,OAAO,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;oBAChC,CAAC;yBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;wBACjC,YAAY,CAAC,OAAO,CAAC,CAAC;wBACtB,WAAW,CAAC,KAAK,EAAE,CAAC;wBACpB,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;oBAClC,CAAC;yBAAM,CAAC;wBACN,IAAA,kBAAQ,EAAC,cAAc,EAAE,yBAAyB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;oBACjE,CAAC;gBACH,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,YAAY,CAAC,OAAO,CAAC,CAAC;oBACtB,WAAW,CAAC,KAAK,EAAE,CAAC;oBACpB,MAAM,CAAC,GAAG,CAAC,CAAC;gBACd,CAAC;YACH,CAAC,CAAC;YAEF,WAAW,CAAC,OAAO,GAAG,CAAC,KAAY,EAAE,EAAE;gBACrC,YAAY,CAAC,OAAO,CAAC,CAAC;gBACtB,WAAW,CAAC,KAAK,EAAE,CAAC;gBACpB,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA1DD,oCA0DC"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import type { UploadOptions, ZephyrEngine } from '../../zephyr-engine';
|
|
2
|
+
export declare function awsUploadStrategy(zephyr_engine: ZephyrEngine, { snapshot, getDashData, assets: { assetsMap, missingAssets } }: UploadOptions): Promise<string>;
|
|
3
|
+
export declare function createBucket(application_uid: string): Promise<void>;
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.awsUploadStrategy = awsUploadStrategy;
|
|
4
|
+
exports.createBucket = createBucket;
|
|
5
|
+
const logging_1 = require("../logging");
|
|
6
|
+
const errors_1 = require("../errors");
|
|
7
|
+
const get_application_configuration_1 = require("../edge-requests/get-application-configuration");
|
|
8
|
+
const http_request_1 = require("../http/http-request");
|
|
9
|
+
const edge_actions_1 = require("../edge-actions");
|
|
10
|
+
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
|
|
12
|
+
async function awsUploadStrategy(zephyr_engine, { snapshot, getDashData, assets: { assetsMap, missingAssets } }) {
|
|
13
|
+
const snapshotSize = Buffer.byteLength(JSON.stringify(snapshot), 'utf8');
|
|
14
|
+
if (snapshotSize > EDGE_LAMBDA_MAX_BODY_SIZE) {
|
|
15
|
+
const opts = {
|
|
16
|
+
entity_name: 'snapshot',
|
|
17
|
+
entity_size: snapshotSize,
|
|
18
|
+
max_allowed_size: EDGE_LAMBDA_MAX_BODY_SIZE,
|
|
19
|
+
};
|
|
20
|
+
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_MAX_PAYLOAD_SIZE_EXCEEDED, opts);
|
|
21
|
+
}
|
|
22
|
+
for (const missingAsset of missingAssets) {
|
|
23
|
+
if (missingAsset.size > EDGE_LAMBDA_MAX_BODY_SIZE) {
|
|
24
|
+
const opts = {
|
|
25
|
+
entity_name: missingAsset.path,
|
|
26
|
+
entity_size: missingAsset.size,
|
|
27
|
+
max_allowed_size: EDGE_LAMBDA_MAX_BODY_SIZE,
|
|
28
|
+
};
|
|
29
|
+
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_MAX_PAYLOAD_SIZE_EXCEEDED, opts);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
await createBucket(zephyr_engine.application_uid);
|
|
33
|
+
await (0, upload_base_1.uploadAssets)(zephyr_engine, { assetsMap, missingAssets });
|
|
34
|
+
const versionUrl = await (0, edge_actions_1.zeUploadSnapshot)(zephyr_engine, { snapshot });
|
|
35
|
+
// Waits for the reply to check upload problems, but the reply is a simply
|
|
36
|
+
// 200 OK sent before any processing
|
|
37
|
+
await (0, upload_base_1.uploadBuildStatsAndEnableEnvs)(zephyr_engine, { getDashData, versionUrl });
|
|
38
|
+
return versionUrl;
|
|
39
|
+
}
|
|
40
|
+
async function createBucket(application_uid) {
|
|
41
|
+
const { EDGE_URL, jwt } = await (0, get_application_configuration_1.getApplicationConfiguration)({
|
|
42
|
+
application_uid,
|
|
43
|
+
});
|
|
44
|
+
const options = {
|
|
45
|
+
method: 'POST',
|
|
46
|
+
headers: {
|
|
47
|
+
can_write_jwt: jwt,
|
|
48
|
+
},
|
|
49
|
+
};
|
|
50
|
+
const url = new URL('/upload', EDGE_URL);
|
|
51
|
+
url.searchParams.append('type', 'bucket');
|
|
52
|
+
const [ok, cause] = await (0, http_request_1.makeRequest)(url, options);
|
|
53
|
+
if (!ok) {
|
|
54
|
+
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_FAILED_UPLOAD, {
|
|
55
|
+
type: 'bucket',
|
|
56
|
+
cause,
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
logging_1.ze_log.snapshot('Done: bucket initialized...');
|
|
60
|
+
}
|
|
61
|
+
//# sourceMappingURL=aws-upload.strategy.js.map
|
|
@@ -0,0 +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"}
|
|
@@ -4,6 +4,7 @@ exports.getUploadStrategy = getUploadStrategy;
|
|
|
4
4
|
const errors_1 = require("../errors");
|
|
5
5
|
const upload_provider_options_1 = require("../node-persist/upload-provider-options");
|
|
6
6
|
const common_upload_strategy_1 = require("./common-upload.strategy");
|
|
7
|
+
const aws_upload_strategy_1 = require("./aws-upload.strategy");
|
|
7
8
|
function getUploadStrategy(platform) {
|
|
8
9
|
switch (platform) {
|
|
9
10
|
case upload_provider_options_1.UploadProviderType.CLOUDFLARE:
|
|
@@ -11,6 +12,8 @@ function getUploadStrategy(platform) {
|
|
|
11
12
|
case upload_provider_options_1.UploadProviderType.FASTLY:
|
|
12
13
|
case upload_provider_options_1.UploadProviderType.AKAMAI:
|
|
13
14
|
return common_upload_strategy_1.commonUploadStrategy;
|
|
15
|
+
case upload_provider_options_1.UploadProviderType.AWS:
|
|
16
|
+
return aws_upload_strategy_1.awsUploadStrategy;
|
|
14
17
|
default:
|
|
15
18
|
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_UNKNOWN, {
|
|
16
19
|
message: 'Unsupported upload provider.',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-upload-strategy.js","sourceRoot":"","sources":["../../../src/lib/deployment/get-upload-strategy.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"get-upload-strategy.js","sourceRoot":"","sources":["../../../src/lib/deployment/get-upload-strategy.ts"],"names":[],"mappings":";;AAWA,8CAiBC;AA3BD,sCAAkD;AAClD,qFAA6E;AAC7E,qEAAgE;AAChE,+DAA0D;AAO1D,SAAgB,iBAAiB,CAAC,QAA4B;IAC5D,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,4CAAkB,CAAC,UAAU,CAAC;QACnC,KAAK,4CAAkB,CAAC,OAAO,CAAC;QAChC,KAAK,4CAAkB,CAAC,MAAM,CAAC;QAC/B,KAAK,4CAAkB,CAAC,MAAM;YAC5B,OAAO,6CAAoB,CAAC;QAC9B,KAAK,4CAAkB,CAAC,GAAG;YACzB,OAAO,uCAAiB,CAAC;QAC3B;YACE,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,WAAW,EAAE;gBAC1C,OAAO,EAAE,8BAA8B;gBACvC,IAAI,EAAE;oBACJ,QAAQ;iBACT;aACF,CAAC,CAAC;IACP,CAAC;AACH,CAAC"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getUploadStrategy = exports.commonUploadStrategy = void 0;
|
|
3
|
+
exports.getUploadStrategy = exports.commonUploadStrategy = exports.awsUploadStrategy = void 0;
|
|
4
|
+
var aws_upload_strategy_1 = require("./aws-upload.strategy");
|
|
5
|
+
Object.defineProperty(exports, "awsUploadStrategy", { enumerable: true, get: function () { return aws_upload_strategy_1.awsUploadStrategy; } });
|
|
4
6
|
var common_upload_strategy_1 = require("./common-upload.strategy");
|
|
5
7
|
Object.defineProperty(exports, "commonUploadStrategy", { enumerable: true, get: function () { return common_upload_strategy_1.commonUploadStrategy; } });
|
|
6
8
|
var get_upload_strategy_1 = require("./get-upload-strategy");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/deployment/index.ts"],"names":[],"mappings":";;;AAAA,mEAAgE;AAAvD,8HAAA,oBAAoB,OAAA;AAC7B,6DAA0D;AAAjD,wHAAA,iBAAiB,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/deployment/index.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAAjD,wHAAA,iBAAiB,OAAA;AAC1B,mEAAgE;AAAvD,8HAAA,oBAAoB,OAAA;AAC7B,6DAA0D;AAAjD,wHAAA,iBAAiB,OAAA"}
|
|
@@ -300,6 +300,11 @@ export declare const ZeErrors: {
|
|
|
300
300
|
readonly message: "Missing platform target (ios, android or others) from compiler options. Please open an issue on https://github.com/ZephyrCloudIO/zephyr-packages/issues";
|
|
301
301
|
readonly kind: "config";
|
|
302
302
|
};
|
|
303
|
+
readonly ERR_MAX_PAYLOAD_SIZE_EXCEEDED: {
|
|
304
|
+
readonly id: "037";
|
|
305
|
+
readonly message: "The \"{{entity_name}}\" is too large. It is {{entity_size}} bytes, but the maximum allowed size is {{max_allowed_size}} bytes.";
|
|
306
|
+
readonly kind: "deploy";
|
|
307
|
+
};
|
|
303
308
|
};
|
|
304
309
|
/** Error object for Zephyr errors. */
|
|
305
310
|
export type ZeErrors = typeof ZeErrors;
|
package/dist/lib/errors/codes.js
CHANGED
|
@@ -450,6 +450,11 @@ Were the required packages in Module federation plugin installed and included in
|
|
|
450
450
|
message: 'Missing platform target (ios, android or others) from compiler options. Please open an issue on https://github.com/ZephyrCloudIO/zephyr-packages/issues',
|
|
451
451
|
kind: 'config',
|
|
452
452
|
},
|
|
453
|
+
ERR_MAX_PAYLOAD_SIZE_EXCEEDED: {
|
|
454
|
+
id: '037',
|
|
455
|
+
message: `The "{{entity_name}}" is too large. It is {{entity_size}} bytes, but the maximum allowed size is {{max_allowed_size}} bytes.`,
|
|
456
|
+
kind: 'deploy',
|
|
457
|
+
},
|
|
453
458
|
};
|
|
454
459
|
/** Ensures `a` and `b` are the same error type. */
|
|
455
460
|
function isZeErrorEqual(a, b) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codes.js","sourceRoot":"","sources":["../../../src/lib/errors/codes.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"codes.js","sourceRoot":"","sources":["../../../src/lib/errors/codes.ts"],"names":[],"mappings":";;;AA0hBA,wCAEC;AA1hBD,sCAAsC;AACzB,QAAA,iBAAiB,GAAG;IAC/B,0CAA0C;IAC1C,OAAO,EAAE,IAAI;IACb,0BAA0B;IAC1B,KAAK,EAAE,IAAI;IACX,+BAA+B;IAC/B,MAAM,EAAE,IAAI;IACZ,oBAAoB;IACpB,OAAO,EAAE,IAAI;IACb,6CAA6C;IAC7C,MAAM,EAAE,IAAI;CAGb,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACU,QAAA,QAAQ,GAAG;IACtB,WAAW,EAAE;QACX,EAAE,EAAE,KAAK;QACT,OAAO,EAAE;;;CAGZ;QACG,IAAI,EAAE,SAAS;KAChB;IAED,mCAAmC;IACnC,4CAA4C;IAC5C,0BAA0B,EAAE;QAC1B,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,wBAAwB;QACjC,IAAI,EAAE,OAAO;KACd;IAED,iDAAiD;IACjD,0BAA0B,EAAE;QAC1B,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,6CAA6C;QACtD,IAAI,EAAE,OAAO;KACd;IAED,2BAA2B;IAC3B,kBAAkB,EAAE;QAClB,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,uBAAuB;QAChC,IAAI,EAAE,OAAO;KACd;IAED,uCAAuC,EAAE;QACvC,EAAE,EAAE,KAAK;QACT,OAAO,EACL,sKAAsK;QACxK,IAAI,EAAE,OAAO;KACd;IAED,qBAAqB,EAAE;QACrB,EAAE,EAAE,KAAK;QACT,OAAO,EAAE;;;;;;;;;CASZ;QACG,IAAI,EAAE,OAAO;KACd;IAED,+CAA+C;IAC/C,yBAAyB,EAAE;QACzB,EAAE,EAAE,KAAK;QACT,OAAO,EAAE;;;;CAIZ;QACG,IAAI,EAAE,OAAO;KACd;IAED,6BAA6B;IAC7B,eAAe,EAAE;QACf,EAAE,EAAE,KAAK;QACT,OAAO,EAAE;;;;;;CAMZ;QACG,IAAI,EAAE,OAAO;KACd;IAED,2CAA2C;IAC3C,2BAA2B,EAAE;QAC3B,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,4BAA4B;QACrC,IAAI,EAAE,OAAO;KACd;IAED,iBAAiB;IACjB,cAAc,EAAE;QACd,EAAE,EAAE,KAAK;QACT,OAAO,EAAE;;;;;;CAMZ;QACG,IAAI,EAAE,OAAO;KACd;IAED,gBAAgB,EAAE;QAChB,EAAE,EAAE,KAAK;QACT,OAAO,EAAE;;;;;;;;;CASZ;QACG,IAAI,EAAE,OAAO;KACd;IAED,yCAAyC;IACzC,2BAA2B,EAAE;QAC3B,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,oCAAoC;QAC7C,IAAI,EAAE,OAAO;KACd;IAED,gCAAgC;IAChC,6BAA6B,EAAE;QAC7B,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,6BAA6B;QACtC,IAAI,EAAE,OAAO;KACd;IAED,2BAA2B;IAC3B,wBAAwB,EAAE;QACxB,EAAE,EAAE,KAAK;QACT,OAAO,EAAE;;;;;;CAMZ;QACG,IAAI,EAAE,OAAO;KACd;IAED;;;;;;OAMG;IACH,qBAAqB,EAAE;QACrB,EAAE,EAAE,KAAK;QACT,OAAO,EAAE;;;;kEAIqD;QAC9D,IAAI,EAAE,OAAO;KACd;IAED,kBAAkB,EAAE;QAClB,EAAE,EAAE,KAAK;QACT,OAAO,EAAE;;;;qqBAIwpB;QACjqB,IAAI,EAAE,OAAO;KACd;IAED,yCAAyC;IACzC,oBAAoB,EAAE;QACpB,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,mBAAmB;QAC5B,IAAI,EAAE,QAAQ;KACf;IAED,mCAAmC;IACnC,gCAAgC,EAAE;QAChC,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,+BAA+B;QACxC,IAAI,EAAE,QAAQ;KACf;IAED,8BAA8B;IAC9B,kCAAkC,EAAE;QAClC,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,gCAAgC;QACzC,IAAI,EAAE,QAAQ;KACf;IAED,qBAAqB,EAAE;QACrB,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,oBAAoB;QAC7B,IAAI,EAAE,QAAQ;KACf;IAED,gDAAgD;IAChD,mBAAmB,EAAE;QACnB,EAAE,EAAE,KAAK;QACT,OAAO,EAAE;;;;;;KAMR;QACD,IAAI,EAAE,QAAQ;KACf;IAED,mDAAmD;IACnD,qCAAqC,EAAE;QACrC,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,+CAA+C;QACxD,IAAI,EAAE,QAAQ;KACf;IAED,+BAA+B;IAC/B,iBAAiB,EAAE;QACjB,EAAE,EAAE,KAAK;QACT,OAAO,EAAE;;;;;;KAMR;QACD,IAAI,EAAE,QAAQ;KACf;IAED,wCAAwC;IACxC,+BAA+B,EAAE;QAC/B,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,mCAAmC;QAC5C,IAAI,EAAE,QAAQ;KACf;IAED,0CAA0C;IAC1C,6BAA6B,EAAE;QAC7B,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,sCAAsC;QAC/C,IAAI,EAAE,QAAQ;KACf;IAED,yBAAyB,EAAE;QACzB,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,0BAA0B;QACnC,IAAI,EAAE,QAAQ;KACf;IAED,sBAAsB,EAAE;QACtB,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,qBAAqB;QAC9B,IAAI,EAAE,QAAQ;KACf;IAED,sBAAsB,EAAE;QACtB,EAAE,EAAE,KAAK;QACT,OAAO,EAAE;;;;GAIV;QACC,IAAI,EAAE,QAAQ;KACf;IAED,gCAAgC;IAChC,uBAAuB,EAAE;QACvB,EAAE,EAAE,KAAK;QACT,OAAO,EACL,kHAAkH;QACpH,IAAI,EAAE,QAAQ;KACf;IAED,8BAA8B,EAAE;QAC9B,EAAE,EAAE,KAAK;QACT,OAAO,EAAE;;;;;;;;CAQZ;QACG,IAAI,EAAE,SAAS;KAChB;IAED,8BAA8B,EAAE;QAC9B,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,mCAAmC;QAC5C,IAAI,EAAE,QAAQ;KACf;IAED,iBAAiB,EAAE;QACjB,EAAE,EAAE,KAAK;QACT,OAAO,EAAE;;;;CAIZ;QACG,IAAI,EAAE,QAAQ;KACf;IAED,4BAA4B,EAAE;QAC5B,EAAE,EAAE,KAAK;QACT,OAAO,EACL,qGAAqG;QACvG,IAAI,EAAE,QAAQ;KACf;IAED,cAAc,EAAE;QACd,EAAE,EAAE,KAAK;QACT,OAAO,EAAE;;;;;;;;CAQZ;QACG,IAAI,EAAE,QAAQ;KACf;IAED,eAAe,EAAE;QACf,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,2HAA2H;QACpI,IAAI,EAAE,OAAO;KACd;IAED,sBAAsB,EAAE;QACtB,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,6GAA6G;QACtH,IAAI,EAAE,OAAO;KACd;IAED;;;;;;;;;;OAUG;IACH,8BAA8B,EAAE;QAC9B,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,2CAA2C;QACpD,IAAI,EAAE,OAAO;KACd;IAED,UAAU,EAAE;QACV,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,iHAAiH;QAC1H,IAAI,EAAE,OAAO;KACd;IAED,eAAe,EAAE;QACf,EAAE,EAAE,KAAK;QACT,OAAO,EACL,4GAA4G;QAC9G,IAAI,EAAE,OAAO;KACd;IAED,wBAAwB,EAAE;QACxB,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,0CAA0C;QACnD,IAAI,EAAE,OAAO;KACd;IAED,kBAAkB,EAAE;QAClB,EAAE,EAAE,KAAK;QACT,OAAO,EACL,oJAAoJ;QACtJ,IAAI,EAAE,OAAO;KACd;IAED,mBAAmB,EAAE;QACnB,EAAE,EAAE,KAAK;QACT,OAAO,EACL,0FAA0F;QAC5F,IAAI,EAAE,OAAO;KACd;IAED,mBAAmB,EAAE;QACnB,EAAE,EAAE,KAAK;QACT,OAAO,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6BZ;QACG,IAAI,EAAE,QAAQ;KACf;IAED,wCAAwC,EAAE;QACxC,EAAE,EAAE,KAAK;QACT,OAAO,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BN;QACH,IAAI,EAAE,QAAQ;KACf;IACD,kBAAkB,EAAE;QAClB,EAAE,EAAE,KAAK;QACT,OAAO,EAAE;8JACiJ;QAC1J,IAAI,EAAE,QAAQ;KACf;IAED,8BAA8B,EAAE;QAC9B,EAAE,EAAE,KAAK;QACT,OAAO,EACL,oLAAoL;QACtL,IAAI,EAAE,QAAQ;KACf;IACD,oBAAoB,EAAE;QACpB,EAAE,EAAE,KAAK;QACT,OAAO,EACL,yJAAyJ;QAC3J,IAAI,EAAE,QAAQ;KACf;IACD,6BAA6B,EAAE;QAC7B,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,8HAA8H;QACvI,IAAI,EAAE,QAAQ;KACf;CAUF,CAAC;AAkBF,mDAAmD;AACnD,SAAgB,cAAc,CAAC,CAAc,EAAE,CAAc;IAC3D,OAAO,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC;AAC5C,CAAC"}
|
|
@@ -2,28 +2,45 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.fetchWithRetries = fetchWithRetries;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const
|
|
6
|
-
const axios_1 = require("axios");
|
|
7
|
-
const axios_2 = tslib_1.__importDefault(require("axios"));
|
|
5
|
+
const axios_1 = tslib_1.__importStar(require("axios"));
|
|
8
6
|
const axios_retry_1 = tslib_1.__importDefault(require("axios-retry"));
|
|
7
|
+
const is_ci_1 = tslib_1.__importDefault(require("is-ci"));
|
|
8
|
+
const errors_1 = require("../errors");
|
|
9
|
+
const IPV4_FAMILY = 4;
|
|
10
|
+
const RETRY_ERROR_CODES = [
|
|
11
|
+
'ETIMEDOUT',
|
|
12
|
+
'ENETUNREACH',
|
|
13
|
+
'ECONNRESET',
|
|
14
|
+
'ECONNREFUSED',
|
|
15
|
+
'EPIPE',
|
|
16
|
+
];
|
|
17
|
+
function shouldRetry(error) {
|
|
18
|
+
// Retry on network errors (no response received)
|
|
19
|
+
if (!error.response) {
|
|
20
|
+
const code = error.code;
|
|
21
|
+
const message = error.message || '';
|
|
22
|
+
return ((code && RETRY_ERROR_CODES.includes(code)) ||
|
|
23
|
+
message.includes('network') ||
|
|
24
|
+
message.includes('timeout'));
|
|
25
|
+
}
|
|
26
|
+
// Retry on server errors (5xx)
|
|
27
|
+
return error.response.status >= 500;
|
|
28
|
+
}
|
|
9
29
|
async function fetchWithRetries(url, options = {}, retries = 3) {
|
|
10
30
|
var _a, _b, _c, _d, _e;
|
|
11
31
|
try {
|
|
12
|
-
// Create a custom axios instance for this request
|
|
13
|
-
const axiosInstance =
|
|
32
|
+
// Create a custom axios instance for this request with CI-friendly settings
|
|
33
|
+
const axiosInstance = axios_1.default.create({
|
|
34
|
+
// Force IPv4 in CI environments to avoid IPv6 connectivity issues
|
|
35
|
+
// References: https://github.com/actions/runner/issues/3138
|
|
36
|
+
// https://x.com/matteocollina/status/1640384245834055680
|
|
37
|
+
family: is_ci_1.default ? IPV4_FAMILY : undefined,
|
|
38
|
+
});
|
|
14
39
|
// Configure axios-retry
|
|
15
40
|
(0, axios_retry_1.default)(axiosInstance, {
|
|
16
41
|
retries,
|
|
17
42
|
retryDelay: axios_retry_1.default.exponentialDelay,
|
|
18
|
-
retryCondition:
|
|
19
|
-
// Retry on network errors
|
|
20
|
-
if (!error.response) {
|
|
21
|
-
const networkError = error.code || error.message || '';
|
|
22
|
-
return networkError === 'EPIPE' || networkError.includes('network');
|
|
23
|
-
}
|
|
24
|
-
// Retry on server errors (5xx)
|
|
25
|
-
return error.response.status >= 500;
|
|
26
|
-
},
|
|
43
|
+
retryCondition: shouldRetry,
|
|
27
44
|
});
|
|
28
45
|
// Convert fetch options to axios options
|
|
29
46
|
const axiosConfig = Object.assign({ method: (_a = options.method) !== null && _a !== void 0 ? _a : 'GET', data: options.body }, (options.signal ? { signal: options.signal } : {}));
|
|
@@ -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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"}
|
|
@@ -3,6 +3,8 @@ export declare const brightBlueBgName: string;
|
|
|
3
3
|
export declare const brightYellowBgName: string;
|
|
4
4
|
export declare const brightGreenBgName: string;
|
|
5
5
|
export declare const brightRedBgName: string;
|
|
6
|
+
export declare const ze_error: import("debug").Debugger;
|
|
7
|
+
export declare const ze_debug: import("debug").Debugger;
|
|
6
8
|
/**
|
|
7
9
|
* Debug contexts:
|
|
8
10
|
*
|
|
@@ -32,4 +34,6 @@ export declare const ze_log: {
|
|
|
32
34
|
remotes: import("debug").Debugger;
|
|
33
35
|
snapshot: import("debug").Debugger;
|
|
34
36
|
upload: import("debug").Debugger;
|
|
37
|
+
debug: import("debug").Debugger;
|
|
38
|
+
error: import("debug").Debugger;
|
|
35
39
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ze_log = exports.brightRedBgName = exports.brightGreenBgName = exports.brightYellowBgName = exports.brightBlueBgName = exports.dimmedName = void 0;
|
|
3
|
+
exports.ze_log = exports.ze_debug = exports.ze_error = exports.brightRedBgName = exports.brightGreenBgName = exports.brightYellowBgName = exports.brightBlueBgName = exports.dimmedName = void 0;
|
|
4
4
|
// light weight functions for decorated console.error + able to toggle different parts of whole module's logging result
|
|
5
5
|
const debug_1 = require("debug");
|
|
6
6
|
const picocolor_1 = require("./picocolor");
|
|
@@ -11,6 +11,8 @@ exports.brightBlueBgName = (0, picocolor_1.bold)((0, picocolor_1.bgCyanBright)((
|
|
|
11
11
|
exports.brightYellowBgName = (0, picocolor_1.bold)((0, picocolor_1.bgYellowBright)((0, picocolor_1.black)(name)));
|
|
12
12
|
exports.brightGreenBgName = (0, picocolor_1.bold)((0, picocolor_1.bgGreenBright)((0, picocolor_1.black)(name)));
|
|
13
13
|
exports.brightRedBgName = (0, picocolor_1.bold)((0, picocolor_1.bgRedBright)((0, picocolor_1.black)(name)));
|
|
14
|
+
exports.ze_error = (0, debug_1.debug)('zephyr:error');
|
|
15
|
+
exports.ze_debug = (0, debug_1.debug)('zephyr:debug');
|
|
14
16
|
const createLogger = () => {
|
|
15
17
|
return {
|
|
16
18
|
app: (0, debug_1.debug)('zephyr:app'),
|
|
@@ -25,6 +27,8 @@ const createLogger = () => {
|
|
|
25
27
|
remotes: (0, debug_1.debug)('zephyr:remotes'),
|
|
26
28
|
snapshot: (0, debug_1.debug)('zephyr:snapshot'),
|
|
27
29
|
upload: (0, debug_1.debug)('zephyr:upload'),
|
|
30
|
+
debug: (0, debug_1.debug)('zephyr:debug'),
|
|
31
|
+
error: (0, debug_1.debug)('zephyr:error'),
|
|
28
32
|
};
|
|
29
33
|
};
|
|
30
34
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../../src/lib/logging/debug.ts"],"names":[],"mappings":";;;AAAA,uHAAuH;AACvH,iCAA8B;AAC9B,2CAQqB;AAErB,uDAAuD;AACvD,MAAM,IAAI,GAAG,UAAU,CAAC;AAEX,QAAA,UAAU,GAAG,IAAA,eAAG,EAAC,IAAI,CAAC,CAAC;AAEvB,QAAA,gBAAgB,GAAG,IAAA,gBAAI,EAAC,IAAA,wBAAY,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAEnD,QAAA,kBAAkB,GAAG,IAAA,gBAAI,EAAC,IAAA,0BAAc,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAEvD,QAAA,iBAAiB,GAAG,IAAA,gBAAI,EAAC,IAAA,yBAAa,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAErD,QAAA,eAAe,GAAG,IAAA,gBAAI,EAAC,IAAA,uBAAW,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../../src/lib/logging/debug.ts"],"names":[],"mappings":";;;AAAA,uHAAuH;AACvH,iCAA8B;AAC9B,2CAQqB;AAErB,uDAAuD;AACvD,MAAM,IAAI,GAAG,UAAU,CAAC;AAEX,QAAA,UAAU,GAAG,IAAA,eAAG,EAAC,IAAI,CAAC,CAAC;AAEvB,QAAA,gBAAgB,GAAG,IAAA,gBAAI,EAAC,IAAA,wBAAY,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAEnD,QAAA,kBAAkB,GAAG,IAAA,gBAAI,EAAC,IAAA,0BAAc,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAEvD,QAAA,iBAAiB,GAAG,IAAA,gBAAI,EAAC,IAAA,yBAAa,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAErD,QAAA,eAAe,GAAG,IAAA,gBAAI,EAAC,IAAA,uBAAW,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAEjD,QAAA,QAAQ,GAAG,IAAA,aAAK,EAAC,cAAc,CAAC,CAAC;AACjC,QAAA,QAAQ,GAAG,IAAA,aAAK,EAAC,cAAc,CAAC,CAAC;AAC9C,MAAM,YAAY,GAAG,GAAG,EAAE;IACxB,OAAO;QACL,GAAG,EAAE,IAAA,aAAK,EAAC,YAAY,CAAC;QACxB,IAAI,EAAE,IAAA,aAAK,EAAC,aAAa,CAAC;QAC1B,MAAM,EAAE,IAAA,aAAK,EAAC,eAAe,CAAC;QAC9B,GAAG,EAAE,IAAA,aAAK,EAAC,YAAY,CAAC;QACxB,IAAI,EAAE,IAAA,aAAK,EAAC,aAAa,CAAC;QAC1B,IAAI,EAAE,IAAA,aAAK,EAAC,aAAa,CAAC;QAC1B,EAAE,EAAE,IAAA,aAAK,EAAC,WAAW,CAAC;QACtB,IAAI,EAAE,IAAA,aAAK,EAAC,aAAa,CAAC;QAC1B,OAAO,EAAE,IAAA,aAAK,EAAC,gBAAgB,CAAC;QAChC,OAAO,EAAE,IAAA,aAAK,EAAC,gBAAgB,CAAC;QAChC,QAAQ,EAAE,IAAA,aAAK,EAAC,iBAAiB,CAAC;QAClC,MAAM,EAAE,IAAA,aAAK,EAAC,eAAe,CAAC;QAC9B,KAAK,EAAE,IAAA,aAAK,EAAC,cAAc,CAAC;QAC5B,KAAK,EAAE,IAAA,aAAK,EAAC,cAAc,CAAC;KAC7B,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACU,QAAA,MAAM,GAAG,YAAY,EAAE,CAAC;AACrC,qEAAqE;AACrE,wDAAwD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export { ze_log } from './debug';
|
|
1
|
+
export { ze_log, ze_error, ze_debug } from './debug';
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ze_log = void 0;
|
|
3
|
+
exports.ze_debug = exports.ze_error = exports.ze_log = void 0;
|
|
4
4
|
var debug_1 = require("./debug");
|
|
5
5
|
Object.defineProperty(exports, "ze_log", { enumerable: true, get: function () { return debug_1.ze_log; } });
|
|
6
|
+
Object.defineProperty(exports, "ze_error", { enumerable: true, get: function () { return debug_1.ze_error; } });
|
|
7
|
+
Object.defineProperty(exports, "ze_debug", { enumerable: true, get: function () { return debug_1.ze_debug; } });
|
|
6
8
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/logging/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/logging/index.ts"],"names":[],"mappings":";;;AAAA,iCAAqD;AAA5C,+FAAA,MAAM,OAAA;AAAE,iGAAA,QAAQ,OAAA;AAAE,iGAAA,QAAQ,OAAA"}
|
|
@@ -68,7 +68,8 @@ function safeLockSync(createIfNotExists = true) {
|
|
|
68
68
|
// The timeout to the whole login process makes sense to keep the lock for the same amount of time
|
|
69
69
|
return (0, proper_lockfile_1.lockSync)(storage_keys_1.ZE_SESSION_LOCK, { stale: auth_flags_1.DEFAULT_AUTH_COMPLETION_TIMEOUT_MS });
|
|
70
70
|
}
|
|
71
|
-
catch (
|
|
71
|
+
catch (ex) {
|
|
72
|
+
const error = ex;
|
|
72
73
|
if (error.code === 'ELOCKED') {
|
|
73
74
|
return null;
|
|
74
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-lock.js","sourceRoot":"","sources":["../../../src/lib/node-persist/session-lock.ts"],"names":[],"mappings":";;AAqBA,sCA6CC;
|
|
1
|
+
{"version":3,"file":"session-lock.js","sourceRoot":"","sources":["../../../src/lib/node-persist/session-lock.ts"],"names":[],"mappings":"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"}
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "zephyr-agent",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.58",
|
|
4
4
|
"description": "Zephyr plugin agent",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -37,20 +37,22 @@
|
|
|
37
37
|
"axios-retry": "^4.5.0",
|
|
38
38
|
"cloudflare": "^3.4.0",
|
|
39
39
|
"debug": "^4.3.4",
|
|
40
|
+
"eventsource": "^4.0.0",
|
|
40
41
|
"git-url-parse": "^15.0.0",
|
|
41
42
|
"is-ci": "catalog:plugin-shared",
|
|
42
43
|
"jose": "^5.10.0",
|
|
43
44
|
"node-persist": "^4.0.1",
|
|
44
45
|
"open": "^10.1.0",
|
|
45
46
|
"proper-lockfile": "^4.1.2",
|
|
46
|
-
"socket.io-client": "^4.7.5",
|
|
47
47
|
"tslib": "catalog:typescript",
|
|
48
48
|
"uuid": "^8.3.2",
|
|
49
|
+
"ws": "^8.18.3",
|
|
49
50
|
"zephyr-edge-contract": "workspace:*"
|
|
50
51
|
},
|
|
51
52
|
"devDependencies": {
|
|
52
53
|
"@jest/globals": "catalog:react",
|
|
53
54
|
"@types/debug": "^4.1.12",
|
|
55
|
+
"@types/eventsource": "^3.0.0",
|
|
54
56
|
"@types/git-url-parse": "^9.0.3",
|
|
55
57
|
"@types/is-ci": "catalog:typescript",
|
|
56
58
|
"@types/jest": "catalog:typescript",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "zephyr-agent",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.58",
|
|
4
4
|
"description": "Zephyr plugin agent",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -32,20 +32,22 @@
|
|
|
32
32
|
"axios-retry": "^4.5.0",
|
|
33
33
|
"cloudflare": "^3.4.0",
|
|
34
34
|
"debug": "^4.3.4",
|
|
35
|
+
"eventsource": "^4.0.0",
|
|
35
36
|
"git-url-parse": "^15.0.0",
|
|
36
37
|
"is-ci": "^4.1.0",
|
|
37
38
|
"jose": "^5.10.0",
|
|
38
39
|
"node-persist": "^4.0.1",
|
|
39
40
|
"open": "^10.1.0",
|
|
40
41
|
"proper-lockfile": "^4.1.2",
|
|
41
|
-
"socket.io-client": "^4.7.5",
|
|
42
42
|
"tslib": "^2.8.1",
|
|
43
43
|
"uuid": "^8.3.2",
|
|
44
|
-
"
|
|
44
|
+
"ws": "^8.18.3",
|
|
45
|
+
"zephyr-edge-contract": "0.0.58"
|
|
45
46
|
},
|
|
46
47
|
"devDependencies": {
|
|
47
48
|
"@jest/globals": "^29.7.0",
|
|
48
49
|
"@types/debug": "^4.1.12",
|
|
50
|
+
"@types/eventsource": "^3.0.0",
|
|
49
51
|
"@types/git-url-parse": "^9.0.3",
|
|
50
52
|
"@types/is-ci": "3.0.4",
|
|
51
53
|
"@types/jest": "29.5.14",
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
import { type Socket } from 'socket.io-client';
|
|
2
|
-
interface ClientToServerEvents {
|
|
3
|
-
joinAccessTokenRoom: (props: {
|
|
4
|
-
state: string;
|
|
5
|
-
}) => void;
|
|
6
|
-
}
|
|
7
|
-
interface ServerToClientEvents {
|
|
8
|
-
'access-token': (token: string) => void;
|
|
9
|
-
'access-token-error': (msg: string) => void;
|
|
10
|
-
}
|
|
11
|
-
/**
|
|
12
|
-
* Creates a new socket.io connection to the specified endpoint
|
|
13
|
-
*
|
|
14
|
-
* @param endpoint The endpoint to connect to
|
|
15
|
-
* @returns A socket.io Socket instance
|
|
16
|
-
*/
|
|
17
|
-
export declare function createSocket(endpoint: string): Socket<ServerToClientEvents, ClientToServerEvents>;
|
|
18
|
-
export {};
|
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createSocket = createSocket;
|
|
4
|
-
const socket_io_client_1 = require("socket.io-client");
|
|
5
|
-
/**
|
|
6
|
-
* Creates a new socket.io connection to the specified endpoint
|
|
7
|
-
*
|
|
8
|
-
* @param endpoint The endpoint to connect to
|
|
9
|
-
* @returns A socket.io Socket instance
|
|
10
|
-
*/
|
|
11
|
-
function createSocket(endpoint) {
|
|
12
|
-
// Set forceNew to ensure a clean connection
|
|
13
|
-
return (0, socket_io_client_1.io)(endpoint, {
|
|
14
|
-
forceNew: true,
|
|
15
|
-
reconnection: false,
|
|
16
|
-
withCredentials: true,
|
|
17
|
-
});
|
|
18
|
-
}
|
|
19
|
-
//# sourceMappingURL=websocket.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"websocket.js","sourceRoot":"","sources":["../../../src/lib/auth/websocket.ts"],"names":[],"mappings":";;AAiBA,oCASC;AA1BD,uDAA+D;AAW/D;;;;;GAKG;AACH,SAAgB,YAAY,CAC1B,QAAgB;IAEhB,4CAA4C;IAC5C,OAAO,IAAA,qBAAQ,EAAC,QAAQ,EAAE;QACxB,QAAQ,EAAE,IAAI;QACd,YAAY,EAAE,KAAK;QACnB,eAAe,EAAE,IAAI;KACtB,CAAC,CAAC;AACL,CAAC"}
|