@overlordai/worker 1.0.53 → 1.0.55
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/clean-output-buffer.d.ts +21 -0
- package/dist/clean-output-buffer.d.ts.map +1 -0
- package/dist/clean-output-buffer.js +70 -0
- package/dist/clean-output-buffer.js.map +1 -0
- package/dist/config.d.ts +4 -4
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +54 -39
- package/dist/config.js.map +1 -1
- package/dist/executor/base.executor.d.ts +30 -11
- package/dist/executor/base.executor.d.ts.map +1 -1
- package/dist/executor/base.executor.js +25 -2
- package/dist/executor/base.executor.js.map +1 -1
- package/dist/executor/claude.executor.d.ts +7 -8
- package/dist/executor/claude.executor.d.ts.map +1 -1
- package/dist/executor/claude.executor.js +36 -26
- package/dist/executor/claude.executor.js.map +1 -1
- package/dist/executor/codex.executor.d.ts +7 -8
- package/dist/executor/codex.executor.d.ts.map +1 -1
- package/dist/executor/codex.executor.js +64 -26
- package/dist/executor/codex.executor.js.map +1 -1
- package/dist/executor/cursor.executor.d.ts +6 -7
- package/dist/executor/cursor.executor.d.ts.map +1 -1
- package/dist/executor/cursor.executor.js +12 -22
- package/dist/executor/cursor.executor.js.map +1 -1
- package/dist/executor/custom.executor.d.ts +15 -7
- package/dist/executor/custom.executor.d.ts.map +1 -1
- package/dist/executor/custom.executor.js +25 -28
- package/dist/executor/custom.executor.js.map +1 -1
- package/dist/git-operations.d.ts +14 -12
- package/dist/git-operations.d.ts.map +1 -1
- package/dist/git-operations.js +50 -98
- package/dist/git-operations.js.map +1 -1
- package/dist/git-token-helper.d.ts +27 -0
- package/dist/git-token-helper.d.ts.map +1 -0
- package/dist/git-token-helper.js +114 -0
- package/dist/git-token-helper.js.map +1 -0
- package/dist/healthz.d.ts.map +1 -1
- package/dist/healthz.js +3 -7
- package/dist/healthz.js.map +1 -1
- package/dist/http-post.d.ts +2 -0
- package/dist/http-post.d.ts.map +1 -0
- package/dist/http-post.js +74 -0
- package/dist/http-post.js.map +1 -0
- package/dist/jwt-manager.d.ts +2 -3
- package/dist/jwt-manager.d.ts.map +1 -1
- package/dist/jwt-manager.js +5 -43
- package/dist/jwt-manager.js.map +1 -1
- package/dist/lease-manager.d.ts +4 -1
- package/dist/lease-manager.d.ts.map +1 -1
- package/dist/lease-manager.js +2 -6
- package/dist/lease-manager.js.map +1 -1
- package/dist/main.js +147 -277
- package/dist/main.js.map +1 -1
- package/dist/orphan-reaper.d.ts +1 -1
- package/dist/orphan-reaper.d.ts.map +1 -1
- package/dist/orphan-reaper.js +46 -30
- package/dist/orphan-reaper.js.map +1 -1
- package/dist/pipeline-compiler.d.ts +10 -0
- package/dist/pipeline-compiler.d.ts.map +1 -0
- package/dist/pipeline-compiler.js +179 -0
- package/dist/pipeline-compiler.js.map +1 -0
- package/dist/pipeline-parser.d.ts.map +1 -1
- package/dist/pipeline-parser.js +4 -3
- package/dist/pipeline-parser.js.map +1 -1
- package/dist/pipeline-runner.d.ts +1 -0
- package/dist/pipeline-runner.d.ts.map +1 -1
- package/dist/pipeline-runner.js +37 -27
- package/dist/pipeline-runner.js.map +1 -1
- package/dist/project-mutex.d.ts +1 -0
- package/dist/project-mutex.d.ts.map +1 -1
- package/dist/project-mutex.js +9 -1
- package/dist/project-mutex.js.map +1 -1
- package/dist/pty-manager.d.ts +2 -0
- package/dist/pty-manager.d.ts.map +1 -1
- package/dist/pty-manager.js +68 -42
- package/dist/pty-manager.js.map +1 -1
- package/dist/pty-relay-client.d.ts +38 -0
- package/dist/pty-relay-client.d.ts.map +1 -0
- package/dist/pty-relay-client.js +146 -0
- package/dist/pty-relay-client.js.map +1 -0
- package/dist/pty-stdin-writer.d.ts +11 -0
- package/dist/pty-stdin-writer.d.ts.map +1 -0
- package/dist/pty-stdin-writer.js +22 -0
- package/dist/pty-stdin-writer.js.map +1 -0
- package/dist/ringbuffer.d.ts +2 -0
- package/dist/ringbuffer.d.ts.map +1 -1
- package/dist/ringbuffer.js +10 -1
- package/dist/ringbuffer.js.map +1 -1
- package/dist/stage-monitor.d.ts +72 -0
- package/dist/stage-monitor.d.ts.map +1 -0
- package/dist/stage-monitor.js +234 -0
- package/dist/stage-monitor.js.map +1 -0
- package/dist/task-handler.d.ts +18 -12
- package/dist/task-handler.d.ts.map +1 -1
- package/dist/task-handler.js +298 -78
- package/dist/task-handler.js.map +1 -1
- package/dist/tunnel-manager.d.ts +16 -6
- package/dist/tunnel-manager.d.ts.map +1 -1
- package/dist/tunnel-manager.js +117 -16
- package/dist/tunnel-manager.js.map +1 -1
- package/dist/worker-client.d.ts +16 -7
- package/dist/worker-client.d.ts.map +1 -1
- package/dist/worker-client.js +40 -52
- package/dist/worker-client.js.map +1 -1
- package/dist/workspace-manager.d.ts +1 -0
- package/dist/workspace-manager.d.ts.map +1 -1
- package/dist/workspace-manager.js +102 -82
- package/dist/workspace-manager.js.map +1 -1
- package/package.json +4 -2
package/dist/tunnel-manager.js
CHANGED
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.TunnelManager = void 0;
|
|
7
|
+
const events_1 = require("events");
|
|
7
8
|
const node_child_process_1 = require("node:child_process");
|
|
8
9
|
const pino_1 = __importDefault(require("pino"));
|
|
9
10
|
const safe_env_js_1 = require("./safe-env.js");
|
|
@@ -11,31 +12,36 @@ const log = (0, pino_1.default)({ name: 'tunnel-manager' });
|
|
|
11
12
|
/**
|
|
12
13
|
* Manages Cursor remote tunnel processes for active tasks.
|
|
13
14
|
*
|
|
14
|
-
*
|
|
15
|
-
* -
|
|
16
|
-
* -
|
|
17
|
-
* -
|
|
18
|
-
* - Allocate and track ports
|
|
15
|
+
* Emits events:
|
|
16
|
+
* - `tunnel_started(taskId, tunnelUrl)` — when tunnel URL is extracted from stdout
|
|
17
|
+
* - `tunnel_closed(taskId, reason)` — when tunnel is stopped or retries exhausted
|
|
18
|
+
* - `tunnel_crashed(taskId, error, willRetry)` — on unexpected process exit
|
|
19
19
|
*/
|
|
20
|
-
class TunnelManager {
|
|
20
|
+
class TunnelManager extends events_1.EventEmitter {
|
|
21
21
|
tunnels = new Map();
|
|
22
|
+
restartTimers = new Map();
|
|
22
23
|
/**
|
|
23
24
|
* Start a Cursor remote tunnel for the given task workspace.
|
|
24
25
|
* Returns the tunnel URL on success.
|
|
25
26
|
*/
|
|
26
27
|
async start(taskId, workspacePath) {
|
|
28
|
+
this.clearRestartTimer(taskId);
|
|
27
29
|
// If a tunnel already exists for this task, stop it first
|
|
28
30
|
if (this.tunnels.has(taskId)) {
|
|
29
31
|
log.warn({ taskId }, 'Tunnel already exists for task, stopping existing tunnel');
|
|
30
32
|
await this.stop(taskId);
|
|
31
33
|
}
|
|
32
34
|
log.info({ taskId, workspacePath }, 'Starting cursor remote tunnel');
|
|
35
|
+
// Fresh start always resets retry count
|
|
36
|
+
return this._spawnTunnel(taskId, workspacePath, 0);
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Spawn a tunnel process. Used by both start() and crash-recovery restarts.
|
|
40
|
+
*/
|
|
41
|
+
_spawnTunnel(taskId, workspacePath, retryCount) {
|
|
33
42
|
return new Promise((resolve, reject) => {
|
|
34
43
|
let resolved = false;
|
|
35
44
|
let output = '';
|
|
36
|
-
// TODO: Replace with actual `cursor --remote-tunnel` invocation once
|
|
37
|
-
// the cursor CLI tunnel feature is available and tested.
|
|
38
|
-
// For now, spawn the process and attempt to extract a URL from stdout.
|
|
39
45
|
const child = (0, node_child_process_1.spawn)('cursor', ['--remote-tunnel', '--folder', workspacePath], {
|
|
40
46
|
stdio: ['ignore', 'pipe', 'pipe'],
|
|
41
47
|
env: (0, safe_env_js_1.buildSafeEnv)(),
|
|
@@ -45,14 +51,33 @@ class TunnelManager {
|
|
|
45
51
|
workspacePath,
|
|
46
52
|
process: child,
|
|
47
53
|
tunnelUrl: null,
|
|
54
|
+
retryCount,
|
|
55
|
+
stopping: false,
|
|
48
56
|
};
|
|
49
57
|
this.tunnels.set(taskId, entry);
|
|
50
58
|
const timeout = setTimeout(() => {
|
|
51
59
|
if (!resolved) {
|
|
52
60
|
resolved = true;
|
|
53
|
-
|
|
54
|
-
|
|
61
|
+
try {
|
|
62
|
+
child.kill('SIGTERM');
|
|
63
|
+
}
|
|
64
|
+
catch {
|
|
65
|
+
// Process may already be dead
|
|
66
|
+
}
|
|
55
67
|
log.warn({ taskId }, 'Tunnel start timed out, killing child process');
|
|
68
|
+
// Don't delete from map immediately — wait for the 'exit' event
|
|
69
|
+
// to ensure proper cleanup. Add a fallback timer in case exit never fires.
|
|
70
|
+
const fallback = setTimeout(() => {
|
|
71
|
+
if (this.tunnels.get(taskId)?.process === child) {
|
|
72
|
+
this.tunnels.delete(taskId);
|
|
73
|
+
}
|
|
74
|
+
}, 5_000);
|
|
75
|
+
child.once('exit', () => {
|
|
76
|
+
clearTimeout(fallback);
|
|
77
|
+
if (this.tunnels.get(taskId)?.process === child) {
|
|
78
|
+
this.tunnels.delete(taskId);
|
|
79
|
+
}
|
|
80
|
+
});
|
|
56
81
|
reject(new Error('Tunnel start timed out waiting for URL'));
|
|
57
82
|
}
|
|
58
83
|
}, 30_000);
|
|
@@ -63,13 +88,14 @@ class TunnelManager {
|
|
|
63
88
|
output += chunk;
|
|
64
89
|
log.debug({ taskId, chunk: chunk.trim() }, 'Tunnel stdout');
|
|
65
90
|
// Attempt to extract tunnel URL from output
|
|
66
|
-
// Common patterns: https://... or vscode://...
|
|
67
91
|
const urlMatch = output.match(/https?:\/\/[^\s"'<>)\]},;]+/);
|
|
68
|
-
if (urlMatch
|
|
92
|
+
if (urlMatch) {
|
|
69
93
|
resolved = true;
|
|
70
94
|
clearTimeout(timeout);
|
|
71
95
|
entry.tunnelUrl = urlMatch[0];
|
|
96
|
+
entry.retryCount = 0; // Reset on successful connection
|
|
72
97
|
log.info({ taskId, tunnelUrl: entry.tunnelUrl }, 'Tunnel URL extracted');
|
|
98
|
+
this.emit('tunnel_started', taskId, entry.tunnelUrl);
|
|
73
99
|
resolve(entry.tunnelUrl);
|
|
74
100
|
}
|
|
75
101
|
});
|
|
@@ -88,7 +114,54 @@ class TunnelManager {
|
|
|
88
114
|
child.on('exit', (code, signal) => {
|
|
89
115
|
clearTimeout(timeout);
|
|
90
116
|
log.info({ taskId, code, signal }, 'Tunnel process exited');
|
|
91
|
-
|
|
117
|
+
// Check if the entry still exists (may have been removed by stop/stopAll)
|
|
118
|
+
const currentEntry = this.tunnels.get(taskId);
|
|
119
|
+
if (!currentEntry || currentEntry.process !== child) {
|
|
120
|
+
// Entry was already cleaned up or replaced
|
|
121
|
+
if (!resolved) {
|
|
122
|
+
resolved = true;
|
|
123
|
+
reject(new Error(`Tunnel process exited prematurely with code ${code}`));
|
|
124
|
+
}
|
|
125
|
+
return;
|
|
126
|
+
}
|
|
127
|
+
if (currentEntry.stopping) {
|
|
128
|
+
// Intentional stop — no restart
|
|
129
|
+
this.tunnels.delete(taskId);
|
|
130
|
+
this.emit('tunnel_closed', taskId, 'manual');
|
|
131
|
+
if (!resolved) {
|
|
132
|
+
resolved = true;
|
|
133
|
+
reject(new Error(`Tunnel process was stopped manually`));
|
|
134
|
+
}
|
|
135
|
+
return;
|
|
136
|
+
}
|
|
137
|
+
// Unexpected exit — attempt crash recovery
|
|
138
|
+
const error = new Error(`Tunnel process exited unexpectedly with code ${code}, signal ${signal}`);
|
|
139
|
+
if (currentEntry.retryCount < 3) {
|
|
140
|
+
this.emit('tunnel_crashed', taskId, error.message, true);
|
|
141
|
+
const nextRetryCount = currentEntry.retryCount + 1;
|
|
142
|
+
const backoffMs = 2_000 * Math.pow(2, currentEntry.retryCount); // 2s, 4s, 8s
|
|
143
|
+
log.info({ taskId, retryCount: nextRetryCount, backoffMs }, 'Scheduling tunnel restart');
|
|
144
|
+
// Remove current entry before scheduling restart
|
|
145
|
+
this.tunnels.delete(taskId);
|
|
146
|
+
const restartTimer = setTimeout(() => {
|
|
147
|
+
this.restartTimers.delete(taskId);
|
|
148
|
+
// Only restart if no new tunnel was started for this task in the meantime
|
|
149
|
+
if (!this.tunnels.has(taskId)) {
|
|
150
|
+
this._spawnTunnel(taskId, workspacePath, nextRetryCount).catch((restartErr) => {
|
|
151
|
+
log.error({ taskId, err: restartErr }, 'Tunnel restart failed');
|
|
152
|
+
this.emit('tunnel_crashed', taskId, restartErr instanceof Error ? restartErr.message : String(restartErr), true);
|
|
153
|
+
});
|
|
154
|
+
}
|
|
155
|
+
}, backoffMs);
|
|
156
|
+
this.restartTimers.set(taskId, restartTimer);
|
|
157
|
+
}
|
|
158
|
+
else {
|
|
159
|
+
// Retries exhausted
|
|
160
|
+
this.emit('tunnel_crashed', taskId, error.message, false);
|
|
161
|
+
this.tunnels.delete(taskId);
|
|
162
|
+
this.emit('tunnel_closed', taskId, 'crashed');
|
|
163
|
+
log.error({ taskId }, 'Tunnel retries exhausted, giving up');
|
|
164
|
+
}
|
|
92
165
|
if (!resolved) {
|
|
93
166
|
resolved = true;
|
|
94
167
|
reject(new Error(`Tunnel process exited prematurely with code ${code}`));
|
|
@@ -106,7 +179,8 @@ class TunnelManager {
|
|
|
106
179
|
return;
|
|
107
180
|
}
|
|
108
181
|
log.info({ taskId }, 'Stopping tunnel');
|
|
109
|
-
|
|
182
|
+
entry.stopping = true;
|
|
183
|
+
this.clearRestartTimer(taskId);
|
|
110
184
|
return new Promise((resolve) => {
|
|
111
185
|
const child = entry.process;
|
|
112
186
|
// Give the process a chance to exit gracefully
|
|
@@ -117,6 +191,11 @@ class TunnelManager {
|
|
|
117
191
|
catch {
|
|
118
192
|
// Process may already be dead
|
|
119
193
|
}
|
|
194
|
+
// Clean up map entry if it still exists (exit handler may not have fired)
|
|
195
|
+
if (this.tunnels.has(taskId)) {
|
|
196
|
+
this.tunnels.delete(taskId);
|
|
197
|
+
this.emit('tunnel_closed', taskId, 'manual');
|
|
198
|
+
}
|
|
120
199
|
resolve();
|
|
121
200
|
}, 5_000);
|
|
122
201
|
child.once('exit', () => {
|
|
@@ -129,6 +208,8 @@ class TunnelManager {
|
|
|
129
208
|
catch {
|
|
130
209
|
// Process may already be dead
|
|
131
210
|
clearTimeout(forceKillTimeout);
|
|
211
|
+
this.tunnels.delete(taskId);
|
|
212
|
+
this.emit('tunnel_closed', taskId, 'manual');
|
|
132
213
|
resolve();
|
|
133
214
|
}
|
|
134
215
|
});
|
|
@@ -137,14 +218,22 @@ class TunnelManager {
|
|
|
137
218
|
* Stop all active tunnels. Called during worker shutdown.
|
|
138
219
|
*/
|
|
139
220
|
stopAll() {
|
|
140
|
-
|
|
221
|
+
// Clear all pending restart timers
|
|
222
|
+
for (const [, timer] of this.restartTimers) {
|
|
223
|
+
clearTimeout(timer);
|
|
224
|
+
}
|
|
225
|
+
this.restartTimers.clear();
|
|
226
|
+
const entries = [...this.tunnels.entries()];
|
|
227
|
+
for (const [taskId, entry] of entries) {
|
|
141
228
|
log.info({ taskId }, 'Stopping tunnel during shutdown');
|
|
229
|
+
entry.stopping = true;
|
|
142
230
|
try {
|
|
143
231
|
entry.process.kill('SIGTERM');
|
|
144
232
|
}
|
|
145
233
|
catch {
|
|
146
234
|
// Process may already be dead
|
|
147
235
|
}
|
|
236
|
+
this.emit('tunnel_closed', taskId, 'manual');
|
|
148
237
|
}
|
|
149
238
|
this.tunnels.clear();
|
|
150
239
|
}
|
|
@@ -160,6 +249,18 @@ class TunnelManager {
|
|
|
160
249
|
getTunnelUrl(taskId) {
|
|
161
250
|
return this.tunnels.get(taskId)?.tunnelUrl ?? null;
|
|
162
251
|
}
|
|
252
|
+
clearRestartTimer(taskId) {
|
|
253
|
+
const timer = this.restartTimers.get(taskId);
|
|
254
|
+
if (timer) {
|
|
255
|
+
clearTimeout(timer);
|
|
256
|
+
this.restartTimers.delete(taskId);
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
getActiveTunnels() {
|
|
260
|
+
return Array.from(this.tunnels.values())
|
|
261
|
+
.filter(e => e.tunnelUrl !== null && !e.stopping)
|
|
262
|
+
.map(e => ({ taskId: e.taskId, tunnelUrl: e.tunnelUrl }));
|
|
263
|
+
}
|
|
163
264
|
}
|
|
164
265
|
exports.TunnelManager = TunnelManager;
|
|
165
266
|
//# sourceMappingURL=tunnel-manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-manager.js","sourceRoot":"","sources":["../src/tunnel-manager.ts"],"names":[],"mappings":";;;;;;AAAA,2DAA8D;AAC9D,gDAAwB;AACxB,+CAA6C;AAE7C,MAAM,GAAG,GAAG,IAAA,cAAI,EAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"tunnel-manager.js","sourceRoot":"","sources":["../src/tunnel-manager.ts"],"names":[],"mappings":"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"}
|
package/dist/worker-client.d.ts
CHANGED
|
@@ -1,14 +1,17 @@
|
|
|
1
|
-
import type { ExecuteTaskFrame, CancelTaskFrame, CleanupWorkspaceFrame, ResumeTaskFrame, HeartbeatAckFrame, ServerShuttingDownFrame, RecoverySecretBootstrapFrame, StartTunnelFrame, StopTunnelFrame, StageConfirmResponseFrame } from '@overlordai/protocol';
|
|
2
|
-
import type { StageConfirmMode, StageChoiceOption } from '@overlordai/protocol';
|
|
1
|
+
import type { WorkerProgressFrame, ExecuteTaskFrame, CancelTaskFrame, CleanupWorkspaceFrame, ResumeTaskFrame, HeartbeatAckFrame, ServerShuttingDownFrame, RecoverySecretBootstrapFrame, StartTunnelFrame, StopTunnelFrame, StageConfirmResponseFrame, TunnelClosedFrame } from '@overlordai/protocol';
|
|
3
2
|
export interface WorkerClientOptions {
|
|
4
3
|
overlordHost: string;
|
|
5
|
-
|
|
4
|
+
workerId: string;
|
|
6
5
|
workerVersion: string;
|
|
7
6
|
cpuModel?: string;
|
|
8
7
|
maxSlots?: number;
|
|
9
8
|
getToken: () => string;
|
|
10
9
|
getCapabilities: () => string[];
|
|
11
10
|
getActiveSlots: () => number;
|
|
11
|
+
getActiveTunnels?: () => Array<{
|
|
12
|
+
taskId: number;
|
|
13
|
+
tunnelUrl: string;
|
|
14
|
+
}>;
|
|
12
15
|
}
|
|
13
16
|
export interface WorkerClientHandlers {
|
|
14
17
|
onExecute: (frame: ExecuteTaskFrame) => void;
|
|
@@ -40,19 +43,25 @@ export declare class WorkerClient {
|
|
|
40
43
|
isConnected(): boolean;
|
|
41
44
|
connect(): void;
|
|
42
45
|
disconnect(): void;
|
|
43
|
-
sendHeartbeat(
|
|
46
|
+
sendHeartbeat(activeTunnels?: Array<{
|
|
47
|
+
taskId: number;
|
|
48
|
+
tunnelUrl: string;
|
|
49
|
+
}>): void;
|
|
44
50
|
sendAck(msgId: string, payload?: Record<string, unknown>): void;
|
|
45
|
-
sendProgress(taskId: number, stage: string, status:
|
|
51
|
+
sendProgress(taskId: number, stage: string, status: WorkerProgressFrame['status'], message?: string): void;
|
|
46
52
|
sendReconnect(tasks: Array<{
|
|
47
53
|
taskId: number;
|
|
48
|
-
localStatus: '
|
|
54
|
+
localStatus: import('@overlordai/protocol').LocalStatus;
|
|
49
55
|
currentStage?: string;
|
|
50
56
|
branch?: string;
|
|
51
57
|
mrUrl?: string;
|
|
52
58
|
errorMessage?: string;
|
|
53
59
|
}>): void;
|
|
54
60
|
sendRecoverySecretAck(): void;
|
|
55
|
-
sendStageConfirmRequest(taskId: number,
|
|
61
|
+
sendStageConfirmRequest(taskId: number, stageName: string, timeout: number, prompt?: string): void;
|
|
62
|
+
sendTunnelStarted(taskId: number, tunnelUrl: string): void;
|
|
63
|
+
sendTunnelClosed(taskId: number, reason: TunnelClosedFrame['reason']): void;
|
|
64
|
+
sendTunnelCrashed(taskId: number, error: string, willRetry: boolean): void;
|
|
56
65
|
private sendFrame;
|
|
57
66
|
private handleMessage;
|
|
58
67
|
private buildWsUrl;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-client.d.ts","sourceRoot":"","sources":["../src/worker-client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"worker-client.d.ts","sourceRoot":"","sources":["../src/worker-client.ts"],"names":[],"mappings":"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"}
|
package/dist/worker-client.js
CHANGED
|
@@ -70,9 +70,7 @@ class WorkerClient {
|
|
|
70
70
|
this.startDedupCleanup();
|
|
71
71
|
this.handlers.onConnected();
|
|
72
72
|
});
|
|
73
|
-
this.ws.on('message', (data) =>
|
|
74
|
-
this.handleMessage(data);
|
|
75
|
-
});
|
|
73
|
+
this.ws.on('message', (data) => this.handleMessage(data));
|
|
76
74
|
this.ws.on('close', (code, reason) => {
|
|
77
75
|
log.info({ code, reason: reason.toString() }, 'WebSocket closed');
|
|
78
76
|
this.cleanup();
|
|
@@ -102,11 +100,12 @@ class WorkerClient {
|
|
|
102
100
|
this.ws = null;
|
|
103
101
|
}
|
|
104
102
|
}
|
|
105
|
-
sendHeartbeat() {
|
|
103
|
+
sendHeartbeat(activeTunnels) {
|
|
104
|
+
const tunnels = activeTunnels ?? this.options.getActiveTunnels?.();
|
|
106
105
|
const metrics = (0, hardware_js_1.collectRuntimeMetrics)();
|
|
107
106
|
const frame = {
|
|
108
107
|
type: 'heartbeat',
|
|
109
|
-
|
|
108
|
+
workerId: this.options.workerId,
|
|
110
109
|
timestamp: new Date().toISOString(),
|
|
111
110
|
workerVersion: this.options.workerVersion,
|
|
112
111
|
cpuModel: this.options.cpuModel,
|
|
@@ -118,52 +117,39 @@ class WorkerClient {
|
|
|
118
117
|
activeSlots: this.options.getActiveSlots(),
|
|
119
118
|
},
|
|
120
119
|
capabilities: this.options.getCapabilities(),
|
|
120
|
+
...(tunnels && tunnels.length > 0 && { activeTunnels: tunnels }),
|
|
121
121
|
};
|
|
122
122
|
this.sendFrame(frame);
|
|
123
123
|
}
|
|
124
124
|
sendAck(msgId, payload) {
|
|
125
|
-
|
|
126
|
-
type: 'ack',
|
|
127
|
-
msgId,
|
|
128
|
-
payload,
|
|
129
|
-
};
|
|
130
|
-
this.sendFrame(frame);
|
|
125
|
+
this.sendFrame({ type: 'ack', msgId, payload });
|
|
131
126
|
}
|
|
132
127
|
sendProgress(taskId, stage, status, message) {
|
|
133
|
-
|
|
134
|
-
type: 'progress',
|
|
135
|
-
taskId,
|
|
136
|
-
stage,
|
|
137
|
-
status,
|
|
138
|
-
message,
|
|
139
|
-
};
|
|
140
|
-
this.sendFrame(frame);
|
|
128
|
+
this.sendFrame({ type: 'progress', taskId, stage, status, message });
|
|
141
129
|
}
|
|
142
130
|
sendReconnect(tasks) {
|
|
143
|
-
|
|
144
|
-
type: 'reconnect',
|
|
145
|
-
machineId: this.options.machineId,
|
|
146
|
-
tasks,
|
|
147
|
-
};
|
|
148
|
-
this.sendFrame(frame);
|
|
131
|
+
this.sendFrame({ type: 'reconnect', workerId: this.options.workerId, tasks });
|
|
149
132
|
}
|
|
150
133
|
sendRecoverySecretAck() {
|
|
151
|
-
|
|
152
|
-
type: 'recovery_secret_ack',
|
|
153
|
-
};
|
|
154
|
-
this.sendFrame(frame);
|
|
134
|
+
this.sendFrame({ type: 'recovery_secret_ack' });
|
|
155
135
|
}
|
|
156
|
-
sendStageConfirmRequest(taskId,
|
|
157
|
-
|
|
136
|
+
sendStageConfirmRequest(taskId, stageName, timeout, prompt) {
|
|
137
|
+
this.sendFrame({
|
|
158
138
|
type: 'stage_confirm_request',
|
|
159
139
|
taskId,
|
|
160
|
-
|
|
161
|
-
mode,
|
|
140
|
+
stageName,
|
|
162
141
|
timeout,
|
|
163
142
|
...(prompt !== undefined && { prompt }),
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
143
|
+
});
|
|
144
|
+
}
|
|
145
|
+
sendTunnelStarted(taskId, tunnelUrl) {
|
|
146
|
+
this.sendFrame({ type: 'tunnel_started', taskId, tunnelUrl });
|
|
147
|
+
}
|
|
148
|
+
sendTunnelClosed(taskId, reason) {
|
|
149
|
+
this.sendFrame({ type: 'tunnel_closed', taskId, reason });
|
|
150
|
+
}
|
|
151
|
+
sendTunnelCrashed(taskId, error, willRetry) {
|
|
152
|
+
this.sendFrame({ type: 'tunnel_crashed', taskId, error, willRetry });
|
|
167
153
|
}
|
|
168
154
|
sendFrame(frame) {
|
|
169
155
|
if (!this.ws || this.ws.readyState !== ws_1.default.OPEN) {
|
|
@@ -232,22 +218,12 @@ class WorkerClient {
|
|
|
232
218
|
}
|
|
233
219
|
}
|
|
234
220
|
buildWsUrl() {
|
|
235
|
-
const
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
}
|
|
240
|
-
|
|
241
|
-
wsBase = 'ws://' + host.slice(7);
|
|
242
|
-
}
|
|
243
|
-
else {
|
|
244
|
-
wsBase = 'ws://' + host;
|
|
245
|
-
}
|
|
246
|
-
// Remove trailing slash
|
|
247
|
-
if (wsBase.endsWith('/')) {
|
|
248
|
-
wsBase = wsBase.slice(0, -1);
|
|
249
|
-
}
|
|
250
|
-
return `${wsBase}/api/workers/channel`;
|
|
221
|
+
const wsBase = this.options.overlordHost
|
|
222
|
+
.replace(/^https:\/\//, 'wss://')
|
|
223
|
+
.replace(/^http:\/\//, 'ws://')
|
|
224
|
+
.replace(/\/$/, '');
|
|
225
|
+
const base = wsBase.startsWith('ws') ? wsBase : `ws://${wsBase}`;
|
|
226
|
+
return `${base}/api/workers/channel`;
|
|
251
227
|
}
|
|
252
228
|
startHeartbeat() {
|
|
253
229
|
this.stopHeartbeat();
|
|
@@ -268,6 +244,7 @@ class WorkerClient {
|
|
|
268
244
|
}
|
|
269
245
|
startDedupCleanup() {
|
|
270
246
|
this.stopDedupCleanup();
|
|
247
|
+
const MAX_DEDUP_SIZE = 10_000;
|
|
271
248
|
this.dedupCleanupTimer = setInterval(() => {
|
|
272
249
|
const cutoff = Date.now() - protocol_1.MSGID_DEDUP_TTL_SEC * 1000;
|
|
273
250
|
for (const [msgId, timestamp] of this.dedupSet) {
|
|
@@ -275,6 +252,17 @@ class WorkerClient {
|
|
|
275
252
|
this.dedupSet.delete(msgId);
|
|
276
253
|
}
|
|
277
254
|
}
|
|
255
|
+
// If still over max size after TTL cleanup, prune oldest half
|
|
256
|
+
if (this.dedupSet.size > MAX_DEDUP_SIZE) {
|
|
257
|
+
const entriesToDelete = Math.floor(this.dedupSet.size / 2);
|
|
258
|
+
let deleted = 0;
|
|
259
|
+
for (const key of this.dedupSet.keys()) {
|
|
260
|
+
if (deleted >= entriesToDelete)
|
|
261
|
+
break;
|
|
262
|
+
this.dedupSet.delete(key);
|
|
263
|
+
deleted++;
|
|
264
|
+
}
|
|
265
|
+
}
|
|
278
266
|
}, DEDUP_CLEANUP_INTERVAL_MS);
|
|
279
267
|
if (this.dedupCleanupTimer.unref) {
|
|
280
268
|
this.dedupCleanupTimer.unref();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-client.js","sourceRoot":"","sources":["../src/worker-client.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA2B;
|
|
1
|
+
{"version":3,"file":"worker-client.js","sourceRoot":"","sources":["../src/worker-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-manager.d.ts","sourceRoot":"","sources":["../src/workspace-manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"workspace-manager.d.ts","sourceRoot":"","sources":["../src/workspace-manager.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAc3D,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;IAC/B,SAAS,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B;AAID,qBAAa,gBAAgB;IAKf,OAAO,CAAC,MAAM;IAJ1B,OAAO,CAAC,GAAG,CAAgB;IAC3B,OAAO,CAAC,KAAK,CAAe;IAC5B,OAAO,CAAC,cAAc,CAA6B;gBAE/B,MAAM,EAAE;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE;IAK1E;;;;;;;;OAQG;IACG,UAAU,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,aAAa,CAAC;IA+IrE;;;;;OAKG;IACG,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA4BnE;;OAEG;IACG,cAAc,CAAC,aAAa,GAAE,GAAG,CAAC,MAAM,CAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAiD3E;;OAEG;IACH,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;CAIzC"}
|