@trigger.dev/core 4.0.0-v4-beta.16 → 4.0.0-v4-beta.18
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/commonjs/v3/config.d.ts +38 -0
- package/dist/commonjs/v3/runEngineWorker/supervisor/http.d.ts +1 -0
- package/dist/commonjs/v3/runEngineWorker/supervisor/http.js +4 -2
- package/dist/commonjs/v3/runEngineWorker/supervisor/http.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/queueConsumer.d.ts +1 -0
- package/dist/commonjs/v3/runEngineWorker/supervisor/queueConsumer.js +25 -11
- package/dist/commonjs/v3/runEngineWorker/supervisor/queueConsumer.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/session.d.ts +1 -0
- package/dist/commonjs/v3/runEngineWorker/supervisor/session.js +22 -27
- package/dist/commonjs/v3/runEngineWorker/supervisor/session.js.map +1 -1
- package/dist/commonjs/v3/schemas/common.d.ts +6 -0
- package/dist/commonjs/v3/schemas/common.js +2 -0
- package/dist/commonjs/v3/schemas/common.js.map +1 -1
- package/dist/commonjs/v3/serverOnly/httpServer.js +2 -2
- package/dist/commonjs/v3/serverOnly/httpServer.js.map +1 -1
- package/dist/commonjs/v3/utils/ioSerialization.d.ts +1 -0
- package/dist/commonjs/v3/utils/ioSerialization.js +21 -0
- package/dist/commonjs/v3/utils/ioSerialization.js.map +1 -1
- package/dist/commonjs/v3/utils/structuredLogger.d.ts +4 -1
- package/dist/commonjs/v3/utils/structuredLogger.js +18 -4
- package/dist/commonjs/v3/utils/structuredLogger.js.map +1 -1
- package/dist/commonjs/version.js +1 -1
- package/dist/esm/v3/config.d.ts +38 -0
- package/dist/esm/v3/runEngineWorker/supervisor/http.d.ts +1 -0
- package/dist/esm/v3/runEngineWorker/supervisor/http.js +4 -2
- package/dist/esm/v3/runEngineWorker/supervisor/http.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/supervisor/queueConsumer.d.ts +1 -0
- package/dist/esm/v3/runEngineWorker/supervisor/queueConsumer.js +25 -11
- package/dist/esm/v3/runEngineWorker/supervisor/queueConsumer.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/supervisor/session.d.ts +1 -0
- package/dist/esm/v3/runEngineWorker/supervisor/session.js +22 -27
- package/dist/esm/v3/runEngineWorker/supervisor/session.js.map +1 -1
- package/dist/esm/v3/schemas/common.d.ts +6 -0
- package/dist/esm/v3/schemas/common.js +2 -0
- package/dist/esm/v3/schemas/common.js.map +1 -1
- package/dist/esm/v3/serverOnly/httpServer.js +2 -2
- package/dist/esm/v3/serverOnly/httpServer.js.map +1 -1
- package/dist/esm/v3/utils/ioSerialization.d.ts +1 -0
- package/dist/esm/v3/utils/ioSerialization.js +20 -0
- package/dist/esm/v3/utils/ioSerialization.js.map +1 -1
- package/dist/esm/v3/utils/structuredLogger.d.ts +4 -1
- package/dist/esm/v3/utils/structuredLogger.js +18 -4
- package/dist/esm/v3/utils/structuredLogger.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/package.json +1 -1
|
@@ -142,6 +142,44 @@ export type TriggerConfig = {
|
|
|
142
142
|
* @see https://trigger.dev/docs/config/config-file#external
|
|
143
143
|
*/
|
|
144
144
|
external?: string[];
|
|
145
|
+
/**
|
|
146
|
+
* **WARNING: This is an experimental feature and might be removed in a future version.**
|
|
147
|
+
*
|
|
148
|
+
* Automatically detect dependencies that shouldn't be bundled and mark them as external. For example, native modules.
|
|
149
|
+
*
|
|
150
|
+
* Turning this on will not affect dependencies that were manually added to the `external` array.
|
|
151
|
+
*
|
|
152
|
+
* @default false
|
|
153
|
+
*
|
|
154
|
+
* @deprecated (experimental)
|
|
155
|
+
*/
|
|
156
|
+
experimental_autoDetectExternal?: boolean;
|
|
157
|
+
/**
|
|
158
|
+
* **WARNING: This is an experimental feature and might be removed in a future version.**
|
|
159
|
+
*
|
|
160
|
+
* Preserve the original names of functions and classes in the bundle. This can fix issues with frameworks that rely on the original names for registration and binding, for example MikroORM.
|
|
161
|
+
*
|
|
162
|
+
* @link https://esbuild.github.io/api/#keep-names
|
|
163
|
+
*
|
|
164
|
+
* @default false
|
|
165
|
+
*
|
|
166
|
+
* @deprecated (experimental)
|
|
167
|
+
*/
|
|
168
|
+
experimental_keepNames?: boolean;
|
|
169
|
+
/**
|
|
170
|
+
* **WARNING: This is an experimental feature and might be removed in a future version.**
|
|
171
|
+
*
|
|
172
|
+
* "Minification is not safe for 100% of all JavaScript code" - esbuild docs
|
|
173
|
+
*
|
|
174
|
+
* Minify the generated code to help decrease bundle size. This may break stuff.
|
|
175
|
+
*
|
|
176
|
+
* @link https://esbuild.github.io/api/#minify
|
|
177
|
+
*
|
|
178
|
+
* @default false
|
|
179
|
+
*
|
|
180
|
+
* @deprecated (experimental)
|
|
181
|
+
*/
|
|
182
|
+
experimental_minify?: boolean;
|
|
145
183
|
jsx?: {
|
|
146
184
|
/**
|
|
147
185
|
* @default "React.createElement"
|
|
@@ -6,6 +6,7 @@ export declare class SupervisorHttpClient {
|
|
|
6
6
|
private readonly workerToken;
|
|
7
7
|
private readonly instanceName;
|
|
8
8
|
private readonly defaultHeaders;
|
|
9
|
+
private readonly logger;
|
|
9
10
|
constructor(opts: SupervisorHttpClientOptions);
|
|
10
11
|
connect(body: WorkerApiConnectRequestBody): Promise<import("../../zodfetch.js").ApiResult<{
|
|
11
12
|
ok: true;
|
|
@@ -7,11 +7,13 @@ const util_js_1 = require("./util.js");
|
|
|
7
7
|
const zodfetch_js_1 = require("../../zodfetch.js");
|
|
8
8
|
const util_js_2 = require("../util.js");
|
|
9
9
|
const consts_js_1 = require("../consts.js");
|
|
10
|
+
const structuredLogger_js_1 = require("../../utils/structuredLogger.js");
|
|
10
11
|
class SupervisorHttpClient {
|
|
11
12
|
apiUrl;
|
|
12
13
|
workerToken;
|
|
13
14
|
instanceName;
|
|
14
15
|
defaultHeaders;
|
|
16
|
+
logger = new structuredLogger_js_1.SimpleStructuredLogger("supervisor-http-client");
|
|
15
17
|
constructor(opts) {
|
|
16
18
|
this.apiUrl = opts.apiUrl.replace(/\/$/, "");
|
|
17
19
|
this.workerToken = opts.workerToken;
|
|
@@ -127,11 +129,11 @@ class SupervisorHttpClient {
|
|
|
127
129
|
body: JSON.stringify(body),
|
|
128
130
|
});
|
|
129
131
|
if (!res.success) {
|
|
130
|
-
|
|
132
|
+
this.logger.error("Failed to send debug log", { error: res.error });
|
|
131
133
|
}
|
|
132
134
|
}
|
|
133
135
|
catch (error) {
|
|
134
|
-
|
|
136
|
+
this.logger.error("Failed to send debug log (caught error)", { error });
|
|
135
137
|
}
|
|
136
138
|
}
|
|
137
139
|
async continueRunExecution(runId, snapshotId, runnerId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/http.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AACxB,6CAmBsB;AAEtB,uCAAoD;AACpD,mDAAiD;AACjD,wCAA2C;AAC3C,4CAA8C;
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/http.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RunQueueConsumer = void 0;
|
|
4
|
+
const structuredLogger_js_1 = require("../../utils/structuredLogger.js");
|
|
4
5
|
class RunQueueConsumer {
|
|
5
6
|
client;
|
|
6
7
|
preDequeue;
|
|
7
8
|
preSkip;
|
|
8
9
|
maxRunCount;
|
|
9
10
|
onDequeue;
|
|
11
|
+
logger = new structuredLogger_js_1.SimpleStructuredLogger("queue-consumer");
|
|
10
12
|
intervalMs;
|
|
11
13
|
idleIntervalMs;
|
|
12
14
|
isEnabled;
|
|
@@ -34,35 +36,44 @@ class RunQueueConsumer {
|
|
|
34
36
|
this.isEnabled = false;
|
|
35
37
|
}
|
|
36
38
|
async dequeue() {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
+
this.logger.verbose("dequeue()", {
|
|
40
|
+
enabled: this.isEnabled,
|
|
41
|
+
intervalMs: this.intervalMs,
|
|
42
|
+
idleIntervalMs: this.idleIntervalMs,
|
|
43
|
+
maxRunCount: this.maxRunCount,
|
|
44
|
+
preDequeue: !!this.preDequeue,
|
|
45
|
+
preSkip: !!this.preSkip,
|
|
46
|
+
});
|
|
39
47
|
if (!this.isEnabled) {
|
|
48
|
+
this.logger.warn("dequeue() - not enabled");
|
|
40
49
|
return;
|
|
41
50
|
}
|
|
42
51
|
let preDequeueResult;
|
|
43
52
|
if (this.preDequeue) {
|
|
44
|
-
|
|
53
|
+
this.logger.verbose("preDequeue()");
|
|
45
54
|
try {
|
|
46
55
|
preDequeueResult = await this.preDequeue();
|
|
47
56
|
}
|
|
48
57
|
catch (preDequeueError) {
|
|
49
|
-
|
|
58
|
+
this.logger.error("preDequeue error", { error: preDequeueError });
|
|
50
59
|
}
|
|
51
60
|
}
|
|
52
|
-
|
|
61
|
+
this.logger.verbose("preDequeueResult", { preDequeueResult });
|
|
53
62
|
if (preDequeueResult?.skipDequeue ||
|
|
54
63
|
preDequeueResult?.maxResources?.cpu === 0 ||
|
|
55
64
|
preDequeueResult?.maxResources?.memory === 0) {
|
|
65
|
+
this.logger.debug("skipping dequeue", { preDequeueResult });
|
|
56
66
|
if (this.preSkip) {
|
|
57
|
-
|
|
67
|
+
this.logger.debug("preSkip()");
|
|
58
68
|
try {
|
|
59
69
|
await this.preSkip();
|
|
60
70
|
}
|
|
61
71
|
catch (preSkipError) {
|
|
62
|
-
|
|
72
|
+
this.logger.error("preSkip error", { error: preSkipError });
|
|
63
73
|
}
|
|
64
74
|
}
|
|
65
|
-
|
|
75
|
+
this.scheduleNextDequeue(this.idleIntervalMs);
|
|
76
|
+
return;
|
|
66
77
|
}
|
|
67
78
|
let nextIntervalMs = this.idleIntervalMs;
|
|
68
79
|
try {
|
|
@@ -71,7 +82,7 @@ class RunQueueConsumer {
|
|
|
71
82
|
maxRunCount: this.maxRunCount,
|
|
72
83
|
});
|
|
73
84
|
if (!response.success) {
|
|
74
|
-
|
|
85
|
+
this.logger.error("Failed to dequeue", { error: response.error });
|
|
75
86
|
}
|
|
76
87
|
else {
|
|
77
88
|
try {
|
|
@@ -81,16 +92,19 @@ class RunQueueConsumer {
|
|
|
81
92
|
}
|
|
82
93
|
}
|
|
83
94
|
catch (handlerError) {
|
|
84
|
-
|
|
95
|
+
this.logger.error("onDequeue error", { error: handlerError });
|
|
85
96
|
}
|
|
86
97
|
}
|
|
87
98
|
}
|
|
88
99
|
catch (clientError) {
|
|
89
|
-
|
|
100
|
+
this.logger.error("client.dequeue error", { error: clientError });
|
|
90
101
|
}
|
|
91
102
|
this.scheduleNextDequeue(nextIntervalMs);
|
|
92
103
|
}
|
|
93
104
|
scheduleNextDequeue(delayMs) {
|
|
105
|
+
if (delayMs === this.idleIntervalMs && this.idleIntervalMs !== this.intervalMs) {
|
|
106
|
+
this.logger.verbose("scheduled dequeue with idle interval", { delayMs });
|
|
107
|
+
}
|
|
94
108
|
setTimeout(this.dequeue.bind(this), delayMs);
|
|
95
109
|
}
|
|
96
110
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queueConsumer.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/queueConsumer.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"queueConsumer.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/queueConsumer.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ type SupervisorSessionOptions = SupervisorClientCommonOptions & {
|
|
|
16
16
|
export declare class SupervisorSession extends EventEmitter<WorkerEvents> {
|
|
17
17
|
private opts;
|
|
18
18
|
readonly httpClient: SupervisorHttpClient;
|
|
19
|
+
private readonly logger;
|
|
19
20
|
private readonly runNotificationsEnabled;
|
|
20
21
|
private runNotificationsSocket?;
|
|
21
22
|
private readonly queueConsumerEnabled;
|
|
@@ -11,9 +11,11 @@ const version_js_1 = require("../../../version.js");
|
|
|
11
11
|
const socket_io_client_1 = require("socket.io-client");
|
|
12
12
|
const util_js_1 = require("./util.js");
|
|
13
13
|
const interval_js_1 = require("../../utils/interval.js");
|
|
14
|
+
const structuredLogger_js_1 = require("../../utils/structuredLogger.js");
|
|
14
15
|
class SupervisorSession extends events_1.default {
|
|
15
16
|
opts;
|
|
16
17
|
httpClient;
|
|
18
|
+
logger = new structuredLogger_js_1.SimpleStructuredLogger("supervisor-session");
|
|
17
19
|
runNotificationsEnabled;
|
|
18
20
|
runNotificationsSocket;
|
|
19
21
|
queueConsumerEnabled;
|
|
@@ -38,26 +40,23 @@ class SupervisorSession extends events_1.default {
|
|
|
38
40
|
});
|
|
39
41
|
this.heartbeat = new interval_js_1.IntervalService({
|
|
40
42
|
onInterval: async () => {
|
|
41
|
-
|
|
43
|
+
this.logger.debug("Sending heartbeat");
|
|
42
44
|
const body = this.getHeartbeatBody();
|
|
43
45
|
const response = await this.httpClient.heartbeatWorker(body);
|
|
44
46
|
if (!response.success) {
|
|
45
|
-
|
|
47
|
+
this.logger.error("Heartbeat failed", { error: response.error });
|
|
46
48
|
}
|
|
47
49
|
},
|
|
48
50
|
intervalMs: opts.heartbeatIntervalSeconds * 1000,
|
|
49
51
|
leadingEdge: false,
|
|
50
52
|
onError: async (error) => {
|
|
51
|
-
|
|
53
|
+
this.logger.error("Failed to send heartbeat", { error });
|
|
52
54
|
},
|
|
53
55
|
});
|
|
54
56
|
}
|
|
55
57
|
async onDequeue(messages) {
|
|
56
|
-
|
|
57
|
-
// console.log("[SupervisorSession] Dequeued messages", { count: messages.length });
|
|
58
|
-
// console.debug("[SupervisorSession] Dequeued messages with contents", messages);
|
|
58
|
+
this.logger.verbose("Dequeued messages with contents", { count: messages.length, messages });
|
|
59
59
|
for (const message of messages) {
|
|
60
|
-
console.log("[SupervisorSession] Emitting message", { message });
|
|
61
60
|
this.emit("runQueueMessage", {
|
|
62
61
|
time: new Date(),
|
|
63
62
|
message,
|
|
@@ -65,9 +64,9 @@ class SupervisorSession extends events_1.default {
|
|
|
65
64
|
}
|
|
66
65
|
}
|
|
67
66
|
subscribeToRunNotifications(runFriendlyIds) {
|
|
68
|
-
|
|
67
|
+
this.logger.debug("Subscribing to run notifications", { runFriendlyIds });
|
|
69
68
|
if (!this.runNotificationsSocket) {
|
|
70
|
-
|
|
69
|
+
this.logger.error("Socket not connected");
|
|
71
70
|
return;
|
|
72
71
|
}
|
|
73
72
|
this.runNotificationsSocket.emit("run:subscribe", { version: "1", runFriendlyIds });
|
|
@@ -77,9 +76,9 @@ class SupervisorSession extends events_1.default {
|
|
|
77
76
|
})));
|
|
78
77
|
}
|
|
79
78
|
unsubscribeFromRunNotifications(runFriendlyIds) {
|
|
80
|
-
|
|
79
|
+
this.logger.debug("Unsubscribing from run notifications", { runFriendlyIds });
|
|
81
80
|
if (!this.runNotificationsSocket) {
|
|
82
|
-
|
|
81
|
+
this.logger.error("Socket not connected");
|
|
83
82
|
return;
|
|
84
83
|
}
|
|
85
84
|
this.runNotificationsSocket.emit("run:unsubscribe", { version: "1", runFriendlyIds });
|
|
@@ -99,25 +98,21 @@ class SupervisorSession extends events_1.default {
|
|
|
99
98
|
extraHeaders: (0, util_js_1.getDefaultWorkerHeaders)(this.opts),
|
|
100
99
|
});
|
|
101
100
|
socket.on("run:notify", ({ version, run }) => {
|
|
102
|
-
|
|
101
|
+
this.logger.debug("[WS] Received run notification", { version, run });
|
|
103
102
|
this.emit("runNotification", { time: new Date(), run });
|
|
104
|
-
this.httpClient
|
|
105
|
-
.sendDebugLog(run.friendlyId, {
|
|
103
|
+
this.httpClient.sendDebugLog(run.friendlyId, {
|
|
106
104
|
time: new Date(),
|
|
107
105
|
message: "run:notify received by supervisor",
|
|
108
|
-
})
|
|
109
|
-
.catch((error) => {
|
|
110
|
-
console.error("[SupervisorSession] Failed to send debug log", { error });
|
|
111
106
|
});
|
|
112
107
|
});
|
|
113
108
|
socket.on("connect", () => {
|
|
114
|
-
|
|
109
|
+
this.logger.log("[WS] Connected to platform");
|
|
115
110
|
});
|
|
116
111
|
socket.on("connect_error", (error) => {
|
|
117
|
-
|
|
112
|
+
this.logger.error("[WS] Connection error", { error });
|
|
118
113
|
});
|
|
119
114
|
socket.on("disconnect", (reason, description) => {
|
|
120
|
-
|
|
115
|
+
this.logger.log("[WS] Disconnected from platform", { reason, description });
|
|
121
116
|
});
|
|
122
117
|
return socket;
|
|
123
118
|
}
|
|
@@ -128,28 +123,28 @@ class SupervisorSession extends events_1.default {
|
|
|
128
123
|
},
|
|
129
124
|
});
|
|
130
125
|
if (!connect.success) {
|
|
131
|
-
|
|
132
|
-
throw new Error("[SupervisorSession]
|
|
126
|
+
this.logger.error("Failed to connect", { error: connect.error });
|
|
127
|
+
throw new Error("[SupervisorSession]Failed to connect");
|
|
133
128
|
}
|
|
134
129
|
const { workerGroup } = connect.data;
|
|
135
|
-
|
|
130
|
+
this.logger.log("Connected to platform", {
|
|
136
131
|
type: workerGroup.type,
|
|
137
132
|
name: workerGroup.name,
|
|
138
133
|
});
|
|
139
134
|
if (this.queueConsumerEnabled) {
|
|
140
|
-
|
|
135
|
+
this.logger.log("Queue consumer enabled");
|
|
141
136
|
await Promise.allSettled(this.queueConsumers.map(async (q) => q.start()));
|
|
142
137
|
this.heartbeat.start();
|
|
143
138
|
}
|
|
144
139
|
else {
|
|
145
|
-
|
|
140
|
+
this.logger.warn("Queue consumer disabled");
|
|
146
141
|
}
|
|
147
142
|
if (this.runNotificationsEnabled) {
|
|
148
|
-
|
|
143
|
+
this.logger.log("Run notifications enabled");
|
|
149
144
|
this.runNotificationsSocket = this.createRunNotificationsSocket();
|
|
150
145
|
}
|
|
151
146
|
else {
|
|
152
|
-
|
|
147
|
+
this.logger.warn("Run notifications disabled");
|
|
153
148
|
}
|
|
154
149
|
}
|
|
155
150
|
async stop() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/session.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAiD;AAGjD,yDAAsD;AAEtD,oDAAkC;AAClC,oDAA8C;AAC9C,uDAA8C;AAE9C,uCAAoD;AACpD,yDAA0D;
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -517,7 +517,9 @@ export declare const MachineConfig: z.ZodObject<{
|
|
|
517
517
|
export type MachineConfig = z.infer<typeof MachineConfig>;
|
|
518
518
|
export declare const MachinePreset: z.ZodObject<{
|
|
519
519
|
name: z.ZodEnum<["micro", "small-1x", "small-2x", "medium-1x", "medium-2x", "large-1x", "large-2x"]>;
|
|
520
|
+
/** unit: vCPU */
|
|
520
521
|
cpu: z.ZodNumber;
|
|
522
|
+
/** unit: GB */
|
|
521
523
|
memory: z.ZodNumber;
|
|
522
524
|
centsPerMs: z.ZodNumber;
|
|
523
525
|
}, "strip", z.ZodTypeAny, {
|
|
@@ -991,7 +993,9 @@ export declare const TaskRunExecution: z.ZodObject<{
|
|
|
991
993
|
}>>;
|
|
992
994
|
machine: z.ZodObject<{
|
|
993
995
|
name: z.ZodEnum<["micro", "small-1x", "small-2x", "medium-1x", "medium-2x", "large-1x", "large-2x"]>;
|
|
996
|
+
/** unit: vCPU */
|
|
994
997
|
cpu: z.ZodNumber;
|
|
998
|
+
/** unit: GB */
|
|
995
999
|
memory: z.ZodNumber;
|
|
996
1000
|
centsPerMs: z.ZodNumber;
|
|
997
1001
|
}, "strip", z.ZodTypeAny, {
|
|
@@ -1295,7 +1299,9 @@ export declare const TaskRunContext: z.ZodObject<{
|
|
|
1295
1299
|
}>>;
|
|
1296
1300
|
machine: z.ZodOptional<z.ZodObject<{
|
|
1297
1301
|
name: z.ZodEnum<["micro", "small-1x", "small-2x", "medium-1x", "medium-2x", "large-1x", "large-2x"]>;
|
|
1302
|
+
/** unit: vCPU */
|
|
1298
1303
|
cpu: z.ZodNumber;
|
|
1304
|
+
/** unit: GB */
|
|
1299
1305
|
memory: z.ZodNumber;
|
|
1300
1306
|
centsPerMs: z.ZodNumber;
|
|
1301
1307
|
}, "strip", z.ZodTypeAny, {
|
|
@@ -79,7 +79,9 @@ exports.MachineConfig = zod_1.z.object({
|
|
|
79
79
|
});
|
|
80
80
|
exports.MachinePreset = zod_1.z.object({
|
|
81
81
|
name: exports.MachinePresetName,
|
|
82
|
+
/** unit: vCPU */
|
|
82
83
|
cpu: zod_1.z.number(),
|
|
84
|
+
/** unit: GB */
|
|
83
85
|
memory: zod_1.z.number(),
|
|
84
86
|
centsPerMs: zod_1.z.number(),
|
|
85
87
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/v3/schemas/common.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AACxB,mDAA+D;AAKlD,QAAA,0BAA0B,GAAG,OAAC,CAAC,MAAM,CAAC;IACjD,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IACzB,KAAK,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,OAAO,EAAE,CAAC;CAC7B,CAAC,CAAC;AAIU,QAAA,0BAA0B,GAAG,OAAC,CAAC,MAAM,CAAC;IACjD,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IACtB,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE;IACf,KAAK,EAAE,gCAAsB;CAC9B,CAAC,CAAC;AAIU,QAAA,6BAA6B,GAAG,OAAC,CAAC,MAAM,CAAC;IACpD,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IACzB,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE;CAChB,CAAC,CAAC;AAIU,QAAA,6BAA6B,GAAG,OAAC,CAAC,MAAM,CAAC;IACpD,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IACzB,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE;IACf,KAAK,EAAE,gCAAsB;CAC9B,CAAC,CAAC;AAIU,QAAA,iCAAiC,GAAG,OAAC,CAAC,MAAM,CAAC;IACxD,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IACzB,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE;IACf,KAAK,EAAE,gCAAsB;CAC9B,CAAC,CAAC;AAIU,QAAA,gCAAgC,GAAG,OAAC,CAAC,MAAM,CAAC;IACvD,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,WAAW,CAAC;IAC5B,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE;IACf,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE;CAClB,CAAC,CAAC;AAIU,QAAA,0BAA0B,GAAG,OAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE;IACrE,kCAA0B;IAC1B,kCAA0B;IAC1B,qCAA6B;IAC7B,qCAA6B;IAC7B,yCAAiC;IACjC,wCAAgC;CACjC,CAAC,CAAC;AAIU,QAAA,kBAAkB,GAAG,OAAC,CAAC,MAAM,CAAC;IACzC,QAAQ,EAAE,OAAC,CAAC,MAAM,CAAC,gCAAsB,CAAC,CAAC,QAAQ,EAAE;IACrD,UAAU,EAAE,OAAC,CAAC,KAAK,CAAC,kCAA0B,CAAC,CAAC,QAAQ,EAAE;IAC1D,gBAAgB,EAAE,OAAC,CAAC,KAAK,CAAC,kCAA0B,CAAC,CAAC,QAAQ,EAAE;IAChE,cAAc,EAAE,OAAC,CAAC,KAAK,CAAC,kCAA0B,CAAC,CAAC,QAAQ,EAAE;CAC/D,CAAC,CAAC;AAIH,kBAAkB;AACL,QAAA,UAAU,GAAG,OAAC,CAAC,KAAK,CAAC;IAChC,OAAC,CAAC,OAAO,CAAC,IAAI,CAAC;IACf,OAAC,CAAC,OAAO,CAAC,GAAG,CAAC;IACd,OAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IACZ,OAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IACZ,OAAC,CAAC,OAAO,CAAC,CAAC,CAAC;CACb,CAAC,CAAC;AAIH,gBAAgB;AACH,QAAA,aAAa,GAAG,OAAC,CAAC,KAAK,CAAC;IACnC,OAAC,CAAC,OAAO,CAAC,IAAI,CAAC;IACf,OAAC,CAAC,OAAO,CAAC,GAAG,CAAC;IACd,OAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IACZ,OAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IACZ,OAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IACZ,OAAC,CAAC,OAAO,CAAC,CAAC,CAAC;CACb,CAAC,CAAC;AAIH,sBAAsB;AACT,QAAA,iBAAiB,GAAG,OAAC,CAAC,IAAI,CAAC;IACtC,OAAO;IACP,UAAU;IACV,UAAU;IACV,WAAW;IACX,WAAW;IACX,UAAU;IACV,UAAU;CACX,CAAC,CAAC;AAIU,QAAA,aAAa,GAAG,OAAC,CAAC,MAAM,CAAC;IACpC,GAAG,EAAE,kBAAU,CAAC,QAAQ,EAAE;IAC1B,MAAM,EAAE,qBAAa,CAAC,QAAQ,EAAE;IAChC,MAAM,EAAE,yBAAiB,CAAC,QAAQ,EAAE;CACrC,CAAC,CAAC;AAIU,QAAA,aAAa,GAAG,OAAC,CAAC,MAAM,CAAC;IACpC,IAAI,EAAE,yBAAiB;IACvB,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE;IACf,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE;IAClB,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE;CACvB,CAAC,CAAC;AAMU,QAAA,mBAAmB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC1C,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC;IACjC,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE;IACnB,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE;CACvB,CAAC,CAAC;AAIU,QAAA,wBAAwB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC/C,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,cAAc,CAAC;IAC/B,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE;CAChB,CAAC,CAAC;AAIU,QAAA,kBAAkB,GAAG,OAAC,CAAC,MAAM,CAAC;IACzC,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,cAAc,CAAC;IAC/B,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE;CAChB,CAAC,CAAC;AAIU,QAAA,oBAAoB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC3C,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC;IACjC,IAAI,EAAE,OAAC,CAAC,IAAI,CAAC;QACX,yBAAyB;QACzB,qBAAqB;QACrB,uBAAuB;QACvB,wBAAwB;QACxB,sBAAsB;QACtB,uBAAuB;QACvB,wBAAwB;QACxB,wCAAwC;QACxC,8BAA8B;QAC9B,sBAAsB;QACtB,sBAAsB;QACtB,yBAAyB;QACzB,+BAA+B;QAC/B,oBAAoB;QACpB,kBAAkB;QAClB,mBAAmB;QACnB,uBAAuB;QACvB,oBAAoB;QACpB,uBAAuB;QACvB,4BAA4B;QAC5B,kBAAkB;QAClB,uBAAuB;QACvB,qBAAqB;QACrB,aAAa;QACb,mBAAmB;QACnB,gCAAgC;QAChC,6BAA6B;QAC7B,+BAA+B;QAC/B,+BAA+B;QAC/B,4BAA4B;QAC5B,4CAA4C;QAC5C,sBAAsB;QACtB,0BAA0B;QAC1B,yBAAyB;KAC1B,CAAC;IACF,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAClC,CAAC,CAAC;AAIU,QAAA,iBAAiB,GAAG,4BAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;AAGzD,QAAA,YAAY,GAAG,OAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE;IACvD,2BAAmB;IACnB,gCAAwB;IACxB,0BAAkB;IAClB,4BAAoB;CACrB,CAAC,CAAC;AAIU,QAAA,OAAO,GAAG,OAAC,CAAC,MAAM,CAAC;IAC9B,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;IACd,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE;IACnB,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE;IACvB,IAAI,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC;IACzB,MAAM,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;IAClC,SAAS,EAAE,OAAC,CAAC,MAAM,CAAC,IAAI,EAAE;IAC1B,SAAS,EAAE,OAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC;IACpD,cAAc,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACrC,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,QAAQ,EAAE,OAAC,CAAC,MAAM,CAAC,gCAAsB,CAAC,CAAC,QAAQ,EAAE;IACrD,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,kBAAkB;IAClB,OAAO,EAAE,OAAC,CAAC,GAAG,EAAE;IAChB;;;OAGG;IACH,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IACjC;;;OAGG;IACH,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAClC;;;OAGG;IACH,eAAe,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IACtC,+JAA+J;IAC/J,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAChC,CAAC,CAAC;AAIU,QAAA,oBAAoB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC3C,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;IACd,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE;IACpB,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAClC,CAAC,CAAC;AAIU,QAAA,uBAAuB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC9C,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE;IAClB,SAAS,EAAE,OAAC,CAAC,MAAM,CAAC,IAAI,EAAE;IAC1B,kBAAkB;IAClB,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;IACd,kBAAkB;IAClB,kBAAkB,EAAE,OAAC,CAAC,MAAM,EAAE;IAC9B,kBAAkB;IAClB,sBAAsB,EAAE,OAAC,CAAC,MAAM,EAAE;IAClC,kBAAkB;IAClB,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE;CACnB,CAAC,CAAC;AAIU,QAAA,2BAA2B,GAAG,OAAC,CAAC,MAAM,CAAC;IAClD,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;IACd,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,IAAI,EAAE,OAAC,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;CAClE,CAAC,CAAC;AAIU,QAAA,4BAA4B,GAAG,OAAC,CAAC,MAAM,CAAC;IACnD,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;IACd,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;CACjB,CAAC,CAAC;AAIU,QAAA,uBAAuB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC9C,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;IACd,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE;IACf,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;CACjB,CAAC,CAAC;AAIU,QAAA,qBAAqB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC5C,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;IACd,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;CACjB,CAAC,CAAC;AAIU,QAAA,qBAAqB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC5C,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;CACf,CAAC,CAAC;AAEU,QAAA,gBAAgB,GAAG,OAAC,CAAC,MAAM,CAAC;IACvC,IAAI,EAAE,4BAAoB;IAC1B,OAAO,EAAE,+BAAuB;IAChC,GAAG,EAAE,eAAO,CAAC,GAAG,CACd,OAAC,CAAC,MAAM,CAAC;QACP,YAAY,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;KAC/C,CAAC,CACH;IACD,KAAK,EAAE,6BAAqB;IAC5B,WAAW,EAAE,mCAA2B;IACxC,YAAY,EAAE,oCAA4B;IAC1C,OAAO,EAAE,+BAAuB;IAChC,KAAK,EAAE,6BAAqB,CAAC,QAAQ,EAAE;IACvC,OAAO,EAAE,qBAAa;CACvB,CAAC,CAAC;AAIU,QAAA,cAAc,GAAG,OAAC,CAAC,MAAM,CAAC;IACrC,IAAI,EAAE,4BAAoB;IAC1B,OAAO,EAAE,+BAAuB,CAAC,IAAI,CAAC;QACpC,kBAAkB,EAAE,IAAI;QACxB,sBAAsB,EAAE,IAAI;KAC7B,CAAC;IACF,GAAG,EAAE,eAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACvE,KAAK,EAAE,6BAAqB;IAC5B,WAAW,EAAE,mCAA2B;IACxC,YAAY,EAAE,oCAA4B;IAC1C,OAAO,EAAE,+BAAuB;IAChC,KAAK,EAAE,6BAAqB,CAAC,QAAQ,EAAE;IACvC,OAAO,EAAE,qBAAa,CAAC,QAAQ,EAAE;CAClC,CAAC,CAAC;AAIU,QAAA,qBAAqB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC5C,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE;IACrB,kCAAkC;IAClC,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE;IACjB,KAAK,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CAC9B,CAAC,CAAC;AAIU,QAAA,qBAAqB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC5C,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE;CACvB,CAAC,CAAC;AAIU,QAAA,4BAA4B,GAAG,OAAC,CAAC,MAAM,CAAC;IACnD,EAAE,EAAE,OAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IACpB,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;IACd,KAAK,EAAE,oBAAY;IACnB,KAAK,EAAE,6BAAqB,CAAC,QAAQ,EAAE;IACvC,eAAe,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IACvC,KAAK,EAAE,6BAAqB,CAAC,QAAQ,EAAE;IACvC,+CAA+C;IAC/C,cAAc,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACrC,QAAQ,EAAE,0BAAkB,CAAC,QAAQ,EAAE;CACxC,CAAC,CAAC;AAIU,QAAA,gCAAgC,GAAG,OAAC,CAAC,MAAM,CAAC;IACvD,EAAE,EAAE,OAAC,CAAC,OAAO,CAAC,IAAI,CAAC;IACnB,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;IACd,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE;IACtB,KAAK,EAAE,6BAAqB,CAAC,QAAQ,EAAE;IACvC,+CAA+C;IAC/C,cAAc,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACrC,QAAQ,EAAE,0BAAkB,CAAC,QAAQ,EAAE;CACxC,CAAC,CAAC;AAIU,QAAA,sBAAsB,GAAG,OAAC,CAAC,kBAAkB,CAAC,IAAI,EAAE;IAC/D,wCAAgC;IAChC,oCAA4B;CAC7B,CAAC,CAAC;AAIU,QAAA,2BAA2B,GAAG,OAAC,CAAC,MAAM,CAAC;IAClD,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;IACd,KAAK,EAAE,8BAAsB,CAAC,KAAK,EAAE;CACtC,CAAC,CAAC;AAIU,QAAA,oBAAoB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC3C,EAAE,EAAE,OAAC,CAAC,OAAO,EAAE;IACf,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAClC,CAAC,CAAC;AAaU,QAAA,eAAe,GAAG,OAAC,CAAC,MAAM,CAAC;IACtC,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE;IACnB,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAClC,CAAC,CAAC;AAIU,QAAA,sBAAsB,GAAG;IACpC,UAAU,EAAE,YAAY;IACxB,OAAO,EAAE,SAAS;IAClB,WAAW,EAAE,aAAa;IAC1B,OAAO,EAAE,SAAS;CACsB,CAAC;AAK9B,QAAA,4BAA4B,GAAG,OAAC,CAAC,IAAI,CAChD,MAAM,CAAC,MAAM,CAAC,8BAAsB,CAA+B,CACpE,CAAC"}
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/v3/schemas/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ const structuredLogger_js_1 = require("../utils/structuredLogger.js");
|
|
|
7
7
|
const http_js_1 = require("../apps/http.js");
|
|
8
8
|
const prom_client_1 = require("prom-client");
|
|
9
9
|
const utils_js_1 = require("../../utils.js");
|
|
10
|
-
const logger = new structuredLogger_js_1.SimpleStructuredLogger("
|
|
10
|
+
const logger = new structuredLogger_js_1.SimpleStructuredLogger("http-server");
|
|
11
11
|
const HttpMethod = zod_1.z.enum([
|
|
12
12
|
"GET",
|
|
13
13
|
"POST",
|
|
@@ -68,7 +68,7 @@ class HttpServer {
|
|
|
68
68
|
const startTime = process.hrtime();
|
|
69
69
|
try {
|
|
70
70
|
const { url, method } = req;
|
|
71
|
-
logger.
|
|
71
|
+
logger.debug(`${method} ${url?.split("?")[0]}`, { url });
|
|
72
72
|
if (!url) {
|
|
73
73
|
logger.error("Request URL is empty", { method });
|
|
74
74
|
return reply.text("Request URL is empty", 400);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"httpServer.js","sourceRoot":"","sources":["../../../../src/v3/serverOnly/httpServer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"httpServer.js","sourceRoot":"","sources":["../../../../src/v3/serverOnly/httpServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ export type ParsePacketOptions = {
|
|
|
9
9
|
filteredKeys?: string[];
|
|
10
10
|
};
|
|
11
11
|
export declare function parsePacket(value: IOPacket, options?: ParsePacketOptions): Promise<any>;
|
|
12
|
+
export declare function parsePacketAsJson(value: IOPacket, options?: ParsePacketOptions): Promise<any>;
|
|
12
13
|
export declare function conditionallyImportAndParsePacket(value: IOPacket, client?: ApiClient): Promise<any>;
|
|
13
14
|
export declare function stringifyIO(value: any): Promise<IOPacket>;
|
|
14
15
|
export declare function conditionallyExportPacket(packet: IOPacket, pathPrefix: string, tracer?: TriggerTracer): Promise<IOPacket>;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.parsePacket = parsePacket;
|
|
4
|
+
exports.parsePacketAsJson = parsePacketAsJson;
|
|
4
5
|
exports.conditionallyImportAndParsePacket = conditionallyImportAndParsePacket;
|
|
5
6
|
exports.stringifyIO = stringifyIO;
|
|
6
7
|
exports.conditionallyExportPacket = conditionallyExportPacket;
|
|
@@ -35,6 +36,26 @@ async function parsePacket(value, options) {
|
|
|
35
36
|
return value.data;
|
|
36
37
|
}
|
|
37
38
|
}
|
|
39
|
+
async function parsePacketAsJson(value, options) {
|
|
40
|
+
if (!value.data) {
|
|
41
|
+
return undefined;
|
|
42
|
+
}
|
|
43
|
+
switch (value.dataType) {
|
|
44
|
+
case "application/json":
|
|
45
|
+
return JSON.parse(value.data, makeSafeReviver(options));
|
|
46
|
+
case "application/super+json":
|
|
47
|
+
const { parse, serialize } = await loadSuperJSON();
|
|
48
|
+
const superJsonResult = parse(value.data);
|
|
49
|
+
const { json } = serialize(superJsonResult);
|
|
50
|
+
return json;
|
|
51
|
+
case "text/plain":
|
|
52
|
+
return value.data;
|
|
53
|
+
case "application/store":
|
|
54
|
+
throw new Error(`Cannot parse an application/store packet (${value.data}). Needs to be imported first.`);
|
|
55
|
+
default:
|
|
56
|
+
return value.data;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
38
59
|
async function conditionallyImportAndParsePacket(value, client) {
|
|
39
60
|
const importedPacket = await conditionallyImportPacket(value, undefined, client);
|
|
40
61
|
return await parsePacket(importedPacket);
|