ework-web 0.10.37 → 0.10.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ework-web",
-  "version": "0.10.37",
+  "version": "0.10.39",
   "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/config.ts

@@ -64,8 +64,8 @@ export const configSchema = z.object({
   collapseLines: z.coerce.number().int().positive().default(16),
   fileRoots: z
     .string()
-    .transform((s) => s.split(",").map((x) => x.trim()).filter(Boolean))
-    .default("/tmp"),
+    .default("/tmp")
+    .transform((s) => s.split(",").map((x) => x.trim()).filter(Boolean)),
   fileMaxLines: z.coerce.number().int().positive().default(2000),
   fileMaxBytes: z.coerce.number().int().positive().default(512 * 1024),
   translateUrl: z.string().default(""),

package/src/remote-file.ts

@@ -1,4 +1,36 @@
 import { THEME_CSS, escapeHtml, tabNavHTML } from "./render/layout";
+import hljs from "highlight.js";
+import { renderMarkdown } from "./render/markdown";
+
+// Extension → hljs language map (mirrors fileview.ts for parity).
+const EXT_LANG: Record<string, string> = {
+  js: "javascript", mjs: "javascript", cjs: "javascript", jsx: "javascript",
+  ts: "typescript", tsx: "typescript", mts: "typescript", cts: "typescript",
+  py: "python", rb: "ruby", go: "go", rs: "rust", java: "java", kt: "kotlin",
+  c: "c", h: "c", cpp: "cpp", cc: "cpp", cxx: "cpp", hpp: "cpp", hxx: "cpp",
+  cs: "csharp", php: "php", swift: "swift", scala: "scala", sh: "bash",
+  bash: "bash", zsh: "bash", fish: "bash", yml: "yaml", yaml: "yaml",
+  json: "json", json5: "json", toml: "toml", xml: "xml", html: "xml",
+  htm: "xml", css: "css", scss: "scss", less: "less", sql: "sql",
+  dockerfile: "dockerfile", makefile: "makefile", lua: "lua", pl: "perl",
+};
+
+function extToLang(p: string): string {
+  const base = (p.split("/").pop() || "").toLowerCase();
+  if (base === "dockerfile" || base.endsWith(".dockerfile")) return "dockerfile";
+  if (base === "makefile" || base.endsWith(".mk")) return "makefile";
+  const m = base.match(/\.([a-z0-9]+)$/);
+  const ext = m && m[1];
+  return ext ? (EXT_LANG[ext] || "") : "";
+}
+
+function hljsHighlight(text: string, lang: string): string {
+  try {
+    return hljs.highlight(text, { language: lang }).value;
+  } catch {
+    return escapeHtml(text);
+  }
+}
 
 export class RemoteFileError extends Error {
   status: number;
@@ -50,7 +82,8 @@ async function fetchDaemon(
   apiPath: string,
   params: Record<string, string>
 ): Promise<Response> {
-  const url = new URL(`${endpoint}${apiPath}`);
+  const base = /^https?:\/\//.test(endpoint) ? endpoint : `http://${endpoint}`;
+  const url = new URL(`${base}${apiPath}`);
   for (const [k, v] of Object.entries(params)) url.searchParams.set(k, v);
   const resp = await fetch(url.toString(), { signal: AbortSignal.timeout(10_000) });
   return resp;
@@ -153,31 +186,66 @@ function renderFileContent(
   const enc = encodeURIComponent;
   const daemonParam = `&daemon=${enc(endpoint)}`;
   const user = viewerLogin ? { login: viewerLogin, is_admin: 0 } : undefined;
-  const lines = data.rows.map((r) =>
-    `<div class="l"><span class="ln">${r.n}</span><span class="lt">${escapeHtml(r.t)}</span></div>`
-  ).join("");
+
+  const ext = (data.path.split(".").pop() || "").toLowerCase();
+  const isMd = ext === "md" || ext === "markdown";
+  const lang = extToLang(data.path);
+  const fullText = data.rows.map((r) => r.t).join("\n");
+  const shownBytes = data.rows.reduce((s, r) => s + r.t.length + 1, 0);
+
+  let body: string;
+  if (isMd) {
+    body = `<div class="md-render">${renderMarkdown(fullText, "")}</div>`;
+  } else if (lang && shownBytes <= 100000) {
+    const nums = data.rows.map((r) => r.n).join("\n");
+    body = `<div class="fv-code"><pre class="fv-gutter">${escapeHtml(nums)}</pre><pre class="fv-src"><code class="hljs language-${escapeHtml(lang)}">${hljsHighlight(fullText, lang)}</code></pre></div>`;
+  } else {
+    body = `<pre class="fv-plain"><code>${data.rows.map((r) => `<span class="ln"><span class="lnn">${r.n}</span><span class="lnc">${escapeHtml(r.t)}</span></span>`).join("")}</code></pre>`;
+  }
 
   return `<!doctype html>
 <html lang="zh"><head><meta charset="utf-8">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 <link rel="icon" type="image/svg+xml" href="/favicon.svg">
 <title>ework-web · ${escapeHtml(data.path)}</title>
+<link rel="stylesheet" href="/static/highlight.css">
 <style>${THEME_CSS}
 .nav{display:flex;align-items:center;gap:.5rem;padding:.55rem 1rem;background:var(--header-bg);color:var(--header-text);font-size:13px}
 .nav a{color:var(--header-text);opacity:.95}
-.wrap{max-width:1000px;margin:0 auto;padding:1rem}
+.wrap{max-width:1100px;margin:0 auto;padding:1rem}
 h1{font-size:14px;margin:0 0 .3rem;font-family:ui-monospace,monospace;word-break:break-all}
 .remote-badge{display:inline-block;background:#1f6feb33;color:#58a6ff;padding:2px 8px;border-radius:10px;font-size:11px;font-weight:600;margin-left:.5rem}
 .note{color:var(--text-muted);font-size:12px;margin:0 0 .5rem}
 .parent-link{font-size:13px;margin-bottom:.4rem}
 .parent-link a{color:var(--text-muted)}
-.fview{background:var(--bg-elev);border:1px solid var(--border);border-radius:6px;overflow:auto;max-height:80vh;font-size:12.5px;font-family:ui-monospace,monospace}
-.l{display:flex}
-.ln{color:var(--text-muted);min-width:3.5rem;text-align:right;padding:0 .5rem;user-select:none;border-right:1px solid var(--border)}
-.lt{padding:0 .5rem;white-space:pre-wrap;word-break:break-all;flex:1}
-.tabs{display:flex;gap:.3rem;padding:.5rem 1rem;border-bottom:1px solid var(--border);font-size:13px}
-.tab{padding:.3rem .7rem;border-radius:6px 6px 0 0;text-decoration:none;color:var(--text-muted)}
-.tab.active{background:var(--accent);color:#fff}
+.fv-code{display:flex;border:1px solid var(--border);border-radius:8px;overflow:auto;font-size:12.5px;line-height:1.5}
+.fv-gutter{background:var(--bg-muted);color:var(--text-muted);text-align:right;padding:.6rem .7rem;user-select:none;white-space:pre;flex-shrink:0;border:none;margin:0}
+.fv-src{margin:0;flex:1;overflow:auto;background:var(--bg-elev);padding:.6rem .8rem;border:none}
+.fv-src code{background:none;padding:0;white-space:pre;font-size:12.5px}
+.fv-plain{background:var(--bg-elev);border:1px solid var(--border);border-radius:8px;padding:.6rem 0;overflow:auto;font-size:12.5px;line-height:1.5}
+.fv-plain .ln{display:flex}
+.fv-plain .lnn{user-select:none;text-align:right;color:var(--text-muted);padding:0 .7rem 0 .8rem;min-width:3.5em;flex-shrink:0;border-right:1px solid var(--border);background:var(--bg-muted)}
+.fv-plain .lnc{padding:0 .8rem;white-space:pre;overflow-wrap:anywhere}
+.md-render{max-width:820px;margin:0 auto;padding:1rem 1.5rem 5rem;font-size:14.5px;line-height:1.7;color:var(--text)}
+.md-render h1,.md-render h2,.md-render h3,.md-render h4{line-height:1.3;margin:1.4em 0 .6em;font-weight:600}
+.md-render h1{font-size:1.7em;border-bottom:1px solid var(--border);padding-bottom:.3em}
+.md-render h2{font-size:1.4em;border-bottom:1px solid var(--border);padding-bottom:.3em}
+.md-render h3{font-size:1.2em}
+.md-render h4{font-size:1.05em}
+.md-render p{margin:.6em 0}
+.md-render ul,.md-render ol{margin:.6em 0;padding-left:1.6em}
+.md-render li{margin:.25em 0}
+.md-render a{color:var(--accent);text-decoration:none}
+.md-render a:hover{text-decoration:underline}
+.md-render code{font-family:ui-monospace,SFMono-Regular,Menlo,monospace;font-size:.88em;background:var(--bg-muted);padding:.15em .35em;border-radius:4px}
+.md-render pre{background:var(--bg-elev);border:1px solid var(--border);border-radius:8px;padding:.7rem 1rem;overflow:auto;margin:.8em 0}
+.md-render pre code{background:none;padding:0;font-size:13px}
+.md-render blockquote{border-left:3px solid var(--border);margin:.8em 0;padding:.2em 0 .2em 1em;color:var(--text-muted)}
+.md-render table{border-collapse:collapse;margin:.8em 0;width:100%}
+.md-render th,.md-render td{border:1px solid var(--border);padding:.4em .7em;text-align:left}
+.md-render th{background:var(--bg-muted);font-weight:600}
+.md-render img{max-width:100%}
+.md-render hr{border:none;border-top:1px solid var(--border);margin:1.4em 0}
 </style></head><body>
 <header class="nav"><a href="/" style="color:var(--header-text)">🏠 ework-web</a></header>
 ${tabNavHTML("sessions", user)}
@@ -185,7 +253,7 @@ ${tabNavHTML("sessions", user)}
 <div class="parent-link">📁 <a href="/file?path=${enc(data.path.split("/").slice(0, -1).join("/") || "/")}${daemonParam}">..</a></div>
 <h1>${escapeHtml(data.path)}<span class="remote-badge">远程 ${daemonLabel}</span></h1>
 ${data.note ? `<p class="note">${escapeHtml(data.note)}</p>` : ""}
-<div class="fview">${lines}</div>
+${body}
 </main></body></html>`;
 }
 

package/src/store.ts

@@ -5,6 +5,22 @@
 import { getDB } from "./db";
 import { createHash } from "node:crypto";
 
+let _visibilityChecked = false;
+let _hasVisibilityColumn = true;
+
+async function visibilitySupported(): Promise<boolean> {
+  if (_visibilityChecked) return _hasVisibilityColumn;
+  _visibilityChecked = true;
+  try {
+    await getDB().get("SELECT visibility FROM {{projects}} LIMIT 0");
+    _hasVisibilityColumn = true;
+  } catch {
+    _hasVisibilityColumn = false;
+    console.warn("[store] projects.visibility column missing — treating all projects as public");
+  }
+  return _hasVisibilityColumn;
+}
+
 export type UserKind = "human" | "bot" | "system";
 
 export interface UserRow {
@@ -181,12 +197,15 @@ export async function listProjectsWithCounts(
 ): Promise<ProjectWithCounts[]> {
   const isAdmin = viewer?.is_admin === 1;
   const login = viewer?.login;
-  const visibilityFilter = isAdmin
+  const hasVis = isAdmin ? true : await visibilitySupported();
+  const visibilityFilter = !hasVis
     ? ""
-    : login
-      ? ` AND (p.visibility != 'private' OR EXISTS (SELECT 1 FROM {{project_members}} pm WHERE pm.project_id = p.id AND pm.user_login = ?))`
-      : ` AND p.visibility != 'private'`;
-  const args = !isAdmin && login ? [login] : [];
+    : isAdmin
+      ? ""
+      : login
+        ? ` AND (p.visibility != 'private' OR EXISTS (SELECT 1 FROM {{project_members}} pm WHERE pm.project_id = p.id AND pm.user_login = ?))`
+        : ` AND p.visibility != 'private'`;
+  const args = hasVis && !isAdmin && login ? [login] : [];
   return await getDB().all<ProjectWithCounts>(
     `SELECT p.*,
        COALESCE(SUM(CASE WHEN i.state = 'open' THEN 1 ELSE 0 END), 0) AS open_count,
@@ -404,7 +423,7 @@ export async function listAllIssues(opts: ListIssuesOpts = {}): Promise<IssueWit
     sql += " AND EXISTS (SELECT 1 FROM {{issue_labels}} il JOIN {{labels}} l ON l.id = il.label_id WHERE il.issue_id = i.id AND l.name = ?)";
     args.push(label);
   }
-  if (!opts.viewerIsAdmin) {
+  if (!opts.viewerIsAdmin && await visibilitySupported()) {
     sql += " AND (p.visibility != 'private'";
     if (opts.viewerLogin) {
       sql += " OR EXISTS (SELECT 1 FROM {{project_members}} pm WHERE pm.project_id = p.id AND pm.user_login = ?)";