ework-web 0.10.0 → 0.10.2

package/package.json

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

@@ -85,7 +85,7 @@ function buildEnvBlock(env: Map<string, string>, target: DeployTarget): string {
   return lines.join("\n");
 }
 
-function buildSetupScript(envBlock: string): string {
+function buildSetupScript(envBlock: string, daemonPort: number): 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; }`,
@@ -99,12 +99,18 @@ function buildSetupScript(envBlock: string): string {
     `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'`,
+    `REMOTE_IP=$(hostname -I 2>/dev/null | awk '{print $1}')`,
+    `DAEMON_ENDPOINT_LINE=""`,
+    `if [ -n "$REMOTE_IP" ]; then DAEMON_ENDPOINT_LINE="DAEMON_ENDPOINT=$REMOTE_IP:${String(daemonPort)}"; fi`,
+    `{ cat <<'EWORK_DAEMON_ENV_EOF'`,
     envBlock,
     `EWORK_DAEMON_ENV_EOF`,
+    `echo "$DAEMON_ENDPOINT_LINE"; } > ~/.local/share/ework-aio/ework-daemon/.env`,
     `echo "[3/4] starting daemon..."`,
     `ework-aio start daemon`,
-    `echo "[4/4] done"`,
+    `echo "[4/4] 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`,
   ].join("\n");
 }
@@ -126,7 +132,7 @@ export async function deployRemoteDaemon(opts: DeployOpts): Promise<DeployResult
   }
   const env = parseEnvFile(envContent);
   const envBlock = buildEnvBlock(env, opts);
-  const script = buildSetupScript(envBlock);
+  const script = buildSetupScript(envBlock, opts.daemonPort ?? 3101);
 
   const args = [
     "ssh",

package/src/index.ts

@@ -479,6 +479,9 @@ async function handle(req: Request, url: URL, ip: string, ctx: { authed: boolean
 
   const auth = await checkAuth(req, cfg, ip);
   if (!auth.ok) {
+    if (url.pathname.startsWith("/api/")) {
+      return json({ error: "authentication required" }, 401);
+    }
     const next = sanitizeNext(url.pathname + url.search);
     return Response.redirect(`${url.origin}/login?next=${encodeURIComponent(next)}`, 302);
   }
@@ -887,6 +890,35 @@ async function handle(req: Request, url: URL, ip: string, ctx: { authed: boolean
   }
 
   const daemonIdRe = /^\/api\/daemons\/(\d+)$/;
+  const daemonRestartRe = /^\/api\/daemons\/(\d+)\/restart$/;
+  const daemonRemoveRe = /^\/api\/daemons\/(\d+)\/remove$/;
+
+  if (req.method === "POST" && daemonRestartRe.test(url.pathname)) {
+    if (!ctx.user || ctx.user.is_admin !== 1) return json({ error: "admin required" }, 403);
+    const match = url.pathname.match(daemonRestartRe);
+    const id = match ? Number(match[1]) : NaN;
+    if (!Number.isFinite(id)) return json({ error: "invalid id" }, 400);
+    const rows = await getDB().all<{ endpoint: string; status: string }>(
+      `SELECT internal_endpoint AS endpoint, status FROM {{d_daemons}} WHERE id = ?`, [id]
+    );
+    if (rows.length === 0) return json({ ok: false, error: "daemon not found" }, 404);
+    await getDB().run(`UPDATE {{d_daemons}} SET status = 'active', last_heartbeat = datetime('now') WHERE id = ?`, [id]);
+    return json({ ok: true, note: "reactivated — daemon process will re-register via heartbeat" });
+  }
+
+  if (req.method === "DELETE" && daemonRemoveRe.test(url.pathname)) {
+    if (!ctx.user || ctx.user.is_admin !== 1) return json({ error: "admin required" }, 403);
+    const match = url.pathname.match(daemonRemoveRe);
+    const id = match ? Number(match[1]) : NaN;
+    if (!Number.isFinite(id)) return json({ error: "invalid id" }, 400);
+    const rows = await getDB().all<{ status: string }>(`SELECT status FROM {{d_daemons}} WHERE id = ?`, [id]);
+    if (rows.length === 0) return json({ ok: false, error: "daemon not found" }, 404);
+    const st = String(rows[0]?.status ?? "").toLowerCase();
+    if (st === "active") return json({ ok: false, error: "stop (drain) the daemon first before removing" }, 400);
+    await getDB().run(`DELETE FROM {{d_daemons}} WHERE id = ?`, [id]);
+    return json({ ok: true });
+  }
+
   if (req.method === "DELETE" && daemonIdRe.test(url.pathname)) {
     if (!ctx.user || ctx.user.is_admin !== 1) return json({ error: "admin required" }, 403);
     const match = url.pathname.match(daemonIdRe);

package/src/static/daemon-mgr.js

@@ -52,9 +52,14 @@
       return;
     }
     var rows = daemons.map(function (d) {
-      var stopBtn = String(d.status || '').toLowerCase() === 'active'
-        ? '<button type="button" class="stop" data-id="' + d.id + '">停止</button>'
-        : '';
+      var stRaw = String(d.status || 'unknown').toLowerCase();
+      var actions = '';
+      if (stRaw === 'active') {
+        actions = '<button type="button" class="stop" data-id="' + d.id + '">停止</button>';
+      } else {
+        actions = '<button type="button" class="restart" data-id="' + d.id + '">重启</button>' +
+          '<button type="button" class="remove" data-id="' + d.id + '">删除</button>';
+      }
       return '<tr>' +
         '<td class="cap">' + d.id + '</td>' +
         '<td class="loc">' + locationCell(d.endpoint) + '</td>' +
@@ -63,16 +68,21 @@
         '<td class="heartbeat">' + fmtTime(d.lastHeartbeat) + '</td>' +
         '<td class="registered">' + fmtTime(d.registeredAt) + '</td>' +
         '<td>' + statusPill(d.status) + '</td>' +
-        '<td>' + stopBtn + '</td>' +
+        '<td>' + actions + '</td>' +
         '</tr>';
     }).join('');
     listEl.innerHTML =
       '<table><thead><tr>' +
-      '<th>ID</th><th>位置</th><th>Endpoint</th><th>容量</th><th>心跳</th><th>注册于</th><th>状态</th><th></th>' +
+      '<th>ID</th><th>位置</th><th>Endpoint</th><th>容量</th><th>心跳</th><th>注册于</th><th>状态</th><th>操作</th>' +
       '</tr></thead><tbody>' + rows + '</tbody></table>';
-    listEl.querySelectorAll('button.stop').forEach(function (b) {
-      b.addEventListener('click', function () { stopDaemon(Number(b.getAttribute('data-id'))); });
-    });
+    var bindBtn = function (selector, fn) {
+      listEl.querySelectorAll(selector).forEach(function (b) {
+        b.addEventListener('click', function () { fn(Number(b.getAttribute('data-id'))); });
+      });
+    };
+    bindBtn('button.stop', stopDaemon);
+    bindBtn('button.restart', restartDaemon);
+    bindBtn('button.remove', removeDaemon);
   }
 
   function setResult(text, kind) {
@@ -145,6 +155,43 @@
     }
   }
 
+  async function restartDaemon(id) {
+    setResult('正在重启 daemon #' + id + '…', 'loading');
+    try {
+      var res = await fetch('/api/daemons/' + id + '/restart', { method: 'POST' });
+      if (res.status === 401) {
+        setResult('✗ 登录已过期，请刷新页面重新登录', 'err');
+        return;
+      }
+      var data = await res.json();
+      if (data.ok) {
+        setResult('✓ daemon #' + id + ' 已重新激活', 'ok');
+        await loadDaemons();
+      } else {
+        setResult('✗ ' + (data.error || '未知错误'), 'err');
+      }
+    } catch (e) {
+      setResult('✗ ' + (e.message || String(e)), 'err');
+    }
+  }
+
+  async function removeDaemon(id) {
+    if (!confirm('确认删除 daemon #' + id + '？\n这会从数据库永久移除该记录。')) return;
+    setResult('正在删除 daemon #' + id + '…', 'loading');
+    try {
+      var res = await fetch('/api/daemons/' + id + '/remove', { method: 'DELETE' });
+      var data = await res.json();
+      if (data.ok) {
+        setResult('✓ daemon #' + id + ' 已删除', 'ok');
+        await loadDaemons();
+      } else {
+        setResult('✗ ' + (data.error || '未知错误'), 'err');
+      }
+    } catch (e) {
+      setResult('✗ ' + (e.message || String(e)), 'err');
+    }
+  }
+
   function setDeployResult(text, kind) {
     if (!deployResultEl) return;
     deployResultEl.className = 'db-result db-' + (kind === 'ok' ? 'ok' : kind === 'err' ? 'err' : 'loading');

package/src/views/settings.ts

@@ -153,6 +153,9 @@ button.secondary{background:transparent;color:var(--text-muted);border:1px solid
 .daemon-list td.loc{white-space:nowrap}
 .daemon-list button.stop{padding:.25rem .6rem;font-size:11px;background:transparent;color:#e87c7c;border:1px solid rgba(220,53,69,.4)}
 .daemon-list button.stop:hover{background:rgba(220,53,69,.12)}
+.daemon-list button.restart{padding:.25rem .6rem;font-size:11px;background:transparent;color:#5eb88a;border:1px solid rgba(40,167,69,.4);margin-right:.3rem}
+.daemon-list button.restart:hover{background:rgba(40,167,69,.12)}
+.daemon-list button.remove{padding:.25rem .6rem;font-size:11px;background:transparent;color:var(--text-muted);border:1px solid var(--border)}
 .daemon-empty{color:var(--text-muted);font-size:13px;padding:.5rem 0}
 </style></head><body>
 <header class="nav"><a href="/" style="color:var(--header-text)">🏠 ework-web</a><span style="opacity:.8"> · 设置</span></header>