ework-web 0.10.27 → 0.10.28
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/coordination.ts +15 -0
- package/src/index.ts +22 -2
package/package.json
CHANGED
package/src/coordination.ts
CHANGED
|
@@ -103,3 +103,18 @@ export async function getSessionDaemonMap(): Promise<Map<string, SessionDaemonIn
|
|
|
103
103
|
return new Map();
|
|
104
104
|
}
|
|
105
105
|
}
|
|
106
|
+
|
|
107
|
+
export async function resolveDaemonEndpoint(daemonId: number): Promise<string | null> {
|
|
108
|
+
try {
|
|
109
|
+
const rows = await getDB().all<{ internal_endpoint: string | null }>(
|
|
110
|
+
`SELECT internal_endpoint FROM {{d_daemons}} WHERE id = ?`,
|
|
111
|
+
[daemonId],
|
|
112
|
+
);
|
|
113
|
+
const ep = rows[0]?.internal_endpoint;
|
|
114
|
+
if (!ep) return null;
|
|
115
|
+
return ep;
|
|
116
|
+
} catch (e) {
|
|
117
|
+
log.info(`coordination: resolve daemon ${daemonId} failed (${e instanceof Error ? e.message : String(e)})`);
|
|
118
|
+
return null;
|
|
119
|
+
}
|
|
120
|
+
}
|
package/src/index.ts
CHANGED
|
@@ -6,7 +6,7 @@ import { homedir } from "os";
|
|
|
6
6
|
import { loadConfig, DB_OVERRIDABLE, parseOverride, resolveTtsBackend } from "./config";
|
|
7
7
|
import type { Config } from "./config";
|
|
8
8
|
import { setConfig, initDB, getDB } from "./db";
|
|
9
|
-
import { getActiveDaemons, listAllDaemons, getSessionDaemonMap } from "./coordination";
|
|
9
|
+
import { getActiveDaemons, listAllDaemons, getSessionDaemonMap, resolveDaemonEndpoint } from "./coordination";
|
|
10
10
|
import { testMysqlConnection, migrateSqliteToMysql, writeMysqlEnv, migrateMysqlToSqlite, writeSqliteEnv, migrateDaemonSqliteToMysql, generateMysqlDDL } from "./db-admin";
|
|
11
11
|
import type { MysqlTargetOpts } from "./db-admin";
|
|
12
12
|
import { checkAuth, makeAuthCookieHeader, clearAuthCookieHeader, loginHTML, sanitizeNext, ensureBootstrapAdmin, ensureBootstrapSystem, isReservedSystemLogin } from "./auth";
|
|
@@ -628,6 +628,18 @@ async function handle(req: Request, url: URL, ip: string, ctx: { authed: boolean
|
|
|
628
628
|
const all = url.searchParams.get("all") === "1";
|
|
629
629
|
const limit = Math.min(5000, Math.max(1, Number(url.searchParams.get("limit")) || 30));
|
|
630
630
|
const daemonEp = url.searchParams.get("daemon");
|
|
631
|
+
const daemonIdParam = url.searchParams.get("daemon_id");
|
|
632
|
+
if (!daemonEp && daemonIdParam) {
|
|
633
|
+
const id = Number(daemonIdParam);
|
|
634
|
+
if (Number.isFinite(id) && id > 0) {
|
|
635
|
+
const ep = await resolveDaemonEndpoint(id);
|
|
636
|
+
if (ep) {
|
|
637
|
+
const client = new RemoteOpencodeClient(ep);
|
|
638
|
+
const { html: body } = await buildSessionView(client, sid, desc, cfg.collapseLines, limit, all);
|
|
639
|
+
return html(body);
|
|
640
|
+
}
|
|
641
|
+
}
|
|
642
|
+
}
|
|
631
643
|
const client = daemonEp ? new RemoteOpencodeClient(daemonEp) : opencode;
|
|
632
644
|
try {
|
|
633
645
|
const { html: body } = await buildSessionView(client, sid, desc, cfg.collapseLines, limit, all);
|
|
@@ -651,7 +663,15 @@ async function handle(req: Request, url: URL, ip: string, ctx: { authed: boolean
|
|
|
651
663
|
|
|
652
664
|
if (url.pathname === "/file") {
|
|
653
665
|
const rawPath = url.searchParams.get("path") ?? "";
|
|
654
|
-
|
|
666
|
+
let daemonParam = url.searchParams.get("daemon");
|
|
667
|
+
const daemonIdParam = url.searchParams.get("daemon_id");
|
|
668
|
+
if (!daemonParam && daemonIdParam) {
|
|
669
|
+
const id = Number(daemonIdParam);
|
|
670
|
+
if (Number.isFinite(id) && id > 0) {
|
|
671
|
+
const ep = await resolveDaemonEndpoint(id);
|
|
672
|
+
if (ep) daemonParam = ep;
|
|
673
|
+
}
|
|
674
|
+
}
|
|
655
675
|
if (daemonParam && !isLocalhost(daemonParam)) {
|
|
656
676
|
try {
|
|
657
677
|
const mode = url.searchParams.get("mode") ?? "tail";
|