@hjd-hitsz/claudex-web 4.1.4 → 4.2.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/.env.example +2 -0
- package/CHANGELOG.md +47 -0
- package/README.md +13 -1
- package/bin/auth.mjs +86 -0
- package/bin/claudex-web.mjs +20 -0
- package/bin/p2p.mjs +134 -0
- package/build-info.json +4 -4
- package/client/dist/app.js +104 -104
- package/client/dist/code-highlight-style.js +1 -1
- package/client/dist/document-editor.js +55 -54
- package/client/dist/file-panel.js +5 -5
- package/client/dist/notification-worker.js +2 -1
- package/client/dist/p2p-sw.js +162 -0
- package/client/dist/style.css +1 -1
- package/client/dist/terminal-panel.js +11 -11
- package/docs/architecture/backends.md +9 -2
- package/docs/architecture/behavior.md +167 -53
- package/docs/architecture.md +36 -337
- package/docs/background-tasks.md +30 -26
- package/docs/deployment.md +47 -6
- package/docs/development.md +111 -153
- package/docs/images/desktop-dark.png +0 -0
- package/docs/images/desktop-light.png +0 -0
- package/docs/images/mobile-sidebar.png +0 -0
- package/docs/images/mobile.png +0 -0
- package/docs/releases/v4.1.5.md +6 -0
- package/docs/releases/v4.2.0.md +13 -0
- package/docs/versioning.md +13 -3
- package/package.json +14 -5
- package/packages/background-terminal/LICENSE +674 -0
- package/packages/background-terminal/README.md +17 -0
- package/packages/background-terminal/background-jobs.mjs +457 -0
- package/packages/background-terminal/background-mcp.mjs +79 -0
- package/packages/background-terminal/background-protocol.mjs +80 -0
- package/packages/background-terminal/cli.mjs +14 -0
- package/packages/background-terminal/client.mjs +61 -0
- package/packages/background-terminal/codex.mjs +88 -0
- package/packages/background-terminal/delivery.mjs +192 -0
- package/packages/background-terminal/log.mjs +25 -0
- package/packages/background-terminal/native-watches.mjs +160 -0
- package/packages/background-terminal/package.json +15 -0
- package/packages/background-terminal/service.mjs +126 -0
- package/packages/translation-engine/package.json +1 -1
- package/server/src/application.mjs +82 -10
- package/server/src/auth-http.mjs +187 -0
- package/server/src/auth-login.mjs +144 -0
- package/server/src/auth-totp.mjs +233 -0
- package/server/src/auth.mjs +169 -220
- package/server/src/backends/claude/background-tasks.mjs +88 -35
- package/server/src/backends/claude/messages.mjs +1 -1
- package/server/src/backends/claude/worker-client.mjs +47 -35
- package/server/src/backends/claude/worker-lines.mjs +17 -0
- package/server/src/backends/claude/worker-server.mjs +49 -69
- package/server/src/backends/codex/adapter.mjs +46 -5
- package/server/src/backends/codex/background-service.mjs +85 -0
- package/server/src/backends/codex/background-task-views.mjs +87 -0
- package/server/src/backends/codex/background-terminals.mjs +91 -0
- package/server/src/backends/codex/events.mjs +11 -0
- package/server/src/backends/codex/methods.mjs +1 -0
- package/server/src/backends/codex/native-background-handoff.mjs +72 -0
- package/server/src/backends/codex/requests.mjs +51 -38
- package/server/src/backends/codex/subscriptions.mjs +34 -4
- package/server/src/backends/configuration.mjs +8 -0
- package/server/src/backends/manager.mjs +35 -33
- package/server/src/backends/storage.mjs +3 -14
- package/server/src/config.mjs +13 -0
- package/server/src/http/business.mjs +21 -0
- package/server/src/http/router.mjs +12 -25
- package/server/src/p2p/http.mjs +136 -0
- package/server/src/p2p/peers.mjs +132 -0
- package/server/src/p2p/service.mjs +229 -0
- package/server/src/p2p/storage.mjs +45 -0
- package/server/src/p2p/tunnel.mjs +95 -0
- package/server/src/p2p-http.mjs +149 -0
- package/server/src/p2p-peer.mjs +135 -0
- package/server/src/private-file.mjs +14 -0
- package/server/src/summary-translation.mjs +1 -1
- package/server/src/thread-folders.mjs +3 -13
- package/server/src/translation-service.mjs +3 -8
- package/server/src/workspace/file-search.mjs +244 -0
- package/server/src/workspace/service.mjs +17 -3
- package/shared/codex-preferences.mjs +9 -0
- package/shared/p2p-wire.mjs +157 -0
package/server/src/auth.mjs
CHANGED
|
@@ -1,48 +1,27 @@
|
|
|
1
|
-
import { migrateWebDirectory } from "./web-config-migration.mjs";
|
|
2
1
|
import { createHash, randomBytes, timingSafeEqual } from "node:crypto";
|
|
3
|
-
import {
|
|
2
|
+
import { readFile, writeFile, rename } from "node:fs/promises";
|
|
4
3
|
import { join } from "node:path";
|
|
5
4
|
import { userInfo } from "node:os";
|
|
6
|
-
import {
|
|
5
|
+
import { createLoginFlow, localSessionBinding } from "./auth-login.mjs";
|
|
6
|
+
import { openTotpStore, prepareAuthDirectory } from "./auth-totp.mjs";
|
|
7
|
+
import {
|
|
8
|
+
createAuthHttpHandler,
|
|
9
|
+
isDirectLocalRequest,
|
|
10
|
+
json,
|
|
11
|
+
requestToken,
|
|
12
|
+
sessionCookieName,
|
|
13
|
+
} from "./auth-http.mjs";
|
|
7
14
|
|
|
8
|
-
const cookieName = "__Host-claudex-web-session";
|
|
9
15
|
const digest = (value) => createHash("sha256").update(value).digest("hex");
|
|
10
|
-
const
|
|
11
|
-
|
|
12
|
-
|
|
16
|
+
const tokenId = (token) =>
|
|
17
|
+
typeof token === "string" && /^[a-zA-Z0-9_-]{43}$/.test(token)
|
|
18
|
+
? digest(token)
|
|
19
|
+
: null;
|
|
20
|
+
function isLoopback(address) {
|
|
13
21
|
return ["127.0.0.1", "::1", "::ffff:127.0.0.1"].includes(address);
|
|
14
22
|
}
|
|
15
|
-
function json(response, status, body, headers = {}) {
|
|
16
|
-
response.writeHead(status, {
|
|
17
|
-
"Content-Type": "application/json",
|
|
18
|
-
"Cache-Control": "no-store",
|
|
19
|
-
...headers,
|
|
20
|
-
});
|
|
21
|
-
response.end(JSON.stringify(body));
|
|
22
|
-
}
|
|
23
|
-
async function credentials(request) {
|
|
24
|
-
if (!/^application\/json(?:;|$)/i.test(request.headers["content-type"] || ""))
|
|
25
|
-
throw new Error("请使用 JSON 提交登录信息。", { cause: 415 });
|
|
26
|
-
let size = 0;
|
|
27
|
-
const chunks = [];
|
|
28
|
-
for await (const chunk of request.iterator({ destroyOnReturn: false })) {
|
|
29
|
-
size += chunk.length;
|
|
30
|
-
if (size > 8192) throw new Error("登录信息过长。", { cause: 413 });
|
|
31
|
-
chunks.push(chunk);
|
|
32
|
-
}
|
|
33
|
-
try {
|
|
34
|
-
return JSON.parse(Buffer.concat(chunks).toString("utf8"));
|
|
35
|
-
} catch {
|
|
36
|
-
throw new Error("登录信息格式错误。", { cause: 400 });
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
23
|
export async function createAuthentication(config) {
|
|
40
|
-
await
|
|
41
|
-
"sessions.json",
|
|
42
|
-
"maintenance-token",
|
|
43
|
-
]);
|
|
44
|
-
const directory = join(config.configDir, "auth");
|
|
45
|
-
await mkdir(directory, { recursive: true, mode: 0o700 });
|
|
24
|
+
const directory = await prepareAuthDirectory(config);
|
|
46
25
|
const path = join(directory, "sessions.json");
|
|
47
26
|
const username = userInfo().username;
|
|
48
27
|
let entries = [];
|
|
@@ -51,9 +30,15 @@ export async function createAuthentication(config) {
|
|
|
51
30
|
} catch (error) {
|
|
52
31
|
if (error.code !== "ENOENT") throw error;
|
|
53
32
|
}
|
|
33
|
+
const totp = await openTotpStore(directory);
|
|
34
|
+
const allowed = (session) =>
|
|
35
|
+
session &&
|
|
36
|
+
session.expiresAt > Date.now() &&
|
|
37
|
+
(session.binding === localSessionBinding ||
|
|
38
|
+
totp.allowsBinding(session.binding));
|
|
54
39
|
const sessions = new Map(
|
|
55
40
|
entries.filter(
|
|
56
|
-
([,
|
|
41
|
+
([, session]) => session.username === username && allowed(session),
|
|
57
42
|
),
|
|
58
43
|
);
|
|
59
44
|
const sockets = new Map();
|
|
@@ -70,6 +55,7 @@ export async function createAuthentication(config) {
|
|
|
70
55
|
writing = result;
|
|
71
56
|
return result;
|
|
72
57
|
};
|
|
58
|
+
if (entries.length !== sessions.size) await persist();
|
|
73
59
|
const secretPath = join(directory, "maintenance-token");
|
|
74
60
|
let maintenanceToken;
|
|
75
61
|
try {
|
|
@@ -87,26 +73,53 @@ export async function createAuthentication(config) {
|
|
|
87
73
|
for (const response of responses.get(id) || []) response.destroy();
|
|
88
74
|
responses.delete(id);
|
|
89
75
|
};
|
|
90
|
-
const
|
|
76
|
+
const lookup = (id) => {
|
|
91
77
|
const session = sessions.get(id);
|
|
92
|
-
if (!session
|
|
78
|
+
if (!session) return null;
|
|
79
|
+
if (!allowed(session)) {
|
|
93
80
|
revoke(id);
|
|
81
|
+
persist().catch((error) => console.error("清理失效登录会话失败", error));
|
|
94
82
|
return null;
|
|
95
83
|
}
|
|
96
84
|
return session;
|
|
97
85
|
};
|
|
98
|
-
const
|
|
99
|
-
const
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
if (tokens.length !== 1) return null;
|
|
107
|
-
const token = tokens[0].slice(name.length + 1);
|
|
108
|
-
return /^[a-zA-Z0-9_-]{43}$/.test(token) ? digest(token) : null;
|
|
86
|
+
const valid = (id, linkId, local = false) => {
|
|
87
|
+
const session = lookup(id);
|
|
88
|
+
if (
|
|
89
|
+
session?.linkId !== linkId ||
|
|
90
|
+
(session?.binding === localSessionBinding && !local)
|
|
91
|
+
)
|
|
92
|
+
return null;
|
|
93
|
+
return session;
|
|
109
94
|
};
|
|
95
|
+
function trackConnection(connections, id, connection, session) {
|
|
96
|
+
if (!connections.has(id)) connections.set(id, new Set());
|
|
97
|
+
const tracked = connections.get(id);
|
|
98
|
+
tracked.add(connection);
|
|
99
|
+
let timer;
|
|
100
|
+
const expire = () => {
|
|
101
|
+
if (!lookup(id)) return;
|
|
102
|
+
timer = setTimeout(
|
|
103
|
+
expire,
|
|
104
|
+
Math.min(session.expiresAt - Date.now(), 2147483647),
|
|
105
|
+
);
|
|
106
|
+
timer.unref();
|
|
107
|
+
};
|
|
108
|
+
const untrack = () => {
|
|
109
|
+
connection.removeListener("close", untrack);
|
|
110
|
+
clearTimeout(timer);
|
|
111
|
+
tracked.delete(connection);
|
|
112
|
+
if (!tracked.size && connections.get(id) === tracked)
|
|
113
|
+
connections.delete(id);
|
|
114
|
+
};
|
|
115
|
+
connection.once("close", untrack);
|
|
116
|
+
expire();
|
|
117
|
+
return untrack;
|
|
118
|
+
}
|
|
119
|
+
const sessionId = (request) =>
|
|
120
|
+
tokenId(
|
|
121
|
+
requestToken(request, sessionCookieName, "__Host-codex-web-session"),
|
|
122
|
+
);
|
|
110
123
|
const sameOrigin = (request) => {
|
|
111
124
|
const origin = request.headers.origin;
|
|
112
125
|
return (
|
|
@@ -114,37 +127,81 @@ export async function createAuthentication(config) {
|
|
|
114
127
|
origin === `https://${request.headers.host}`
|
|
115
128
|
);
|
|
116
129
|
};
|
|
117
|
-
const
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
130
|
+
const sessionCheck = setInterval(() => {
|
|
131
|
+
if (!sessions.size) return;
|
|
132
|
+
try {
|
|
133
|
+
const expired = [...sessions].filter(([, session]) => !allowed(session));
|
|
134
|
+
if (!expired.length) return;
|
|
135
|
+
for (const [id] of expired) revoke(id);
|
|
136
|
+
persist().catch((error) => console.error("清理失效登录会话失败", error));
|
|
137
|
+
} catch (error) {
|
|
138
|
+
console.error("检查登录会话失败", error);
|
|
139
|
+
}
|
|
140
|
+
}, 1000);
|
|
141
|
+
sessionCheck.unref();
|
|
142
|
+
const describe = ({ username, expiresAt, binding }) => ({
|
|
143
|
+
authenticated: true,
|
|
144
|
+
username,
|
|
145
|
+
expiresAt,
|
|
146
|
+
...(binding === localSessionBinding
|
|
147
|
+
? { kind: "local", totpStatus: totp.state().status }
|
|
148
|
+
: {
|
|
149
|
+
totpStatus: binding.startsWith("totp:") ? "enabled" : "disabled",
|
|
150
|
+
}),
|
|
151
|
+
});
|
|
152
|
+
async function issueSession({ previousId, linkId, signal, binding, local }) {
|
|
153
|
+
const current =
|
|
154
|
+
binding === localSessionBinding
|
|
155
|
+
? local && !linkId
|
|
156
|
+
: totp.allowsBinding(binding);
|
|
157
|
+
if (!current)
|
|
158
|
+
throw new Error("登录设置已变更,请重新登录。", { cause: 410 });
|
|
159
|
+
for (const [key, session] of sessions)
|
|
160
|
+
if (session.expiresAt <= Date.now()) revoke(key);
|
|
161
|
+
if (sessions.size >= 64) revoke(sessions.keys().next().value);
|
|
162
|
+
if (valid(previousId, linkId, local)) revoke(previousId);
|
|
163
|
+
const token = randomBytes(32).toString("base64url");
|
|
164
|
+
const id = digest(token);
|
|
165
|
+
const session = {
|
|
166
|
+
username,
|
|
167
|
+
expiresAt: Date.now() + config.sessionDays * 86400000,
|
|
168
|
+
binding,
|
|
128
169
|
};
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
170
|
+
sessions.set(id, linkId ? { ...session, linkId } : session);
|
|
171
|
+
try {
|
|
172
|
+
await persist();
|
|
173
|
+
if (signal?.aborted) {
|
|
174
|
+
revoke(id);
|
|
175
|
+
await persist();
|
|
176
|
+
signal.throwIfAborted();
|
|
177
|
+
}
|
|
178
|
+
if (!lookup(id))
|
|
179
|
+
throw new Error("登录设置已变更,请重新登录。", { cause: 410 });
|
|
180
|
+
} catch (error) {
|
|
181
|
+
revoke(id);
|
|
182
|
+
throw error;
|
|
183
|
+
}
|
|
184
|
+
return { id, token, session: describe(session) };
|
|
185
|
+
}
|
|
186
|
+
async function logout(id, linkId, local) {
|
|
187
|
+
if (!valid(id, linkId, local)) return;
|
|
188
|
+
revoke(id);
|
|
189
|
+
await persist();
|
|
140
190
|
}
|
|
191
|
+
const loginFlow = createLoginFlow({ config, username, totp, issueSession });
|
|
141
192
|
return {
|
|
193
|
+
close() {
|
|
194
|
+
clearInterval(sessionCheck);
|
|
195
|
+
totp.close();
|
|
196
|
+
},
|
|
142
197
|
sameOrigin,
|
|
198
|
+
isDirectLocalRequest,
|
|
199
|
+
describe,
|
|
143
200
|
valid,
|
|
144
201
|
sessionId,
|
|
145
202
|
authorize(request, response) {
|
|
146
203
|
const id = sessionId(request);
|
|
147
|
-
const session = valid(id);
|
|
204
|
+
const session = valid(id, undefined, isDirectLocalRequest(request));
|
|
148
205
|
if (!session) {
|
|
149
206
|
json(response, 401, { error: "请先登录。" });
|
|
150
207
|
return false;
|
|
@@ -158,23 +215,7 @@ export async function createAuthentication(config) {
|
|
|
158
215
|
json(response, 403, { error: "请求来源不匹配。" });
|
|
159
216
|
return false;
|
|
160
217
|
}
|
|
161
|
-
|
|
162
|
-
responses.get(id).add(response);
|
|
163
|
-
let timer;
|
|
164
|
-
const expire = () => {
|
|
165
|
-
if (!valid(id)) return;
|
|
166
|
-
timer = setTimeout(
|
|
167
|
-
expire,
|
|
168
|
-
Math.min(session.expiresAt - Date.now(), 2147483647),
|
|
169
|
-
);
|
|
170
|
-
timer.unref();
|
|
171
|
-
};
|
|
172
|
-
expire();
|
|
173
|
-
response.once("close", () => {
|
|
174
|
-
clearTimeout(timer);
|
|
175
|
-
responses.get(id)?.delete(response);
|
|
176
|
-
if (!responses.get(id)?.size) responses.delete(id);
|
|
177
|
-
});
|
|
218
|
+
trackConnection(responses, id, response, session);
|
|
178
219
|
return true;
|
|
179
220
|
},
|
|
180
221
|
maintenance(request) {
|
|
@@ -187,142 +228,50 @@ export async function createAuthentication(config) {
|
|
|
187
228
|
timingSafeEqual(supplied, expected)
|
|
188
229
|
);
|
|
189
230
|
},
|
|
190
|
-
attach(socket, id) {
|
|
191
|
-
const session = valid(id);
|
|
231
|
+
attach(socket, id, linkId, local) {
|
|
232
|
+
const session = valid(id, linkId, local);
|
|
192
233
|
if (!session) {
|
|
193
234
|
socket.close(4401, "登录已失效,请重新登录");
|
|
194
235
|
return;
|
|
195
236
|
}
|
|
196
237
|
socket.authSessionId = id;
|
|
197
|
-
|
|
198
|
-
sockets
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
Math.min(session.expiresAt - Date.now(), 2147483647),
|
|
205
|
-
);
|
|
206
|
-
timer.unref();
|
|
207
|
-
};
|
|
208
|
-
expire();
|
|
209
|
-
socket.once("close", () => {
|
|
210
|
-
clearTimeout(timer);
|
|
211
|
-
sockets.get(id)?.delete(socket);
|
|
238
|
+
socket.authLocal = local;
|
|
239
|
+
return trackConnection(sockets, id, socket, session);
|
|
240
|
+
},
|
|
241
|
+
loginPeer(linkId, input, options) {
|
|
242
|
+
return loginFlow.login(() => input, `p2p:${linkId}`, {
|
|
243
|
+
...options,
|
|
244
|
+
linkId,
|
|
212
245
|
});
|
|
213
246
|
},
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
json(response, 405, { error: "不支持此登录操作。" });
|
|
234
|
-
return true;
|
|
235
|
-
}
|
|
236
|
-
if (
|
|
237
|
-
!sameOrigin(request) ||
|
|
238
|
-
request.headers["x-claudex-web-request"] !== "1"
|
|
239
|
-
) {
|
|
240
|
-
json(response, 403, { error: "请求来源不匹配,请重新打开本站。" });
|
|
241
|
-
return true;
|
|
242
|
-
}
|
|
243
|
-
if (route === "/api/auth/logout") {
|
|
244
|
-
revoke(id);
|
|
245
|
-
await persist();
|
|
246
|
-
json(
|
|
247
|
-
response,
|
|
248
|
-
200,
|
|
249
|
-
{ authenticated: false },
|
|
250
|
-
{ "Set-Cookie": cookie("", 0) },
|
|
251
|
-
);
|
|
252
|
-
return true;
|
|
253
|
-
}
|
|
254
|
-
if (limited(request.socket.remoteAddress)) {
|
|
255
|
-
json(
|
|
256
|
-
response,
|
|
257
|
-
429,
|
|
258
|
-
{ error: "登录尝试过于频繁,请稍后重试。" },
|
|
259
|
-
{ "Retry-After": "900" },
|
|
260
|
-
);
|
|
261
|
-
return true;
|
|
262
|
-
}
|
|
263
|
-
active++;
|
|
264
|
-
try {
|
|
265
|
-
const input = await credentials(request);
|
|
266
|
-
const { username: submitted, password } = input || {};
|
|
267
|
-
if (
|
|
268
|
-
typeof submitted !== "string" ||
|
|
269
|
-
typeof password !== "string" ||
|
|
270
|
-
!submitted ||
|
|
271
|
-
!password ||
|
|
272
|
-
submitted.length > 256 ||
|
|
273
|
-
password.length > 1024 ||
|
|
274
|
-
/\0/.test(submitted + password)
|
|
275
|
-
) {
|
|
276
|
-
json(response, 400, { error: "请输入有效的系统用户名和密码。" });
|
|
277
|
-
return true;
|
|
278
|
-
}
|
|
279
|
-
if (
|
|
280
|
-
submitted !== username ||
|
|
281
|
-
!(await authenticateSystemUser(submitted, password, config))
|
|
282
|
-
) {
|
|
283
|
-
json(response, 401, {
|
|
284
|
-
error:
|
|
285
|
-
"用户名或密码错误,或系统账户不可用。请使用运行服务的系统账户。",
|
|
286
|
-
});
|
|
287
|
-
return true;
|
|
288
|
-
}
|
|
289
|
-
for (const [key, session] of sessions)
|
|
290
|
-
if (session.expiresAt <= Date.now()) revoke(key);
|
|
291
|
-
if (sessions.size >= 64) revoke(sessions.keys().next().value);
|
|
292
|
-
revoke(id);
|
|
293
|
-
const token = randomBytes(32).toString("base64url");
|
|
294
|
-
const session = {
|
|
295
|
-
username,
|
|
296
|
-
expiresAt: Date.now() + config.sessionDays * 86400000,
|
|
297
|
-
};
|
|
298
|
-
const key = digest(token);
|
|
299
|
-
sessions.set(key, session);
|
|
300
|
-
try {
|
|
301
|
-
await persist();
|
|
302
|
-
} catch (error) {
|
|
303
|
-
revoke(key);
|
|
304
|
-
throw error;
|
|
305
|
-
}
|
|
306
|
-
json(
|
|
307
|
-
response,
|
|
308
|
-
200,
|
|
309
|
-
{ authenticated: true, ...session },
|
|
310
|
-
{ "Set-Cookie": cookie(token, config.sessionDays * 86400) },
|
|
311
|
-
);
|
|
312
|
-
} finally {
|
|
313
|
-
active--;
|
|
314
|
-
}
|
|
315
|
-
} catch (error) {
|
|
316
|
-
request.resume();
|
|
317
|
-
if (!response.headersSent && !response.destroyed)
|
|
318
|
-
json(response, typeof error.cause === "number" ? error.cause : 503, {
|
|
319
|
-
error:
|
|
320
|
-
typeof error.cause === "number"
|
|
321
|
-
? error.message
|
|
322
|
-
: "登录暂不可用,请稍后重试或联系管理员。",
|
|
323
|
-
});
|
|
324
|
-
}
|
|
325
|
-
return true;
|
|
247
|
+
verifyPeer(linkId, input, options) {
|
|
248
|
+
return loginFlow.verify(input, `p2p:${linkId}`, { ...options, linkId });
|
|
249
|
+
},
|
|
250
|
+
pendingPeer: loginFlow.pending,
|
|
251
|
+
cancelPeer: loginFlow.cancel,
|
|
252
|
+
resumePeer(linkId, token) {
|
|
253
|
+
const id = tokenId(token);
|
|
254
|
+
const session = valid(id, linkId);
|
|
255
|
+
if (!session) return { session: { authenticated: false } };
|
|
256
|
+
return { id, session: describe(session) };
|
|
257
|
+
},
|
|
258
|
+
logoutPeer: (linkId, id) => logout(id, linkId),
|
|
259
|
+
async revokeLink(linkId) {
|
|
260
|
+
const ids = [...sessions].filter(
|
|
261
|
+
([, session]) => session.linkId === linkId,
|
|
262
|
+
);
|
|
263
|
+
if (!ids.length) return;
|
|
264
|
+
for (const [id] of ids) revoke(id);
|
|
265
|
+
await persist();
|
|
326
266
|
},
|
|
267
|
+
handle: createAuthHttpHandler({
|
|
268
|
+
loginFlow,
|
|
269
|
+
sessionId,
|
|
270
|
+
sameOrigin,
|
|
271
|
+
valid,
|
|
272
|
+
describe,
|
|
273
|
+
logout,
|
|
274
|
+
sessionDays: config.sessionDays,
|
|
275
|
+
}),
|
|
327
276
|
};
|
|
328
277
|
}
|
|
@@ -5,6 +5,13 @@ import {
|
|
|
5
5
|
recoverNativeProcesses,
|
|
6
6
|
} from "./process-ownership.mjs";
|
|
7
7
|
|
|
8
|
+
const shellTask = (task) =>
|
|
9
|
+
task?.is_backgrounded &&
|
|
10
|
+
!task.ambient &&
|
|
11
|
+
["local_bash", "shell", "local_shell"].includes(task.task_type);
|
|
12
|
+
const activeTask = (task) =>
|
|
13
|
+
["running", "pending", "unknown"].includes(task.status);
|
|
14
|
+
|
|
8
15
|
export function createBackgroundTasks({ storage, save, emit }) {
|
|
9
16
|
const owners = new Map();
|
|
10
17
|
async function event(threadId, message, process) {
|
|
@@ -24,16 +31,26 @@ export function createBackgroundTasks({ storage, save, emit }) {
|
|
|
24
31
|
}));
|
|
25
32
|
}
|
|
26
33
|
if (subtype === "background_tasks_changed") {
|
|
27
|
-
const
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
34
|
+
const live = new Set(message.tasks.map((task) => task.task_id));
|
|
35
|
+
for (const task of message.tasks)
|
|
36
|
+
owners.set(`${threadId}/${task.task_id}`, process);
|
|
37
|
+
await save(threadId, (s) => {
|
|
38
|
+
const tasks = { ...s.backgroundTasks };
|
|
39
|
+
for (const [id, task] of Object.entries(tasks))
|
|
40
|
+
if (task.is_backgrounded && activeTask(task) && !live.has(id))
|
|
41
|
+
tasks[id] = { ...task, status: "stopped" };
|
|
42
|
+
for (const task of message.tasks) {
|
|
43
|
+
const previous = tasks[task.task_id];
|
|
44
|
+
tasks[task.task_id] = {
|
|
45
|
+
...previous,
|
|
46
|
+
...task,
|
|
47
|
+
startedAt: previous?.startedAt ?? Date.now(),
|
|
48
|
+
status: "running",
|
|
49
|
+
is_backgrounded: true,
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
return { ...s, backgroundTasks: tasks };
|
|
53
|
+
});
|
|
37
54
|
} else if (
|
|
38
55
|
[
|
|
39
56
|
"task_started",
|
|
@@ -84,7 +101,10 @@ export function createBackgroundTasks({ storage, save, emit }) {
|
|
|
84
101
|
...s.backgroundTasks?.[id],
|
|
85
102
|
...message,
|
|
86
103
|
...message.patch,
|
|
87
|
-
...(subtype === "task_started" && {
|
|
104
|
+
...(subtype === "task_started" && {
|
|
105
|
+
status: "running",
|
|
106
|
+
startedAt: s.backgroundTasks?.[id]?.startedAt ?? Date.now(),
|
|
107
|
+
}),
|
|
88
108
|
},
|
|
89
109
|
},
|
|
90
110
|
}));
|
|
@@ -113,42 +133,55 @@ export function createBackgroundTasks({ storage, save, emit }) {
|
|
|
113
133
|
const tasks = Object.values(session.backgroundTasks || {})
|
|
114
134
|
.filter(
|
|
115
135
|
(task) =>
|
|
116
|
-
!ended.has(task.task_id) &&
|
|
117
|
-
task.is_backgrounded &&
|
|
118
|
-
["local_bash", "shell", "local_shell"].includes(task.task_type) &&
|
|
119
|
-
["running", "pending", "unknown"].includes(task.status),
|
|
136
|
+
!ended.has(task.task_id) && shellTask(task) && activeTask(task),
|
|
120
137
|
)
|
|
121
138
|
.map((task) => ({
|
|
122
139
|
processId: task.task_id,
|
|
140
|
+
startedAt: task.startedAt,
|
|
123
141
|
command: task.description || task.summary || "后台终端",
|
|
124
142
|
cwd: session.cwd,
|
|
125
143
|
status: task.status,
|
|
126
144
|
}));
|
|
127
145
|
return tasks;
|
|
128
146
|
}
|
|
147
|
+
async function stopTask(threadId, taskId) {
|
|
148
|
+
const process = owners.get(`${threadId}/${taskId}`);
|
|
149
|
+
if (!process?.query) {
|
|
150
|
+
const session = (await storage.read()).sessions[threadId];
|
|
151
|
+
const previous = session.backgroundTasks[taskId];
|
|
152
|
+
if (!previous.nativeProcess)
|
|
153
|
+
throw new Error("后台终端缺少可核对的进程身份,请检查原后端进程。");
|
|
154
|
+
await recoverNativeProcesses(previous);
|
|
155
|
+
} else await process.query.stopTask(taskId);
|
|
156
|
+
await save(threadId, (s) => ({
|
|
157
|
+
...s,
|
|
158
|
+
backgroundTasks: {
|
|
159
|
+
...s.backgroundTasks,
|
|
160
|
+
[taskId]: { ...s.backgroundTasks[taskId], status: "stopped" },
|
|
161
|
+
},
|
|
162
|
+
}));
|
|
163
|
+
emit("thread/backgroundTerminals/updated", { threadId });
|
|
164
|
+
}
|
|
165
|
+
async function readTask({ threadId, taskId }) {
|
|
166
|
+
const task = (await storage.read()).sessions[threadId]?.backgroundTasks?.[
|
|
167
|
+
taskId
|
|
168
|
+
];
|
|
169
|
+
if (!shellTask(task)) throw new Error("该对话中没有此后台任务");
|
|
170
|
+
const query = owners.get(`${threadId}/${taskId}`)?.query;
|
|
171
|
+
if (!query?.getTaskOutput) throw new Error("原生后台终端输出当前不可读取");
|
|
172
|
+
const result = await query.getTaskOutput(taskId);
|
|
173
|
+
return {
|
|
174
|
+
id: taskId,
|
|
175
|
+
title: task.description || task.summary || "后台终端",
|
|
176
|
+
status: activeTask(task) ? "running" : task.status,
|
|
177
|
+
output: result.output,
|
|
178
|
+
truncated: result.truncated,
|
|
179
|
+
};
|
|
180
|
+
}
|
|
129
181
|
async function clean(p) {
|
|
130
182
|
const data = await records(p);
|
|
131
183
|
const results = await Promise.allSettled(
|
|
132
|
-
data.map(
|
|
133
|
-
const process = owners.get(`${p.threadId}/${task.processId}`);
|
|
134
|
-
if (!process?.query) {
|
|
135
|
-
const session = (await storage.read()).sessions[p.threadId];
|
|
136
|
-
const previous = session.backgroundTasks[task.processId];
|
|
137
|
-
if (!previous.nativeProcess)
|
|
138
|
-
throw new Error("后台终端缺少可核对的进程身份,请检查原后端进程。");
|
|
139
|
-
await recoverNativeProcesses(previous);
|
|
140
|
-
} else await process.query.stopTask(task.processId);
|
|
141
|
-
await save(p.threadId, (s) => ({
|
|
142
|
-
...s,
|
|
143
|
-
backgroundTasks: {
|
|
144
|
-
...s.backgroundTasks,
|
|
145
|
-
[task.processId]: {
|
|
146
|
-
...s.backgroundTasks[task.processId],
|
|
147
|
-
status: "stopped",
|
|
148
|
-
},
|
|
149
|
-
},
|
|
150
|
-
}));
|
|
151
|
-
}),
|
|
184
|
+
data.map((task) => stopTask(p.threadId, task.processId)),
|
|
152
185
|
);
|
|
153
186
|
const errors = results.filter((r) => r.status === "rejected");
|
|
154
187
|
if (errors.length)
|
|
@@ -163,6 +196,26 @@ export function createBackgroundTasks({ storage, save, emit }) {
|
|
|
163
196
|
async (p) => page(await records(p), p),
|
|
164
197
|
],
|
|
165
198
|
["thread/backgroundTerminals/clean", clean],
|
|
199
|
+
[
|
|
200
|
+
"thread/backgroundTasks/list",
|
|
201
|
+
async (p) => ({
|
|
202
|
+
tasks: (await records(p)).map((task) => ({
|
|
203
|
+
id: task.processId,
|
|
204
|
+
title: task.command,
|
|
205
|
+
status: "running",
|
|
206
|
+
startedAt: task.startedAt,
|
|
207
|
+
})),
|
|
208
|
+
}),
|
|
209
|
+
],
|
|
210
|
+
["thread/backgroundTasks/read", readTask],
|
|
211
|
+
[
|
|
212
|
+
"thread/backgroundTasks/cancel",
|
|
213
|
+
async (p) => {
|
|
214
|
+
if ((await records(p)).some((task) => task.processId === p.taskId))
|
|
215
|
+
await stopTask(p.threadId, p.taskId);
|
|
216
|
+
return {};
|
|
217
|
+
},
|
|
218
|
+
],
|
|
166
219
|
]),
|
|
167
220
|
};
|
|
168
221
|
}
|