pi-x-ide 1.5.0 → 1.6.0
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/package.json +1 -1
- package/dist/src/pi/connection.d.ts +6 -1
- package/dist/src/pi/connection.js +30 -5
- package/dist/src/pi/connection.js.map +1 -1
- package/dist/src/pi/index.js +28 -8
- package/dist/src/pi/index.js.map +1 -1
- package/dist/src/pi/reconnect.d.ts +6 -0
- package/dist/src/pi/reconnect.js +30 -0
- package/dist/src/pi/reconnect.js.map +1 -0
- package/dist/src/pi/state.d.ts +2 -0
- package/dist/src/pi/state.js +1 -0
- package/dist/src/pi/state.js.map +1 -1
- package/dist/test/connection.test.d.ts +1 -0
- package/dist/test/connection.test.js +78 -0
- package/dist/test/connection.test.js.map +1 -0
- package/package.json +1 -1
- package/src/pi/connection.ts +24 -3
- package/src/pi/index.ts +41 -11
- package/src/pi/reconnect.ts +33 -0
- package/src/pi/state.ts +3 -0
package/dist/package.json
CHANGED
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
import { type AtMentionedParams, type EditorSelectionSnapshot, type LockFileCandidate, type SelectionClearedParams } from "../shared/protocol";
|
|
2
|
+
export declare const IDE_CONNECT_TIMEOUT_MS = 5000;
|
|
3
|
+
export declare class IdeConnectionTimeoutError extends Error {
|
|
4
|
+
readonly candidate: LockFileCandidate;
|
|
5
|
+
constructor(candidate: LockFileCandidate);
|
|
6
|
+
}
|
|
2
7
|
export interface IdeConnectionCallbacks {
|
|
3
8
|
onConnected?: (server: {
|
|
4
9
|
name: string;
|
|
@@ -20,7 +25,7 @@ export declare class IdeConnection {
|
|
|
20
25
|
private closedByUser;
|
|
21
26
|
constructor(candidate: LockFileCandidate, cwd: string, callbacks: IdeConnectionCallbacks);
|
|
22
27
|
get isOpen(): boolean;
|
|
23
|
-
connect(): Promise<void>;
|
|
28
|
+
connect(timeoutMs?: number): Promise<void>;
|
|
24
29
|
disconnect(): void;
|
|
25
30
|
private sendInitialize;
|
|
26
31
|
private handleMessage;
|
|
@@ -3,11 +3,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.IdeConnection = void 0;
|
|
6
|
+
exports.IdeConnection = exports.IdeConnectionTimeoutError = exports.IDE_CONNECT_TIMEOUT_MS = void 0;
|
|
7
7
|
const ws_1 = __importDefault(require("ws"));
|
|
8
8
|
const protocol_1 = require("../shared/protocol");
|
|
9
9
|
const schema_1 = require("../shared/schema");
|
|
10
10
|
const ws_2 = require("../shared/ws");
|
|
11
|
+
exports.IDE_CONNECT_TIMEOUT_MS = 5_000;
|
|
12
|
+
class IdeConnectionTimeoutError extends Error {
|
|
13
|
+
candidate;
|
|
14
|
+
constructor(candidate) {
|
|
15
|
+
super(`Timed out connecting to ${candidate.lock.name} at ${candidate.lock.host}:${candidate.lock.port}`);
|
|
16
|
+
this.candidate = candidate;
|
|
17
|
+
this.name = "IdeConnectionTimeoutError";
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
exports.IdeConnectionTimeoutError = IdeConnectionTimeoutError;
|
|
11
21
|
class IdeConnection {
|
|
12
22
|
candidate;
|
|
13
23
|
cwd;
|
|
@@ -23,10 +33,11 @@ class IdeConnection {
|
|
|
23
33
|
get isOpen() {
|
|
24
34
|
return this.socket?.readyState === ws_1.default.OPEN;
|
|
25
35
|
}
|
|
26
|
-
async connect() {
|
|
36
|
+
async connect(timeoutMs = exports.IDE_CONNECT_TIMEOUT_MS) {
|
|
27
37
|
this.closedByUser = false;
|
|
28
38
|
const { lock } = this.candidate;
|
|
29
39
|
const socket = new ws_1.default(`ws://${lock.host}:${lock.port}`, {
|
|
40
|
+
handshakeTimeout: timeoutMs + 1_000,
|
|
30
41
|
headers: {
|
|
31
42
|
[protocol_1.AUTH_HEADER]: lock.authToken,
|
|
32
43
|
},
|
|
@@ -34,12 +45,23 @@ class IdeConnection {
|
|
|
34
45
|
this.socket = socket;
|
|
35
46
|
socket.on("message", (raw) => this.handleMessage((0, ws_2.decodeRawData)(raw)));
|
|
36
47
|
socket.on("close", (_code, reason) => {
|
|
37
|
-
if (this.socket
|
|
38
|
-
|
|
48
|
+
if (this.socket !== socket)
|
|
49
|
+
return;
|
|
50
|
+
this.socket = undefined;
|
|
39
51
|
this.callbacks.onDisconnected?.(reason.toString("utf8") || (this.closedByUser ? "closed" : "disconnected"));
|
|
40
52
|
});
|
|
41
|
-
socket.on("error", (error) =>
|
|
53
|
+
socket.on("error", (error) => {
|
|
54
|
+
if (this.socket === socket)
|
|
55
|
+
this.callbacks.onError?.(error);
|
|
56
|
+
});
|
|
42
57
|
await new Promise((resolve, reject) => {
|
|
58
|
+
const timeout = setTimeout(() => {
|
|
59
|
+
cleanup();
|
|
60
|
+
if (this.socket === socket)
|
|
61
|
+
this.socket = undefined;
|
|
62
|
+
socket.terminate();
|
|
63
|
+
reject(new IdeConnectionTimeoutError(this.candidate));
|
|
64
|
+
}, timeoutMs);
|
|
43
65
|
const onOpen = () => {
|
|
44
66
|
cleanup();
|
|
45
67
|
this.sendInitialize();
|
|
@@ -47,9 +69,12 @@ class IdeConnection {
|
|
|
47
69
|
};
|
|
48
70
|
const onError = (error) => {
|
|
49
71
|
cleanup();
|
|
72
|
+
if (this.socket === socket)
|
|
73
|
+
this.socket = undefined;
|
|
50
74
|
reject(error);
|
|
51
75
|
};
|
|
52
76
|
const cleanup = () => {
|
|
77
|
+
clearTimeout(timeout);
|
|
53
78
|
socket.off("open", onOpen);
|
|
54
79
|
socket.off("error", onError);
|
|
55
80
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/pi/connection.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA2B;AAC3B,iDAS4B;AAC5B,6CAA2G;AAC3G,qCAA6C;
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/pi/connection.ts"],"names":[],"mappings":"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"}
|
package/dist/src/pi/index.js
CHANGED
|
@@ -8,12 +8,16 @@ const connection_1 = require("./connection");
|
|
|
8
8
|
const install_1 = require("./install");
|
|
9
9
|
const commands_1 = require("./commands");
|
|
10
10
|
const context_1 = require("./context");
|
|
11
|
+
const reconnect_1 = require("./reconnect");
|
|
11
12
|
const state_1 = require("./state");
|
|
12
13
|
const ui_1 = require("./ui");
|
|
13
14
|
const zed_1 = require("./zed");
|
|
14
15
|
const RECONNECT_DELAY_MS = 2_000;
|
|
15
16
|
const INSTALL_RECONNECT_RETRY_MS = 1_500;
|
|
16
17
|
const INSTALL_RECONNECT_TIMEOUT_MS = 15_000;
|
|
18
|
+
function formatConnectTimeoutMessage(error) {
|
|
19
|
+
return `${error.message}.`;
|
|
20
|
+
}
|
|
17
21
|
function default_1(pi) {
|
|
18
22
|
const runtime = (0, state_1.createRuntime)();
|
|
19
23
|
(0, context_1.registerContextHandlers)(pi, runtime);
|
|
@@ -180,17 +184,19 @@ async function refreshCandidates(runtime, ctx) {
|
|
|
180
184
|
runtime.candidates = await (0, discovery_1.discoverIdeCandidates)({ cwd: ctx.cwd });
|
|
181
185
|
return runtime.candidates;
|
|
182
186
|
}
|
|
183
|
-
async function connectAutoWithZedFallback(runtime, ctx, generation = runtime.sessionGeneration) {
|
|
184
|
-
await connectAuto(runtime, ctx);
|
|
187
|
+
async function connectAutoWithZedFallback(runtime, ctx, generation = runtime.sessionGeneration, options = {}) {
|
|
188
|
+
await connectAuto(runtime, ctx, options);
|
|
185
189
|
if (runtime.connectionStatus !== "connected") {
|
|
186
190
|
(0, zed_1.startZedPolling)(runtime, ctx, { generation });
|
|
187
191
|
}
|
|
188
192
|
}
|
|
189
|
-
async function connectAuto(runtime, ctx) {
|
|
193
|
+
async function connectAuto(runtime, ctx, options = {}) {
|
|
190
194
|
runtime.enabled = true;
|
|
191
195
|
const candidates = await refreshCandidates(runtime, ctx);
|
|
192
196
|
const candidate = candidates.find((candidate) => isAutoConnectCandidate(candidate, ctx.cwd));
|
|
193
197
|
if (!candidate) {
|
|
198
|
+
if (options.resetReconnectState !== false)
|
|
199
|
+
(0, reconnect_1.resetReconnectState)(runtime);
|
|
194
200
|
runtime.connectionStatus = "disconnected";
|
|
195
201
|
runtime.connectionMessage =
|
|
196
202
|
candidates.length > 0
|
|
@@ -201,12 +207,14 @@ async function connectAuto(runtime, ctx) {
|
|
|
201
207
|
(0, ui_1.updateIdeUi)(runtime, ctx);
|
|
202
208
|
return;
|
|
203
209
|
}
|
|
204
|
-
await connectCandidate(runtime, candidate, ctx);
|
|
210
|
+
await connectCandidate(runtime, candidate, ctx, options);
|
|
205
211
|
}
|
|
206
212
|
function isAutoConnectCandidate(candidate, cwd) {
|
|
207
213
|
return (0, paths_1.hasDirectWorkspaceMatch)(candidate.lock.workspaceFolders, cwd);
|
|
208
214
|
}
|
|
209
|
-
async function connectCandidate(runtime, candidate, ctx) {
|
|
215
|
+
async function connectCandidate(runtime, candidate, ctx, options = {}) {
|
|
216
|
+
if (options.resetReconnectState !== false)
|
|
217
|
+
(0, reconnect_1.resetReconnectState)(runtime);
|
|
210
218
|
runtime.ctx = ctx;
|
|
211
219
|
runtime.cwd = ctx.cwd;
|
|
212
220
|
runtime.enabled = true;
|
|
@@ -231,6 +239,7 @@ async function connectCandidate(runtime, candidate, ctx) {
|
|
|
231
239
|
if (runtime.connection === connection && runtime.connectionStatus === "connecting") {
|
|
232
240
|
runtime.connectionStatus = "connected";
|
|
233
241
|
runtime.connectionMessage = undefined;
|
|
242
|
+
(0, reconnect_1.resetReconnectState)(runtime);
|
|
234
243
|
(0, ui_1.updateIdeUi)(runtime, ctx);
|
|
235
244
|
}
|
|
236
245
|
}
|
|
@@ -238,9 +247,11 @@ async function connectCandidate(runtime, candidate, ctx) {
|
|
|
238
247
|
if (runtime.connection === connection) {
|
|
239
248
|
runtime.connection = undefined;
|
|
240
249
|
runtime.connectionStatus = "error";
|
|
241
|
-
runtime.connectionMessage =
|
|
250
|
+
runtime.connectionMessage =
|
|
251
|
+
error instanceof connection_1.IdeConnectionTimeoutError ? formatConnectTimeoutMessage(error) : errorMessage(error);
|
|
242
252
|
(0, ui_1.updateIdeUi)(runtime, ctx);
|
|
243
|
-
|
|
253
|
+
if (!(error instanceof connection_1.IdeConnectionTimeoutError))
|
|
254
|
+
scheduleReconnect(runtime);
|
|
244
255
|
}
|
|
245
256
|
}
|
|
246
257
|
}
|
|
@@ -252,6 +263,7 @@ function createConnectionCallbacks(runtime, getConnection) {
|
|
|
252
263
|
runtime.connectedServer = server;
|
|
253
264
|
runtime.connectionStatus = "connected";
|
|
254
265
|
runtime.connectionMessage = undefined;
|
|
266
|
+
(0, reconnect_1.resetReconnectState)(runtime);
|
|
255
267
|
(0, ui_1.updateIdeUi)(runtime);
|
|
256
268
|
},
|
|
257
269
|
onDisconnected: (reason) => {
|
|
@@ -301,6 +313,7 @@ function disconnect(runtime, ctx, disabled = false) {
|
|
|
301
313
|
const connection = runtime.connection;
|
|
302
314
|
runtime.connection = undefined;
|
|
303
315
|
connection?.disconnect();
|
|
316
|
+
(0, reconnect_1.resetReconnectState)(runtime);
|
|
304
317
|
runtime.enabled = !disabled;
|
|
305
318
|
runtime.connectedServer = undefined;
|
|
306
319
|
runtime.connectionStatus = disabled ? "disabled" : "disconnected";
|
|
@@ -316,12 +329,19 @@ function disconnect(runtime, ctx, disabled = false) {
|
|
|
316
329
|
function scheduleReconnect(runtime) {
|
|
317
330
|
if (runtime.reconnectTimer || !runtime.enabled)
|
|
318
331
|
return;
|
|
332
|
+
const attempt = (0, reconnect_1.recordReconnectAttempt)(runtime, runtime.currentCandidate);
|
|
333
|
+
if (attempt === undefined) {
|
|
334
|
+
runtime.connectionStatus = "error";
|
|
335
|
+
runtime.connectionMessage = (0, reconnect_1.formatReconnectLimitMessage)(runtime.currentCandidate);
|
|
336
|
+
(0, ui_1.updateIdeUi)(runtime);
|
|
337
|
+
return;
|
|
338
|
+
}
|
|
319
339
|
runtime.reconnectTimer = setTimeout(() => {
|
|
320
340
|
runtime.reconnectTimer = undefined;
|
|
321
341
|
const ctx = runtime.ctx;
|
|
322
342
|
if (!ctx || !runtime.enabled)
|
|
323
343
|
return;
|
|
324
|
-
connectAutoWithZedFallback(runtime, ctx).catch((error) => {
|
|
344
|
+
connectAutoWithZedFallback(runtime, ctx, runtime.sessionGeneration, { resetReconnectState: false }).catch((error) => {
|
|
325
345
|
runtime.connectionStatus = "error";
|
|
326
346
|
runtime.connectionMessage = error instanceof Error ? error.message : String(error);
|
|
327
347
|
(0, ui_1.updateIdeUi)(runtime);
|
package/dist/src/pi/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/pi/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/pi/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { LockFileCandidate } from "../shared/protocol";
|
|
2
|
+
import type { PiIdeRuntime } from "./state";
|
|
3
|
+
export declare const MAX_RECONNECT_ATTEMPTS = 3;
|
|
4
|
+
export declare function resetReconnectState(runtime: PiIdeRuntime): void;
|
|
5
|
+
export declare function recordReconnectAttempt(runtime: PiIdeRuntime, candidate: LockFileCandidate | undefined): number | undefined;
|
|
6
|
+
export declare function formatReconnectLimitMessage(candidate: LockFileCandidate | undefined): string;
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MAX_RECONNECT_ATTEMPTS = void 0;
|
|
4
|
+
exports.resetReconnectState = resetReconnectState;
|
|
5
|
+
exports.recordReconnectAttempt = recordReconnectAttempt;
|
|
6
|
+
exports.formatReconnectLimitMessage = formatReconnectLimitMessage;
|
|
7
|
+
exports.MAX_RECONNECT_ATTEMPTS = 3;
|
|
8
|
+
function resetReconnectState(runtime) {
|
|
9
|
+
runtime.reconnectAttempts = 0;
|
|
10
|
+
runtime.reconnectCandidateKey = undefined;
|
|
11
|
+
}
|
|
12
|
+
function recordReconnectAttempt(runtime, candidate) {
|
|
13
|
+
const key = candidate ? reconnectCandidateKey(candidate) : undefined;
|
|
14
|
+
if (runtime.reconnectCandidateKey !== key) {
|
|
15
|
+
runtime.reconnectCandidateKey = key;
|
|
16
|
+
runtime.reconnectAttempts = 0;
|
|
17
|
+
}
|
|
18
|
+
if (runtime.reconnectAttempts >= exports.MAX_RECONNECT_ATTEMPTS)
|
|
19
|
+
return undefined;
|
|
20
|
+
runtime.reconnectAttempts += 1;
|
|
21
|
+
return runtime.reconnectAttempts;
|
|
22
|
+
}
|
|
23
|
+
function formatReconnectLimitMessage(candidate) {
|
|
24
|
+
const target = candidate ? `${candidate.lock.name} at ${candidate.lock.host}:${candidate.lock.port}` : "IDE";
|
|
25
|
+
return `Stopped reconnecting to ${target} after ${exports.MAX_RECONNECT_ATTEMPTS} attempts.`;
|
|
26
|
+
}
|
|
27
|
+
function reconnectCandidateKey(candidate) {
|
|
28
|
+
return `${candidate.path}:${candidate.lock.host}:${candidate.lock.port}:${candidate.mtimeMs}`;
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=reconnect.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reconnect.js","sourceRoot":"","sources":["../../../src/pi/reconnect.ts"],"names":[],"mappings":";;;AAKA,kDAGC;AAED,wDAaC;AAED,kEAGC;AAzBY,QAAA,sBAAsB,GAAG,CAAC,CAAC;AAExC,SAAgB,mBAAmB,CAAC,OAAqB;IACvD,OAAO,CAAC,iBAAiB,GAAG,CAAC,CAAC;IAC9B,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;AAC5C,CAAC;AAED,SAAgB,sBAAsB,CACpC,OAAqB,EACrB,SAAwC;IAExC,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACrE,IAAI,OAAO,CAAC,qBAAqB,KAAK,GAAG,EAAE,CAAC;QAC1C,OAAO,CAAC,qBAAqB,GAAG,GAAG,CAAC;QACpC,OAAO,CAAC,iBAAiB,GAAG,CAAC,CAAC;IAChC,CAAC;IAED,IAAI,OAAO,CAAC,iBAAiB,IAAI,8BAAsB;QAAE,OAAO,SAAS,CAAC;IAC1E,OAAO,CAAC,iBAAiB,IAAI,CAAC,CAAC;IAC/B,OAAO,OAAO,CAAC,iBAAiB,CAAC;AACnC,CAAC;AAED,SAAgB,2BAA2B,CAAC,SAAwC;IAClF,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,OAAO,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;IAC7G,OAAO,2BAA2B,MAAM,UAAU,8BAAsB,YAAY,CAAC;AACvF,CAAC;AAED,SAAS,qBAAqB,CAAC,SAA4B;IACzD,OAAO,GAAG,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;AAChG,CAAC"}
|
package/dist/src/pi/state.d.ts
CHANGED
|
@@ -20,6 +20,8 @@ export interface PiIdeRuntime {
|
|
|
20
20
|
attachState: AttachState;
|
|
21
21
|
turnSelection?: EditorSelectionSnapshot;
|
|
22
22
|
reconnectTimer?: NodeJS.Timeout;
|
|
23
|
+
reconnectAttempts: number;
|
|
24
|
+
reconnectCandidateKey?: string;
|
|
23
25
|
zedPollTimer?: NodeJS.Timeout;
|
|
24
26
|
zedPollSelectionKey?: string;
|
|
25
27
|
zedPollWalMtimeMs?: number;
|
package/dist/src/pi/state.js
CHANGED
package/dist/src/pi/state.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../src/pi/state.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../src/pi/state.ts"],"names":[],"mappings":";;AA4BA,sCAUC;AAVD,SAAgB,aAAa;IAC3B,OAAO;QACL,OAAO,EAAE,IAAI;QACb,UAAU,EAAE,EAAE;QACd,gBAAgB,EAAE,MAAM;QACxB,WAAW,EAAE,MAAM;QACnB,iBAAiB,EAAE,CAAC;QACpB,gBAAgB,EAAE,IAAI,GAAG,EAAU;QACnC,iBAAiB,EAAE,CAAC;KACrB,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const strict_1 = __importDefault(require("node:assert/strict"));
|
|
7
|
+
const node_net_1 = require("node:net");
|
|
8
|
+
const node_test_1 = __importDefault(require("node:test"));
|
|
9
|
+
const connection_1 = require("../src/pi/connection");
|
|
10
|
+
const reconnect_1 = require("../src/pi/reconnect");
|
|
11
|
+
const state_1 = require("../src/pi/state");
|
|
12
|
+
void (0, node_test_1.default)("caps reconnect attempts at three per candidate", () => {
|
|
13
|
+
const runtime = (0, state_1.createRuntime)();
|
|
14
|
+
const candidate = createCandidate({ port: 41001 });
|
|
15
|
+
strict_1.default.equal((0, reconnect_1.recordReconnectAttempt)(runtime, candidate), 1);
|
|
16
|
+
strict_1.default.equal((0, reconnect_1.recordReconnectAttempt)(runtime, candidate), 2);
|
|
17
|
+
strict_1.default.equal((0, reconnect_1.recordReconnectAttempt)(runtime, candidate), reconnect_1.MAX_RECONNECT_ATTEMPTS);
|
|
18
|
+
strict_1.default.equal((0, reconnect_1.recordReconnectAttempt)(runtime, candidate), undefined);
|
|
19
|
+
strict_1.default.match((0, reconnect_1.formatReconnectLimitMessage)(candidate), /after 3 attempts/);
|
|
20
|
+
strict_1.default.match((0, reconnect_1.formatReconnectLimitMessage)(candidate), /\/ide/);
|
|
21
|
+
const nextCandidate = createCandidate({ port: 41002 });
|
|
22
|
+
strict_1.default.equal((0, reconnect_1.recordReconnectAttempt)(runtime, nextCandidate), 1);
|
|
23
|
+
(0, reconnect_1.resetReconnectState)(runtime);
|
|
24
|
+
strict_1.default.equal((0, reconnect_1.recordReconnectAttempt)(runtime, candidate), 1);
|
|
25
|
+
});
|
|
26
|
+
void (0, node_test_1.default)("times out stalled websocket handshakes", async () => {
|
|
27
|
+
const sockets = new Set();
|
|
28
|
+
const server = (0, node_net_1.createServer)((socket) => {
|
|
29
|
+
sockets.add(socket);
|
|
30
|
+
socket.on("close", () => sockets.delete(socket));
|
|
31
|
+
socket.on("data", () => {
|
|
32
|
+
// Keep the TCP connection open but never send an HTTP/WebSocket handshake response.
|
|
33
|
+
});
|
|
34
|
+
});
|
|
35
|
+
await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve));
|
|
36
|
+
try {
|
|
37
|
+
const address = server.address();
|
|
38
|
+
const candidate = createCandidate({ port: address.port });
|
|
39
|
+
let disconnects = 0;
|
|
40
|
+
const connection = new connection_1.IdeConnection(candidate, "/repo", {
|
|
41
|
+
onDisconnected: () => {
|
|
42
|
+
disconnects += 1;
|
|
43
|
+
},
|
|
44
|
+
});
|
|
45
|
+
await strict_1.default.rejects(() => connection.connect(100), (error) => error instanceof connection_1.IdeConnectionTimeoutError && /timed out/i.test(error.message));
|
|
46
|
+
strict_1.default.equal(connection.isOpen, false);
|
|
47
|
+
strict_1.default.equal(disconnects, 0);
|
|
48
|
+
}
|
|
49
|
+
finally {
|
|
50
|
+
for (const socket of sockets)
|
|
51
|
+
socket.destroy();
|
|
52
|
+
await new Promise((resolve, reject) => {
|
|
53
|
+
server.close((error) => (error ? reject(error) : resolve()));
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
});
|
|
57
|
+
function createCandidate(overrides = {}) {
|
|
58
|
+
return {
|
|
59
|
+
path: "/tmp/pi-x-ide-stalled.lock",
|
|
60
|
+
mtimeMs: Date.now(),
|
|
61
|
+
matchLength: 1,
|
|
62
|
+
workspaceFolder: "/repo",
|
|
63
|
+
lock: {
|
|
64
|
+
version: 1,
|
|
65
|
+
ide: "nvim",
|
|
66
|
+
name: "Neovim",
|
|
67
|
+
transport: "ws",
|
|
68
|
+
host: "127.0.0.1",
|
|
69
|
+
port: 41000,
|
|
70
|
+
authToken: "token",
|
|
71
|
+
workspaceFolders: ["/repo"],
|
|
72
|
+
createdAt: new Date().toISOString(),
|
|
73
|
+
updatedAt: new Date().toISOString(),
|
|
74
|
+
...overrides,
|
|
75
|
+
},
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
//# sourceMappingURL=connection.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connection.test.js","sourceRoot":"","sources":["../../test/connection.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/pi/connection.ts
CHANGED
|
@@ -12,6 +12,15 @@ import {
|
|
|
12
12
|
import { isAtMentionedParams, isSelectionChangedParams, isSelectionClearedParams } from "../shared/schema";
|
|
13
13
|
import { decodeRawData } from "../shared/ws";
|
|
14
14
|
|
|
15
|
+
export const IDE_CONNECT_TIMEOUT_MS = 5_000;
|
|
16
|
+
|
|
17
|
+
export class IdeConnectionTimeoutError extends Error {
|
|
18
|
+
constructor(readonly candidate: LockFileCandidate) {
|
|
19
|
+
super(`Timed out connecting to ${candidate.lock.name} at ${candidate.lock.host}:${candidate.lock.port}`);
|
|
20
|
+
this.name = "IdeConnectionTimeoutError";
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
|
|
15
24
|
export interface IdeConnectionCallbacks {
|
|
16
25
|
onConnected?: (server: { name: string; version?: string; ide?: string }) => void;
|
|
17
26
|
onDisconnected?: (reason: string) => void;
|
|
@@ -36,10 +45,11 @@ export class IdeConnection {
|
|
|
36
45
|
return this.socket?.readyState === WebSocket.OPEN;
|
|
37
46
|
}
|
|
38
47
|
|
|
39
|
-
async connect(): Promise<void> {
|
|
48
|
+
async connect(timeoutMs = IDE_CONNECT_TIMEOUT_MS): Promise<void> {
|
|
40
49
|
this.closedByUser = false;
|
|
41
50
|
const { lock } = this.candidate;
|
|
42
51
|
const socket = new WebSocket(`ws://${lock.host}:${lock.port}`, {
|
|
52
|
+
handshakeTimeout: timeoutMs + 1_000,
|
|
43
53
|
headers: {
|
|
44
54
|
[AUTH_HEADER]: lock.authToken,
|
|
45
55
|
},
|
|
@@ -48,12 +58,21 @@ export class IdeConnection {
|
|
|
48
58
|
|
|
49
59
|
socket.on("message", (raw) => this.handleMessage(decodeRawData(raw)));
|
|
50
60
|
socket.on("close", (_code, reason) => {
|
|
51
|
-
if (this.socket
|
|
61
|
+
if (this.socket !== socket) return;
|
|
62
|
+
this.socket = undefined;
|
|
52
63
|
this.callbacks.onDisconnected?.(reason.toString("utf8") || (this.closedByUser ? "closed" : "disconnected"));
|
|
53
64
|
});
|
|
54
|
-
socket.on("error", (error) =>
|
|
65
|
+
socket.on("error", (error) => {
|
|
66
|
+
if (this.socket === socket) this.callbacks.onError?.(error);
|
|
67
|
+
});
|
|
55
68
|
|
|
56
69
|
await new Promise<void>((resolve, reject) => {
|
|
70
|
+
const timeout = setTimeout(() => {
|
|
71
|
+
cleanup();
|
|
72
|
+
if (this.socket === socket) this.socket = undefined;
|
|
73
|
+
socket.terminate();
|
|
74
|
+
reject(new IdeConnectionTimeoutError(this.candidate));
|
|
75
|
+
}, timeoutMs);
|
|
57
76
|
const onOpen = () => {
|
|
58
77
|
cleanup();
|
|
59
78
|
this.sendInitialize();
|
|
@@ -61,9 +80,11 @@ export class IdeConnection {
|
|
|
61
80
|
};
|
|
62
81
|
const onError = (error: Error) => {
|
|
63
82
|
cleanup();
|
|
83
|
+
if (this.socket === socket) this.socket = undefined;
|
|
64
84
|
reject(error);
|
|
65
85
|
};
|
|
66
86
|
const cleanup = () => {
|
|
87
|
+
clearTimeout(timeout);
|
|
67
88
|
socket.off("open", onOpen);
|
|
68
89
|
socket.off("error", onError);
|
|
69
90
|
};
|
package/src/pi/index.ts
CHANGED
|
@@ -5,7 +5,7 @@ import { formatRangeMention } from "../shared/format";
|
|
|
5
5
|
import { hasDirectWorkspaceMatch } from "../shared/paths";
|
|
6
6
|
import type { AtMentionedParams, LockFileCandidate } from "../shared/protocol";
|
|
7
7
|
import { discoverIdeCandidates } from "./discovery";
|
|
8
|
-
import { IdeConnection, type IdeConnectionCallbacks } from "./connection";
|
|
8
|
+
import { IdeConnection, IdeConnectionTimeoutError, type IdeConnectionCallbacks } from "./connection";
|
|
9
9
|
import {
|
|
10
10
|
discoverInstallCandidates,
|
|
11
11
|
installIdeExtension,
|
|
@@ -15,6 +15,7 @@ import {
|
|
|
15
15
|
} from "./install";
|
|
16
16
|
import { registerIdeCommand } from "./commands";
|
|
17
17
|
import { clearLatestSelection, registerContextHandlers, setLatestSelection } from "./context";
|
|
18
|
+
import { formatReconnectLimitMessage, recordReconnectAttempt, resetReconnectState } from "./reconnect";
|
|
18
19
|
import { createRuntime, type PiIdeRuntime } from "./state";
|
|
19
20
|
import { clearIdeUi, updateIdeUi } from "./ui";
|
|
20
21
|
import { startZedPolling, stopZedPolling } from "./zed";
|
|
@@ -23,6 +24,14 @@ const RECONNECT_DELAY_MS = 2_000;
|
|
|
23
24
|
const INSTALL_RECONNECT_RETRY_MS = 1_500;
|
|
24
25
|
const INSTALL_RECONNECT_TIMEOUT_MS = 15_000;
|
|
25
26
|
|
|
27
|
+
interface ConnectOptions {
|
|
28
|
+
resetReconnectState?: boolean;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
function formatConnectTimeoutMessage(error: IdeConnectionTimeoutError): string {
|
|
32
|
+
return `${error.message}.`;
|
|
33
|
+
}
|
|
34
|
+
|
|
26
35
|
export default function (pi: ExtensionAPI): void {
|
|
27
36
|
const runtime = createRuntime();
|
|
28
37
|
|
|
@@ -245,18 +254,24 @@ async function connectAutoWithZedFallback(
|
|
|
245
254
|
runtime: PiIdeRuntime,
|
|
246
255
|
ctx: ExtensionContext | ExtensionCommandContext,
|
|
247
256
|
generation = runtime.sessionGeneration,
|
|
257
|
+
options: ConnectOptions = {},
|
|
248
258
|
): Promise<void> {
|
|
249
|
-
await connectAuto(runtime, ctx);
|
|
259
|
+
await connectAuto(runtime, ctx, options);
|
|
250
260
|
if (runtime.connectionStatus !== "connected") {
|
|
251
261
|
startZedPolling(runtime, ctx, { generation });
|
|
252
262
|
}
|
|
253
263
|
}
|
|
254
264
|
|
|
255
|
-
async function connectAuto(
|
|
265
|
+
async function connectAuto(
|
|
266
|
+
runtime: PiIdeRuntime,
|
|
267
|
+
ctx: ExtensionContext | ExtensionCommandContext,
|
|
268
|
+
options: ConnectOptions = {},
|
|
269
|
+
): Promise<void> {
|
|
256
270
|
runtime.enabled = true;
|
|
257
271
|
const candidates = await refreshCandidates(runtime, ctx);
|
|
258
272
|
const candidate = candidates.find((candidate) => isAutoConnectCandidate(candidate, ctx.cwd));
|
|
259
273
|
if (!candidate) {
|
|
274
|
+
if (options.resetReconnectState !== false) resetReconnectState(runtime);
|
|
260
275
|
runtime.connectionStatus = "disconnected";
|
|
261
276
|
runtime.connectionMessage =
|
|
262
277
|
candidates.length > 0
|
|
@@ -267,7 +282,7 @@ async function connectAuto(runtime: PiIdeRuntime, ctx: ExtensionContext | Extens
|
|
|
267
282
|
updateIdeUi(runtime, ctx);
|
|
268
283
|
return;
|
|
269
284
|
}
|
|
270
|
-
await connectCandidate(runtime, candidate, ctx);
|
|
285
|
+
await connectCandidate(runtime, candidate, ctx, options);
|
|
271
286
|
}
|
|
272
287
|
|
|
273
288
|
function isAutoConnectCandidate(candidate: LockFileCandidate, cwd: string): boolean {
|
|
@@ -278,7 +293,9 @@ async function connectCandidate(
|
|
|
278
293
|
runtime: PiIdeRuntime,
|
|
279
294
|
candidate: LockFileCandidate,
|
|
280
295
|
ctx: ExtensionContext | ExtensionCommandContext,
|
|
296
|
+
options: ConnectOptions = {},
|
|
281
297
|
): Promise<void> {
|
|
298
|
+
if (options.resetReconnectState !== false) resetReconnectState(runtime);
|
|
282
299
|
runtime.ctx = ctx;
|
|
283
300
|
runtime.cwd = ctx.cwd;
|
|
284
301
|
runtime.enabled = true;
|
|
@@ -310,15 +327,17 @@ async function connectCandidate(
|
|
|
310
327
|
if (runtime.connection === connection && runtime.connectionStatus === "connecting") {
|
|
311
328
|
runtime.connectionStatus = "connected";
|
|
312
329
|
runtime.connectionMessage = undefined;
|
|
330
|
+
resetReconnectState(runtime);
|
|
313
331
|
updateIdeUi(runtime, ctx);
|
|
314
332
|
}
|
|
315
333
|
} catch (error) {
|
|
316
334
|
if (runtime.connection === connection) {
|
|
317
335
|
runtime.connection = undefined;
|
|
318
336
|
runtime.connectionStatus = "error";
|
|
319
|
-
runtime.connectionMessage =
|
|
337
|
+
runtime.connectionMessage =
|
|
338
|
+
error instanceof IdeConnectionTimeoutError ? formatConnectTimeoutMessage(error) : errorMessage(error);
|
|
320
339
|
updateIdeUi(runtime, ctx);
|
|
321
|
-
scheduleReconnect(runtime);
|
|
340
|
+
if (!(error instanceof IdeConnectionTimeoutError)) scheduleReconnect(runtime);
|
|
322
341
|
}
|
|
323
342
|
}
|
|
324
343
|
}
|
|
@@ -333,6 +352,7 @@ function createConnectionCallbacks(
|
|
|
333
352
|
runtime.connectedServer = server;
|
|
334
353
|
runtime.connectionStatus = "connected";
|
|
335
354
|
runtime.connectionMessage = undefined;
|
|
355
|
+
resetReconnectState(runtime);
|
|
336
356
|
updateIdeUi(runtime);
|
|
337
357
|
},
|
|
338
358
|
onDisconnected: (reason) => {
|
|
@@ -377,6 +397,7 @@ function disconnect(runtime: PiIdeRuntime, ctx: ExtensionContext | ExtensionComm
|
|
|
377
397
|
const connection = runtime.connection;
|
|
378
398
|
runtime.connection = undefined;
|
|
379
399
|
connection?.disconnect();
|
|
400
|
+
resetReconnectState(runtime);
|
|
380
401
|
runtime.enabled = !disabled;
|
|
381
402
|
runtime.connectedServer = undefined;
|
|
382
403
|
runtime.connectionStatus = disabled ? "disabled" : "disconnected";
|
|
@@ -392,15 +413,24 @@ function disconnect(runtime: PiIdeRuntime, ctx: ExtensionContext | ExtensionComm
|
|
|
392
413
|
|
|
393
414
|
function scheduleReconnect(runtime: PiIdeRuntime): void {
|
|
394
415
|
if (runtime.reconnectTimer || !runtime.enabled) return;
|
|
416
|
+
const attempt = recordReconnectAttempt(runtime, runtime.currentCandidate);
|
|
417
|
+
if (attempt === undefined) {
|
|
418
|
+
runtime.connectionStatus = "error";
|
|
419
|
+
runtime.connectionMessage = formatReconnectLimitMessage(runtime.currentCandidate);
|
|
420
|
+
updateIdeUi(runtime);
|
|
421
|
+
return;
|
|
422
|
+
}
|
|
395
423
|
runtime.reconnectTimer = setTimeout(() => {
|
|
396
424
|
runtime.reconnectTimer = undefined;
|
|
397
425
|
const ctx = runtime.ctx;
|
|
398
426
|
if (!ctx || !runtime.enabled) return;
|
|
399
|
-
connectAutoWithZedFallback(runtime, ctx).catch(
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
427
|
+
connectAutoWithZedFallback(runtime, ctx, runtime.sessionGeneration, { resetReconnectState: false }).catch(
|
|
428
|
+
(error: unknown) => {
|
|
429
|
+
runtime.connectionStatus = "error";
|
|
430
|
+
runtime.connectionMessage = error instanceof Error ? error.message : String(error);
|
|
431
|
+
updateIdeUi(runtime);
|
|
432
|
+
},
|
|
433
|
+
);
|
|
404
434
|
}, RECONNECT_DELAY_MS);
|
|
405
435
|
}
|
|
406
436
|
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import type { LockFileCandidate } from "../shared/protocol";
|
|
2
|
+
import type { PiIdeRuntime } from "./state";
|
|
3
|
+
|
|
4
|
+
export const MAX_RECONNECT_ATTEMPTS = 3;
|
|
5
|
+
|
|
6
|
+
export function resetReconnectState(runtime: PiIdeRuntime): void {
|
|
7
|
+
runtime.reconnectAttempts = 0;
|
|
8
|
+
runtime.reconnectCandidateKey = undefined;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
export function recordReconnectAttempt(
|
|
12
|
+
runtime: PiIdeRuntime,
|
|
13
|
+
candidate: LockFileCandidate | undefined,
|
|
14
|
+
): number | undefined {
|
|
15
|
+
const key = candidate ? reconnectCandidateKey(candidate) : undefined;
|
|
16
|
+
if (runtime.reconnectCandidateKey !== key) {
|
|
17
|
+
runtime.reconnectCandidateKey = key;
|
|
18
|
+
runtime.reconnectAttempts = 0;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
if (runtime.reconnectAttempts >= MAX_RECONNECT_ATTEMPTS) return undefined;
|
|
22
|
+
runtime.reconnectAttempts += 1;
|
|
23
|
+
return runtime.reconnectAttempts;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
export function formatReconnectLimitMessage(candidate: LockFileCandidate | undefined): string {
|
|
27
|
+
const target = candidate ? `${candidate.lock.name} at ${candidate.lock.host}:${candidate.lock.port}` : "IDE";
|
|
28
|
+
return `Stopped reconnecting to ${target} after ${MAX_RECONNECT_ATTEMPTS} attempts.`;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
function reconnectCandidateKey(candidate: LockFileCandidate): string {
|
|
32
|
+
return `${candidate.path}:${candidate.lock.host}:${candidate.lock.port}:${candidate.mtimeMs}`;
|
|
33
|
+
}
|
package/src/pi/state.ts
CHANGED
|
@@ -17,6 +17,8 @@ export interface PiIdeRuntime {
|
|
|
17
17
|
attachState: AttachState;
|
|
18
18
|
turnSelection?: EditorSelectionSnapshot;
|
|
19
19
|
reconnectTimer?: NodeJS.Timeout;
|
|
20
|
+
reconnectAttempts: number;
|
|
21
|
+
reconnectCandidateKey?: string;
|
|
20
22
|
zedPollTimer?: NodeJS.Timeout;
|
|
21
23
|
zedPollSelectionKey?: string;
|
|
22
24
|
zedPollWalMtimeMs?: number;
|
|
@@ -30,6 +32,7 @@ export function createRuntime(): PiIdeRuntime {
|
|
|
30
32
|
candidates: [],
|
|
31
33
|
connectionStatus: "idle",
|
|
32
34
|
attachState: "idle",
|
|
35
|
+
reconnectAttempts: 0,
|
|
33
36
|
installingIdeIds: new Set<string>(),
|
|
34
37
|
sessionGeneration: 0,
|
|
35
38
|
};
|