ework-web 0.10.7 → 0.10.9

package/package.json

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

@@ -112,10 +112,16 @@ function buildSetupScript(envBlock: string, daemonPort: number, mysqlHostRaw: st
     `EWORK_DAEMON_ENV_EOF`,
     `echo "$DAEMON_ENDPOINT_LINE"; } > ~/.local/share/ework-aio/ework-daemon/.env`,
     `echo "[4/5] starting daemon..."`,
-    `ework-aio stop daemon 2>/dev/null; sleep 1; ework-aio start daemon`,
-    `echo "[5/5] verifying daemon is alive..."`,
+    `ework-aio stop daemon 2>/dev/null || true`,
+    `kill $(lsof -ti:${String(daemonPort)} 2>/dev/null) 2>/dev/null || true`,
+    `pkill -f ework-daemon-server 2>/dev/null || true`,
+    `sleep 2`,
+    `ework-aio start daemon`,
+    `echo "[5/5] verifying daemon is alive + on MySQL..."`,
     `sleep 3`,
-    `curl -sf --max-time 5 http://127.0.0.1:${String(daemonPort)}/api/status 2>/dev/null && echo "DAEMON_ALIVE" || { echo "DAEMON_FAILED: status check failed"; echo "=== daemon log (last 20 lines) ==="; tail -20 ~/.local/share/ework-aio/run/daemon.log 2>/dev/null || echo "(no log)"; exit 1; }`,
+    `STATUS=$(curl -sf --max-time 5 http://127.0.0.1:${String(daemonPort)}/api/status 2>/dev/null) || { echo "DAEMON_FAILED: status check failed"; echo "=== daemon log (last 20 lines) ==="; tail -20 ~/.local/share/ework-aio/run/daemon.log 2>/dev/null || echo "(no log)"; exit 1; }`,
+    `echo "$STATUS"`,
+    `echo "$STATUS" | grep -q '"driver":"mysql"' || { echo "DAEMON_FAILED: daemon is NOT on MySQL (still SQLite?)"; tail -20 ~/.local/share/ework-aio/run/daemon.log 2>/dev/null; exit 1; }`,
     `echo "=== hostname: $(hostname) ==="`,
     `echo DAEMON_STARTED`,
   ].join("\n");

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;