@walkhi/code-relax 0.1.0-beta.2 → 0.1.0-beta.21

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.
Files changed (120) hide show
  1. package/README.md +55 -71
  2. package/dist/bin/codex-remote.mjs +150 -126
  3. package/dist/bin/manage-relay-admin.mjs +20 -0
  4. package/dist/bin/migrate-relay-db.mjs +107 -0
  5. package/dist/bin/self-relay-admin.mjs +8 -0
  6. package/dist/bin/self-relay-demo.mjs +2 -2
  7. package/dist/bin/self-relay-server.mjs +18 -10
  8. package/dist/shared/app-server-events.cjs +42 -15
  9. package/dist/shared/file-mentions.cjs +35 -0
  10. package/dist/shared/server-requests.cjs +86 -58
  11. package/dist/skills/code-relax/SKILL.md +7 -6
  12. package/dist/src/desktop-launcher.mjs +16 -21
  13. package/dist/src/file-upload-session.mjs +124 -0
  14. package/dist/src/lan-socket-server.mjs +52 -9
  15. package/dist/src/managed-app-server.mjs +44 -13
  16. package/dist/src/message-images.mjs +0 -18
  17. package/dist/src/onboarding.mjs +9 -11
  18. package/dist/src/platform/README.md +1 -1
  19. package/dist/src/platform/windows/background-process.mjs +1 -1
  20. package/dist/src/platform/windows/codex-runtime.mjs +251 -0
  21. package/dist/src/platform/windows/desktop-host.mjs +17 -3
  22. package/dist/src/platform/windows/desktop-info.ps1 +2 -4
  23. package/dist/src/platform/windows/desktop-runtime.ps1 +10 -0
  24. package/dist/src/platform/windows/desktop-shortcuts.ps1 +7 -14
  25. package/dist/src/platform/windows/launch-worker.mjs +42 -0
  26. package/dist/src/platform/windows/resident-start.js +20 -0
  27. package/dist/src/platform/windows/resident-startup.ps1 +76 -20
  28. package/dist/src/platform/windows/service-host.mjs +4 -16
  29. package/dist/src/platform/windows/start-hidden-console.ps1 +10 -5
  30. package/dist/src/platform/windows/stop-desktop.ps1 +7 -4
  31. package/dist/src/platform/windows/user-environment.mjs +1 -1
  32. package/dist/src/runtime-discovery.mjs +43 -0
  33. package/dist/src/self-relay/admin-cloud.mjs +101 -0
  34. package/dist/src/self-relay/admin-page.mjs +79 -0
  35. package/dist/src/self-relay/admin-server.mjs +66 -0
  36. package/dist/src/self-relay/admin-state.mjs +82 -19
  37. package/dist/src/self-relay/admin-style.mjs +9 -0
  38. package/dist/src/self-relay/admin-usage-page.mjs +28 -0
  39. package/dist/src/self-relay/connector.mjs +243 -30
  40. package/dist/src/self-relay/demo.mjs +3 -4
  41. package/dist/src/self-relay/email-accounts.mjs +141 -0
  42. package/dist/src/self-relay/lifecycle.mjs +99 -142
  43. package/dist/src/self-relay/mysql-state.mjs +104 -0
  44. package/dist/src/self-relay/p2p-probe.mjs +1 -1
  45. package/dist/src/self-relay/server.mjs +335 -59
  46. package/dist/src/self-relay/usage-diagnostics.mjs +46 -0
  47. package/dist/src/self-relay/usage-meter.mjs +125 -0
  48. package/dist/src/server.mjs +731 -1439
  49. package/dist/src/service-control.mjs +4 -4
  50. package/dist/src/service-doctor.mjs +27 -29
  51. package/dist/src/service-health.mjs +2 -2
  52. package/dist/src/service-install.mjs +1 -4
  53. package/dist/src/service-lifecycle.mjs +19 -19
  54. package/dist/src/shared-app-server.mjs +277 -270
  55. package/dist/src/shared-catalog.mjs +1 -11
  56. package/dist/src/shared-recovery.mjs +11 -9
  57. package/dist/src/shared-thread-stream.mjs +1 -1
  58. package/dist/src/skill-install.mjs +0 -13
  59. package/package.json +17 -18
  60. package/tools/postinstall.mjs +69 -15
  61. package/dist/src/app-server-client.mjs +0 -468
  62. package/dist/src/app-server-tasks.mjs +0 -358
  63. package/dist/src/debug-ui.mjs +0 -131
  64. package/dist/src/platform/windows/desktop-monitor.mjs +0 -34
  65. package/dist/src/platform/windows/desktop-shortcut-run.ps1 +0 -5
  66. package/dist/src/platform/windows/desktop-tools.mjs +0 -48
  67. package/dist/src/platform/windows/launch-worker.ps1 +0 -20
  68. package/dist/src/thread-catalog.mjs +0 -47
  69. package/dist/tools/find-desktop-pipe.mjs +0 -10
  70. package/dist/web/activity-view.js +0 -283
  71. package/dist/web/approval-ui.js +0 -188
  72. package/dist/web/capabilities.js +0 -57
  73. package/dist/web/chat-transport.js +0 -202
  74. package/dist/web/chat.css +0 -782
  75. package/dist/web/chat.js +0 -3830
  76. package/dist/web/client-platform.js +0 -11
  77. package/dist/web/community-view.js +0 -20
  78. package/dist/web/community.css +0 -77
  79. package/dist/web/community.html +0 -37
  80. package/dist/web/composer-controller.js +0 -101
  81. package/dist/web/conversation-controller.js +0 -99
  82. package/dist/web/disclosure-state-controller.js +0 -95
  83. package/dist/web/draft-controller.js +0 -103
  84. package/dist/web/harmony-platform.js +0 -52
  85. package/dist/web/highlight-powershell.min.js +0 -39
  86. package/dist/web/highlight.min.js +0 -1262
  87. package/dist/web/history-cache.js +0 -240
  88. package/dist/web/history-controller.js +0 -167
  89. package/dist/web/index.html +0 -325
  90. package/dist/web/lan-session.js +0 -122
  91. package/dist/web/link-action-controller.js +0 -212
  92. package/dist/web/message-send-controller.js +0 -177
  93. package/dist/web/message-view.js +0 -98
  94. package/dist/web/p2p-data-channel.js +0 -50
  95. package/dist/web/p2p-diagnostics.js +0 -28
  96. package/dist/web/p2p-probe.js +0 -123
  97. package/dist/web/page-resume.js +0 -28
  98. package/dist/web/pending-message-store.js +0 -108
  99. package/dist/web/queue-controller.js +0 -82
  100. package/dist/web/resources.json +0 -1
  101. package/dist/web/self-relay-session.js +0 -129
  102. package/dist/web/server-requests.js +0 -67
  103. package/dist/web/station-connection-controller.js +0 -75
  104. package/dist/web/task-list-view.js +0 -296
  105. package/dist/web/thread-attention-controller.js +0 -124
  106. package/dist/web/thread-context-controller.js +0 -30
  107. package/dist/web/thread-list-controller.js +0 -61
  108. package/dist/web/thread-list-sync.js +0 -86
  109. package/dist/web/thread-title-controller.js +0 -57
  110. package/dist/web/timeline-formatters.js +0 -249
  111. package/dist/web/timeline-reducer.js +0 -81
  112. package/dist/web/timeline-renderer.js +0 -161
  113. package/dist/web/timeline-scroll-controller.js +0 -50
  114. package/dist/web/timeline-sync.js +0 -67
  115. package/dist/web/usage-controller.js +0 -258
  116. package/dist/web/vendor/README.md +0 -14
  117. package/dist/web/vendor/highlight-powershell.min.js +0 -39
  118. package/dist/web/vendor/highlight.LICENSE.txt +0 -29
  119. package/dist/web/vendor/highlight.min.js +0 -1262
  120. package/dist/web/vendor/lucide.LICENSE.txt +0 -17
@@ -1,33 +1,179 @@
1
- import { randomUUID } from 'node:crypto';
2
- import { EventEmitter } from 'node:events';
3
- import WebSocket from 'ws';
1
+ import { randomUUID } from 'node:crypto';
2
+ import { EventEmitter } from 'node:events';
3
+ import fs from 'node:fs';
4
+ import WebSocket from 'ws';
4
5
  import { decode, loopbackUrl, relayAddress, send } from './wire.mjs';
5
6
  import { createP2pProbe, validProbeSignal } from './p2p-probe.mjs';
6
7
  import { createWindowsRouteHelper } from './windows-route-helper.mjs';
7
8
 
8
9
  // Reuse the actual LAN dispatcher, including its normal/shared capability boundary.
9
10
  // The LAN token never travels to the relay. No requests are replayed after a close.
10
- export function connectBridgeRelay({ relayUrl, hostKey, bridgeUrl, bridgeToken, identity, bridgeConnection, hostName = 'Codex-PC', lanCandidates = [], p2pProbe = false, iceServers = [], p2pWindowsRouteHelper = false, p2pWindowsRouteHelperToken = '' }) {
11
+ export function connectBridgeRelay({ relayUrl, hostKey, bridgeUrl, bridgeToken, identity, bridgeConnection, usageCacheFile,
12
+ hostName = 'Codex-PC', lanCandidates = [], p2pProbe = false, iceServers = [], p2pWindowsRouteHelper = false, p2pWindowsRouteHelperToken = '' }) {
11
13
  relayAddress(relayUrl); loopbackUrl(bridgeUrl, '/api/socket');
12
- if (!bridgeToken) throw new Error('Bridge token required');
14
+ if (!bridgeToken) throw new Error('Desktop service credential required');
13
15
  const events = new EventEmitter();
14
16
  const remote = new WebSocket(relayUrl, { maxPayload: 64 * 1024 * 1024, perMessageDeflate: {
15
17
  serverNoContextTakeover: true, clientNoContextTakeover: true,
16
18
  threshold: 1024, zlibDeflateOptions: { level: 3 },
17
19
  } });
18
- const locals = new Map();
19
- let heartbeat, operation, lastClose;
20
+ const locals = new Map();
21
+ const fileLocals = new Map();
22
+ const activeTurns = new Map();
23
+ const completedTurns = new Map();
24
+ const trackedTurns = new Map();
25
+ if (usageCacheFile) {
26
+ try {
27
+ const saved = JSON.parse(fs.readFileSync(usageCacheFile, 'utf8'));
28
+ if (saved.version === 1 && Array.isArray(saved.turns)) {
29
+ for (const item of saved.turns.slice(0, 128)) {
30
+ if (typeof item.threadId === 'string' && item.threadId.length <= 80 &&
31
+ typeof item.turnId === 'string' && item.turnId.length <= 80) trackedTurns.set(item.threadId, item.turnId);
32
+ }
33
+ }
34
+ } catch (error) { if (error.code !== 'ENOENT') events.emit('diagnostic', `Usage task cache: ${error.message}`); }
35
+ }
36
+ function saveTrackedTurns() {
37
+ if (!usageCacheFile) return;
38
+ try {
39
+ const temp = `${usageCacheFile}.tmp`;
40
+ fs.writeFileSync(temp, JSON.stringify({ version: 1, turns: [...trackedTurns].map(([threadId, turnId]) => ({ threadId, turnId })) }), { mode: 0o600 });
41
+ fs.renameSync(temp, usageCacheFile);
42
+ } catch (error) { events.emit('diagnostic', `Usage task cache: ${error.message}`); }
43
+ }
44
+ let fileRemote, fileRetryTimer, turnLocal, turnRetryTimer, turnPulseTimer, turnObserverReady = false,
45
+ queueTurnResync = () => {}, heartbeat, operation, lastClose, closing = false;
20
46
  const alive = () => { clearTimeout(heartbeat); heartbeat = setTimeout(() => remote.terminate(), 75000); };
21
47
  remote.on('open', alive); remote.on('ping', alive); remote.on('message', alive);
22
- function dropLocal(session) {
23
- const current = locals.get(session);
24
- if (!current) return;
25
- locals.delete(session); clearTimeout(current.timer); current.socket?.terminate();
26
- current.probe?.then(probe => probe.close());
27
- }
28
- function dropLocals() {
29
- for (const session of [...locals.keys()]) dropLocal(session);
48
+ function dropLocal(session) {
49
+ const current = locals.get(session);
50
+ if (!current) return;
51
+ locals.delete(session); clearTimeout(current.timer);
52
+ if (current.ready && current.socket?.readyState === WebSocket.OPEN && current.usageRequests.size &&
53
+ remote.readyState === WebSocket.OPEN && !closing) {
54
+ // Keep only the in-flight submission receipt; no late response goes to the phone.
55
+ current.detached = true;
56
+ current.detachedTimer = setTimeout(() => current.socket?.terminate(), 35000);
57
+ } else current.socket?.terminate();
58
+ current.probe?.then(probe => probe.close());
59
+ current.diagnosticProbe?.then(probe => probe.close());
30
60
  }
61
+ function dropLocals() {
62
+ for (const session of [...locals.keys()]) dropLocal(session);
63
+ for (const socket of fileLocals.values()) socket.terminate();
64
+ fileLocals.clear(); clearTimeout(fileRetryTimer); fileRemote?.terminate(); fileRemote = undefined;
65
+ clearTimeout(turnRetryTimer); clearInterval(turnPulseTimer); turnLocal?.terminate(); turnLocal = undefined;
66
+ turnObserverReady = false; activeTurns.clear(); completedTurns.clear();
67
+ }
68
+ function startTurnReceiver() {
69
+ if (closing || remote.readyState !== WebSocket.OPEN) return;
70
+ let connection;
71
+ try { connection = bridgeConnection?.() || { url: bridgeUrl, token: bridgeToken }; loopbackUrl(connection.url, '/api/socket'); }
72
+ catch { turnRetryTimer = setTimeout(startTurnReceiver, 3000); return; }
73
+ const socket = turnLocal = new WebSocket(connection.url, { maxPayload: 64 * 1024, perMessageDeflate: false });
74
+ const resyncPending = new Map();
75
+ let resyncId = 1, resyncQueue = [];
76
+ function resyncNext() {
77
+ if (!turnObserverReady || turnLocal !== socket) return;
78
+ while (resyncPending.size < 8 && resyncQueue.length) {
79
+ const [threadId, turnId] = resyncQueue.shift();
80
+ if (trackedTurns.get(threadId) !== turnId) continue;
81
+ const id = ++resyncId;
82
+ resyncPending.set(id, { threadId, turnId });
83
+ send(socket, { type: 'request', id, method: 'GET', path: `/api/threads/${encodeURIComponent(threadId)}/active-turn` });
84
+ }
85
+ }
86
+ queueTurnResync = (threadId, turnId) => { resyncQueue.push([threadId, turnId]); resyncNext(); };
87
+ socket.on('open', () => send(socket, { type: 'auth', token: connection.token }));
88
+ socket.on('error', error => events.emit('diagnostic', `Local turn observer: ${error.message}`));
89
+ socket.on('close', () => {
90
+ if (turnLocal !== socket) return;
91
+ turnLocal = undefined;
92
+ if (turnObserverReady) send(remote, { type: 'usage-observer-lost' });
93
+ turnObserverReady = false;
94
+ queueTurnResync = () => {};
95
+ activeTurns.clear(); completedTurns.clear();
96
+ if (!closing && remote.readyState === WebSocket.OPEN) turnRetryTimer = setTimeout(startTurnReceiver, 3000);
97
+ });
98
+ socket.on('message', (bytes, binary) => {
99
+ if (binary || turnLocal !== socket) return socket.terminate();
100
+ try {
101
+ const message = decode(bytes, false);
102
+ if (message.type === 'ready') { send(socket, { type: 'subscribe', id: 1, path: '/api/turn-events' }); return; }
103
+ if (message.type === 'subscribed' && message.id === 1) {
104
+ turnObserverReady = true; resyncQueue = [...trackedTurns]; resyncNext(); return;
105
+ }
106
+ if (message.type === 'response' && resyncPending.has(message.id)) {
107
+ const { threadId, turnId } = resyncPending.get(message.id);
108
+ resyncPending.delete(message.id);
109
+ if (trackedTurns.get(threadId) === turnId) {
110
+ if (message.status === 200 && message.body?.turnId === turnId) {
111
+ activeTurns.set(threadId, turnId);
112
+ send(remote, { type: 'usage-turn', method: 'resume', threadId, turnId });
113
+ } else if (message.status === 200 || message.status === 404) {
114
+ trackedTurns.delete(threadId); saveTrackedTurns();
115
+ } else { socket.close(); return; }
116
+ }
117
+ resyncNext(); return;
118
+ }
119
+ if (message.type === 'event' && message.id === 1 && message.event === 'turn') {
120
+ const { method, threadId, turnId } = message.data || {};
121
+ if (!['turn/started', 'turn/completed'].includes(method) || typeof threadId !== 'string' || typeof turnId !== 'string') return;
122
+ const key = `${threadId}:${turnId}`;
123
+ if (method === 'turn/started') activeTurns.set(threadId, turnId);
124
+ else {
125
+ if (activeTurns.get(threadId) === turnId) activeTurns.delete(threadId);
126
+ if (trackedTurns.get(threadId) === turnId) { trackedTurns.delete(threadId); saveTrackedTurns(); }
127
+ completedTurns.set(key, Date.now());
128
+ if (completedTurns.size > 100) completedTurns.delete(completedTurns.keys().next().value);
129
+ }
130
+ send(remote, { type: 'usage-turn', method, threadId, turnId });
131
+ } else if (message.type === 'end' || (message.type === 'response' && message.status >= 400)) socket.close();
132
+ } catch (error) { events.emit('diagnostic', error.message); socket.terminate(); }
133
+ });
134
+ }
135
+ function startFileReceiver() {
136
+ if (!identity || closing || remote.readyState !== WebSocket.OPEN) return;
137
+ const receiver = fileRemote = new WebSocket(relayUrl, { maxPayload: 512 * 1024, perMessageDeflate: false });
138
+ receiver.on('open', () => send(receiver, { type: 'file-host', deviceId: identity.id, deviceSecret: identity.secret }));
139
+ receiver.on('error', error => events.emit('diagnostic', `File receiver: ${error.message}`));
140
+ receiver.on('close', () => {
141
+ for (const socket of fileLocals.values()) socket.terminate();
142
+ fileLocals.clear();
143
+ if (fileRemote === receiver) {
144
+ fileRemote = undefined;
145
+ if (!closing && remote.readyState === WebSocket.OPEN) fileRetryTimer = setTimeout(startFileReceiver, 3000);
146
+ }
147
+ });
148
+ receiver.on('message', (bytes, binary) => {
149
+ try {
150
+ const message = decode(bytes, binary);
151
+ if (message.type === 'file-host-ready') return;
152
+ if (message.type === 'file-open') {
153
+ const connection = bridgeConnection?.() || { url: bridgeUrl, token: bridgeToken };
154
+ const url = new URL(connection.url); url.pathname = '/api/file-transfer';
155
+ loopbackUrl(url.href, '/api/file-transfer');
156
+ const socket = new WebSocket(url.href, { maxPayload: 512 * 1024, perMessageDeflate: false });
157
+ fileLocals.set(message.session, socket);
158
+ socket.on('open', () => send(socket, { type: 'auth', token: connection.token }));
159
+ socket.on('error', error => events.emit('diagnostic', `Local file receiver: ${error.message}`));
160
+ socket.on('close', () => {
161
+ if (fileLocals.get(message.session) !== socket) return;
162
+ fileLocals.delete(message.session);
163
+ send(receiver, { type: 'file-close', session: message.session });
164
+ });
165
+ socket.on('message', (data, isBinary) => {
166
+ if (isBinary || fileLocals.get(message.session) !== socket) return socket.terminate();
167
+ send(receiver, { type: 'file-frame', session: message.session, payload: data.toString() });
168
+ });
169
+ } else if (message.type === 'file-frame') {
170
+ const socket = fileLocals.get(message.session);
171
+ if (socket?.readyState === WebSocket.OPEN) socket.send(message.payload);
172
+ } else if (message.type === 'file-close') fileLocals.get(message.session)?.terminate();
173
+ else throw new Error('Invalid file receiver frame');
174
+ } catch (error) { events.emit('diagnostic', error.message); receiver.close(1008, 'Invalid file frame'); }
175
+ });
176
+ }
31
177
  const ready = new Promise((resolve, reject) => {
32
178
  let registered = false;
33
179
  const timer = setTimeout(() => { reject(new Error('Relay registration timeout')); remote.terminate(); }, 5000);
@@ -44,7 +190,13 @@ export function connectBridgeRelay({ relayUrl, hostKey, bridgeUrl, bridgeToken,
44
190
  remote.on('message', (bytes, binary) => {
45
191
  try {
46
192
  const message = decode(bytes, binary);
47
- if (message.type === 'registered' && !registered) { registered = true; clearTimeout(timer); resolve(message); return; }
193
+ if (message.type === 'registered' && !registered) {
194
+ registered = true; clearTimeout(timer); startFileReceiver(); startTurnReceiver();
195
+ turnPulseTimer = setInterval(() => {
196
+ for (const [threadId, turnId] of activeTurns) send(remote, { type: 'usage-turn', method: 'heartbeat', threadId, turnId });
197
+ }, 10000);
198
+ resolve(message); return;
199
+ }
48
200
  if (!registered) throw new Error('Relay not registered');
49
201
  if (message.type === 'pair-code' || message.type === 'revoked' || message.type === 'status') {
50
202
  if (operation && message.commandId === operation.id && message.type === operation.responseType) {
@@ -60,7 +212,7 @@ export function connectBridgeRelay({ relayUrl, hostKey, bridgeUrl, bridgeToken,
60
212
  events.emit('attached', { session: message.session, clientId: message.clientId });
61
213
  dropLocal(message.session);
62
214
  const current = { socket: undefined, ready: false, timer: undefined, p2pProbe: p2pProbe && message.p2pProbe === 1,
63
- bridgeOutbound: Promise.resolve() };
215
+ bridgeOutbound: Promise.resolve(), usageRequests: new Map(), detached: false, detachedTimer: undefined };
64
216
  locals.set(message.session, current);
65
217
  let connection;
66
218
  try {
@@ -68,30 +220,65 @@ export function connectBridgeRelay({ relayUrl, hostKey, bridgeUrl, bridgeToken,
68
220
  loopbackUrl(connection.url, '/api/socket');
69
221
  } catch {
70
222
  send(remote, { type: 'detach', session: message.session }); dropLocal(message.session); events.emit('detached', { session: message.session });
71
- events.emit('diagnostic', 'Local Bridge connection not ready'); return;
223
+ events.emit('diagnostic', 'Local desktop service connection not ready'); return;
72
224
  }
73
225
  const socket = current.socket = new WebSocket(connection.url, { maxPayload: 64 * 1024 * 1024, perMessageDeflate: false });
74
226
  current.forwardToBridge = payload => {
75
- if (locals.get(message.session) !== current || !current.ready) throw new Error('Local Bridge connection not ready');
227
+ if (locals.get(message.session) !== current || !current.ready) throw new Error('Local desktop service connection not ready');
76
228
  const request = decode(payload, false);
77
229
  if (!['request', 'subscribe', 'unsubscribe'].includes(request.type)) throw new Error('Unsupported LAN message');
230
+ if (request.type === 'request' && request.method === 'POST' && Number.isSafeInteger(request.id)) {
231
+ const path = (request.path || '').split('?')[0];
232
+ const existing = /^\/api\/threads\/([^/?]+)\/(?:messages|queue)$/.exec(path);
233
+ const created = /^\/api\/projects\/[^/?]+\/threads$/.test(path);
234
+ if (existing || created) {
235
+ const threadId = existing ? decodeURIComponent(existing[1]) : null;
236
+ const messageKey = typeof request.body?.clientUserMessageId === 'string' && request.body.clientUserMessageId.length <= 64
237
+ ? request.body.clientUserMessageId : `${message.session}:${request.id}`;
238
+ current.usageRequests.set(request.id, { threadId, messageKey, created });
239
+ send(remote, { type: 'usage-arm', session: message.session, requestId: request.id, threadId });
240
+ }
241
+ }
78
242
  send(socket, request);
79
243
  };
80
244
  current.timer = setTimeout(() => socket.terminate(), 5000);
81
245
  socket.on('open', () => send(socket, { type: 'auth', token: connection.token }));
82
- socket.on('error', error => events.emit('diagnostic', `Local Bridge: ${error.message}`));
83
- socket.on('close', () => {
84
- if (locals.get(message.session)?.socket !== socket) return;
246
+ socket.on('error', error => events.emit('diagnostic', `Local desktop service: ${error.message}`));
247
+ socket.on('close', () => {
248
+ clearTimeout(current.detachedTimer);
249
+ if (locals.get(message.session)?.socket !== socket) return;
85
250
  send(remote, { type: 'detach', session: message.session }); dropLocal(message.session); events.emit('detached', { session: message.session });
86
251
  });
87
- socket.on('message', (data, isBinary) => {
88
- if (locals.get(message.session)?.socket !== socket) return;
252
+ socket.on('message', (data, isBinary) => {
253
+ if (locals.get(message.session)?.socket !== socket && !current.detached) return;
89
254
  try {
90
255
  const response = decode(data, isBinary);
91
256
  if (!current.ready) {
92
- if (response.type !== 'ready') throw new Error('Local Bridge authentication failed');
257
+ if (response.type !== 'ready') throw new Error('Local desktop service authentication failed');
93
258
  clearTimeout(current.timer); current.ready = true; send(remote, { type: 'ready', session: message.session });
94
259
  } else {
260
+ const usage = response.type === 'response' ? current.usageRequests.get(response.id) : null;
261
+ if (usage) {
262
+ current.usageRequests.delete(response.id);
263
+ const threadId = usage.threadId || response.body?.threadId;
264
+ if (response.status >= 200 && response.status < 300 && typeof threadId === 'string') {
265
+ const turnId = usage.created ? response.body?.turnId : response.body?.usage?.turnId;
266
+ const turnKind = usage.created ? 'start' : response.body?.usage?.kind;
267
+ send(remote, { type: 'usage-message', session: message.session, requestId: response.id,
268
+ threadId, messageKey: usage.messageKey, turnId, turnKind,
269
+ completed: completedTurns.has(`${threadId}:${turnId}`), observerReady: turnObserverReady,
270
+ active: activeTurns.get(threadId) === turnId });
271
+ if (['start', 'steer'].includes(turnKind) && typeof turnId === 'string' &&
272
+ !completedTurns.has(`${threadId}:${turnId}`)) {
273
+ trackedTurns.set(threadId, turnId); saveTrackedTurns();
274
+ if (turnObserverReady && !activeTurns.has(threadId)) queueTurnResync(threadId, turnId);
275
+ }
276
+ } else send(remote, { type: 'usage-cancel', session: message.session, requestId: response.id });
277
+ }
278
+ if (current.detached) {
279
+ if (!current.usageRequests.size) socket.terminate();
280
+ return;
281
+ }
95
282
  const payload = data.toString();
96
283
  current.bridgeOutbound = current.bridgeOutbound.then(async () => {
97
284
  const probe = await current.probe;
@@ -102,10 +289,36 @@ export function connectBridgeRelay({ relayUrl, hostKey, bridgeUrl, bridgeToken,
102
289
  }
103
290
  } catch (error) { events.emit('diagnostic', error.message); socket.terminate(); }
104
291
  });
105
- } else if (message.type === 'p2p-probe' && locals.has(message.session)) {
106
- const current = locals.get(message.session);
107
- if (!current.ready || !current.p2pProbe || !validProbeSignal(message)) throw new Error('Invalid probe signal');
108
- if (message.kind === 'start' && current.probeId !== message.probeId) {
292
+ } else if (message.type === 'p2p-probe' && locals.has(message.session)) {
293
+ const current = locals.get(message.session);
294
+ if (!current.ready || !current.p2pProbe || !validProbeSignal(message)) throw new Error('Invalid probe signal');
295
+ if (message.purpose === 'diagnostic') {
296
+ if (message.kind === 'start' && current.diagnosticProbeId !== message.probeId) {
297
+ void current.diagnosticProbe?.then(probe => probe.close());
298
+ current.diagnosticProbeId = message.probeId;
299
+ const probeId = message.probeId;
300
+ current.diagnosticProbe = createP2pProbe({ iceServers,
301
+ signal: signal => {
302
+ if (locals.get(message.session) === current && current.diagnosticProbeId === probeId) {
303
+ send(remote, { type: 'p2p-probe', purpose: 'diagnostic', session: message.session,
304
+ version: 1, probeId, ...signal });
305
+ }
306
+ },
307
+ report: (state, diagnostic) => events.emit('p2p-probe', { state, diagnostic })
308
+ }).catch(() => {
309
+ if (locals.get(message.session) === current && current.diagnosticProbeId === probeId) {
310
+ send(remote, { type: 'p2p-probe', purpose: 'diagnostic', session: message.session,
311
+ version: 1, probeId, kind: 'close' });
312
+ }
313
+ return { receive() {}, close() {} };
314
+ });
315
+ } else if (current.diagnosticProbe && current.diagnosticProbeId === message.probeId) {
316
+ void current.diagnosticProbe.then(probe => probe.receive(message));
317
+ }
318
+ return;
319
+ }
320
+ if (message.purpose) throw new Error('Invalid probe purpose');
321
+ if (message.kind === 'start' && current.probeId !== message.probeId) {
109
322
  void current.probe?.then(probe => probe.close());
110
323
  current.probeId = message.probeId;
111
324
  current.routeSignals = Promise.resolve();
@@ -157,6 +370,6 @@ export function connectBridgeRelay({ relayUrl, hostKey, bridgeUrl, bridgeToken,
157
370
  updateLanCandidates(candidates) {
158
371
  if (!send(remote, { type: 'lan-candidates', candidates })) throw new Error('中继未连接');
159
372
  },
160
- close() { clearTimeout(heartbeat); dropLocals(); remote.terminate(); }
373
+ close() { closing = true; clearTimeout(heartbeat); dropLocals(); remote.terminate(); }
161
374
  };
162
375
  }
@@ -7,7 +7,7 @@ import { connectRelayClient } from './client.mjs';
7
7
  import { secret } from './wire.mjs';
8
8
 
9
9
  export async function startRelayDemo({ mode = 'lan-shared', pairingTtlMs, dispatch, remoteRelay, hostName = 'TEST-PC', lanCandidates = [], relayOptions = {} } = {}) {
10
- if (!['lan-legacy', 'lan-shared'].includes(mode)) throw new Error('Invalid demo mode');
10
+ if (mode !== 'lan-shared') throw new Error('Invalid demo mode');
11
11
  const token = secret(), calls = [];
12
12
  const bridge = http.createServer((_request, response) => { response.writeHead(404); response.end(); });
13
13
  const lan = attachLanSocket(bridge, { token, dispatch: async (request, reply) => {
@@ -17,9 +17,8 @@ export async function startRelayDemo({ mode = 'lan-shared', pairingTtlMs, dispat
17
17
  if (request.url.split('?')[0] === '/api/threads/demo/events') {
18
18
  reply.startEvents(); reply.event('update', { thread: { id: 'demo' }, simulated: true }); return;
19
19
  }
20
- if (request.url === '/api/demo/stop') return reply.json(mode === 'lan-shared' ? 200 : 409,
21
- mode === 'lan-shared' ? { stopped: true, simulated: true } : { error: '基础控制不支持停止任务' });
22
- reply.json(404, { error: '模拟 Bridge 不执行真实任务' });
20
+ if (request.url === '/api/demo/stop') return reply.json(200, { stopped: true, simulated: true });
21
+ reply.json(404, { error: '模拟桌面服务不执行真实任务' });
23
22
  } });
24
23
  await new Promise(resolve => bridge.listen(0, '127.0.0.1', resolve));
25
24
  const relay = remoteRelay ? { ...remoteRelay, async close() {} } : await startSelfRelay({ pairingTtlMs, ...relayOptions });
@@ -0,0 +1,141 @@
1
+ import fs from 'node:fs';
2
+ import { createHash, createHmac, randomBytes, randomInt, randomUUID, timingSafeEqual } from 'node:crypto';
3
+ import { tencentAccountProvider } from '../../relay-admin/tencent-account-provider.mjs';
4
+
5
+ const sqlTime = value => value.replace('T', ' ').replace(/Z$/, '');
6
+ const isoTime = value => value.replace(' ', 'T') + 'Z';
7
+ const error = (status, message) => Object.assign(new Error(message), { status });
8
+ const tokenHash = token => createHash('sha256').update(token).digest('hex');
9
+ const normalizeEmail = value => {
10
+ if (typeof value !== 'string') throw error(400, 'Invalid email address');
11
+ const email = value.trim().toLowerCase();
12
+ if (email.length > 254 || !/^[a-z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-z0-9-]+(?:\.[a-z0-9-]+)+$/.test(email)) {
13
+ throw error(400, 'Invalid email address');
14
+ }
15
+ return email;
16
+ };
17
+
18
+ export function openEmailAccounts(pool, configFile, providerOverride) {
19
+ const config = JSON.parse(fs.readFileSync(configFile, 'utf8'));
20
+ if (![config.secretId, config.secretKey, config.captchaAppSecretKey, config.fromEmailAddress, config.sesRegion]
21
+ .every(value => typeof value === 'string' && value.length > 0) ||
22
+ !Number.isSafeInteger(config.captchaAppId) || config.captchaAppId < 1 ||
23
+ !Number.isSafeInteger(config.emailTemplateId) || config.emailTemplateId < 1 ||
24
+ typeof config.codePepper !== 'string' || config.codePepper.length < 32) {
25
+ throw new Error('Incomplete relay account configuration');
26
+ }
27
+ const provider = providerOverride || tencentAccountProvider(config);
28
+ const codeHash = (email, code) => createHmac('sha256', config.codePepper).update(`${email}\0${code}`).digest('hex');
29
+ const scopeHash = value => createHmac('sha256', config.codePepper).update(value).digest('hex');
30
+
31
+ async function requestCode({ email: rawEmail, ticket, randstr }, ip) {
32
+ const email = normalizeEmail(rawEmail);
33
+ if (typeof ticket !== 'string' || !ticket || ticket.length > 2048 ||
34
+ typeof randstr !== 'string' || !randstr || randstr.length > 128) throw error(400, 'Invalid human verification');
35
+ if (!ip || ip.length > 64) throw error(400, 'Invalid client address');
36
+ // A cheap pre-check precedes the billable human verification.
37
+ const [recent] = await pool.execute('SELECT sent_at FROM email_login_challenges WHERE email = ? AND sent_at > UTC_TIMESTAMP(3) - INTERVAL 60 SECOND', [email]);
38
+ if (recent.length) throw error(429, 'Please wait before requesting another code');
39
+ const [ipLimit] = await pool.execute(`SELECT request_count FROM email_send_limits
40
+ WHERE scope_hash=? AND window_start>=UTC_TIMESTAMP() - INTERVAL 1 HOUR ORDER BY window_start DESC LIMIT 1`, [scopeHash(`ip:${ip}`)]);
41
+ if (ipLimit[0]?.request_count >= 20) throw error(429, 'Too many email requests');
42
+ if (!await provider.verifyHuman(ticket, randstr, ip)) throw error(403, 'Human verification failed');
43
+ const code = String(randomInt(0, 1000000)).padStart(6, '0');
44
+ const hash = codeHash(email, code);
45
+ const windowStart = sqlTime(new Date(Math.floor(Date.now() / 3600000) * 3600000).toISOString()).slice(0, 19);
46
+ const db = await pool.getConnection();
47
+ try {
48
+ await db.beginTransaction();
49
+ for (const [scope, limit] of [[`email:${email}`, 5], [`ip:${ip}`, 20]]) {
50
+ const key = scopeHash(scope);
51
+ await db.execute('INSERT INTO email_send_limits (scope_hash,window_start,request_count) VALUES (?,?,1) ON DUPLICATE KEY UPDATE request_count=request_count+1', [key, windowStart]);
52
+ const [rows] = await db.execute('SELECT request_count FROM email_send_limits WHERE scope_hash=? AND window_start=? FOR UPDATE', [key, windowStart]);
53
+ if (rows[0].request_count > limit) throw error(429, 'Too many email requests');
54
+ }
55
+ const [existing] = await db.execute('SELECT sent_at FROM email_login_challenges WHERE email=? FOR UPDATE', [email]);
56
+ if (existing.length && Date.now() - new Date(`${existing[0].sent_at.replace(' ', 'T')}Z`).getTime() < 60000) {
57
+ throw error(429, 'Please wait before requesting another code');
58
+ }
59
+ await db.execute(`INSERT INTO email_login_challenges (email,code_hash,expires_at,attempts,sent_at)
60
+ VALUES (?, ?, UTC_TIMESTAMP(3) + INTERVAL 10 MINUTE, 0, UTC_TIMESTAMP(3))
61
+ ON DUPLICATE KEY UPDATE code_hash=VALUES(code_hash),expires_at=VALUES(expires_at),attempts=0,sent_at=VALUES(sent_at)`, [email, hash]);
62
+ await db.commit();
63
+ } catch (failure) { await db.rollback(); throw failure; }
64
+ finally { db.release(); }
65
+ try { await provider.sendLoginCode(email, code); }
66
+ catch (failure) {
67
+ await pool.execute('DELETE FROM email_login_challenges WHERE email=? AND code_hash=?', [email, hash]);
68
+ throw error(503, 'Email delivery unavailable');
69
+ }
70
+ return { sent: true, expiresInSeconds: 600 };
71
+ }
72
+
73
+ async function verifyCode({ email: rawEmail, code }) {
74
+ const email = normalizeEmail(rawEmail);
75
+ if (typeof code !== 'string' || !/^\d{6}$/.test(code)) throw error(400, 'Invalid code');
76
+ const db = await pool.getConnection();
77
+ try {
78
+ await db.beginTransaction();
79
+ const [challenges] = await db.execute('SELECT code_hash,attempts,expires_at FROM email_login_challenges WHERE email=? FOR UPDATE', [email]);
80
+ const challenge = challenges[0];
81
+ if (!challenge || new Date(`${challenge.expires_at.replace(' ', 'T')}Z`).getTime() <= Date.now()) throw error(401, 'Code expired or incorrect');
82
+ const supplied = Buffer.from(codeHash(email, code), 'hex');
83
+ if (!timingSafeEqual(supplied, Buffer.from(challenge.code_hash, 'hex'))) {
84
+ if (challenge.attempts >= 4) await db.execute('DELETE FROM email_login_challenges WHERE email=?', [email]);
85
+ else await db.execute('UPDATE email_login_challenges SET attempts=attempts+1 WHERE email=?', [email]);
86
+ await db.commit();
87
+ throw error(401, 'Code expired or incorrect');
88
+ }
89
+ await db.execute('DELETE FROM email_login_challenges WHERE email=?', [email]);
90
+ const [identities] = await db.execute(`SELECT u.id,u.status FROM user_login_identities i
91
+ JOIN users u ON u.id=i.user_id WHERE i.kind='email' AND i.normalized_value=?`, [email]);
92
+ let userId = identities[0]?.id;
93
+ if (identities[0]?.status === 'disabled') throw error(403, 'Account unavailable');
94
+ if (!userId) {
95
+ userId = randomUUID();
96
+ await db.execute('INSERT INTO users (id,status,created_at,updated_at) VALUES (?,\'active\',UTC_TIMESTAMP(3),UTC_TIMESTAMP(3))', [userId]);
97
+ await db.execute(`INSERT INTO user_login_identities (user_id,kind,normalized_value,verified_at,created_at)
98
+ VALUES (?,'email',?,UTC_TIMESTAMP(3),UTC_TIMESTAMP(3))`, [userId, email]);
99
+ }
100
+ const token = randomBytes(32).toString('base64url');
101
+ await db.execute(`INSERT INTO user_sessions (token_hash,user_id,created_at,expires_at)
102
+ VALUES (?,?,UTC_TIMESTAMP(3),UTC_TIMESTAMP(3) + INTERVAL 30 DAY)`, [tokenHash(token), userId]);
103
+ await db.commit();
104
+ return { token, user: { id: userId, email }, expiresInSeconds: 30 * 86400 };
105
+ } catch (failure) { await db.rollback(); throw failure; }
106
+ finally { db.release(); }
107
+ }
108
+
109
+ async function current(token) {
110
+ if (typeof token !== 'string' || !/^[A-Za-z0-9_-]{43}$/.test(token)) throw error(401, 'Unauthorized');
111
+ const [rows] = await pool.execute(`SELECT u.id,i.normalized_value AS email,s.expires_at FROM user_sessions s
112
+ JOIN users u ON u.id=s.user_id JOIN user_login_identities i ON i.user_id=u.id AND i.kind='email'
113
+ WHERE s.token_hash=? AND s.revoked_at IS NULL AND s.expires_at>UTC_TIMESTAMP(3) AND u.status='active'`, [tokenHash(token)]);
114
+ if (!rows.length) throw error(401, 'Unauthorized');
115
+ return { id: rows[0].id, email: rows[0].email, expiresAt: isoTime(rows[0].expires_at) };
116
+ }
117
+
118
+ async function usage(userId) {
119
+ const [settings] = await pool.query('SELECT mode FROM relay_usage_settings WHERE id=1');
120
+ if (settings.length !== 1) throw new Error('Missing relay usage settings');
121
+ const [budgets] = await pool.execute(`SELECT period_start,period_end,limit_seconds,used_seconds FROM relay_usage_budgets
122
+ WHERE user_id=? AND period_start<=UTC_TIMESTAMP(3) AND period_end>UTC_TIMESTAMP(3)
123
+ ORDER BY period_start DESC LIMIT 2`, [userId]);
124
+ if (budgets.length > 1) throw new Error('Overlapping relay usage budgets');
125
+ const budget = budgets[0];
126
+ const [totals] = await pool.execute('SELECT task_seconds FROM relay_usage_totals WHERE user_id=?', [userId]);
127
+ return { mode: settings[0].mode, periodStart: budget ? isoTime(budget.period_start) : null,
128
+ periodEnd: budget ? isoTime(budget.period_end) : null,
129
+ limitSeconds: budget?.limit_seconds == null ? null : Number(budget.limit_seconds),
130
+ usedSeconds: budget ? Number(budget.used_seconds) : 0,
131
+ taskSeconds: Number(totals[0]?.task_seconds || 0) };
132
+ }
133
+
134
+ async function logout(token) {
135
+ await current(token);
136
+ await pool.execute('UPDATE user_sessions SET revoked_at=UTC_TIMESTAMP(3) WHERE token_hash=? AND revoked_at IS NULL', [tokenHash(token)]);
137
+ return { ok: true };
138
+ }
139
+
140
+ return { captchaAppId: config.captchaAppId, requestCode, verifyCode, current, usage, logout };
141
+ }