ework-web 0.10.2 → 0.10.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ework-web",
-  "version": "0.10.2",
+  "version": "0.10.4",
   "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

@@ -78,14 +78,16 @@ function buildEnvBlock(env: Map<string, string>, target: DeployTarget): string {
     if (v === undefined) continue;
     lines.push(`${k}=${v}`);
   }
-  lines.push(`WORK_DB_HOST=${target.mysqlHost}`);
+  const mysqlHost = String(target.mysqlHost).replace(/:\d+$/, "");
+  lines.push(`WORK_DB_HOST=${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");
 }
 
-function buildSetupScript(envBlock: string, daemonPort: number): string {
+function buildSetupScript(envBlock: string, daemonPort: number, mysqlHostRaw: string, mysqlPort: string): string {
+  const mysqlHost = mysqlHostRaw.replace(/:\d+$/, "");
   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; }`,
@@ -95,9 +97,11 @@ function buildSetupScript(envBlock: string, daemonPort: number): string {
     `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..."`,
+    `echo "[1/5] checking MySQL connectivity to ${mysqlHost}:${mysqlPort}..."`,
+    `timeout 5 bash -c "echo > /dev/tcp/${mysqlHost}/${mysqlPort}" 2>/dev/null && echo "MySQL port reachable" || { echo "MySQL UNREACHABLE at ${mysqlHost}:${mysqlPort} — daemon will fail to connect"; exit 1; }`,
+    `echo "[2/5] installing ework-aio..."`,
     `npm install -g ework-aio`,
-    `echo "[2/4] writing daemon config..."`,
+    `echo "[3/5] writing daemon config..."`,
     `mkdir -p ~/.local/share/ework-aio/ework-daemon`,
     `REMOTE_IP=$(hostname -I 2>/dev/null | awk '{print $1}')`,
     `DAEMON_ENDPOINT_LINE=""`,
@@ -106,9 +110,9 @@ function buildSetupScript(envBlock: string, daemonPort: number): string {
     envBlock,
     `EWORK_DAEMON_ENV_EOF`,
     `echo "$DAEMON_ENDPOINT_LINE"; } > ~/.local/share/ework-aio/ework-daemon/.env`,
-    `echo "[3/4] starting daemon..."`,
+    `echo "[4/5] starting daemon..."`,
     `ework-aio start daemon`,
-    `echo "[4/4] verifying daemon is alive..."`,
+    `echo "[5/5] verifying daemon is alive..."`,
     `sleep 2`,
     `curl -sf --max-time 3 http://127.0.0.1:${String(daemonPort)}/api/status >/dev/null 2>&1 && echo "DAEMON_ALIVE" || echo "DAEMON_WARNING: status check failed (may need a moment to boot)"`,
     `echo DAEMON_STARTED`,
@@ -132,7 +136,7 @@ export async function deployRemoteDaemon(opts: DeployOpts): Promise<DeployResult
   }
   const env = parseEnvFile(envContent);
   const envBlock = buildEnvBlock(env, opts);
-  const script = buildSetupScript(envBlock, opts.daemonPort ?? 3101);
+  const script = buildSetupScript(envBlock, opts.daemonPort ?? 3101, opts.mysqlHost, String(env.get("WORK_DB_PORT") ?? "3306"));
 
   const args = [
     "ssh",

package/src/index.ts

@@ -973,25 +973,31 @@ async function handle(req: Request, url: URL, ip: string, ctx: { authed: boolean
     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());
+    if (targets.length === 1) {
+      const [single] = targets;
+      send(`▶ 部署到 ${single!.sshHost}:${single!.daemonPort ?? 3101}（超时 ${timeoutMs / 1000}s）...\n\n`);
+      deployRemoteDaemon({ ...single!, timeoutMs, onOutput: (chunk) => send(chunk) })
+        .then((result) => {
+          send(`\n${result.ok ? "✓ 成功" : "✗ 失败"}: ${result.ok ? "daemon 已部署" : (result.error || "未知错误")}\n`);
+          if (result.output) send(result.output);
+        })
+        .catch((e) => send(`\n✗ 异常: ${e instanceof Error ? e.message : String(e)}\n`))
+        .finally(() => writer.close());
+    } else {
+      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" },

package/src/static/daemon-mgr.js

@@ -247,6 +247,11 @@
       if (deployBtn) deployBtn.disabled = false;
       return;
     }
+    if (/^(127\.|localhost$|0\.0\.0\.0$)/.test(mysqlHost)) {
+      setDeployResult('✗ MySQL 主机必须是远程机器可达的地址（不能是 ' + mysqlHost + '）。请使用 LAN IP，如 192.168.x.x', 'err');
+      if (deployBtn) deployBtn.disabled = false;
+      return;
+    }
 
     deployResultEl.textContent = '';
     appendDeployLog('▶ 部署 ' + targets.length + ' 个目标（超时 ' + (timeoutMs / 1000) + 's/个）...\n\n');