ework-web 0.10.36 → 0.10.38
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/package.json +1 -1
- package/src/config.ts +2 -2
- package/src/index.ts +4 -7
- package/src/opencode.ts +16 -4
- package/src/remote-file.ts +2 -1
- package/src/store.ts +25 -6
package/package.json
CHANGED
package/src/config.ts
CHANGED
|
@@ -64,8 +64,8 @@ export const configSchema = z.object({
|
|
|
64
64
|
collapseLines: z.coerce.number().int().positive().default(16),
|
|
65
65
|
fileRoots: z
|
|
66
66
|
.string()
|
|
67
|
-
.
|
|
68
|
-
.
|
|
67
|
+
.default("/tmp")
|
|
68
|
+
.transform((s) => s.split(",").map((x) => x.trim()).filter(Boolean)),
|
|
69
69
|
fileMaxLines: z.coerce.number().int().positive().default(2000),
|
|
70
70
|
fileMaxBytes: z.coerce.number().int().positive().default(512 * 1024),
|
|
71
71
|
translateUrl: z.string().default(""),
|
package/src/index.ts
CHANGED
|
@@ -693,13 +693,10 @@ async function handle(req: Request, url: URL, ip: string, ctx: { authed: boolean
|
|
|
693
693
|
const status = e instanceof OpencodeError ? e.status : 500;
|
|
694
694
|
if (status === 404 && /^ses_[0-9A-Za-z]{8,}/.test(sid)) {
|
|
695
695
|
return html(errorPage(
|
|
696
|
-
"
|
|
697
|
-
`会话 ID ${sid} 在 opencode
|
|
698
|
-
|
|
699
|
-
|
|
700
|
-
`持久化到 DB。\n\n` +
|
|
701
|
-
`排查:docker logs ework-aio 看 opencode 子进程的报错;确认 OPENCODE_AI_API_KEY 已配置\n` +
|
|
702
|
-
`或 ~/.config/opencode/auth.json 存在。`
|
|
696
|
+
"找不到会话",
|
|
697
|
+
`会话 ID ${sid} 在 opencode 数据库中不存在。\n\n` +
|
|
698
|
+
`可能原因:opencode 进程异常退出、session 尚未持久化、或 daemon 连接问题。\n\n` +
|
|
699
|
+
`请检查 daemon 日志或确认 session ID 正确。`
|
|
703
700
|
), 404);
|
|
704
701
|
}
|
|
705
702
|
return html(errorPage(status === 404 ? "找不到会话" : "加载失败", errMsg(e)), status);
|
package/src/opencode.ts
CHANGED
|
@@ -416,16 +416,16 @@ export class MultiDaemonOpencodeClient implements OpencodeClientInterface {
|
|
|
416
416
|
async exportSession(id: string): Promise<SessionExport> {
|
|
417
417
|
try {
|
|
418
418
|
return await Promise.any(this.clients.map((c) => c.exportSession(id)));
|
|
419
|
-
} catch {
|
|
420
|
-
throw
|
|
419
|
+
} catch (e) {
|
|
420
|
+
throw pickErrorFromAggregate(e, id);
|
|
421
421
|
}
|
|
422
422
|
}
|
|
423
423
|
|
|
424
424
|
async exportSessionRaw(id: string): Promise<string> {
|
|
425
425
|
try {
|
|
426
426
|
return await Promise.any(this.clients.map((c) => c.exportSessionRaw(id)));
|
|
427
|
-
} catch {
|
|
428
|
-
throw
|
|
427
|
+
} catch (e) {
|
|
428
|
+
throw pickErrorFromAggregate(e, id);
|
|
429
429
|
}
|
|
430
430
|
}
|
|
431
431
|
|
|
@@ -450,6 +450,18 @@ export function createOpencodeClient(cfg: Config, daemonEndpoint?: string): Open
|
|
|
450
450
|
return new OpencodeClient(cfg);
|
|
451
451
|
}
|
|
452
452
|
|
|
453
|
+
function pickErrorFromAggregate(e: unknown, id: string): OpencodeError {
|
|
454
|
+
if (e instanceof AggregateError) {
|
|
455
|
+
const errors = e.errors as unknown[];
|
|
456
|
+
const non404 = errors.find(
|
|
457
|
+
(err) => err instanceof OpencodeError && err.status !== 404,
|
|
458
|
+
) as OpencodeError | undefined;
|
|
459
|
+
if (non404) return non404;
|
|
460
|
+
}
|
|
461
|
+
if (e instanceof OpencodeError) return e;
|
|
462
|
+
return new OpencodeError(`session ${id} not found on any daemon`, 404);
|
|
463
|
+
}
|
|
464
|
+
|
|
453
465
|
async function readCapped(stream: ReadableStream<Uint8Array> | null, maxBytes: number): Promise<string> {
|
|
454
466
|
if (!stream) return "";
|
|
455
467
|
const reader = stream.getReader();
|
package/src/remote-file.ts
CHANGED
|
@@ -50,7 +50,8 @@ async function fetchDaemon(
|
|
|
50
50
|
apiPath: string,
|
|
51
51
|
params: Record<string, string>
|
|
52
52
|
): Promise<Response> {
|
|
53
|
-
const
|
|
53
|
+
const base = /^https?:\/\//.test(endpoint) ? endpoint : `http://${endpoint}`;
|
|
54
|
+
const url = new URL(`${base}${apiPath}`);
|
|
54
55
|
for (const [k, v] of Object.entries(params)) url.searchParams.set(k, v);
|
|
55
56
|
const resp = await fetch(url.toString(), { signal: AbortSignal.timeout(10_000) });
|
|
56
57
|
return resp;
|
package/src/store.ts
CHANGED
|
@@ -5,6 +5,22 @@
|
|
|
5
5
|
import { getDB } from "./db";
|
|
6
6
|
import { createHash } from "node:crypto";
|
|
7
7
|
|
|
8
|
+
let _visibilityChecked = false;
|
|
9
|
+
let _hasVisibilityColumn = true;
|
|
10
|
+
|
|
11
|
+
async function visibilitySupported(): Promise<boolean> {
|
|
12
|
+
if (_visibilityChecked) return _hasVisibilityColumn;
|
|
13
|
+
_visibilityChecked = true;
|
|
14
|
+
try {
|
|
15
|
+
await getDB().get("SELECT visibility FROM {{projects}} LIMIT 0");
|
|
16
|
+
_hasVisibilityColumn = true;
|
|
17
|
+
} catch {
|
|
18
|
+
_hasVisibilityColumn = false;
|
|
19
|
+
console.warn("[store] projects.visibility column missing — treating all projects as public");
|
|
20
|
+
}
|
|
21
|
+
return _hasVisibilityColumn;
|
|
22
|
+
}
|
|
23
|
+
|
|
8
24
|
export type UserKind = "human" | "bot" | "system";
|
|
9
25
|
|
|
10
26
|
export interface UserRow {
|
|
@@ -181,12 +197,15 @@ export async function listProjectsWithCounts(
|
|
|
181
197
|
): Promise<ProjectWithCounts[]> {
|
|
182
198
|
const isAdmin = viewer?.is_admin === 1;
|
|
183
199
|
const login = viewer?.login;
|
|
184
|
-
const
|
|
200
|
+
const hasVis = isAdmin ? true : await visibilitySupported();
|
|
201
|
+
const visibilityFilter = !hasVis
|
|
185
202
|
? ""
|
|
186
|
-
:
|
|
187
|
-
?
|
|
188
|
-
:
|
|
189
|
-
|
|
203
|
+
: isAdmin
|
|
204
|
+
? ""
|
|
205
|
+
: login
|
|
206
|
+
? ` AND (p.visibility != 'private' OR EXISTS (SELECT 1 FROM {{project_members}} pm WHERE pm.project_id = p.id AND pm.user_login = ?))`
|
|
207
|
+
: ` AND p.visibility != 'private'`;
|
|
208
|
+
const args = hasVis && !isAdmin && login ? [login] : [];
|
|
190
209
|
return await getDB().all<ProjectWithCounts>(
|
|
191
210
|
`SELECT p.*,
|
|
192
211
|
COALESCE(SUM(CASE WHEN i.state = 'open' THEN 1 ELSE 0 END), 0) AS open_count,
|
|
@@ -404,7 +423,7 @@ export async function listAllIssues(opts: ListIssuesOpts = {}): Promise<IssueWit
|
|
|
404
423
|
sql += " AND EXISTS (SELECT 1 FROM {{issue_labels}} il JOIN {{labels}} l ON l.id = il.label_id WHERE il.issue_id = i.id AND l.name = ?)";
|
|
405
424
|
args.push(label);
|
|
406
425
|
}
|
|
407
|
-
if (!opts.viewerIsAdmin) {
|
|
426
|
+
if (!opts.viewerIsAdmin && await visibilitySupported()) {
|
|
408
427
|
sql += " AND (p.visibility != 'private'";
|
|
409
428
|
if (opts.viewerLogin) {
|
|
410
429
|
sql += " OR EXISTS (SELECT 1 FROM {{project_members}} pm WHERE pm.project_id = p.id AND pm.user_login = ?)";
|