@yu_robotics/remote-cli 1.6.49 → 1.6.66
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/README.md +18 -8
- package/dist/client/MessageHandler.d.ts +8 -0
- package/dist/client/MessageHandler.d.ts.map +1 -1
- package/dist/client/MessageHandler.js +108 -3
- package/dist/client/MessageHandler.js.map +1 -1
- package/dist/client/TaskRecovery.d.ts +35 -0
- package/dist/client/TaskRecovery.d.ts.map +1 -0
- package/dist/client/TaskRecovery.js +237 -0
- package/dist/client/TaskRecovery.js.map +1 -0
- package/dist/client/WebSocketClient.d.ts +6 -0
- package/dist/client/WebSocketClient.d.ts.map +1 -1
- package/dist/client/WebSocketClient.js +39 -11
- package/dist/client/WebSocketClient.js.map +1 -1
- package/dist/commands/start.d.ts +3 -11
- package/dist/commands/start.d.ts.map +1 -1
- package/dist/commands/start.js +22 -99
- package/dist/commands/start.js.map +1 -1
- package/dist/executor/ClaudePersistentExecutor.d.ts +38 -2
- package/dist/executor/ClaudePersistentExecutor.d.ts.map +1 -1
- package/dist/executor/ClaudePersistentExecutor.js +369 -21
- package/dist/executor/ClaudePersistentExecutor.js.map +1 -1
- package/dist/executor/CodexAppServerExecutor.d.ts +13 -0
- package/dist/executor/CodexAppServerExecutor.d.ts.map +1 -1
- package/dist/executor/CodexAppServerExecutor.js +208 -5
- package/dist/executor/CodexAppServerExecutor.js.map +1 -1
- package/dist/executor/CodexSandbox.d.ts +23 -0
- package/dist/executor/CodexSandbox.d.ts.map +1 -0
- package/dist/executor/CodexSandbox.js +211 -0
- package/dist/executor/CodexSandbox.js.map +1 -0
- package/dist/executor/IExecutor.d.ts +5 -1
- package/dist/executor/IExecutor.d.ts.map +1 -1
- package/dist/executor/claude/ClaudeFilePolicy.d.ts +7 -0
- package/dist/executor/claude/ClaudeFilePolicy.d.ts.map +1 -0
- package/dist/executor/claude/ClaudeFilePolicy.js +88 -0
- package/dist/executor/claude/ClaudeFilePolicy.js.map +1 -0
- package/dist/executor/claude/ClaudeSandbox.d.ts +32 -0
- package/dist/executor/claude/ClaudeSandbox.d.ts.map +1 -0
- package/dist/executor/claude/ClaudeSandbox.js +245 -0
- package/dist/executor/claude/ClaudeSandbox.js.map +1 -0
- package/dist/executor/claude/approvalMcpServer.d.ts +2 -0
- package/dist/executor/claude/approvalMcpServer.d.ts.map +1 -0
- package/dist/executor/claude/approvalMcpServer.js +159 -0
- package/dist/executor/claude/approvalMcpServer.js.map +1 -0
- package/dist/executor/claude/filePolicyHook.d.ts +2 -0
- package/dist/executor/claude/filePolicyHook.d.ts.map +1 -0
- package/dist/executor/claude/filePolicyHook.js +63 -0
- package/dist/executor/claude/filePolicyHook.js.map +1 -0
- package/dist/executor/index.d.ts.map +1 -1
- package/dist/executor/index.js +4 -3
- package/dist/executor/index.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/thread/ThreadManager.d.ts.map +1 -1
- package/dist/thread/ThreadManager.js +2 -0
- package/dist/thread/ThreadManager.js.map +1 -1
- package/dist/types/config.d.ts +32 -2
- package/dist/types/config.d.ts.map +1 -1
- package/dist/types/config.js.map +1 -1
- package/dist/types/index.d.ts +53 -4
- package/dist/types/index.d.ts.map +1 -1
- package/dist/update/AutomaticUpdater.d.ts +7 -1
- package/dist/update/AutomaticUpdater.d.ts.map +1 -1
- package/dist/update/AutomaticUpdater.js +25 -2
- package/dist/update/AutomaticUpdater.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,237 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TaskRecovery = void 0;
|
|
4
|
+
const uuid_1 = require("uuid");
|
|
5
|
+
const RESULT_TTL = 24 * 60 * 60 * 1000;
|
|
6
|
+
const MAX_RESULTS = 100;
|
|
7
|
+
const RETRY_DELAY = 15000;
|
|
8
|
+
const MAX_RETRY_DELAY = 5 * 60 * 1000;
|
|
9
|
+
// Bound consecutive failures within a recovery round, not successful reconnects.
|
|
10
|
+
const MAX_RECOVERY_FAILURES = 20;
|
|
11
|
+
/** Keeps bounded task metadata across socket reconnects, never process output. */
|
|
12
|
+
class TaskRecovery {
|
|
13
|
+
sendRaw;
|
|
14
|
+
tasks = new Map();
|
|
15
|
+
connected = true;
|
|
16
|
+
supported = false;
|
|
17
|
+
inFlight;
|
|
18
|
+
acknowledgementTimer;
|
|
19
|
+
retry;
|
|
20
|
+
resultTimer;
|
|
21
|
+
constructor(sendRaw) {
|
|
22
|
+
this.sendRaw = sendRaw;
|
|
23
|
+
}
|
|
24
|
+
track(task) {
|
|
25
|
+
this.tasks.set(task.messageId, {
|
|
26
|
+
task: { ...task, threadName: task.threadName.slice(0, 100), backend: task.backend.slice(0, 100),
|
|
27
|
+
cwd: task.cwd.slice(0, 4096), preview: task.preview.replace(/\s+/g, ' ').slice(0, 240) },
|
|
28
|
+
recoveryId: (0, uuid_1.v4)(), needsRecovery: !this.connected, recovered: !this.connected,
|
|
29
|
+
recoveryFailures: 0, recoveryPaused: false,
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
disconnected() {
|
|
33
|
+
this.connected = false;
|
|
34
|
+
this.clearTimers();
|
|
35
|
+
this.inFlight = undefined;
|
|
36
|
+
for (const entry of this.tasks.values()) {
|
|
37
|
+
entry.needsRecovery = true;
|
|
38
|
+
entry.recovered = true;
|
|
39
|
+
entry.recoveryId = (0, uuid_1.v4)();
|
|
40
|
+
entry.recoveryFailures = 0;
|
|
41
|
+
entry.recoveryPaused = false;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
registered(supported) {
|
|
45
|
+
this.connected = true;
|
|
46
|
+
this.supported = supported;
|
|
47
|
+
if (!supported) {
|
|
48
|
+
this.clearTimers();
|
|
49
|
+
this.inFlight = undefined;
|
|
50
|
+
for (const [id, entry] of this.tasks) {
|
|
51
|
+
if (entry.result)
|
|
52
|
+
this.tasks.delete(id);
|
|
53
|
+
else
|
|
54
|
+
entry.needsRecovery = false;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
this.pump();
|
|
58
|
+
}
|
|
59
|
+
send(message) {
|
|
60
|
+
const entry = this.tasks.get(message.messageId);
|
|
61
|
+
if (!entry) {
|
|
62
|
+
this.sendRaw(message);
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
if (message.type === 'response' && typeof message.success === 'boolean') {
|
|
66
|
+
entry.result = { success: message.success, error: message.error?.slice(0, 500), finishedAt: Date.now() };
|
|
67
|
+
if (typeof message.cwd === 'string')
|
|
68
|
+
entry.task.cwd = message.cwd.slice(0, 4096);
|
|
69
|
+
this.prune();
|
|
70
|
+
}
|
|
71
|
+
if (!this.connected || entry.needsRecovery) {
|
|
72
|
+
this.pump();
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
75
|
+
// Aggregate plans and final bodies may contain text generated before reconnecting.
|
|
76
|
+
if (entry.recovered && (message.streamType === 'plan_mode' || message.type === 'structured'))
|
|
77
|
+
return;
|
|
78
|
+
try {
|
|
79
|
+
this.sendRaw(entry.recovered && message.type === 'response'
|
|
80
|
+
? { ...message, output: undefined, error: entry.result?.error } : message);
|
|
81
|
+
}
|
|
82
|
+
catch (error) {
|
|
83
|
+
this.disconnected();
|
|
84
|
+
return;
|
|
85
|
+
}
|
|
86
|
+
if (entry.result) {
|
|
87
|
+
if (!this.supported)
|
|
88
|
+
this.tasks.delete(message.messageId);
|
|
89
|
+
else
|
|
90
|
+
this.waitForResultReceipt();
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
acknowledge(message) {
|
|
94
|
+
if (message.type === 'task_result_ack') {
|
|
95
|
+
if (this.tasks.get(message.messageId)?.result)
|
|
96
|
+
this.tasks.delete(message.messageId);
|
|
97
|
+
if (this.inFlight?.messageId === message.messageId) {
|
|
98
|
+
this.inFlight = undefined;
|
|
99
|
+
this.clearAcknowledgementTimer();
|
|
100
|
+
}
|
|
101
|
+
if (this.retry && this.retry.messageId === message.messageId) {
|
|
102
|
+
clearTimeout(this.retry.timer);
|
|
103
|
+
this.retry = undefined;
|
|
104
|
+
}
|
|
105
|
+
this.pump();
|
|
106
|
+
return;
|
|
107
|
+
}
|
|
108
|
+
const pending = this.inFlight;
|
|
109
|
+
if (!pending || pending.messageId !== message.messageId || pending.recoveryId !== message.recoveryId
|
|
110
|
+
|| pending.state !== message.state)
|
|
111
|
+
return;
|
|
112
|
+
if (message.success !== true) {
|
|
113
|
+
this.failRecovery();
|
|
114
|
+
return;
|
|
115
|
+
}
|
|
116
|
+
this.inFlight = undefined;
|
|
117
|
+
this.clearAcknowledgementTimer();
|
|
118
|
+
const entry = this.tasks.get(message.messageId);
|
|
119
|
+
if (entry) {
|
|
120
|
+
entry.recoveryFailures = 0;
|
|
121
|
+
if (pending.state !== 'running')
|
|
122
|
+
this.tasks.delete(message.messageId);
|
|
123
|
+
else {
|
|
124
|
+
entry.needsRecovery = false;
|
|
125
|
+
if (entry.result) {
|
|
126
|
+
this.send({ type: 'response', messageId: message.messageId, openId: entry.task.openId,
|
|
127
|
+
threadId: entry.task.threadId, cwd: entry.task.cwd, success: entry.result.success,
|
|
128
|
+
error: entry.result.error, timestamp: Date.now() });
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
this.pump();
|
|
133
|
+
}
|
|
134
|
+
hasPendingResults() {
|
|
135
|
+
this.prune();
|
|
136
|
+
return Array.from(this.tasks.values()).some(entry => !!entry.result && !entry.recoveryPaused);
|
|
137
|
+
}
|
|
138
|
+
destroy() {
|
|
139
|
+
this.clearTimers();
|
|
140
|
+
this.tasks.clear();
|
|
141
|
+
this.inFlight = undefined;
|
|
142
|
+
}
|
|
143
|
+
pump() {
|
|
144
|
+
this.prune();
|
|
145
|
+
if (!this.connected || !this.supported || this.inFlight || this.retry)
|
|
146
|
+
return;
|
|
147
|
+
const entry = Array.from(this.tasks.values()).find(item => item.needsRecovery && !item.recoveryPaused);
|
|
148
|
+
if (!entry) {
|
|
149
|
+
if (this.hasPendingResults())
|
|
150
|
+
this.waitForResultReceipt();
|
|
151
|
+
return;
|
|
152
|
+
}
|
|
153
|
+
const { task, result } = entry;
|
|
154
|
+
const taskResume = {
|
|
155
|
+
recoveryId: entry.recoveryId, threadName: task.threadName, backend: task.backend,
|
|
156
|
+
cwd: task.cwd, preview: task.preview,
|
|
157
|
+
state: result ? (result.success ? 'completed' : 'failed') : 'running', error: result?.error,
|
|
158
|
+
};
|
|
159
|
+
this.inFlight = { messageId: task.messageId, recoveryId: entry.recoveryId, state: taskResume.state };
|
|
160
|
+
this.acknowledgementTimer = setTimeout(() => this.failRecovery(), RETRY_DELAY);
|
|
161
|
+
this.acknowledgementTimer.unref?.();
|
|
162
|
+
try {
|
|
163
|
+
this.sendRaw({ type: 'task_resume', messageId: task.messageId, openId: task.openId,
|
|
164
|
+
threadId: task.threadId, taskResume, timestamp: Date.now() });
|
|
165
|
+
}
|
|
166
|
+
catch {
|
|
167
|
+
this.disconnected();
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
failRecovery() {
|
|
171
|
+
const pending = this.inFlight;
|
|
172
|
+
if (!pending)
|
|
173
|
+
return;
|
|
174
|
+
this.inFlight = undefined;
|
|
175
|
+
this.clearAcknowledgementTimer();
|
|
176
|
+
const entry = this.tasks.get(pending.messageId);
|
|
177
|
+
if (!entry) {
|
|
178
|
+
this.pump();
|
|
179
|
+
return;
|
|
180
|
+
}
|
|
181
|
+
entry.recoveryFailures += 1;
|
|
182
|
+
if (entry.recoveryFailures >= MAX_RECOVERY_FAILURES) {
|
|
183
|
+
// Keep the record so late output cannot bypass recovery or replay history.
|
|
184
|
+
// A new connection starts another round; terminal records remain bounded.
|
|
185
|
+
entry.recoveryPaused = true;
|
|
186
|
+
console.error(`[TaskRecovery] Pausing task ${entry.task.messageId} after ${entry.recoveryFailures} failed recovery attempts; recovery will wait for another connection.`);
|
|
187
|
+
this.pump();
|
|
188
|
+
return;
|
|
189
|
+
}
|
|
190
|
+
const delay = Math.min(RETRY_DELAY * 2 ** entry.recoveryFailures, MAX_RETRY_DELAY);
|
|
191
|
+
const timer = setTimeout(() => {
|
|
192
|
+
this.retry = undefined;
|
|
193
|
+
this.pump();
|
|
194
|
+
}, delay);
|
|
195
|
+
timer.unref?.();
|
|
196
|
+
this.retry = { messageId: pending.messageId, timer };
|
|
197
|
+
}
|
|
198
|
+
waitForResultReceipt() {
|
|
199
|
+
if (this.resultTimer || !this.connected || !this.supported)
|
|
200
|
+
return;
|
|
201
|
+
this.resultTimer = setTimeout(() => {
|
|
202
|
+
this.resultTimer = undefined;
|
|
203
|
+
for (const entry of this.tasks.values()) {
|
|
204
|
+
if (entry.result && !entry.recoveryPaused) {
|
|
205
|
+
entry.needsRecovery = true;
|
|
206
|
+
entry.recovered = true;
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
this.pump();
|
|
210
|
+
}, RETRY_DELAY);
|
|
211
|
+
this.resultTimer.unref?.();
|
|
212
|
+
}
|
|
213
|
+
clearAcknowledgementTimer() {
|
|
214
|
+
if (this.acknowledgementTimer)
|
|
215
|
+
clearTimeout(this.acknowledgementTimer);
|
|
216
|
+
this.acknowledgementTimer = undefined;
|
|
217
|
+
}
|
|
218
|
+
clearTimers() {
|
|
219
|
+
this.clearAcknowledgementTimer();
|
|
220
|
+
if (this.retry)
|
|
221
|
+
clearTimeout(this.retry.timer);
|
|
222
|
+
this.retry = undefined;
|
|
223
|
+
if (this.resultTimer)
|
|
224
|
+
clearTimeout(this.resultTimer);
|
|
225
|
+
this.resultTimer = undefined;
|
|
226
|
+
}
|
|
227
|
+
prune() {
|
|
228
|
+
const completed = Array.from(this.tasks.entries()).filter(([, task]) => task.result)
|
|
229
|
+
.sort(([, left], [, right]) => left.result.finishedAt - right.result.finishedAt);
|
|
230
|
+
completed.forEach(([id, task], index) => {
|
|
231
|
+
if (Date.now() - task.result.finishedAt > RESULT_TTL || index < completed.length - MAX_RESULTS)
|
|
232
|
+
this.tasks.delete(id);
|
|
233
|
+
});
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
exports.TaskRecovery = TaskRecovery;
|
|
237
|
+
//# sourceMappingURL=TaskRecovery.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TaskRecovery.js","sourceRoot":"","sources":["../../src/client/TaskRecovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type RecoverableTask } from './TaskRecovery';
|
|
1
2
|
/**
|
|
2
3
|
* WebSocket client configuration
|
|
3
4
|
*/
|
|
@@ -30,6 +31,8 @@ export declare class WebSocketClient {
|
|
|
30
31
|
private heartbeatTimer;
|
|
31
32
|
private manualDisconnect;
|
|
32
33
|
private connected;
|
|
34
|
+
private lastReceivedAt;
|
|
35
|
+
private readonly taskRecovery;
|
|
33
36
|
private messageHandlers;
|
|
34
37
|
private errorHandlers;
|
|
35
38
|
private closeHandlers;
|
|
@@ -48,6 +51,9 @@ export declare class WebSocketClient {
|
|
|
48
51
|
* @param message Message object
|
|
49
52
|
*/
|
|
50
53
|
send(message: any): void;
|
|
54
|
+
trackTask(task: RecoverableTask): void;
|
|
55
|
+
hasPendingTaskResults(): boolean;
|
|
56
|
+
private sendRaw;
|
|
51
57
|
/**
|
|
52
58
|
* Check if connected
|
|
53
59
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSocketClient.d.ts","sourceRoot":"","sources":["../../src/client/WebSocketClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"WebSocketClient.d.ts","sourceRoot":"","sources":["../../src/client/WebSocketClient.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgB,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEpE;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,sDAAsD;IACtD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,uDAAuD;IACvD,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;GAGG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,EAAE,CAA0B;IACpC,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsD;IACnF,OAAO,CAAC,eAAe,CAAqC;IAC5D,OAAO,CAAC,aAAa,CAAqC;IAC1D,OAAO,CAAC,aAAa,CAAqD;IAC1E,OAAO,CAAC,eAAe,CAAyB;gBAEpC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,sBAA2B;IAOrF;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA8E9B;;OAEG;IACH,UAAU,IAAI,IAAI;IAmBlB;;;OAGG;IACH,IAAI,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI;IAIxB,SAAS,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI;IAItC,qBAAqB,IAAI,OAAO;IAIhC,OAAO,CAAC,OAAO;IAQf;;OAEG;IACH,WAAW,IAAI,OAAO;IAItB;;OAEG;IACH,SAAS,IAAI,gBAAgB;IAQ7B;;;OAGG;IACH,SAAS,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;IAIhD;;;OAGG;IACH,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAI9C;;;OAGG;IACH,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;IAI9D;;;OAGG;IACH,SAAS,CAAC,OAAO,EAAE,MAAM,IAAI,GAAG,IAAI;IAIpC;;;;OAIG;IACH,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,IAAI,GAAG,IAAI;IACjD,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,IAAI,GAAG,IAAI;IACpD,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IACzD,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;IAoB3D;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAexB;;OAEG;IACH,OAAO,CAAC,cAAc;IAgBtB;;OAEG;IACH,OAAO,CAAC,aAAa;IAOrB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAYzB;;OAEG;IACH,OAAO,CAAC,mBAAmB;CAM5B"}
|
|
@@ -7,6 +7,7 @@ exports.WebSocketClient = void 0;
|
|
|
7
7
|
const ws_1 = __importDefault(require("ws"));
|
|
8
8
|
const uuid_1 = require("uuid");
|
|
9
9
|
const types_1 = require("../types");
|
|
10
|
+
const TaskRecovery_1 = require("./TaskRecovery");
|
|
10
11
|
/**
|
|
11
12
|
* WebSocket Client
|
|
12
13
|
* Responsible for establishing and maintaining WebSocket connection with router server
|
|
@@ -21,6 +22,8 @@ class WebSocketClient {
|
|
|
21
22
|
heartbeatTimer = null;
|
|
22
23
|
manualDisconnect = false;
|
|
23
24
|
connected = false;
|
|
25
|
+
lastReceivedAt = 0;
|
|
26
|
+
taskRecovery = new TaskRecovery_1.TaskRecovery(message => this.sendRaw(message));
|
|
24
27
|
messageHandlers = [];
|
|
25
28
|
errorHandlers = [];
|
|
26
29
|
closeHandlers = [];
|
|
@@ -38,22 +41,31 @@ class WebSocketClient {
|
|
|
38
41
|
return new Promise((resolve, reject) => {
|
|
39
42
|
this.manualDisconnect = false;
|
|
40
43
|
try {
|
|
41
|
-
|
|
44
|
+
const socket = new ws_1.default(this.serverUrl, { handshakeTimeout: 15000 });
|
|
45
|
+
this.ws = socket;
|
|
42
46
|
const onOpen = () => {
|
|
47
|
+
if (this.ws !== socket)
|
|
48
|
+
return;
|
|
43
49
|
this.connected = true;
|
|
50
|
+
this.lastReceivedAt = Date.now();
|
|
44
51
|
this.startHeartbeat();
|
|
45
52
|
this.sendRegistration();
|
|
46
53
|
this.connectHandlers.forEach(handler => handler());
|
|
47
54
|
resolve();
|
|
48
55
|
};
|
|
49
56
|
const onError = (error) => {
|
|
57
|
+
if (this.ws !== socket)
|
|
58
|
+
return;
|
|
50
59
|
this.errorHandlers.forEach(handler => handler(error));
|
|
51
60
|
if (!this.connected) {
|
|
52
61
|
reject(error);
|
|
53
62
|
}
|
|
54
63
|
};
|
|
55
64
|
const onClose = (code, reason) => {
|
|
65
|
+
if (this.ws !== socket)
|
|
66
|
+
return;
|
|
56
67
|
this.connected = false;
|
|
68
|
+
this.taskRecovery.disconnected();
|
|
57
69
|
this.stopHeartbeat();
|
|
58
70
|
const reasonStr = reason.toString();
|
|
59
71
|
this.closeHandlers.forEach(handler => handler(code, reasonStr));
|
|
@@ -62,23 +74,25 @@ class WebSocketClient {
|
|
|
62
74
|
}
|
|
63
75
|
};
|
|
64
76
|
const onMessage = (data) => {
|
|
77
|
+
if (this.ws !== socket)
|
|
78
|
+
return;
|
|
65
79
|
try {
|
|
66
80
|
const message = JSON.parse(data.toString());
|
|
81
|
+
this.lastReceivedAt = Date.now();
|
|
82
|
+
if (message.type === 'binding_confirm' && message.data?.success === true) {
|
|
83
|
+
this.taskRecovery.registered(message.data?.capabilities?.taskRecovery === true);
|
|
84
|
+
}
|
|
85
|
+
if (message.type === 'task_resume_ack' || message.type === 'task_result_ack') {
|
|
86
|
+
this.taskRecovery.acknowledge(message);
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
67
89
|
// Stop reconnecting if the router rejects this CLI version
|
|
68
90
|
if (message.type === 'error' &&
|
|
69
91
|
message.data?.code === 'PROTOCOL_VERSION_INCOMPATIBLE') {
|
|
70
92
|
console.error(`\n[remote-cli] ${message.data.message}`);
|
|
71
|
-
console.error('[remote-cli]
|
|
93
|
+
console.error('[remote-cli] Reconnection paused until this process restarts with a compatible CLI version.\n');
|
|
72
94
|
this.manualDisconnect = true;
|
|
73
95
|
}
|
|
74
|
-
// Check for version mismatch on binding confirmation
|
|
75
|
-
if (message.type === 'binding_confirm' && message.data?.routerVersion) {
|
|
76
|
-
const routerVersion = message.data.routerVersion;
|
|
77
|
-
if (routerVersion !== types_1.CLI_VERSION) {
|
|
78
|
-
console.warn(`\n[remote-cli] ⚠️ Version mismatch: CLI ${types_1.CLI_VERSION} ↔ Router ${routerVersion}`);
|
|
79
|
-
console.warn('[remote-cli] Consider upgrading to the latest version for best compatibility.\n');
|
|
80
|
-
}
|
|
81
|
-
}
|
|
82
96
|
this.messageHandlers.forEach(handler => handler(message));
|
|
83
97
|
}
|
|
84
98
|
catch (error) {
|
|
@@ -103,6 +117,7 @@ class WebSocketClient {
|
|
|
103
117
|
this.connected = false;
|
|
104
118
|
this.stopHeartbeat();
|
|
105
119
|
this.clearReconnectTimer();
|
|
120
|
+
this.taskRecovery.destroy();
|
|
106
121
|
if (this.ws) {
|
|
107
122
|
this.ws.close();
|
|
108
123
|
this.ws = null;
|
|
@@ -118,6 +133,15 @@ class WebSocketClient {
|
|
|
118
133
|
* @param message Message object
|
|
119
134
|
*/
|
|
120
135
|
send(message) {
|
|
136
|
+
this.taskRecovery.send(message);
|
|
137
|
+
}
|
|
138
|
+
trackTask(task) {
|
|
139
|
+
this.taskRecovery.track(task);
|
|
140
|
+
}
|
|
141
|
+
hasPendingTaskResults() {
|
|
142
|
+
return this.taskRecovery.hasPendingResults();
|
|
143
|
+
}
|
|
144
|
+
sendRaw(message) {
|
|
121
145
|
if (!this.connected || !this.ws) {
|
|
122
146
|
throw new Error('Not connected to server');
|
|
123
147
|
}
|
|
@@ -197,7 +221,7 @@ class WebSocketClient {
|
|
|
197
221
|
data: {
|
|
198
222
|
deviceId: this.deviceId,
|
|
199
223
|
protocolVersion: types_1.PROTOCOL_VERSION,
|
|
200
|
-
capabilities: { queueStarted: true },
|
|
224
|
+
capabilities: { queueStarted: true, taskRecovery: true, approvalCards: true },
|
|
201
225
|
}
|
|
202
226
|
}));
|
|
203
227
|
}
|
|
@@ -209,6 +233,10 @@ class WebSocketClient {
|
|
|
209
233
|
this.stopHeartbeat();
|
|
210
234
|
this.heartbeatTimer = setInterval(() => {
|
|
211
235
|
if (this.ws && this.connected) {
|
|
236
|
+
if (Date.now() - this.lastReceivedAt >= this.heartbeatInterval * 3) {
|
|
237
|
+
this.ws.terminate();
|
|
238
|
+
return;
|
|
239
|
+
}
|
|
212
240
|
this.ws.send(JSON.stringify({
|
|
213
241
|
type: 'heartbeat',
|
|
214
242
|
timestamp: Date.now()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSocketClient.js","sourceRoot":"","sources":["../../src/client/WebSocketClient.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA2B;AAC3B,+BAAoC;AACpC,oCAAyD;
|
|
1
|
+
{"version":3,"file":"WebSocketClient.js","sourceRoot":"","sources":["../../src/client/WebSocketClient.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/start.d.ts
CHANGED
|
@@ -7,7 +7,7 @@ export { isNewerVersion } from '../utils/version';
|
|
|
7
7
|
export interface StartCommandOptions {
|
|
8
8
|
/** Run as daemon */
|
|
9
9
|
daemon?: boolean;
|
|
10
|
-
/**
|
|
10
|
+
/** Exit after automatic updates so a process supervisor can restart the CLI. */
|
|
11
11
|
nonInteractive?: boolean;
|
|
12
12
|
}
|
|
13
13
|
/**
|
|
@@ -24,16 +24,8 @@ export interface StartCommandResult {
|
|
|
24
24
|
* knows why commands will fail before the first Feishu message arrives.
|
|
25
25
|
*/
|
|
26
26
|
export declare function checkBackendAvailability(type: string, spinner: Ora, executorConfig?: ExecutorConfig): Promise<void>;
|
|
27
|
-
/**
|
|
28
|
-
|
|
29
|
-
*/
|
|
30
|
-
export declare function promptYesNo(question: string): Promise<boolean>;
|
|
31
|
-
/**
|
|
32
|
-
* Query the router's /api/version endpoint and, if the router is newer than
|
|
33
|
-
* the local CLI, prompt the user whether to continue or abort.
|
|
34
|
-
* Returns false if the user chooses to abort.
|
|
35
|
-
*/
|
|
36
|
-
export declare function checkServerVersion(serverUrl: string, spinner?: Ora, nonInteractive?: boolean): Promise<boolean>;
|
|
27
|
+
/** Read the Router package version without requiring interactive input. */
|
|
28
|
+
export declare function getServerVersion(serverUrl: string): Promise<string | undefined>;
|
|
37
29
|
/**
|
|
38
30
|
* Start the remote CLI service
|
|
39
31
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGtD,OAAY,EAAE,KAAK,GAAG,EAAE,MAAM,KAAK,CAAC;AAKpC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,oBAAoB;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,gFAAgF;IAChF,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAgDzH;AAED,2EAA2E;AAC3E,wBAAsB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAcrF;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,kBAAkB,CAAC,CAiL7B"}
|