ework-web 0.9.0 → 0.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ework-web",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "type": "module",
   "description": "ework-web — standalone multi-project issue tracker. Local SQLite-backed, no external API dependency. Bun + TypeScript + SSR HTML.",
   "license": "MIT",

package/src/daemon-deploy.ts

@@ -2,7 +2,7 @@ import { join } from "path";
 import { existsSync, readFileSync } from "fs";
 import { homedir } from "os";
 
-export interface DeployOpts {
+export interface DeployTarget {
   sshHost: string;
   sshUser: string;
   sshPort: number;
@@ -11,14 +11,22 @@ export interface DeployOpts {
   mysqlHost: string;
 }
 
+export interface DeployOpts extends DeployTarget {
+  timeoutMs: number;
+  onOutput?: (chunk: string) => void;
+}
+
 export interface DeployResult {
   ok: boolean;
   output: string;
   error?: string;
 }
 
-// Keys forwarded from the local daemon .env to the remote one. Secrets are
-// never logged — only written to the remote .env over SSH.
+export interface BatchTarget {
+  host: string;
+  daemonPort?: number;
+}
+
 const FORWARD_KEYS = [
   "WORK_DB_DRIVER",
   "WORK_DB_USER",
@@ -63,15 +71,15 @@ function parseEnvFile(content: string): Map<string, string> {
   return out;
 }
 
-function buildEnvBlock(env: Map<string, string>, opts: DeployOpts): string {
+function buildEnvBlock(env: Map<string, string>, target: DeployTarget): string {
   const lines: string[] = [];
   for (const k of FORWARD_KEYS) {
     const v = env.get(k);
     if (v === undefined) continue;
     lines.push(`${k}=${v}`);
   }
-  lines.push(`WORK_DB_HOST=${opts.mysqlHost}`);
-  lines.push(`DAEMON_PORT=${String(opts.daemonPort ?? 3101)}`);
+  lines.push(`WORK_DB_HOST=${target.mysqlHost}`);
+  lines.push(`DAEMON_PORT=${String(target.daemonPort ?? 3101)}`);
   lines.push(`DAEMON_HOST=0.0.0.0`);
   lines.push(`DAEMON_ENV=production`);
   return lines.join("\n");
@@ -81,13 +89,22 @@ function buildSetupScript(envBlock: string): string {
   return [
     "set -e",
     `command -v npm >/dev/null 2>&1 || { curl -fsSL https://deb.nodesource.com/setup_22.x | sudo bash -; sudo apt-get install -y nodejs; }`,
-    `command -v bun >/dev/null 2>&1 || { curl -fsSL https://bun.sh/install | bash; export BUN_INSTALL="$HOME/.bun"; export PATH="$BUN_INSTALL/bin:$PATH"; }`,
+    `command -v bun >/dev/null 2>&1 || { curl -fsSL https://bun.sh/install | bash; }`,
+    `export BUN_INSTALL="$HOME/.bun"`,
+    `export PATH="$HOME/.local/lib/bin:$BUN_INSTALL/bin:$PATH"`,
+    `mkdir -p "$HOME/.local/lib"`,
+    `npm config set prefix "$HOME/.local/lib"`,
+    `grep -q '.local/lib/bin' "$HOME/.bashrc" 2>/dev/null || echo 'export PATH="$HOME/.local/lib/bin:$HOME/.bun/bin:$PATH"' >> "$HOME/.bashrc"`,
+    `echo "[1/4] installing ework-aio..."`,
     `npm install -g ework-aio`,
+    `echo "[2/4] writing daemon config..."`,
     `mkdir -p ~/.local/share/ework-aio/ework-daemon`,
     `cat > ~/.local/share/ework-aio/ework-daemon/.env <<'EWORK_DAEMON_ENV_EOF'`,
     envBlock,
     `EWORK_DAEMON_ENV_EOF`,
+    `echo "[3/4] starting daemon..."`,
     `ework-aio start daemon`,
+    `echo "[4/4] done"`,
     `echo DAEMON_STARTED`,
   ].join("\n");
 }
@@ -98,7 +115,7 @@ export async function deployRemoteDaemon(opts: DeployOpts): Promise<DeployResult
     return {
       ok: false,
       output: "",
-      error: "找不到本地 daemon .env（设置 WORK_DAEMON_DATA_DIR 或将 .env 放到 ~/.local/share/ework-aio/ework-daemon/.env）",
+      error: "找不到本地 daemon .env",
     };
   }
   let envContent: string;
@@ -135,23 +152,37 @@ export async function deployRemoteDaemon(opts: DeployOpts): Promise<DeployResult
   const timer = setTimeout(() => {
     ac.abort();
     try { proc.kill(); } catch { /* already dead */ }
-  }, 60_000);
+  }, opts.timeoutMs);
 
-  let stdoutText = "";
-  let stderrText = "";
+  let output = "";
   let exitCode: number | null = null;
   let timedOut = false;
+
+  const decoder = new TextDecoder();
+  const readStream = async (stream: ReadableStream<Uint8Array>) => {
+    const reader = stream.getReader();
+    try {
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done) break;
+        const chunk = decoder.decode(value, { stream: true });
+        output += chunk;
+        opts.onOutput?.(chunk);
+      }
+    } catch { /* stream closed */ }
+  };
+
   try {
     ac.signal.addEventListener("abort", () => { timedOut = true; });
-    [stdoutText, stderrText, exitCode] = await Promise.all([
-      new Response(proc.stdout).text(),
-      new Response(proc.stderr).text(),
-      proc.exited,
+    await Promise.all([
+      readStream(proc.stdout as ReadableStream<Uint8Array>),
+      readStream(proc.stderr as ReadableStream<Uint8Array>),
     ]);
+    exitCode = await proc.exited;
   } catch (e) {
     return {
       ok: false,
-      output: stdoutText + stderrText,
+      output,
       error: e instanceof Error ? e.message : String(e),
     };
   } finally {
@@ -161,14 +192,35 @@ export async function deployRemoteDaemon(opts: DeployOpts): Promise<DeployResult
   if (timedOut) {
     return {
       ok: false,
-      output: stdoutText + stderrText,
-      error: "SSH 部署超时（60s）",
+      output,
+      error: `SSH 部署超时（${String(Math.trunc(opts.timeoutMs / 1000))}s）`,
     };
   }
-  const combined = stdoutText + (stderrText ? "\n--- stderr ---\n" + stderrText : "");
   return {
     ok: exitCode === 0,
-    output: combined,
+    output,
     error: exitCode === 0 ? undefined : `ssh 退出码 ${String(exitCode)}`,
   };
 }
+
+export async function deployBatch(
+  targets: DeployTarget[],
+  timeoutMs: number,
+  onOutput: (target: string, chunk: string) => void,
+): Promise<Map<string, DeployResult>> {
+  const results = new Map<string, DeployResult>();
+  await Promise.all(
+    targets.map(async (t) => {
+      const label = `${t.sshUser}@${t.sshHost}:${String(t.sshPort)}`;
+      onOutput(label, `▶ 开始部署到 ${label}\n`);
+      const r = await deployRemoteDaemon({
+        ...t,
+        timeoutMs,
+        onOutput: (chunk) => onOutput(label, chunk),
+      });
+      results.set(label, r);
+      onOutput(label, r.ok ? `✓ ${label} 部署成功\n` : `✗ ${label} ${r.error ?? "失败"}\n`);
+    }),
+  );
+  return results;
+}

package/src/index.ts

@@ -93,7 +93,7 @@ import { buildProjectMembersPage } from "./views/projectMembers";
 import { buildProjectUpstreamsPage, trySetUpstreamUrls } from "./views/projectUpstreams";
 import { buildProjectModelPage } from "./views/projectModel";
 import { handleGiteaApi } from "./giteaApi";
-import { deployRemoteDaemon } from "./daemon-deploy";
+import { deployRemoteDaemon, deployBatch, type DeployTarget } from "./daemon-deploy";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const STATIC_DIR = join(__dirname, "static");
@@ -902,25 +902,68 @@ async function handle(req: Request, url: URL, ip: string, ctx: { authed: boolean
 
   if (req.method === "POST" && url.pathname === "/api/daemons/deploy") {
     if (!ctx.user || ctx.user.is_admin !== 1) return json({ error: "admin required" }, 403);
-    if (!rateLimit(`daemons-deploy:${ip}`, 3, 3 / 3600)) return json({ error: "rate limited" }, 429);
+    if (!rateLimit(`daemons-deploy:${ip}`, 10, 10 / 3600)) return json({ error: "rate limited" }, 429);
     const payload = await req.json().catch(() => ({} as unknown));
     if (!payload || typeof payload !== "object") return json({ ok: false, error: "invalid body" }, 400);
     const obj = payload as Record<string, unknown>;
-    const sshHost = typeof obj.sshHost === "string" ? obj.sshHost.trim() : "";
-    const sshUser = typeof obj.sshUser === "string" ? obj.sshUser.trim() : "";
+    const sshUser = typeof obj.sshUser === "string" ? obj.sshUser.trim() : "root";
     const mysqlHost = typeof obj.mysqlHost === "string" ? obj.mysqlHost.trim() : "";
-    if (!sshHost || !sshUser || !mysqlHost) {
-      return json({ ok: false, error: "sshHost, sshUser, mysqlHost 必填" }, 400);
-    }
     const sshPort = typeof obj.sshPort === "number" && Number.isFinite(obj.sshPort) && obj.sshPort > 0 && obj.sshPort < 65536
       ? Math.trunc(obj.sshPort)
       : 22;
     const sshKeyFile = typeof obj.sshKeyFile === "string" && obj.sshKeyFile.trim() ? obj.sshKeyFile.trim() : undefined;
-    const daemonPort = typeof obj.daemonPort === "number" && Number.isFinite(obj.daemonPort) && obj.daemonPort > 0 && obj.daemonPort < 65536
-      ? Math.trunc(obj.daemonPort)
-      : undefined;
-    const result = await deployRemoteDaemon({ sshHost, sshUser, sshPort, sshKeyFile, daemonPort, mysqlHost });
-    return json(result, result.ok ? 200 : 422);
+    const timeoutMs = typeof obj.timeoutMs === "number" && Number.isFinite(obj.timeoutMs) && obj.timeoutMs >= 30_000 && obj.timeoutMs <= 600_000
+      ? Math.trunc(obj.timeoutMs)
+      : 180_000;
+
+    const targets: DeployTarget[] = [];
+    if (Array.isArray(obj.targets)) {
+      for (const t of obj.targets) {
+        if (!t || typeof t !== "object") continue;
+        const r = t as Record<string, unknown>;
+        const host = typeof r.host === "string" ? r.host.trim() : "";
+        if (!host) continue;
+        targets.push({
+          sshHost: host, sshUser, sshPort, sshKeyFile, mysqlHost,
+          daemonPort: typeof r.daemonPort === "number" ? Math.trunc(r.daemonPort) : undefined,
+        });
+      }
+    } else {
+      const sshHost = typeof obj.sshHost === "string" ? obj.sshHost.trim() : "";
+      if (sshHost) {
+        targets.push({
+          sshHost, sshUser, sshPort, sshKeyFile, mysqlHost,
+          daemonPort: typeof obj.daemonPort === "number" ? Math.trunc(obj.daemonPort) : undefined,
+        });
+      }
+    }
+
+    if (targets.length === 0 || !mysqlHost) {
+      return json({ ok: false, error: "至少需要一个目标 + mysqlHost" }, 400);
+    }
+    if (targets.length === 1) {
+      const [single] = targets;
+      if (!single) return json({ ok: false, error: "no target" }, 400);
+      const result = await deployRemoteDaemon({ ...single, timeoutMs });
+      return json(result, result.ok ? 200 : 422);
+    }
+
+    const { readable, writable } = new TransformStream();
+    const writer = writable.getWriter();
+    const enc = new TextEncoder();
+    const send = (s: string) => writer.write(enc.encode(`data: ${JSON.stringify(s)}\n\n`));
+
+    deployBatch(targets, timeoutMs, (label, chunk) => send(`[${label}] ${chunk}`))
+      .then((results) => {
+        const ok = [...results.values()].every((r) => r.ok);
+        send(`\n${ok ? "ALL OK" : "SOME FAILED"}: ${[...results.entries()].map(([k, v]) => `${k}=${v.ok ? "✓" : "✗"}`).join(", ")}`);
+      })
+      .catch((e) => send(`ERROR: ${e instanceof Error ? e.message : String(e)}`))
+      .finally(() => writer.close());
+
+    return new Response(readable, {
+      headers: { "Content-Type": "text/event-stream", "Cache-Control": "no-cache", Connection: "keep-alive" },
+    });
   }
 
   if (url.pathname === "/settings") {

package/src/static/daemon-mgr.js

@@ -156,40 +156,111 @@
     return el && el.value != null ? el.value.trim() : '';
   }
 
+  function appendDeployLog(text) {
+    if (!deployResultEl) return;
+    deployResultEl.className = 'db-result db-loading';
+    deployResultEl.textContent += text;
+    deployResultEl.scrollTop = deployResultEl.scrollHeight;
+  }
+
+  function parseTargets(raw) {
+    var targets = [];
+    var lines = raw.split('\n');
+    for (var i = 0; i < lines.length; i++) {
+      var line = lines[i].trim();
+      if (!line || line.startsWith('#')) continue;
+      var parts = line.split(':');
+      var host = parts[0].trim();
+      var port = parts.length > 1 ? parseInt(parts[1].trim(), 10) : NaN;
+      if (host) {
+        var t = { host: host };
+        if (Number.isFinite(port) && port > 0) t.daemonPort = port;
+        targets.push(t);
+      }
+    }
+    return targets;
+  }
+
   async function deployRemote() {
     if (deployBtn) deployBtn.disabled = true;
-    setDeployResult('正在通过 SSH 部署（最长 60s）…', 'loading');
-    var body = {
-      sshHost: val('deploy-host'),
-      sshUser: val('deploy-user'),
-      mysqlHost: val('deploy-mysql-host')
-    };
-    var sshPort = Number(val('deploy-ssh-port'));
-    if (Number.isFinite(sshPort) && sshPort > 0) body.sshPort = sshPort;
-    var dPort = Number(val('deploy-daemon-port'));
-    if (Number.isFinite(dPort) && dPort > 0) body.daemonPort = dPort;
+    var targets = parseTargets(val('deploy-targets'));
+    var mysqlHost = val('deploy-mysql-host');
+    var sshUser = val('deploy-user') || 'root';
+    var sshPort = Number(val('deploy-ssh-port')) || 22;
+    var timeoutMs = (Number(val('deploy-timeout')) || 180) * 1000;
     var keyFile = val('deploy-key');
-    if (keyFile) body.sshKeyFile = keyFile;
-    if (!body.sshHost || !body.sshUser || !body.mysqlHost) {
-      setDeployResult('✗ SSH 主机、SSH 用户、MySQL 主机 必填', 'err');
+
+    if (targets.length === 0) {
+      setDeployResult('✗ 请填写至少一个目标机器', 'err');
+      if (deployBtn) deployBtn.disabled = false;
+      return;
+    }
+    if (!mysqlHost) {
+      setDeployResult('✗ MySQL 主机必填', 'err');
       if (deployBtn) deployBtn.disabled = false;
       return;
     }
+
+    deployResultEl.textContent = '';
+    appendDeployLog('▶ 部署 ' + targets.length + ' 个目标（超时 ' + (timeoutMs / 1000) + 's/个）...\n\n');
+
+    var body = {
+      targets: targets,
+      sshUser: sshUser,
+      sshPort: sshPort,
+      mysqlHost: mysqlHost,
+      timeoutMs: timeoutMs
+    };
+    if (keyFile) body.sshKeyFile = keyFile;
+
     try {
       var res = await fetch('/api/daemons/deploy', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify(body)
       });
-      var data = await res.json();
-      if (data.ok) {
-        setDeployResult('✓ 部署成功' + (data.output ? '\n' + data.output : ''), 'ok');
-        await loadDaemons();
+
+      if (res.headers.get('Content-Type') && res.headers.get('Content-Type').includes('text/event-stream')) {
+        var reader = res.body.getReader();
+        var decoder = new TextDecoder();
+        var allOk = true;
+        while (true) {
+          var chunk = await reader.read();
+          if (chunk.done) break;
+          var text = decoder.decode(chunk.value, { stream: true });
+          var lines = text.split('\n');
+          for (var i = 0; i < lines.length; i++) {
+            var line = lines[i].trim();
+            if (!line.startsWith('data: ')) continue;
+            try {
+              var msg = JSON.parse(line.slice(6));
+              appendDeployLog(msg);
+              if (msg.indexOf('✗') >= 0) allOk = false;
+            } catch (e) { /* skip non-JSON */ }
+          }
+        }
+        if (allOk) {
+          deployResultEl.className = 'db-result db-ok';
+          await loadDaemons();
+        } else {
+          deployResultEl.className = 'db-result db-err';
+        }
       } else {
-        setDeployResult('✗ ' + (data.error || '未知错误') + (data.output ? '\n' + data.output : ''), 'err');
+        var data = await res.json();
+        if (data.ok) {
+          appendDeployLog('✓ 部署成功\n');
+          if (data.output) appendDeployLog(data.output);
+          deployResultEl.className = 'db-result db-ok';
+          await loadDaemons();
+        } else {
+          appendDeployLog('✗ ' + (data.error || '未知错误') + '\n');
+          if (data.output) appendDeployLog(data.output);
+          deployResultEl.className = 'db-result db-err';
+        }
       }
     } catch (e) {
-      setDeployResult('✗ ' + (e.message || String(e)), 'err');
+      appendDeployLog('✗ ' + (e.message || String(e)) + '\n');
+      deployResultEl.className = 'db-result db-err';
     } finally {
       if (deployBtn) deployBtn.disabled = false;
     }

package/src/views/settings.ts

@@ -81,16 +81,16 @@ function buildDaemonSection(viewer: UserRow): string {
 <details style="margin-top:.7rem">
 <summary style="cursor:pointer;font-size:13px;color:var(--text-muted)">📡 SSH 远程部署</summary>
 <div style="margin-top:.5rem">
-<label class="sf"><span>SSH 主机</span><input type="text" id="deploy-host" placeholder="192.168.1.100" autocomplete="off"></label>
 <label class="sf"><span>SSH 用户</span><input type="text" id="deploy-user" placeholder="root" value="root" autocomplete="off"></label>
 <label class="sf"><span>SSH 端口</span><input type="number" id="deploy-ssh-port" value="22" min="1" max="65535" autocomplete="off"></label>
 <label class="sf"><span>SSH 密钥</span><input type="text" id="deploy-key" placeholder="~/.ssh/id_rsa" autocomplete="off"></label>
-<label class="sf"><span>Daemon 端口</span><input type="number" id="deploy-daemon-port" placeholder="3101" min="1" max="65535" autocomplete="off"></label>
 <label class="sf"><span>MySQL 主机（远程可见）</span><input type="text" id="deploy-mysql-host" placeholder="192.168.1.1" autocomplete="off"></label>
-<div class="db-controls"><button type="button" id="daemon-deploy">部署到远程</button></div>
+<label class="sf"><span>超时（秒）</span><input type="number" id="deploy-timeout" value="180" min="30" max="600" autocomplete="off"></label>
+<label class="sf" style="align-items:flex-start"><span>目标机器</span><textarea id="deploy-targets" rows="4" style="flex:1;padding:.35rem .5rem;border:1px solid var(--border);border-radius:6px;background:var(--bg);color:var(--text);font-size:12px;font-family:ui-monospace,monospace" placeholder="每行一个，格式：&#10;192.168.1.100&#10;192.168.1.101:3201&#10;10.0.0.5:3202&#10;（不带端口则用默认 3101）"></textarea></label>
+<div class="db-controls"><button type="button" id="daemon-deploy">部署（支持批量）</button></div>
 </div>
 </details>
-<div id="deploy-result" class="db-result"></div>
+<div id="deploy-result" class="db-result" style="max-height:400px;overflow-y:auto;font-family:ui-monospace,monospace;font-size:11px"></div>
 <script src="/static/daemon-mgr.js"></script>
 </section>`;
 }