ework-web 0.10.8 → 0.10.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ework-web",
-  "version": "0.10.8",
+  "version": "0.10.10",
   "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/index.ts

@@ -1004,6 +1004,41 @@ async function handle(req: Request, url: URL, ip: string, ctx: { authed: boolean
     });
   }
 
+  if (url.pathname === "/api/router/daemons" && req.method === "GET") {
+    if (!ctx.user || ctx.user.is_admin !== 1) return json({ error: "admin required" }, 403);
+    try {
+      const routerUrl = cfg.daemonWebhookUrl.replace(/\/$/, "");
+      const res = await fetch(`${routerUrl}/api/daemons`, { signal: AbortSignal.timeout(5000) });
+      const data = await res.json();
+      return json(data);
+    } catch (e) {
+      return json({ daemons: [], error: errMsg(e) });
+    }
+  }
+
+  if (url.pathname === "/api/router/strategy") {
+    if (!ctx.user || ctx.user.is_admin !== 1) return json({ error: "admin required" }, 403);
+    const routerUrl = cfg.daemonWebhookUrl.replace(/\/$/, "");
+    try {
+      if (req.method === "GET") {
+        const res = await fetch(`${routerUrl}/api/strategy`, { signal: AbortSignal.timeout(5000) });
+        return json(await res.json());
+      }
+      if (req.method === "POST") {
+        const body = await req.text();
+        const res = await fetch(`${routerUrl}/api/strategy`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body,
+          signal: AbortSignal.timeout(5000),
+        });
+        return json(await res.json(), res.ok ? 200 : 400);
+      }
+    } catch (e) {
+      return json({ error: errMsg(e) }, 502);
+    }
+  }
+
   if (url.pathname === "/settings") {
     if (req.method === "GET") {
       return html(buildSettingsPage(cfg, url.searchParams.get("saved") === "1", ctx.user!, await listCachedModels()).html);

package/src/static/daemon-groups.js

@@ -0,0 +1,100 @@
+(async function() {
+  const tbody = document.getElementById("groups-tbody");
+  const bindingsList = document.getElementById("bindings-list");
+  const strategySelect = document.getElementById("strategy-select");
+  const result = document.getElementById("strategy-result");
+  const saveBtn = document.getElementById("strategy-save");
+  const addBindingBtn = document.getElementById("binding-add");
+
+  let currentStrategy = { strategy: "least-loaded", groupBindings: {}, daemonGroups: {} };
+
+  function showResult(msg, ok) {
+    result.textContent = msg;
+    result.className = "db-result " + (ok ? "db-ok" : "db-err");
+    setTimeout(() => { result.textContent = ""; result.className = "db-result"; }, 3000);
+  }
+
+  async function load() {
+    try {
+      const [daemonsRes, strategyRes] = await Promise.all([
+        fetch("/api/router/daemons").then(r => r.json()),
+        fetch("/api/router/strategy").then(r => r.json()),
+      ]);
+      const daemons = daemonsRes.daemons || [];
+      currentStrategy = strategyRes;
+      strategySelect.value = currentStrategy.strategy || "least-loaded";
+
+      tbody.innerHTML = daemons.map(d => {
+        const groups = (currentStrategy.daemonGroups || {})[d.id] || [];
+        return `<tr>
+          <td>${d.id}</td>
+          <td>${d.displayName || "?"}<br><span style="font-size:11px;color:var(--text-muted)">${d.endpoint}</span></td>
+          <td><span class="pill ${d.status}">${d.status}</span></td>
+          <td><input type="text" data-daemon-id="${d.id}" value="${groups.join(", ")}" placeholder="group-a, group-b" style="width:100%;padding:.25rem .4rem;border:1px solid var(--border);border-radius:4px;background:var(--bg);color:var(--text);font-size:12px"></td>
+        </tr>`;
+      }).join("") || '<tr><td colspan="4" class="daemon-empty">没有已注册的 daemon（节点启动后自动出现）</td></tr>';
+
+      renderBindings();
+    } catch (e) {
+      tbody.innerHTML = '<tr><td colspan="4" class="daemon-empty">无法连接 router — 确认 router 已启动</td></tr>';
+    }
+  }
+
+  function renderBindings() {
+    const bindings = currentStrategy.groupBindings || {};
+    const keys = Object.keys(bindings);
+    bindingsList.innerHTML = keys.length === 0
+      ? '<p class="hint" style="margin:0 0 .5rem">暂无绑定</p>'
+      : keys.map(k => `<div style="display:flex;align-items:center;gap:.5rem;margin:.3rem 0;font-size:13px">
+          <code>${k}</code> → <span style="color:var(--accent)">${bindings[k]}</span>
+          <button type="button" class="secondary" data-binding-key="${k}" style="padding:.2rem .5rem;font-size:11px">删除</button>
+        </div>`).join("");
+
+    bindingsList.querySelectorAll("button[data-binding-key]").forEach(btn => {
+      btn.onclick = () => {
+        delete currentStrategy.groupBindings[btn.dataset.bindingKey];
+        renderBindings();
+      };
+    });
+  }
+
+  addBindingBtn.onclick = () => {
+    const repo = document.getElementById("binding-repo").value.trim();
+    const group = document.getElementById("binding-group").value.trim();
+    if (!repo || !group) return;
+    if (!currentStrategy.groupBindings) currentStrategy.groupBindings = {};
+    currentStrategy.groupBindings[repo] = group;
+    document.getElementById("binding-repo").value = "";
+    document.getElementById("binding-group").value = "";
+    renderBindings();
+  };
+
+  saveBtn.onclick = async () => {
+    currentStrategy.strategy = strategySelect.value;
+    const newGroups = {};
+    tbody.querySelectorAll("input[data-daemon-id]").forEach(input => {
+      const id = parseInt(input.dataset.daemonId, 10);
+      const groups = input.value.split(",").map(s => s.trim()).filter(Boolean);
+      if (groups.length > 0) newGroups[id] = groups;
+    });
+    currentStrategy.daemonGroups = newGroups;
+
+    try {
+      const res = await fetch("/api/router/strategy", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(currentStrategy),
+      });
+      const data = await res.json();
+      if (res.ok) {
+        showResult("✓ 策略已保存", true);
+      } else {
+        showResult("✗ " + (data.error || "保存失败"), false);
+      }
+    } catch (e) {
+      showResult("✗ " + e.message, false);
+    }
+  };
+
+  load();
+})();

package/src/views/settings.ts

@@ -170,6 +170,44 @@ ${modelRefreshForm}
 ${ttsLink}
 ${buildDbSection(viewer)}
 ${buildDaemonSection(viewer)}
+${viewer.is_admin === 1 ? buildGroupsSection() : ""}
 </main></body></html>`;
   return { html };
 }
+
+function buildGroupsSection(): string {
+  return `
+<section class="sg" id="groups-section">
+  <h2>Daemon 分组与路由策略</h2>
+  <p class="hint">配置 daemon 分组和 webhook 派发策略。Router 自动摘除心跳超时的节点（120s）。</p>
+  <div class="sf">
+    <span>路由策略</span>
+    <select id="strategy-select">
+      <option value="least-loaded">least-loaded（负载最低优先）</option>
+      <option value="round-robin">round-robin（轮询）</option>
+      <option value="first-available">first-available（按 ID 顺序）</option>
+      <option value="group">group（按分组路由）</option>
+    </select>
+  </div>
+  <div id="daemon-groups-editor" style="margin-top:.7rem">
+    <table class="daemon-list" id="groups-table">
+      <thead><tr><th>ID</th><th>节点</th><th>状态</th><th>分组</th></tr></thead>
+      <tbody id="groups-tbody"></tbody>
+    </table>
+  </div>
+  <div id="bindings-editor" style="margin-top:.7rem">
+    <h2 style="margin-bottom:.5rem">Repo → 分组绑定</h2>
+    <div id="bindings-list"></div>
+    <div class="db-controls">
+      <input type="text" id="binding-repo" placeholder="owner/repo" style="padding:.35rem .5rem;border:1px solid var(--border);border-radius:6px;background:var(--bg);color:var(--text);font-size:13px;flex:1">
+      <input type="text" id="binding-group" placeholder="group-name" style="padding:.35rem .5rem;border:1px solid var(--border);border-radius:6px;background:var(--bg);color:var(--text);font-size:13px;flex:1">
+      <button type="button" id="binding-add" class="secondary">添加绑定</button>
+    </div>
+  </div>
+  <div class="db-controls" style="margin-top:.7rem">
+    <button type="button" id="strategy-save">保存策略</button>
+  </div>
+  <div class="db-result" id="strategy-result"></div>
+</section>
+<script src="/static/daemon-groups.js"></script>`;
+}

package/src/webhooks.ts

@@ -541,25 +541,6 @@ async function recordDelivery(
   }
 }
 
-async function resolveDeliveryUrl(storedUrl: string): Promise<string> {
-  try {
-    const { getActiveDaemons } = await import("./coordination");
-    const daemons = await getActiveDaemons();
-    if (daemons.length === 0) return storedUrl;
-    const storedHost = storedUrl.replace(/^https?:\/\//, "").split("/")[0] ?? "";
-    const storedMatchesDaemon = daemons.some((d) => {
-      const daemonHost = d.endpoint.replace(/^https?:\/\//, "");
-      return daemonHost === storedHost;
-    });
-    if (storedMatchesDaemon) return storedUrl;
-    const best = daemons.sort((a, b) => a.id - b.id)[0]!;
-    const ep = /^https?:\/\//.test(best.endpoint) ? best.endpoint : `http://${best.endpoint}`;
-    return ep.replace(/\/$/, "") + "/webhook/gitea";
-  } catch {
-    return storedUrl;
-  }
-}
-
 async function deliver(
   webhook: WebhookRow,
   event: WebhookEventName,
@@ -567,12 +548,11 @@ async function deliver(
 ): Promise<void> {
   await acquireDeliverySlot();
   try {
-    const targetUrl = await resolveDeliveryUrl(webhook.url);
     for (const attempt of RETRY_DELAYS_MS) {
       if (attempt > 0) await Bun.sleep(attempt);
       const deliveryUuid = randomUUID();
       const headers = buildHeaders(event, deliveryUuid, rawBody, webhook.secret);
-      const result = await postWithTimeout(targetUrl, rawBody, headers);
+      const result = await postWithTimeout(webhook.url, rawBody, headers);
       const success = result.status !== null && result.status >= 200 && result.status < 300;
       await recordDelivery(webhook.id, event, deliveryUuid, rawBody, result);
       if (success) return;