@pi-chamber/web 0.9.5 → 0.9.7
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/assets/DiagramView-BvrCkm_z.js +1 -0
- package/dist/assets/{DiffView-BmIVvheE.js → DiffView-DMvRLRN1.js} +1 -1
- package/dist/assets/FileSaveConflictDialog-DGa9u43J.js +3 -0
- package/dist/assets/FilesView-CNHu4RnC.js +6 -0
- package/dist/assets/{GitView-BNkzec7G.js → GitView-Cbepz-bR.js} +3 -3
- package/dist/assets/{JsonTreeView-C1Kzaybf.js → JsonTreeView-C2X5oXQm.js} +1 -1
- package/dist/assets/{MarkdownRendererImpl-qmKiFVpO.js → MarkdownRendererImpl-BanSCkPy.js} +2 -2
- package/dist/assets/{PatchDiff-D9JesZL1.js → PatchDiff-i_9BIlgo.js} +1 -1
- package/dist/assets/{SessionSwitcherContent-DplV_ApH.js → SessionSwitcherContent-DxS_rFuS.js} +1 -1
- package/dist/assets/{SessionSwitcherDropdown-DdgDKT6K.js → SessionSwitcherDropdown-AVghToww.js} +2 -2
- package/dist/assets/{SessionUnreadDot-BdSDgvhC.js → SessionUnreadDot-CDRZswx-.js} +1 -1
- package/dist/assets/SettingsView-hyAGp836.js +2 -0
- package/dist/assets/SettingsWindow-BfPUzBbq.js +1 -0
- package/dist/assets/{ToolOutputDialog-DaF1xcM0.js → ToolOutputDialog-CJ87b80H.js} +5 -5
- package/dist/assets/{ToolPartDiffPreview-Di6Uo0Dt.js → ToolPartDiffPreview-bF486Lz1.js} +1 -1
- package/dist/assets/{VirtualizedFileDiff-wqcrY0yr.js → VirtualizedFileDiff-CFpvcZ1g.js} +1 -1
- package/dist/assets/{collapsible-DBQnXTNm.js → collapsible-DesjbW8a.js} +1 -1
- package/dist/assets/{computeVirtualFileMetrics-Cr3jh0d6.js → computeVirtualFileMetrics-CsAu9rOt.js} +2 -2
- package/dist/assets/{contextFileOpenGuard-C_AOTYQD.js → contextFileOpenGuard-rILslsBJ.js} +1 -1
- package/dist/assets/{gitStatusPredicates-BvPOjeOy.js → gitStatusPredicates-D_31YElh.js} +1 -1
- package/dist/assets/index-BXgR2dKM.css +1 -0
- package/dist/assets/index-BZpvAhrX.js +8 -0
- package/dist/assets/{index-B8Wt2aN3.js → index-CXLVW_GG.js} +1 -1
- package/dist/assets/{isDiffPlainText-L9uvgz2F.js → isDiffPlainText-BX609Lau.js} +1 -1
- package/dist/assets/{isFilePlainText-C4yk5BOo.js → isFilePlainText-FgBWqu9b.js} +1 -1
- package/dist/assets/{main-DCK6lLCo.js → main-C_pL2r_k.js} +2 -2
- package/dist/assets/{main-C1OSzD-E.js → main-tv2uysSs.js} +7 -7
- package/dist/assets/{markdownCore-Czb_lINQ.js → markdownCore-D3Ibaffd.js} +1 -1
- package/dist/assets/{miniChat-CXiSlptL.js → miniChat-B0xQlBzZ.js} +2 -2
- package/dist/assets/{mobile-D0HVxiyJ.js → mobile-BmSlVuhn.js} +2 -2
- package/dist/assets/renderElectronMiniChatApp-C4xZzAnn.js +2 -0
- package/dist/assets/renderMobileApp-Bi8wTGd5.js +11 -0
- package/dist/assets/runtimeEndpointReset-B6_gFvBD.js +53 -0
- package/dist/assets/{runtimeSurface-vilE4xyj.js → runtimeSurface-egSD9pqj.js} +1 -1
- package/dist/assets/{useAppFontEffects-BP07Vl6M.js → useAppFontEffects-C9QQrBIx.js} +104 -104
- package/dist/assets/useFilesViewSearch-BTZutbn-.js +7 -0
- package/dist/assets/{usePushVisibilityBeacon-CChMvoTL.js → usePushVisibilityBeacon-BZcHxSo-.js} +1 -1
- package/dist/assets/useSwitcherItems-Dw5tHQh8.js +1 -0
- package/dist/assets/{vendor-codemirror-language-data-BJrrV83E.js → vendor-codemirror-language-data-0f_rLdj_.js} +2 -2
- package/dist/assets/{web-components-B5sMa_kC.js → web-components-CYngz9Ml.js} +1 -1
- package/dist/index.html +4 -4
- package/dist/mini-chat.html +3 -3
- package/dist/mobile.html +3 -3
- package/package.json +1 -1
- package/server/index.js +17 -3
- package/server/lib/client-auth/DOCUMENTATION.md +184 -0
- package/server/lib/client-auth/live-revocation.test.js +567 -0
- package/server/lib/client-auth/principal-tracker.js +383 -0
- package/server/lib/client-auth/principal-tracker.test.js +321 -0
- package/server/lib/client-auth/remote-clients.js +31 -0
- package/server/lib/client-auth/remote-clients.test.js +44 -0
- package/server/lib/fs/DOCUMENTATION.md +15 -3
- package/server/lib/fs/routes.js +369 -51
- package/server/lib/fs/routes.test.js +565 -3
- package/server/lib/fs/search.js +74 -29
- package/server/lib/pi/event-stream.js +269 -0
- package/server/lib/pi/event-stream.test.js +776 -0
- package/server/lib/pi/routes.js +132 -28
- package/server/lib/pi/routes.test.js +213 -4
- package/server/lib/pi/session-daemon/DOCUMENTATION.md +6 -4
- package/server/lib/pi/session-daemon/ipc-client.js +19 -15
- package/server/lib/pi/session-daemon/ipc-client.test.js +113 -1
- package/server/lib/pi/session-daemon/prompt-operations.test.js +9 -3
- package/server/lib/pi/session-daemon/prompt-preflight.test.js +556 -0
- package/server/lib/pi/session-daemon/send-operation-dedup.test.js +331 -0
- package/server/lib/pi/session-daemon/send-operation-registry.js +264 -0
- package/server/lib/pi/session-daemon/send-operation-registry.test.js +205 -0
- package/server/lib/pi/session-daemon/session-daemon-epoch.test.js +349 -0
- package/server/lib/pi/session-daemon/session-daemon-extensions.e2e.test.js +16 -5
- package/server/lib/pi/session-daemon/session-daemon-extensions.test.js +3 -1
- package/server/lib/pi/session-daemon/session-daemon.js +339 -37
- package/server/lib/pi/session-daemon/session-daemon.test.js +47 -17
- package/server/lib/pi/session-daemon/session-idle-residency.test.js +8 -1
- package/server/lib/pi/session-daemon/session-replay.test.js +11 -4
- package/server/lib/pi/session-daemon/supervisor.js +30 -5
- package/server/lib/pi/session-daemon/supervisor.test.js +4 -3
- package/server/lib/pi/ui-settings-store.js +1 -1
- package/server/lib/pi/ui-settings-store.test.js +3 -1
- package/server/lib/server/core-routes.js +11 -1
- package/server/lib/server/cors.js +6 -0
- package/server/lib/server/cors.test.js +3 -0
- package/server/lib/stt/DOCUMENTATION.md +2 -0
- package/server/lib/stt/runtime.js +39 -2
- package/server/lib/stt/runtime.test.js +53 -0
- package/server/lib/terminal/DOCUMENTATION.md +2 -0
- package/server/lib/terminal/runtime.js +48 -2
- package/server/lib/terminal/runtime.test.js +35 -0
- package/server/lib/ui-auth/DOCUMENTATION.md +13 -4
- package/server/lib/ui-auth/ui-auth.js +98 -0
- package/server/lib/ui-auth/ui-auth.test.js +249 -0
- package/server/lib/workspace/host.js +9 -3
- package/server/lib/workspace/host.test.js +15 -0
- package/dist/assets/DiagramEditor-BPDkGHsj.js +0 -1
- package/dist/assets/DiagramView-D_EfDz2d.js +0 -1
- package/dist/assets/FilesView-CJytSUAX.js +0 -6
- package/dist/assets/SettingsView-z8uf0XyM.js +0 -2
- package/dist/assets/SettingsWindow-CPDmgNg2.js +0 -1
- package/dist/assets/index-DIF8b4bh.css +0 -1
- package/dist/assets/index-jrfQYSvP.js +0 -8
- package/dist/assets/renderElectronMiniChatApp-BcG209a4.js +0 -2
- package/dist/assets/renderMobileApp-B5x_PWlc.js +0 -11
- package/dist/assets/runtimeEndpointReset-CUiPe6dQ.js +0 -53
- package/dist/assets/useFilesViewSearch-oxIKk-ea.js +0 -7
- package/dist/assets/useSwitcherItems-_RSo3F-A.js +0 -1
|
@@ -24,6 +24,7 @@ class FakeSession {
|
|
|
24
24
|
this.names = [];
|
|
25
25
|
this.entries = [];
|
|
26
26
|
this.sent = [];
|
|
27
|
+
this.promptCalls = [];
|
|
27
28
|
this.aborted = 0;
|
|
28
29
|
this.compacted = 0;
|
|
29
30
|
this.model = { provider: 'test', id: 'model' };
|
|
@@ -65,7 +66,12 @@ class FakeSession {
|
|
|
65
66
|
for (const listener of this.listeners) listener(event);
|
|
66
67
|
}
|
|
67
68
|
|
|
68
|
-
async prompt() {
|
|
69
|
+
async prompt(text, options) {
|
|
70
|
+
this.promptCalls.push({ text, options });
|
|
71
|
+
options?.preflightResult?.(true);
|
|
72
|
+
const deliverAs = options?.streamingBehavior;
|
|
73
|
+
this.sent.push({ text, options: deliverAs ? { deliverAs } : undefined });
|
|
74
|
+
}
|
|
69
75
|
|
|
70
76
|
async sendUserMessage(text, options) { this.sent.push({ text, options }); }
|
|
71
77
|
|
|
@@ -189,12 +195,12 @@ function connectClient(endpoint) {
|
|
|
189
195
|
|
|
190
196
|
return {
|
|
191
197
|
socket,
|
|
192
|
-
async authenticate(value = credential, { sessionId, fromSequence } = {}) {
|
|
198
|
+
async authenticate(value = credential, { sessionId, fromSequence, streamEpoch } = {}) {
|
|
193
199
|
await new Promise((resolve, reject) => {
|
|
194
200
|
socket.once('connect', resolve);
|
|
195
201
|
socket.once('error', reject);
|
|
196
202
|
});
|
|
197
|
-
socket.write(`${JSON.stringify({ kind: 'authenticate', credential: value, ...(sessionId ? { sessionId } : {}), ...(fromSequence !== undefined ? { fromSequence } : {}) })}\n`);
|
|
203
|
+
socket.write(`${JSON.stringify({ kind: 'authenticate', credential: value, ...(sessionId ? { sessionId } : {}), ...(fromSequence !== undefined ? { fromSequence } : {}), ...(streamEpoch ? { streamEpoch } : {}) })}\n`);
|
|
198
204
|
await next((message) => message.kind === 'authenticated');
|
|
199
205
|
if (fromSequence !== undefined) return undefined;
|
|
200
206
|
return next((message) => message.kind === 'event' && message.event === 'session.snapshot');
|
|
@@ -372,12 +378,12 @@ describe('Pi session daemon spike', () => {
|
|
|
372
378
|
await first.close();
|
|
373
379
|
|
|
374
380
|
const replay = connectClient(endpoint);
|
|
375
|
-
await replay.authenticate(credential, { sessionId: 'pi-session-1', fromSequence: snapshot.sequence });
|
|
381
|
+
await replay.authenticate(credential, { sessionId: 'pi-session-1', fromSequence: snapshot.sequence, streamEpoch: snapshot.streamEpoch });
|
|
376
382
|
await expect(replay.next((frame) => frame.event === 'assistant.message.delta')).resolves.toMatchObject({ sequence: delta.sequence, payload: { delta: 'replay' } });
|
|
377
383
|
await replay.close();
|
|
378
384
|
|
|
379
385
|
const stale = connectClient(endpoint);
|
|
380
|
-
await stale.authenticate(credential, { sessionId: 'pi-session-1', fromSequence: 0 });
|
|
386
|
+
await stale.authenticate(credential, { sessionId: 'pi-session-1', fromSequence: 0, streamEpoch: snapshot.streamEpoch });
|
|
381
387
|
await expect(stale.next((frame) => frame.event === 'session.snapshot')).resolves.toMatchObject({ payload: { lastSequence: expect.any(Number) } });
|
|
382
388
|
await stale.close();
|
|
383
389
|
});
|
|
@@ -412,6 +418,7 @@ describe('Pi session daemon spike', () => {
|
|
|
412
418
|
await late.authenticate(credential, {
|
|
413
419
|
sessionId: 'pi-session-1',
|
|
414
420
|
fromSequence: detail.result.lastSequence,
|
|
421
|
+
streamEpoch: detail.result.streamEpoch,
|
|
415
422
|
});
|
|
416
423
|
const firstDelta = first.next((frame) => frame.event === 'assistant.message.delta');
|
|
417
424
|
const lateDelta = late.next((frame) => frame.event === 'assistant.message.delta');
|
|
@@ -441,6 +448,7 @@ describe('Pi session daemon spike', () => {
|
|
|
441
448
|
await resumed.authenticate(credential, {
|
|
442
449
|
sessionId: 'pi-session-1',
|
|
443
450
|
fromSequence: lateDeltaFrame.sequence,
|
|
451
|
+
streamEpoch: detail.result.streamEpoch,
|
|
444
452
|
});
|
|
445
453
|
const resumedEndFrame = await resumed.next((frame) => frame.event === 'assistant.message.end');
|
|
446
454
|
expect(resumedEndFrame.sequence).toBe(firstEndFrame.sequence);
|
|
@@ -1223,7 +1231,11 @@ describe('Pi session daemon spike', () => {
|
|
|
1223
1231
|
await expect(client.request('sessions.abort', { sessionId: 'pi-session-forked' })).resolves.toMatchObject({ result: {} });
|
|
1224
1232
|
expect(runtime.session.aborted).toBe(1);
|
|
1225
1233
|
runtime.session.isStreaming = false;
|
|
1234
|
+
const deletedEvent = client.next((frame) => frame.event === 'session.deleted');
|
|
1226
1235
|
await expect(client.request('sessions.delete', { sessionId: 'pi-session-forked' })).resolves.toMatchObject({ result: {} });
|
|
1236
|
+
await expect(deletedEvent).resolves.toMatchObject({
|
|
1237
|
+
payload: { sessionId: 'pi-session-forked', directory: root },
|
|
1238
|
+
});
|
|
1227
1239
|
await client.close();
|
|
1228
1240
|
});
|
|
1229
1241
|
|
|
@@ -2250,8 +2262,11 @@ describe('Pi session daemon spike', () => {
|
|
|
2250
2262
|
await writeFile(sessionFile, `{"type":"session","id":"session-1","cwd":"${root}"}\n`);
|
|
2251
2263
|
const session = new FakeSession('session-1', sessionFile);
|
|
2252
2264
|
let finishTurn;
|
|
2253
|
-
session.
|
|
2254
|
-
session.
|
|
2265
|
+
session.prompt = (text, options) => {
|
|
2266
|
+
session.promptCalls.push({ text, options });
|
|
2267
|
+
options?.preflightResult?.(true);
|
|
2268
|
+
const deliverAs = options?.streamingBehavior;
|
|
2269
|
+
session.sent.push({ text, options: deliverAs ? { deliverAs } : undefined });
|
|
2255
2270
|
return new Promise((resolve) => {
|
|
2256
2271
|
finishTurn = resolve;
|
|
2257
2272
|
});
|
|
@@ -2290,8 +2305,11 @@ describe('Pi session daemon spike', () => {
|
|
|
2290
2305
|
await writeFile(imageFile, Buffer.from('fake-png-data'));
|
|
2291
2306
|
const session = new FakeSession('session-1', sessionFile);
|
|
2292
2307
|
const finishSends = [];
|
|
2293
|
-
session.
|
|
2294
|
-
session.
|
|
2308
|
+
session.prompt = (text, options) => {
|
|
2309
|
+
session.promptCalls.push({ text, options });
|
|
2310
|
+
options?.preflightResult?.(true);
|
|
2311
|
+
const deliverAs = options?.streamingBehavior;
|
|
2312
|
+
session.sent.push({ text, options: deliverAs ? { deliverAs } : undefined });
|
|
2295
2313
|
return new Promise((resolve) => finishSends.push(resolve));
|
|
2296
2314
|
};
|
|
2297
2315
|
daemon = createSessionDaemon({
|
|
@@ -2341,9 +2359,15 @@ describe('Pi session daemon spike', () => {
|
|
|
2341
2359
|
},
|
|
2342
2360
|
});
|
|
2343
2361
|
expect(session.sent).toHaveLength(2);
|
|
2344
|
-
expect(
|
|
2345
|
-
expect(session.
|
|
2346
|
-
|
|
2362
|
+
expect(session.promptCalls).toHaveLength(2);
|
|
2363
|
+
expect(session.promptCalls[0]).toMatchObject({
|
|
2364
|
+
text: 'first without a file',
|
|
2365
|
+
options: expect.objectContaining({ expandPromptTemplates: false, source: 'extension' }),
|
|
2366
|
+
});
|
|
2367
|
+
expect(session.promptCalls[0].options.images).toBeUndefined();
|
|
2368
|
+
expect(session.promptCalls[1].text).toBe('what is this?');
|
|
2369
|
+
expect(session.promptCalls[1].options).toMatchObject({ expandPromptTemplates: false, source: 'extension' });
|
|
2370
|
+
expect(session.promptCalls[1].options.images).toEqual([{ type: 'image', mimeType: 'image/png', data: Buffer.from('fake-png-data').toString('base64') }]);
|
|
2347
2371
|
for (const finish of finishSends) finish();
|
|
2348
2372
|
await client.close();
|
|
2349
2373
|
});
|
|
@@ -2374,7 +2398,9 @@ describe('Pi session daemon spike', () => {
|
|
|
2374
2398
|
|
|
2375
2399
|
expect(response.result.accepted).toBe(true);
|
|
2376
2400
|
expect(session.sent).toHaveLength(1);
|
|
2377
|
-
|
|
2401
|
+
// Requested delivery always travels as SDK `streamingBehavior`; the SDK
|
|
2402
|
+
// ignores it while idle and starts a new turn.
|
|
2403
|
+
expect(session.sent[0].options).toEqual({ deliverAs: 'followUp' });
|
|
2378
2404
|
await client.close();
|
|
2379
2405
|
});
|
|
2380
2406
|
|
|
@@ -2387,8 +2413,10 @@ describe('Pi session daemon spike', () => {
|
|
|
2387
2413
|
let rejectFirst;
|
|
2388
2414
|
let finishSecond;
|
|
2389
2415
|
let sendCount = 0;
|
|
2390
|
-
session.
|
|
2391
|
-
session.
|
|
2416
|
+
session.prompt = (text, options) => {
|
|
2417
|
+
session.promptCalls.push({ text, options });
|
|
2418
|
+
options?.preflightResult?.(true);
|
|
2419
|
+
session.sent.push({ text, options: options?.streamingBehavior ? { deliverAs: options.streamingBehavior } : undefined });
|
|
2392
2420
|
sendCount += 1;
|
|
2393
2421
|
if (sendCount === 1) return new Promise((_, reject) => { rejectFirst = reject; });
|
|
2394
2422
|
return new Promise((resolve) => { finishSecond = resolve; });
|
|
@@ -2420,8 +2448,10 @@ describe('Pi session daemon spike', () => {
|
|
|
2420
2448
|
const sessionFile = join(root, 'session-1.jsonl');
|
|
2421
2449
|
await writeFile(sessionFile, `{"type":"session","id":"session-1","cwd":"${root}"}\n`);
|
|
2422
2450
|
const session = new FakeSession('session-1', sessionFile);
|
|
2423
|
-
session.
|
|
2424
|
-
session.
|
|
2451
|
+
session.prompt = (text, options) => {
|
|
2452
|
+
session.promptCalls.push({ text, options });
|
|
2453
|
+
options?.preflightResult?.(true);
|
|
2454
|
+
session.sent.push({ text, options: options?.streamingBehavior ? { deliverAs: options.streamingBehavior } : undefined });
|
|
2425
2455
|
session.isStreaming = true;
|
|
2426
2456
|
return Promise.reject(new Error('Stream ended without finish_reason'));
|
|
2427
2457
|
};
|
|
@@ -87,7 +87,14 @@ class FakeSession {
|
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
89
|
|
|
90
|
-
async prompt() {
|
|
90
|
+
async prompt(text, options) {
|
|
91
|
+
options?.preflightResult?.(true);
|
|
92
|
+
const deliverAs = options?.streamingBehavior;
|
|
93
|
+
this.sent.push({ text, options: deliverAs ? { deliverAs } : undefined });
|
|
94
|
+
if (this.pendingSend) {
|
|
95
|
+
await this.pendingSend;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
91
98
|
|
|
92
99
|
async sendUserMessage(text, options) {
|
|
93
100
|
this.sent.push({ text, options });
|
|
@@ -46,7 +46,9 @@ class FakeSession {
|
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
48
|
|
|
49
|
-
async prompt() {
|
|
49
|
+
async prompt(text, options) {
|
|
50
|
+
options?.preflightResult?.(true);
|
|
51
|
+
}
|
|
50
52
|
|
|
51
53
|
async sendUserMessage() {}
|
|
52
54
|
|
|
@@ -153,7 +155,7 @@ function connectDaemonClient(endpoint) {
|
|
|
153
155
|
socket,
|
|
154
156
|
messages,
|
|
155
157
|
waitForMessage,
|
|
156
|
-
async authenticate(credentialOverride = credential, { sessionId, fromSequence } = {}) {
|
|
158
|
+
async authenticate(credentialOverride = credential, { sessionId, fromSequence, streamEpoch } = {}) {
|
|
157
159
|
await new Promise((resolve, reject) => {
|
|
158
160
|
if (socket.connecting === false && socket.pending === false) {
|
|
159
161
|
return resolve();
|
|
@@ -166,6 +168,7 @@ function connectDaemonClient(endpoint) {
|
|
|
166
168
|
credential: credentialOverride,
|
|
167
169
|
...(sessionId ? { sessionId } : {}),
|
|
168
170
|
...(fromSequence !== undefined ? { fromSequence } : {}),
|
|
171
|
+
...(streamEpoch ? { streamEpoch } : {}),
|
|
169
172
|
};
|
|
170
173
|
socket.write(`${JSON.stringify(frame)}\n`);
|
|
171
174
|
await waitForMessage((message) => message.kind === 'authenticated');
|
|
@@ -325,20 +328,24 @@ describe('session replay log bounds', () => {
|
|
|
325
328
|
|
|
326
329
|
describe('daemon byte-bounded reconnect', () => {
|
|
327
330
|
let daemon;
|
|
331
|
+
let latestEpoch;
|
|
328
332
|
const temporaryRoots = [];
|
|
329
333
|
const connectedClients = new Set();
|
|
330
334
|
|
|
331
335
|
const connectLiveClient = async (endpoint) => {
|
|
332
336
|
const client = connectDaemonClient(endpoint);
|
|
333
337
|
connectedClients.add(client);
|
|
334
|
-
await client.authenticate();
|
|
338
|
+
const snapshot = await client.authenticate();
|
|
339
|
+
// Track the live daemon epoch so resuming clients can stamp their cursor
|
|
340
|
+
// (replay requires the stream-epoch marker).
|
|
341
|
+
latestEpoch = snapshot.streamEpoch;
|
|
335
342
|
return client;
|
|
336
343
|
};
|
|
337
344
|
|
|
338
345
|
const connectResumingClient = async (endpoint, fromSequence) => {
|
|
339
346
|
const client = connectDaemonClient(endpoint);
|
|
340
347
|
connectedClients.add(client);
|
|
341
|
-
await client.authenticate(credential, { sessionId: 'pi-session-1', fromSequence });
|
|
348
|
+
await client.authenticate(credential, { sessionId: 'pi-session-1', fromSequence, streamEpoch: latestEpoch });
|
|
342
349
|
return client;
|
|
343
350
|
};
|
|
344
351
|
|
|
@@ -495,7 +495,15 @@ export const createPiSessionDaemonSupervisor = ({
|
|
|
495
495
|
const claimed = await claimDaemonOwnership(credential);
|
|
496
496
|
if (isCompatibleBuild && claimed) {
|
|
497
497
|
const ready = await probe(credential);
|
|
498
|
-
return {
|
|
498
|
+
return {
|
|
499
|
+
state: 'ready',
|
|
500
|
+
reused: true,
|
|
501
|
+
protocolVersion: PROTOCOL_VERSION,
|
|
502
|
+
capabilities: ready.health.capabilities ?? [],
|
|
503
|
+
...(typeof ready.health.streamEpoch === 'string' && ready.health.streamEpoch.length > 0
|
|
504
|
+
? { streamEpoch: ready.health.streamEpoch }
|
|
505
|
+
: {}),
|
|
506
|
+
};
|
|
499
507
|
}
|
|
500
508
|
// Replace an older protocol/build, and always replace a development
|
|
501
509
|
// daemon so a source restart cannot keep running stale module code.
|
|
@@ -571,7 +579,15 @@ export const createPiSessionDaemonSupervisor = ({
|
|
|
571
579
|
while (Date.now() < deadline) {
|
|
572
580
|
try {
|
|
573
581
|
const started = await probe(credential);
|
|
574
|
-
return {
|
|
582
|
+
return {
|
|
583
|
+
state: 'ready',
|
|
584
|
+
reused: false,
|
|
585
|
+
protocolVersion: PROTOCOL_VERSION,
|
|
586
|
+
capabilities: started.health.capabilities ?? [],
|
|
587
|
+
...(typeof started.health.streamEpoch === 'string' && started.health.streamEpoch.length > 0
|
|
588
|
+
? { streamEpoch: started.health.streamEpoch }
|
|
589
|
+
: {}),
|
|
590
|
+
};
|
|
575
591
|
} catch (error) {
|
|
576
592
|
if (error instanceof PiSessionDaemonUnavailableError && isPermanentStartupFailure(error.code)) throw error;
|
|
577
593
|
await wait(RETRY_DELAY_MS);
|
|
@@ -627,10 +643,12 @@ export const createPiSessionDaemonSupervisor = ({
|
|
|
627
643
|
}
|
|
628
644
|
};
|
|
629
645
|
|
|
630
|
-
const subscribe = async ({ sessionId, fromSequence, onEvent, onError }) => {
|
|
646
|
+
const subscribe = async ({ sessionId, fromSequence, streamEpoch, onEvent, onError, signal }) => {
|
|
631
647
|
try {
|
|
648
|
+
if (signal?.aborted) return () => {};
|
|
632
649
|
const { credential } = await ensureReady();
|
|
633
|
-
|
|
650
|
+
if (signal?.aborted) return () => {};
|
|
651
|
+
return await subscribeSessionDaemon({ endpoint: paths.endpoint, credential, sessionId, fromSequence, streamEpoch, onEvent, onError, signal });
|
|
634
652
|
} catch (error) {
|
|
635
653
|
throw new PiSessionDaemonUnavailableError(
|
|
636
654
|
error instanceof SessionDaemonClientError && error.code !== 'DAEMON_CONNECTION_REFUSED'
|
|
@@ -643,7 +661,14 @@ export const createPiSessionDaemonSupervisor = ({
|
|
|
643
661
|
const health = async () => {
|
|
644
662
|
try {
|
|
645
663
|
const { ready } = await ensureReady();
|
|
646
|
-
return {
|
|
664
|
+
return {
|
|
665
|
+
state: 'ready',
|
|
666
|
+
protocolVersion: PROTOCOL_VERSION,
|
|
667
|
+
capabilities: ready.health.capabilities ?? [],
|
|
668
|
+
...(typeof ready.health.streamEpoch === 'string' && ready.health.streamEpoch.length > 0
|
|
669
|
+
? { streamEpoch: ready.health.streamEpoch }
|
|
670
|
+
: {}),
|
|
671
|
+
};
|
|
647
672
|
} catch (error) {
|
|
648
673
|
return {
|
|
649
674
|
state: 'unavailable',
|
|
@@ -87,12 +87,13 @@ describe('Pi session daemon supervisor', () => {
|
|
|
87
87
|
};
|
|
88
88
|
|
|
89
89
|
supervisor = createPiSessionDaemonSupervisor({ env, cwd });
|
|
90
|
-
await expect(supervisor.start()).resolves.toMatchObject({ state: 'ready', reused: false, protocolVersion: 1 });
|
|
91
|
-
await expect(supervisor.start()).resolves.toMatchObject({ state: 'ready', reused: true, protocolVersion: 1 });
|
|
90
|
+
await expect(supervisor.start()).resolves.toMatchObject({ state: 'ready', reused: false, protocolVersion: 1, streamEpoch: expect.stringMatching(/^[0-9a-f]{32}$/) });
|
|
91
|
+
await expect(supervisor.start()).resolves.toMatchObject({ state: 'ready', reused: true, protocolVersion: 1, streamEpoch: expect.stringMatching(/^[0-9a-f]{32}$/) });
|
|
92
92
|
await expect(supervisor.health()).resolves.toEqual({
|
|
93
93
|
state: 'ready',
|
|
94
94
|
protocolVersion: 1,
|
|
95
|
-
capabilities: expect.arrayContaining(['projects.list', 'projects.select', 'sessions.list', 'sessions.create', 'sessions.open', 'sessions.rename', 'sessions.delete', 'sessions.tree', 'sessions.navigate', 'sessions.fork', 'sessions.clone', 'sessions.prompt', 'sessions.steer', 'sessions.followUp', 'sessions.abort', 'sessions.setModel', 'sessions.setThinking', 'sessions.compact', 'providers.list', 'providers.config.get', 'providers.models.set', 'providers.status', 'providers.login', 'providers.login.respond', 'providers.login.status', 'providers.logout', 'settings.get', 'settings.set', 'resources.list', 'resources.update', 'resources.prompts.create', 'resources.prompts.update', 'resources.prompts.delete']),
|
|
95
|
+
capabilities: expect.arrayContaining(['projects.list', 'projects.select', 'sessions.list', 'sessions.create', 'sessions.open', 'sessions.rename', 'sessions.delete', 'sessions.tree', 'sessions.navigate', 'sessions.fork', 'sessions.clone', 'sessions.prompt', 'sessions.steer', 'sessions.followUp', 'sessions.abort', 'sessions.setModel', 'sessions.setThinking', 'sessions.compact', 'providers.list', 'providers.config.get', 'providers.models.set', 'providers.status', 'providers.login', 'providers.login.respond', 'providers.login.status', 'providers.logout', 'settings.get', 'settings.set', 'resources.list', 'resources.update', 'resources.prompts.create', 'resources.prompts.update', 'resources.prompts.delete', 'events.streamEpoch']),
|
|
96
|
+
streamEpoch: expect.stringMatching(/^[0-9a-f]{32}$/),
|
|
96
97
|
});
|
|
97
98
|
await expect(supervisor.request('sessions.list')).resolves.toMatchObject({ sessions: expect.any(Array) });
|
|
98
99
|
|
|
@@ -54,7 +54,7 @@ const LOCAL_FIELDS = new Set([
|
|
|
54
54
|
'securityScopedBookmarks', 'pinnedDirectories', 'defaultGitIdentityId', 'openInAppId',
|
|
55
55
|
'terminalShell', 'terminalLoginShells', 'desktopLanAccessEnabled',
|
|
56
56
|
'desktopKeepAwakeEnabled', 'desktopProcessPerformanceRecordingEnabled',
|
|
57
|
-
'desktopMinimizeToTrayEnabled', 'desktopMacMenuBarEnabled',
|
|
57
|
+
'desktopMinimizeToTrayEnabled', 'desktopCloseToTrayEnabled', 'desktopMacMenuBarEnabled',
|
|
58
58
|
'desktopWindowState', 'desktopLocalPort', 'desktopInstallId', 'desktopHosts',
|
|
59
59
|
'desktopDefaultHostId', 'desktopInitialHostChoiceCompleted',
|
|
60
60
|
'pwaAppName', 'pwaOrientation', 'mobileKeyboardMode',
|
|
@@ -68,11 +68,12 @@ describe('Pi UI settings store', () => {
|
|
|
68
68
|
const { file, runtimeFile, store } = await makeStore();
|
|
69
69
|
await Promise.all([
|
|
70
70
|
store.write({ themeId: 'dark' }),
|
|
71
|
-
store.write({ projects: [{ id: 'one', path: '/one' }] }),
|
|
71
|
+
store.write({ projects: [{ id: 'one', path: '/one' }], desktopCloseToTrayEnabled: false }),
|
|
72
72
|
]);
|
|
73
73
|
await expect(store.read()).resolves.toEqual({
|
|
74
74
|
themeId: 'dark',
|
|
75
75
|
projects: [{ id: 'one', path: '/one' }],
|
|
76
|
+
desktopCloseToTrayEnabled: false,
|
|
76
77
|
});
|
|
77
78
|
await expect(readJson(file)).resolves.toEqual({
|
|
78
79
|
__pichamberSettingsScope: 'portable-v1',
|
|
@@ -80,6 +81,7 @@ describe('Pi UI settings store', () => {
|
|
|
80
81
|
});
|
|
81
82
|
await expect(readJson(runtimeFile)).resolves.toEqual({
|
|
82
83
|
projects: [{ id: 'one', path: '/one' }],
|
|
84
|
+
desktopCloseToTrayEnabled: false,
|
|
83
85
|
});
|
|
84
86
|
});
|
|
85
87
|
|
|
@@ -391,6 +391,11 @@ export const registerAuthAndAccessRoutes = (app, dependencies) => {
|
|
|
391
391
|
remoteClientAuthRuntime,
|
|
392
392
|
clientPairingRuntime,
|
|
393
393
|
readSettingsFromDiskMigrated,
|
|
394
|
+
// Live-revocation coordinator: closes the revoked principal's tracked
|
|
395
|
+
// live connections (SSE, terminal/dictation WebSocket) in this process
|
|
396
|
+
// immediately after the store write commits. Cross-process convergence
|
|
397
|
+
// is the coordinator's bounded poll, not this emitter.
|
|
398
|
+
liveRevocation = null,
|
|
394
399
|
normalizeTunnelSessionTtlMs,
|
|
395
400
|
// Returns the relay pairing candidate ({ type:'relay', relayUrl, serverId,
|
|
396
401
|
// hostEncPubJwk, priority }) when the host relay is enabled, else null.
|
|
@@ -821,8 +826,13 @@ export const registerAuthAndAccessRoutes = (app, dependencies) => {
|
|
|
821
826
|
if (!result.revoked) {
|
|
822
827
|
return res.status(404).json({ revoked: false, error: 'Client not found' });
|
|
823
828
|
}
|
|
829
|
+
// Close the revoked principal's live connections now that the store
|
|
830
|
+
// marks them revoked; new bearer/URL-token establishment is denied by
|
|
831
|
+
// the credential checks. The revoked device's own request may be the
|
|
832
|
+
// one being closed — the count reports what was torn down.
|
|
833
|
+
const closedConnections = liveRevocation?.clientRevoked?.(result.client.id) ?? 0;
|
|
824
834
|
void reconcileRelay();
|
|
825
|
-
res.json(result);
|
|
835
|
+
res.json({ ...result, closedConnections });
|
|
826
836
|
});
|
|
827
837
|
});
|
|
828
838
|
|
|
@@ -26,6 +26,11 @@ const DEFAULT_ALLOWED_CORS_HEADERS = [
|
|
|
26
26
|
'x-pichamber-mime',
|
|
27
27
|
].join(',');
|
|
28
28
|
|
|
29
|
+
const EXPOSED_UI_CORS_HEADERS = [
|
|
30
|
+
'x-pichamber-file-revision',
|
|
31
|
+
'x-pichamber-file-exists',
|
|
32
|
+
].join(',');
|
|
33
|
+
|
|
29
34
|
export const isAllowedUiCorsOrigin = (origin) => (
|
|
30
35
|
typeof origin === 'string'
|
|
31
36
|
&& (ALLOWED_UI_CORS_ORIGINS.has(origin) || LOOPBACK_HTTP_ORIGIN.test(origin))
|
|
@@ -48,6 +53,7 @@ export const applyUiCorsHeaders = (req, res) => {
|
|
|
48
53
|
res.setHeader('Access-Control-Allow-Credentials', 'true');
|
|
49
54
|
res.setHeader('Access-Control-Allow-Methods', 'GET,POST,PUT,PATCH,DELETE,OPTIONS');
|
|
50
55
|
res.setHeader('Access-Control-Allow-Headers', resolveAllowedCorsHeaders(req.headers?.['access-control-request-headers']));
|
|
56
|
+
res.setHeader('Access-Control-Expose-Headers', EXPOSED_UI_CORS_HEADERS);
|
|
51
57
|
res.setHeader('Vary', 'Origin');
|
|
52
58
|
return req.method === 'OPTIONS';
|
|
53
59
|
};
|
|
@@ -36,5 +36,8 @@ describe('packaged UI CORS', () => {
|
|
|
36
36
|
expect(ended).toBe(true);
|
|
37
37
|
expect(headers['Access-Control-Allow-Origin']).toBe('pichamber-ui://app');
|
|
38
38
|
expect(headers['Access-Control-Allow-Headers']).toBe('x-pichamber-directory,x-pichamber-filename,x-pichamber-mime,authorization');
|
|
39
|
+
expect(headers['Access-Control-Expose-Headers']).toBe(
|
|
40
|
+
'x-pichamber-file-revision,x-pichamber-file-exists',
|
|
41
|
+
);
|
|
39
42
|
});
|
|
40
43
|
});
|
|
@@ -21,6 +21,8 @@ This module owns final-only composer dictation for web, Electron, hosted mobile,
|
|
|
21
21
|
|
|
22
22
|
All routes use the existing `/api` authentication middleware. The WebSocket path is in both the URL-token and private-relay allowlists. Shared UI opens it through `openRuntimeWebSocket` with the token returned by that connection's URL-auth mint. A failed older connection cannot clear a newer shared token.
|
|
23
23
|
|
|
24
|
+
This runtime owns the WebSocket's auth and connection lifetime: the upgrade re-validates the principal (credential store or signing secret) at establishment, so a URL token minted before a revocation or global sign-out is denied at open; the coordinator generation is captured before the auth/origin awaits and passed at track time, so a revocation racing verification reject-closes without trusting the principal and `handleUpgrade` is skipped for inactive entries. After the upgrade the connection is registered with the live-revocation coordinator under the authenticated principal, so a later revocation closes the socket within the documented latency guarantee. The 60-second URL token TTL gates establishment only — it never schedules a connection's death. Resource bounds (50 per principal / 1000 global) reject-close with `close('over-limit')` without evicting unrelated sockets. See `../client-auth/DOCUMENTATION.md`.
|
|
25
|
+
|
|
24
26
|
Remote URL and API-key values live in `<PiChamber data>/stt/config.json` with owner-only permissions where the platform supports them. Status responses redact API keys. WebSocket start frames carry only a stored provider configuration ID. They never accept a URL or credential.
|
|
25
27
|
|
|
26
28
|
Local models live under `<PiChamber data>/speech-models`. Downloads verify a pinned archive size and SHA-256 checksum, extract into a staging directory, hash required installed files into a manifest, and rename only after verification. Missing, changed-size, or checksum-invalid models are removed before retry. The main server process never imports `sherpa-onnx-node`; only `worker-process.js` does.
|
|
@@ -6,7 +6,7 @@ import { SttStreamManager } from './stream-manager.js';
|
|
|
6
6
|
|
|
7
7
|
const HEARTBEAT_MS = 30_000;
|
|
8
8
|
|
|
9
|
-
export function createSttRuntime({ app, server, express, uiAuthController, isRequestOriginAllowed, rejectWebSocketUpgrade, modelsDir, configFile }) {
|
|
9
|
+
export function createSttRuntime({ app, server, express, uiAuthController, isRequestOriginAllowed, rejectWebSocketUpgrade, modelsDir, configFile, liveRevocation = null }) {
|
|
10
10
|
const service = createSttService({ modelsDir, configFile });
|
|
11
11
|
const manager = new SttStreamManager({ createTranscriber: (providerConfigId) => service.createTranscriber(providerConfigId) });
|
|
12
12
|
|
|
@@ -82,15 +82,52 @@ export function createSttRuntime({ app, server, express, uiAuthController, isReq
|
|
|
82
82
|
socket.on('error', () => {});
|
|
83
83
|
});
|
|
84
84
|
|
|
85
|
+
const trackUpgradePrincipal = (socket, principal, generation) => {
|
|
86
|
+
if (!principal || typeof liveRevocation?.trackLiveConnection !== 'function') return null;
|
|
87
|
+
let tracked;
|
|
88
|
+
try {
|
|
89
|
+
tracked = liveRevocation.trackLiveConnection({
|
|
90
|
+
principal,
|
|
91
|
+
close: () => {
|
|
92
|
+
if (!socket.destroyed) socket.destroy();
|
|
93
|
+
},
|
|
94
|
+
generation,
|
|
95
|
+
});
|
|
96
|
+
} catch {
|
|
97
|
+
try { if (!socket.destroyed) socket.destroy(); } catch {}
|
|
98
|
+
// A throwing tracker already destroyed the socket above; return an
|
|
99
|
+
// inactive entry so the caller skips handleUpgrade like any other
|
|
100
|
+
// rejected registration instead of upgrading a destroyed socket.
|
|
101
|
+
return { active: false, end: () => {}, revoke: () => false };
|
|
102
|
+
}
|
|
103
|
+
// Covers the pending window, a failed upgrade, and the natural close.
|
|
104
|
+
// Rejected registrations already destroyed the socket; the inactive entry
|
|
105
|
+
// signals the caller to skip handleUpgrade.
|
|
106
|
+
socket.once('close', () => tracked.end());
|
|
107
|
+
return tracked;
|
|
108
|
+
};
|
|
109
|
+
|
|
85
110
|
const upgradeHandler = (req, socket, head) => {
|
|
86
111
|
if (parseRequestPathname(req.url) !== STT_WS_PATH) return;
|
|
87
112
|
void (async () => {
|
|
88
113
|
try {
|
|
114
|
+
let principal = null;
|
|
115
|
+
let generation;
|
|
116
|
+
try {
|
|
117
|
+
if (typeof liveRevocation?.getGeneration === 'function') generation = liveRevocation.getGeneration();
|
|
118
|
+
} catch {
|
|
119
|
+
generation = undefined;
|
|
120
|
+
}
|
|
89
121
|
if (uiAuthController?.enabled) {
|
|
90
|
-
|
|
122
|
+
principal = await uiAuthController.ensureSessionToken(req, null);
|
|
123
|
+
if (!principal) { rejectWebSocketUpgrade(socket, 401, 'UI authentication required'); return; }
|
|
91
124
|
if (!await isRequestOriginAllowed(req)) { rejectWebSocketUpgrade(socket, 403, 'Invalid origin'); return; }
|
|
92
125
|
}
|
|
93
126
|
if (!wsServer) { rejectWebSocketUpgrade(socket, 503, 'STT WebSocket unavailable'); return; }
|
|
127
|
+
// Deterministic verify-registration barrier, as in the terminal
|
|
128
|
+
// runtime: generation captured before the auth/origin awaits.
|
|
129
|
+
const tracked = trackUpgradePrincipal(socket, principal, generation);
|
|
130
|
+
if (principal && tracked && tracked.active === false) return;
|
|
94
131
|
wsServer.handleUpgrade(req, socket, head, (ws) => wsServer.emit('connection', ws, req));
|
|
95
132
|
} catch { rejectWebSocketUpgrade(socket, 500, 'Upgrade failed'); }
|
|
96
133
|
})();
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { EventEmitter } from 'node:events';
|
|
2
|
+
import { describe, expect, test } from 'bun:test';
|
|
3
|
+
import { WebSocketServer } from 'ws';
|
|
4
|
+
|
|
5
|
+
import { createSttRuntime } from './runtime.js';
|
|
6
|
+
|
|
7
|
+
describe('STT runtime upgrade', () => {
|
|
8
|
+
test('skips handleUpgrade when principal tracking throws', async () => {
|
|
9
|
+
const originalHandleUpgrade = WebSocketServer.prototype.handleUpgrade;
|
|
10
|
+
let handleUpgradeCalls = 0;
|
|
11
|
+
WebSocketServer.prototype.handleUpgrade = function () {
|
|
12
|
+
handleUpgradeCalls += 1;
|
|
13
|
+
return undefined;
|
|
14
|
+
};
|
|
15
|
+
const app = {
|
|
16
|
+
get() {},
|
|
17
|
+
put() {},
|
|
18
|
+
post() {},
|
|
19
|
+
delete() {},
|
|
20
|
+
};
|
|
21
|
+
const express = { json: () => (_req, _res, next) => next?.() };
|
|
22
|
+
const server = new EventEmitter();
|
|
23
|
+
const runtime = createSttRuntime({
|
|
24
|
+
app,
|
|
25
|
+
server,
|
|
26
|
+
express,
|
|
27
|
+
uiAuthController: {
|
|
28
|
+
enabled: true,
|
|
29
|
+
ensureSessionToken: async () => 'client:thrower',
|
|
30
|
+
},
|
|
31
|
+
isRequestOriginAllowed: async () => true,
|
|
32
|
+
rejectWebSocketUpgrade: () => {},
|
|
33
|
+
modelsDir: '/tmp/stt-test-models',
|
|
34
|
+
configFile: '/tmp/stt-test-config.json',
|
|
35
|
+
liveRevocation: {
|
|
36
|
+
getGeneration: () => 0,
|
|
37
|
+
trackLiveConnection: () => { throw new Error('tracker boom'); },
|
|
38
|
+
},
|
|
39
|
+
});
|
|
40
|
+
try {
|
|
41
|
+
const socket = new EventEmitter();
|
|
42
|
+
socket.destroyed = false;
|
|
43
|
+
socket.destroy = function () { this.destroyed = true; };
|
|
44
|
+
server.emit('upgrade', { url: '/api/stt/ws', headers: {} }, socket, Buffer.alloc(0));
|
|
45
|
+
await new Promise((resolve) => setTimeout(resolve, 10));
|
|
46
|
+
expect(socket.destroyed).toBe(true);
|
|
47
|
+
expect(handleUpgradeCalls).toBe(0);
|
|
48
|
+
} finally {
|
|
49
|
+
WebSocketServer.prototype.handleUpgrade = originalHandleUpgrade;
|
|
50
|
+
await runtime.shutdown();
|
|
51
|
+
}
|
|
52
|
+
});
|
|
53
|
+
});
|
|
@@ -38,6 +38,8 @@ HTTP remains the authenticated command plane for create, resize, appearance upda
|
|
|
38
38
|
|
|
39
39
|
The WebSocket path must remain in both `isUrlAuthWebSocketPath` and relay `ALLOWED_WS_PATHS`. The client must use `getRuntimeUrlResolver().websocket()` and `openRuntimeWebSocket`; direct local URLs or raw browser WebSockets break relay and URL-token authentication.
|
|
40
40
|
|
|
41
|
+
This runtime owns the WebSocket's auth and connection lifetime: the upgrade re-validates the principal (credential store or signing secret) at establishment, so an already-minted URL token minted before a revocation or global sign-out is denied at open; the coordinator generation is captured before the auth/origin awaits and passed at track time, so a revocation racing verification reject-closes without trusting the principal and `handleUpgrade` is skipped for inactive entries. After the upgrade the connection is registered with the live-revocation coordinator under the authenticated principal, so a later revocation closes the socket within the documented latency guarantee. The 60-second URL token TTL gates establishment only — it never schedules a connection's death. Resource bounds (50 per principal / 1000 global) reject-close with `close('over-limit')` without evicting unrelated sockets. See `../client-auth/DOCUMENTATION.md`.
|
|
42
|
+
|
|
41
43
|
## Verification
|
|
42
44
|
|
|
43
45
|
Run:
|
|
@@ -29,7 +29,11 @@ const trimHistory = (history) => {
|
|
|
29
29
|
export function createTerminalRuntime({
|
|
30
30
|
app, server, fs, path, uiAuthController, buildAugmentedPath, searchPathFor, isExecutable,
|
|
31
31
|
isRequestOriginAllowed, rejectWebSocketUpgrade, TERMINAL_INPUT_WS_HEARTBEAT_INTERVAL_MS,
|
|
32
|
-
|
|
32
|
+
// Live-revocation owner for this transport: upgrades are tracked under the
|
|
33
|
+
// authenticated principal so a later revocation or global invalidation
|
|
34
|
+
// closes the socket. Lifetime is not tied to the 60-second URL token TTL
|
|
35
|
+
// used to establish the connection.
|
|
36
|
+
liveRevocation = null, loadPtyProvider, terminalTerminationGraceMs = TERMINATION_GRACE_MS,
|
|
33
37
|
}) {
|
|
34
38
|
const sessions = new Map();
|
|
35
39
|
const pendingSessionCreates = new Map();
|
|
@@ -274,15 +278,57 @@ export function createTerminalRuntime({
|
|
|
274
278
|
socket.on('close', cleanup); socket.on('error', () => {});
|
|
275
279
|
});
|
|
276
280
|
|
|
281
|
+
const trackUpgradePrincipal = (socket, principal, generation) => {
|
|
282
|
+
if (!principal || typeof liveRevocation?.trackLiveConnection !== 'function') return null;
|
|
283
|
+
let tracked;
|
|
284
|
+
try {
|
|
285
|
+
tracked = liveRevocation.trackLiveConnection({
|
|
286
|
+
principal,
|
|
287
|
+
close: () => {
|
|
288
|
+
if (!socket.destroyed) socket.destroy();
|
|
289
|
+
},
|
|
290
|
+
generation,
|
|
291
|
+
});
|
|
292
|
+
} catch {
|
|
293
|
+
try { if (!socket.destroyed) socket.destroy(); } catch {}
|
|
294
|
+
// A throwing tracker already destroyed the socket above; return an
|
|
295
|
+
// inactive entry so the caller skips handleUpgrade like any other
|
|
296
|
+
// rejected registration instead of upgrading a destroyed socket.
|
|
297
|
+
return { active: false, end: () => {}, revoke: () => false };
|
|
298
|
+
}
|
|
299
|
+
// Covers the pending window (gates passed, upgrade not yet handled), a
|
|
300
|
+
// failed upgrade, and the natural close after the WebSocket is live.
|
|
301
|
+
// Rejected registrations (revoked/stale-generation/over-limit/disposed)
|
|
302
|
+
// already destroyed the socket via close(); the inactive entry keeps the
|
|
303
|
+
// close handler safe and signals the caller to skip handleUpgrade.
|
|
304
|
+
socket.once('close', () => tracked.end());
|
|
305
|
+
return tracked;
|
|
306
|
+
};
|
|
307
|
+
|
|
277
308
|
const upgradeHandler = (req, socket, head) => {
|
|
278
309
|
if (parseRequestPathname(req.url) !== TERMINAL_WS_PATH) return;
|
|
279
310
|
void (async () => {
|
|
280
311
|
try {
|
|
312
|
+
let principal = null;
|
|
313
|
+
let generation;
|
|
314
|
+
try {
|
|
315
|
+
if (typeof liveRevocation?.getGeneration === 'function') generation = liveRevocation.getGeneration();
|
|
316
|
+
} catch {
|
|
317
|
+
generation = undefined;
|
|
318
|
+
}
|
|
281
319
|
if (uiAuthController?.enabled) {
|
|
282
|
-
|
|
320
|
+
principal = await uiAuthController.ensureSessionToken(req, null);
|
|
321
|
+
if (!principal) { rejectWebSocketUpgrade(socket, 401, 'UI authentication required'); return; }
|
|
283
322
|
if (!await isRequestOriginAllowed(req)) { rejectWebSocketUpgrade(socket, 403, 'Invalid origin'); return; }
|
|
284
323
|
}
|
|
285
324
|
if (!wsServer) { rejectWebSocketUpgrade(socket, 500, 'Terminal WebSocket unavailable'); return; }
|
|
325
|
+
// Deterministic verify-registration barrier: generation was captured
|
|
326
|
+
// before the auth/origin awaits, so a revocation or global
|
|
327
|
+
// invalidation racing verification reject-closes here without trusting
|
|
328
|
+
// the principal. An inactive entry means the socket is already
|
|
329
|
+
// destroyed — never call handleUpgrade for it.
|
|
330
|
+
const tracked = trackUpgradePrincipal(socket, principal, generation);
|
|
331
|
+
if (principal && tracked && tracked.active === false) return;
|
|
286
332
|
wsServer.handleUpgrade(req, socket, head, (ws) => wsServer.emit('connection', ws, req));
|
|
287
333
|
} catch { rejectWebSocketUpgrade(socket, 500, 'Upgrade failed'); }
|
|
288
334
|
})();
|