ework-web 0.10.101 → 0.10.103

package/package.json

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

@@ -208,7 +208,6 @@ const SEC_HEADERS: Record<string, string> = {
   "x-content-type-options": "nosniff",
   "x-frame-options": "DENY",
   "referrer-policy": "same-origin",
-  "permissions-policy": "()",
 };
 
 function buildCsp(cfg: Config): string {
@@ -1828,11 +1827,19 @@ async function handle(req: Request, url: URL, ip: string, ctx: { authed: boolean
       const [, owner, repo, numStr] = cp;
       if (!(owner && repo && numStr)) return json({ error: "bad path" }, 400);
       const number = Number(numStr);
+      const isFormSubmit = (req.headers.get("content-type") || "").includes("application/x-www-form-urlencoded");
       try {
-        const payload = (await req.json().catch(() => ({}))) as { body?: unknown; close?: unknown; reopen?: unknown };
-        const body = typeof payload.body === "string" ? payload.body : "";
+        const payload = isFormSubmit
+          ? ((await req.formData().catch(() => new FormData())) as FormData)
+          : ((await req.json().catch(() => ({}))) as { body?: unknown; close?: unknown; reopen?: unknown });
+        const body = typeof (payload as FormData).get === "function"
+          ? String((payload as FormData).get("body") ?? "")
+          : typeof (payload as { body?: unknown }).body === "string"
+            ? ((payload as { body: string }).body)
+            : "";
         const hasBody = body.trim().length > 0;
-        const wantsStateChange = payload.close === true || payload.reopen === true;
+        const jsonPayload = isFormSubmit ? null : (payload as { close?: unknown; reopen?: unknown });
+        const wantsStateChange = (jsonPayload?.close ?? jsonPayload?.reopen) === true;
         if (!hasBody && !wantsStateChange) return json({ error: "body required" }, 400);
         if (body.length > 65536) return json({ error: "body too long" }, 413);
         const project = await getProject(owner, repo);
@@ -1855,11 +1862,11 @@ async function handle(req: Request, url: URL, ip: string, ctx: { authed: boolean
         }
         let closed = false;
         let reopened = false;
-        if (payload.close === true) {
+        if (jsonPayload?.close === true) {
           await setIssueState(issue.id, "closed");
           closed = true;
           void emitIssueEvent(project.id, issue.id, "closed", url.origin);
-        } else if (payload.reopen === true) {
+        } else if (jsonPayload?.reopen === true) {
           await setIssueState(issue.id, "open");
           reopened = true;
           void emitIssueEvent(project.id, issue.id, "reopened", url.origin);
@@ -1867,8 +1874,17 @@ async function handle(req: Request, url: URL, ip: string, ctx: { authed: boolean
         if (view) {
           void emitCommentEvent(project.id, issue.id, view.id, url.origin);
         }
+        if (isFormSubmit) {
+          return new Response(null, {
+            status: 303,
+            headers: { location: `/${owner}/${repo}/issues/${number}${view ? `#comment-${view.id}` : ""}` },
+          });
+        }
         return json({ comment: view, closed, reopened });
       } catch (e) {
+        if (isFormSubmit) {
+          return new Response(null, { status: 303, headers: { location: `/${owner}/${repo}/issues/${number}` } });
+        }
         return json({ error: errMsg(e) }, e instanceof StoreError ? e.status : 500);
       }
     }

package/src/render/layout.ts

@@ -263,8 +263,8 @@ ${props.descriptionHtml.trim() ? `<div class="desc-wrap">
   ${props.descriptionCollapsed ? `<button type="button" class="desc-toggle" id="descToggle">显示详情 ▾</button>` : ""}
 </div>` : ""}
 ${props.writesEnabled !== false
-  ? `<form id="composer" class="composer">
-  <textarea id="composerInput" rows="5" placeholder="写评论…（Ctrl/⌘+Enter 发送，以 ${escapeHtml(op)} 身份；可粘贴/选择图片或任意文件上传）"></textarea>
+  ? `<form id="composer" class="composer" method="post" action="/api/${encodeURIComponent(repoOwner ?? "")}/${encodeURIComponent(repoName ?? "")}/issues/${props.issueNumber}/comment">
+  <textarea id="composerInput" name="body" rows="5" placeholder="写评论…（Ctrl/⌘+Enter 发送，以 ${escapeHtml(op)} 身份；可粘贴/选择图片或任意文件上传）"></textarea>
   <div class="submit-col">
     <button type="button" id="composerClose" class="btn-close" data-action="${toggleAction}" title="${toggleTitle}">${toggleLabel}</button>
     <label class="upload-btn" title="上传图片/附件/文件">📎<input type="file" id="composerFile" multiple></label>

package/src/static/app.js

@@ -6,6 +6,16 @@
   const initialEl = document.getElementById("initial-data");
   const P = initialEl ? JSON.parse(initialEl.textContent) : null;
   if (!P) return;
+  const earlyForm = document.getElementById("composer");
+  if (earlyForm) {
+    earlyForm.addEventListener(
+      "submit",
+      (e) => {
+        if (!e.defaultPrevented) e.preventDefault();
+      },
+      { capture: true }
+    );
+  }
   const MAX_DOM = 300;
   const POLL_MS = 5000;
   const NEW_FADE_MS = 4500;

package/src/store.ts

@@ -627,6 +627,20 @@ export async function getIssueByUpstreamNumber(projectId: number, upstreamNumber
   );
 }
 
+export async function linkIssueToUpstream(issueId: number, upstreamNumber: number): Promise<boolean> {
+  try {
+    const res = await getDB().run(
+      "UPDATE {{issues}} SET upstream_issue_number = ?, updated_at = ? WHERE id = ? AND upstream_issue_number IS NULL",
+      [upstreamNumber, now(), issueId]
+    );
+    return res.changes > 0;
+  } catch {
+    // Unique index (project_id, upstream_issue_number): another row already
+    // holds this mapping — leave it alone, the existing winner stays linked.
+    return false;
+  }
+}
+
 export async function getCommentByUpstreamId(upstreamCommentId: number): Promise<CommentRow | null> {
   return await getDB().get<CommentRow>(
     "SELECT * FROM {{comments}} WHERE upstream_comment_id = ?",

package/src/upstream-sync.ts

@@ -3,7 +3,9 @@ import {
   type ProjectRow,
   type IssueRow,
   getProjectById,
+  getIssue,
   getIssueByUpstreamNumber,
+  linkIssueToUpstream,
   getCommentByUpstreamId,
   createIssue,
   ensureUser,
@@ -110,6 +112,22 @@ export class UpstreamSync {
   }
 
   private async importIssue(gi: GiteaIssue, emit: boolean): Promise<void> {
+    const body = gi.body ?? "";
+    // Issues ework-mirror created upstream reference their origin issue by
+    // number in the footer. Linking instead of importing prevents the echo
+    // loop (local → mirror → GitHub → poll → twin) while keeping comment and
+    // state sync flowing to the original.
+    const mirrored = body.includes("<!-- ework-mirror -->")
+      ? body.match(/Mirrored from ework issue #(\d+)/)
+      : null;
+    if (mirrored?.[1]) {
+      const origin = await getIssue(this.project.id, Number(mirrored[1]));
+      if (origin) {
+        await linkIssueToUpstream(origin.id, gi.number);
+        return;
+      }
+    }
+    if (body.includes("<!-- ework-mirror -->")) return;
     await ensureUser(gi.user?.login ?? "upstream", fromGithubBot(gi.user?.login) ? "bot" : "human");
     await createIssue(
       this.project.id,

package/src/views/projectUpstreams.ts

@@ -82,7 +82,7 @@ function syncCardHtml(project: ProjectRow, sync: UpstreamSyncRow | null): string
 ${statusHtml}
 <div class="form-grid">
 <div><label for="s-base">上游地址（Gitea 根地址，如 http://host:3000）</label>
-<input id="s-base" name="base_url" type="url" placeholder="http://192.168.10.96:3300" value="${escapeAttr(baseUrl)}" required></div>
+<input id="s-base" name="base_url" type="url" placeholder="http://192.168.1.100:3300" value="${escapeAttr(baseUrl)}" required></div>
 <div><label for="s-owner">上游 owner</label>
 <input id="s-owner" name="upstream_owner" value="${escapeAttr(sync?.upstream_owner ?? project.owner)}" required></div>
 <div><label for="s-repo">上游 repo</label>