zephyr-agent 0.0.0-canary-20241122064756 → 0.0.0-canary-20241122175815
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/edge-actions/ze-upload-assets.js +1 -5
- package/dist/lib/edge-actions/ze-upload-assets.js.map +1 -1
- package/dist/lib/http/ze-http-request.d.ts +2 -2
- package/dist/lib/http/ze-http-request.js +96 -87
- package/dist/lib/http/ze-http-request.js.map +1 -1
- package/dist/package.json +4 -5
- package/package.json +6 -7
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.zeUploadAssets = void 0;
|
|
4
|
-
const get_application_configuration_1 = require("../edge-requests/get-application-configuration");
|
|
5
4
|
const upload_file_1 = require("../http/upload-file");
|
|
6
5
|
const picocolor_1 = require("../logging/picocolor");
|
|
7
6
|
const logging_1 = require("../logging");
|
|
@@ -9,7 +8,7 @@ const CLOUDFLARE_BATCH_SIZE = 6;
|
|
|
9
8
|
async function zeUploadAssets(zephyr_engine, { missingAssets, assetsMap }) {
|
|
10
9
|
const count = Object.keys(assetsMap).length;
|
|
11
10
|
const logger = await zephyr_engine.logger;
|
|
12
|
-
const
|
|
11
|
+
const appConfig = await zephyr_engine.application_configuration;
|
|
13
12
|
if (missingAssets.length === 0) {
|
|
14
13
|
logger({
|
|
15
14
|
level: 'info',
|
|
@@ -20,9 +19,6 @@ async function zeUploadAssets(zephyr_engine, { missingAssets, assetsMap }) {
|
|
|
20
19
|
}
|
|
21
20
|
const start = Date.now();
|
|
22
21
|
let totalSize = 0;
|
|
23
|
-
const appConfig = await (0, get_application_configuration_1.getApplicationConfiguration)({
|
|
24
|
-
application_uid,
|
|
25
|
-
});
|
|
26
22
|
// If the target is iOS or Android, we upload the assets in a 6 request batch to avoid cloudflare worker requests limit
|
|
27
23
|
// 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.
|
|
28
24
|
if (zephyr_engine.env.target !== 'ios' && zephyr_engine.env.target !== 'android') {
|
|
@@ -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,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
/// <reference types="node" />
|
|
3
|
-
import
|
|
3
|
+
import { ClientRequestArgs } from 'node:http';
|
|
4
4
|
/** Http request wrapper that returns a tuple with the response data or an error. */
|
|
5
5
|
export type HttpResponse<T> = [ok: true, error: null, data: T] | [ok: false, error: Error];
|
|
6
6
|
export type UrlString = string | URL | {
|
|
@@ -11,9 +11,9 @@ export type UrlString = string | URL | {
|
|
|
11
11
|
/** Starts a new http request */
|
|
12
12
|
export declare class ZeHttpRequest<T = void> implements PromiseLike<HttpResponse<T>> {
|
|
13
13
|
#private;
|
|
14
|
+
then: <TResult1 = HttpResponse<T>, TResult2 = never>(onfulfilled?: ((value: HttpResponse<T>) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>;
|
|
14
15
|
/** Creates a new http request. */
|
|
15
16
|
static from<T = void>(urlStr: UrlString, options?: ClientRequestArgs, data?: string | Buffer): ZeHttpRequest<T>;
|
|
16
|
-
then: <TResult1 = HttpResponse<T>, TResult2 = never>(onfulfilled?: ((value: HttpResponse<T>) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>;
|
|
17
17
|
/** Transforms `Promise<HttpResponse<T>>` into `Promise<T>` */
|
|
18
18
|
unwrap(): Promise<T>;
|
|
19
19
|
}
|
|
@@ -1,15 +1,47 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var _ZeHttpRequest_instances, _ZeHttpRequest_start, _ZeHttpRequest_url, _ZeHttpRequest_options, _ZeHttpRequest_data, _ZeHttpRequest_promise, _ZeHttpRequest_reject, _ZeHttpRequest_resolve, _ZeHttpRequest_request,
|
|
2
|
+
var _ZeHttpRequest_instances, _ZeHttpRequest_start, _ZeHttpRequest_url, _ZeHttpRequest_options, _ZeHttpRequest_data, _ZeHttpRequest_promise, _ZeHttpRequest_reject, _ZeHttpRequest_resolve, _ZeHttpRequest_request, _ZeHttpRequest_redact;
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
exports.ZeHttpRequest = void 0;
|
|
5
5
|
const tslib_1 = require("tslib");
|
|
6
|
-
const http = tslib_1.__importStar(require("node:http"));
|
|
7
|
-
const https = tslib_1.__importStar(require("node:https"));
|
|
8
|
-
const consumers_1 = require("node:stream/consumers");
|
|
9
6
|
const errors_1 = require("../errors");
|
|
10
7
|
const token_1 = require("../node-persist/token");
|
|
11
8
|
const debug_1 = require("../logging/debug");
|
|
12
9
|
const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
10
|
+
async function fetchWithRetries(url, options = {}, retries = 3) {
|
|
11
|
+
for (let attempt = 1; attempt <= retries; attempt++) {
|
|
12
|
+
try {
|
|
13
|
+
const response = await fetch(url, options);
|
|
14
|
+
if (!response.ok) {
|
|
15
|
+
throw new Error(`HTTP error! Status: ${response.status}`);
|
|
16
|
+
}
|
|
17
|
+
return response;
|
|
18
|
+
}
|
|
19
|
+
catch (err) {
|
|
20
|
+
const error = err;
|
|
21
|
+
if (attempt === retries) {
|
|
22
|
+
(0, debug_1.ze_log)('Max retries reached. Request failed:', error.message);
|
|
23
|
+
throw err;
|
|
24
|
+
}
|
|
25
|
+
if (error.code === 'EPIPE' || error.message.includes('network')) {
|
|
26
|
+
(0, debug_1.ze_log)(`Attempt ${attempt} failed due to network issue, retrying...`);
|
|
27
|
+
}
|
|
28
|
+
else {
|
|
29
|
+
(0, debug_1.ze_log)(`Attempt ${attempt} failed with error:`, error.message);
|
|
30
|
+
throw error;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
throw new Error('Network error: Max retries reached');
|
|
35
|
+
}
|
|
36
|
+
/** Converts ClientRequestArgs to RequestInit */
|
|
37
|
+
function convertClientRequestArgsToRequestInit(args) {
|
|
38
|
+
const { method, headers, timeout } = args, rest = tslib_1.__rest(args, ["method", "headers", "timeout"]);
|
|
39
|
+
const requestInit = Object.assign({ method, headers: headers }, rest);
|
|
40
|
+
if (timeout) {
|
|
41
|
+
requestInit.signal = AbortSignal.timeout(timeout);
|
|
42
|
+
}
|
|
43
|
+
return requestInit;
|
|
44
|
+
}
|
|
13
45
|
/** Starts a new http request */
|
|
14
46
|
class ZeHttpRequest {
|
|
15
47
|
constructor() {
|
|
@@ -26,87 +58,13 @@ class ZeHttpRequest {
|
|
|
26
58
|
_ZeHttpRequest_promise.set(this, (0, zephyr_edge_contract_1.PromiseWithResolvers)());
|
|
27
59
|
// promise extension
|
|
28
60
|
this.then = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_promise, "f").promise.then.bind(tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_promise, "f").promise);
|
|
29
|
-
/** Handles the error when the request fails. */
|
|
30
|
-
_ZeHttpRequest_onRequestError.set(this, (cause) => {
|
|
31
|
-
var _a, _b;
|
|
32
|
-
if ('ERR_TLS_CERT_ALTNAME_INVALID' in cause) {
|
|
33
|
-
tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_instances, "m", _ZeHttpRequest_reject).call(this, new errors_1.ZephyrError(errors_1.ZeErrors.ERR_TLS_CERT_ALTNAME_INVALID, {
|
|
34
|
-
cause,
|
|
35
|
-
}));
|
|
36
|
-
return;
|
|
37
|
-
}
|
|
38
|
-
tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_instances, "m", _ZeHttpRequest_reject).call(this, new errors_1.ZephyrError(errors_1.ZeErrors.ERR_HTTP_ERROR, {
|
|
39
|
-
url: tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_url, "f").toString(),
|
|
40
|
-
method: (_b = (_a = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_options, "f").method) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== null && _b !== void 0 ? _b : 'GET',
|
|
41
|
-
content: 'Could not send request',
|
|
42
|
-
status: '-1',
|
|
43
|
-
cause,
|
|
44
|
-
}));
|
|
45
|
-
});
|
|
46
|
-
/** Handles the response from the server. */
|
|
47
|
-
_ZeHttpRequest_onResponse.set(this, (res) => {
|
|
48
|
-
tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_onResponseAsync, "f").call(this, res).catch(tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_handleUnknownError, "f"));
|
|
49
|
-
});
|
|
50
|
-
_ZeHttpRequest_handleUnknownError.set(this, (cause) => {
|
|
51
|
-
tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_instances, "m", _ZeHttpRequest_reject).call(this, new errors_1.ZephyrError(errors_1.ZeErrors.ERR_UNKNOWN, {
|
|
52
|
-
message: 'Could not process provided http.IncomingMessage',
|
|
53
|
-
cause,
|
|
54
|
-
}));
|
|
55
|
-
});
|
|
56
|
-
_ZeHttpRequest_onResponseAsync.set(this, async (res) => {
|
|
57
|
-
var _a, _b, _c, _d, _e;
|
|
58
|
-
if (res.statusCode === 401) {
|
|
59
|
-
// Clean the tokens and throw an error
|
|
60
|
-
await (0, token_1.cleanTokens)();
|
|
61
|
-
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_AUTH_ERROR, {
|
|
62
|
-
message: 'Unauthenticated request',
|
|
63
|
-
});
|
|
64
|
-
}
|
|
65
|
-
if (res.statusCode === 403) {
|
|
66
|
-
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_AUTH_FORBIDDEN_ERROR, {
|
|
67
|
-
message: 'Unauthorized request',
|
|
68
|
-
});
|
|
69
|
-
}
|
|
70
|
-
const tuple = await (0, zephyr_edge_contract_1.PromiseTuple)((0, consumers_1.text)(res));
|
|
71
|
-
if (!(0, zephyr_edge_contract_1.isSuccessTuple)(tuple)) {
|
|
72
|
-
return tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_onRequestError, "f").call(this, tuple[0]);
|
|
73
|
-
}
|
|
74
|
-
const resText = tuple[1];
|
|
75
|
-
const message = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_instances, "m", _ZeHttpRequest_redact).call(this, resText);
|
|
76
|
-
if (message === 'Not Implemented') {
|
|
77
|
-
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_UNKNOWN, {
|
|
78
|
-
message: 'Not implemented yet. Please get in contact with our support.',
|
|
79
|
-
});
|
|
80
|
-
}
|
|
81
|
-
if (res.statusCode === undefined) {
|
|
82
|
-
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_HTTP_ERROR, {
|
|
83
|
-
content: 'No status code found',
|
|
84
|
-
method: (_b = (_a = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_options, "f").method) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== null && _b !== void 0 ? _b : 'GET',
|
|
85
|
-
url: tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_url, "f").toString(),
|
|
86
|
-
status: -1,
|
|
87
|
-
});
|
|
88
|
-
}
|
|
89
|
-
if (!tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_url, "f").pathname.includes('application/logs')) {
|
|
90
|
-
(0, debug_1.ze_log)(message);
|
|
91
|
-
}
|
|
92
|
-
// Only parses data if reply content is json
|
|
93
|
-
const resData = (_c = (0, zephyr_edge_contract_1.safe_json_parse)(resText)) !== null && _c !== void 0 ? _c : resText;
|
|
94
|
-
if (res.statusCode >= 300) {
|
|
95
|
-
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_HTTP_ERROR, {
|
|
96
|
-
status: res.statusCode,
|
|
97
|
-
url: tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_url, "f").toString(),
|
|
98
|
-
content: resData,
|
|
99
|
-
method: (_e = (_d = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_options, "f").method) === null || _d === void 0 ? void 0 : _d.toUpperCase()) !== null && _e !== void 0 ? _e : 'GET',
|
|
100
|
-
});
|
|
101
|
-
}
|
|
102
|
-
tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_instances, "m", _ZeHttpRequest_resolve).call(this, resData);
|
|
103
|
-
});
|
|
104
61
|
}
|
|
105
62
|
/** Creates a new http request. */
|
|
106
63
|
static from(urlStr, options = {}, data) {
|
|
107
64
|
const req = new ZeHttpRequest();
|
|
108
65
|
tslib_1.__classPrivateFieldSet(req, _ZeHttpRequest_data, data, "f");
|
|
109
|
-
|
|
66
|
+
// todo: convert incoming typings to RequestInit
|
|
67
|
+
tslib_1.__classPrivateFieldSet(req, _ZeHttpRequest_options, convertClientRequestArgsToRequestInit(options), "f");
|
|
110
68
|
// Parse the url into a URL object
|
|
111
69
|
if (typeof urlStr === 'string') {
|
|
112
70
|
tslib_1.__classPrivateFieldSet(req, _ZeHttpRequest_url, new URL(urlStr), "f");
|
|
@@ -140,16 +98,67 @@ class ZeHttpRequest {
|
|
|
140
98
|
}
|
|
141
99
|
}
|
|
142
100
|
exports.ZeHttpRequest = ZeHttpRequest;
|
|
143
|
-
_ZeHttpRequest_start = new WeakMap(), _ZeHttpRequest_url = new WeakMap(), _ZeHttpRequest_options = new WeakMap(), _ZeHttpRequest_data = new WeakMap(), _ZeHttpRequest_promise = new WeakMap(),
|
|
101
|
+
_ZeHttpRequest_start = new WeakMap(), _ZeHttpRequest_url = new WeakMap(), _ZeHttpRequest_options = new WeakMap(), _ZeHttpRequest_data = new WeakMap(), _ZeHttpRequest_promise = new WeakMap(), _ZeHttpRequest_instances = new WeakSet(), _ZeHttpRequest_reject = function _ZeHttpRequest_reject(error) {
|
|
144
102
|
tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_promise, "f").resolve([false, error]);
|
|
145
103
|
}, _ZeHttpRequest_resolve = function _ZeHttpRequest_resolve(data) {
|
|
146
104
|
tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_promise, "f").resolve([true, null, data]);
|
|
147
|
-
}, _ZeHttpRequest_request = function _ZeHttpRequest_request() {
|
|
148
|
-
var _a;
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
105
|
+
}, _ZeHttpRequest_request = async function _ZeHttpRequest_request() {
|
|
106
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
107
|
+
try {
|
|
108
|
+
const response = await fetchWithRetries(tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_url, "f"), Object.assign(Object.assign({}, tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_options, "f")), { body: tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_data, "f") }));
|
|
109
|
+
if (!response) {
|
|
110
|
+
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_HTTP_ERROR, {
|
|
111
|
+
content: 'No response found',
|
|
112
|
+
method: (_b = (_a = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_options, "f").method) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== null && _b !== void 0 ? _b : 'GET',
|
|
113
|
+
url: tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_url, "f").toString(),
|
|
114
|
+
status: -1,
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
const resText = await response.text();
|
|
118
|
+
if (response.status === 401) {
|
|
119
|
+
// Clean the tokens and throw an error
|
|
120
|
+
await (0, token_1.cleanTokens)();
|
|
121
|
+
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_AUTH_ERROR, {
|
|
122
|
+
message: 'Unauthenticated request',
|
|
123
|
+
});
|
|
124
|
+
}
|
|
125
|
+
if (response.status === 403) {
|
|
126
|
+
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_AUTH_FORBIDDEN_ERROR, {
|
|
127
|
+
message: 'Unauthorized request',
|
|
128
|
+
});
|
|
129
|
+
}
|
|
130
|
+
const message = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_instances, "m", _ZeHttpRequest_redact).call(this, resText);
|
|
131
|
+
if (message === 'Not Implemented') {
|
|
132
|
+
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_UNKNOWN, {
|
|
133
|
+
message: 'Not implemented yet. Please get in contact with our support.',
|
|
134
|
+
});
|
|
135
|
+
}
|
|
136
|
+
if (response.status === undefined) {
|
|
137
|
+
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_HTTP_ERROR, {
|
|
138
|
+
content: 'No status code found',
|
|
139
|
+
method: (_d = (_c = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_options, "f").method) === null || _c === void 0 ? void 0 : _c.toUpperCase()) !== null && _d !== void 0 ? _d : 'GET',
|
|
140
|
+
url: tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_url, "f").toString(),
|
|
141
|
+
status: -1,
|
|
142
|
+
});
|
|
143
|
+
}
|
|
144
|
+
if (!tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_url, "f").pathname.includes('application/logs')) {
|
|
145
|
+
(0, debug_1.ze_log)(message);
|
|
146
|
+
}
|
|
147
|
+
// Only parses data if reply content is json
|
|
148
|
+
const resData = (_e = (0, zephyr_edge_contract_1.safe_json_parse)(resText)) !== null && _e !== void 0 ? _e : resText;
|
|
149
|
+
if (response.status >= 300) {
|
|
150
|
+
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_HTTP_ERROR, {
|
|
151
|
+
status: response.status,
|
|
152
|
+
url: tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_url, "f").toString(),
|
|
153
|
+
content: resData,
|
|
154
|
+
method: (_g = (_f = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_options, "f").method) === null || _f === void 0 ? void 0 : _f.toUpperCase()) !== null && _g !== void 0 ? _g : 'GET',
|
|
155
|
+
});
|
|
156
|
+
}
|
|
157
|
+
tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_instances, "m", _ZeHttpRequest_resolve).call(this, resData);
|
|
158
|
+
}
|
|
159
|
+
catch (error) {
|
|
160
|
+
tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_instances, "m", _ZeHttpRequest_reject).call(this, error);
|
|
161
|
+
}
|
|
153
162
|
}, _ZeHttpRequest_redact = function _ZeHttpRequest_redact(response) {
|
|
154
163
|
var _a, _b;
|
|
155
164
|
const str = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-http-request.js","sourceRoot":"","sources":["../../../src/lib/http/ze-http-request.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"ze-http-request.js","sourceRoot":"","sources":["../../../src/lib/http/ze-http-request.ts"],"names":[],"mappings":"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"}
|
package/dist/package.json
CHANGED
|
@@ -23,24 +23,23 @@
|
|
|
23
23
|
}
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"
|
|
26
|
+
"debug": "^4.3.4",
|
|
27
27
|
"git-url-parse": "^15.0.0",
|
|
28
28
|
"is-ci": "^3.0.1",
|
|
29
29
|
"jose": "^5.2.4",
|
|
30
|
+
"node-persist": "^4.0.1",
|
|
30
31
|
"open": "^10.1.0",
|
|
31
32
|
"socket.io-client": "^4.7.5",
|
|
32
33
|
"tslib": "^2.6.3",
|
|
33
34
|
"uuid": "^8.3.2",
|
|
34
|
-
"node-persist": "^4.0.1",
|
|
35
|
-
"debug": "^4.3.4",
|
|
36
35
|
"zephyr-edge-contract": "workspace:*"
|
|
37
36
|
},
|
|
38
37
|
"devDependencies": {
|
|
38
|
+
"@types/debug": "^4.1.12",
|
|
39
39
|
"@types/git-url-parse": "^9.0.3",
|
|
40
40
|
"@types/is-ci": "^3.0.4",
|
|
41
|
-
"@types/uuid": "^9.0.8",
|
|
42
41
|
"@types/node-persist": "^3.1.8",
|
|
43
|
-
"@types/
|
|
42
|
+
"@types/uuid": "^9.0.8"
|
|
44
43
|
},
|
|
45
44
|
"optionalDependencies": {
|
|
46
45
|
"wrangler": "^3.69.1"
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "zephyr-agent",
|
|
3
|
-
"version": "0.0.0-canary-
|
|
3
|
+
"version": "0.0.0-canary-20241122175815",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -18,24 +18,23 @@
|
|
|
18
18
|
}
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"
|
|
21
|
+
"debug": "^4.3.4",
|
|
22
22
|
"git-url-parse": "^15.0.0",
|
|
23
23
|
"is-ci": "^3.0.1",
|
|
24
24
|
"jose": "^5.2.4",
|
|
25
|
+
"node-persist": "^4.0.1",
|
|
25
26
|
"open": "^10.1.0",
|
|
26
27
|
"socket.io-client": "^4.7.5",
|
|
27
28
|
"tslib": "^2.6.3",
|
|
28
29
|
"uuid": "^8.3.2",
|
|
29
|
-
"
|
|
30
|
-
"debug": "^4.3.4",
|
|
31
|
-
"zephyr-edge-contract": "0.0.0-canary-20241122064756"
|
|
30
|
+
"zephyr-edge-contract": "0.0.0-canary-20241122175815"
|
|
32
31
|
},
|
|
33
32
|
"devDependencies": {
|
|
33
|
+
"@types/debug": "^4.1.12",
|
|
34
34
|
"@types/git-url-parse": "^9.0.3",
|
|
35
35
|
"@types/is-ci": "^3.0.4",
|
|
36
|
-
"@types/uuid": "^9.0.8",
|
|
37
36
|
"@types/node-persist": "^3.1.8",
|
|
38
|
-
"@types/
|
|
37
|
+
"@types/uuid": "^9.0.8"
|
|
39
38
|
},
|
|
40
39
|
"optionalDependencies": {
|
|
41
40
|
"wrangler": "^3.69.1"
|