rssany 0.1.5 → 0.2.0

package/dist/index.js

@@ -9,7 +9,7 @@ import { join, dirname, basename, resolve, sep, relative } from "node:path";
 import { promisify } from "node:util";
 import puppeteerCore from "puppeteer-core";
 import { parse, NodeType } from "node-html-parser";
-import Database from "better-sqlite3";
+import { DatabaseSync } from "node:sqlite";
 import { mkdir, writeFile, copyFile, access, rename, readFile, readdir, stat, unlink } from "node:fs/promises";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { createHash } from "node:crypto";
@@ -292,16 +292,14 @@ async function initUserDir() {
 }
 const MAIN_DB_JOURNAL = (process.env.RSSANY_DB_JOURNAL ?? "wal").toLowerCase() === "delete" ? "DELETE" : "WAL";
 let _db = null;
-let _dbInit = null;
 let _writeLock = Promise.resolve();
 const MAIN_DB_LOCK_PATH = join(DATA_DIR, "rssany.db.lock");
 function logCorruptDiagnostic(operation, err) {
-  const code = err?.code;
   const msg = err instanceof Error ? err.message : String(err);
   const lines = [
     "[rssany db] 数据库可能损坏或并发冲突",
     `  操作: ${operation}`,
-    `  错误: ${code ?? "unknown"} - ${msg}`,
+    `  错误: ${msg}`,
     "  常见原因:",
     "    1. 多进程同时打开同一库（例如 tsx --watch 与另一实例同时写）",
     "    2. 异常退出后 WAL 未正常 checkpoint",
@@ -437,48 +435,40 @@ function mapRowsToDbItems(rows) {
   return rows.map(toDbItem);
 }
 function isCorruptError(err) {
-  const code = err?.code;
   const msg = err instanceof Error ? err.message : String(err);
-  return code === "SQLITE_CORRUPT" || code === "SQLITE_CORRUPT_VTAB" || msg.includes("database disk image is malformed");
+  return msg.includes("SQLITE_CORRUPT") || msg.includes("database disk image is malformed");
 }
 async function getDb() {
   if (_db) return _db;
-  if (_dbInit) return _dbInit;
   const dbPath = join(DATA_DIR, "rssany.db");
-  _dbInit = (async () => {
-    await mkdir(DATA_DIR, { recursive: true });
-    acquireDbLock(DATA_DIR);
-    let db = null;
-    try {
-      db = new Database(dbPath);
-      db.pragma(`journal_mode = ${MAIN_DB_JOURNAL}`);
-      db.pragma("synchronous = NORMAL");
-      initSchema(db);
-      _db = db;
-      return db;
-    } catch (err) {
-      _dbInit = null;
-      releaseDbLock();
-      if (db) {
-        try {
-          db.close();
-        } catch {
-        }
-        db = null;
-      }
-      if (isCorruptError(err)) {
-        logCorruptDiagnostic("打开/初始化主库 (getDb)", err);
+  await mkdir(DATA_DIR, { recursive: true });
+  acquireDbLock(DATA_DIR);
+  try {
+    _db = new DatabaseSync(dbPath);
+    _db.exec(`PRAGMA journal_mode = ${MAIN_DB_JOURNAL}`);
+    _db.exec("PRAGMA synchronous = NORMAL");
+    initSchema(_db);
+    return _db;
+  } catch (err) {
+    releaseDbLock();
+    if (_db) {
+      try {
+        _db.close();
+      } catch {
       }
-      throw err;
+      _db = null;
     }
-  })();
-  return _dbInit;
+    if (isCorruptError(err)) {
+      logCorruptDiagnostic("打开/初始化主库 (getDb)", err);
+    }
+    throw err;
+  }
 }
 async function runIntegrityCheck() {
   const db = await getDb();
   try {
-    const row = db.prepare("PRAGMA integrity_check").get();
-    return row?.integrity_check ?? "unknown";
+    const result = db.prepare("PRAGMA integrity_check").get();
+    return result?.integrity_check ?? "unknown";
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     return `integrity_check 执行失败: ${msg}`;
@@ -486,7 +476,6 @@ async function runIntegrityCheck() {
 }
 const LOGS_DB_PATH = join(DATA_DIR, "logs.db");
 let _logsDb = null;
-let _logsDbInit = null;
 function initLogsSchema(db) {
   db.exec(`
     CREATE TABLE IF NOT EXISTS logs (
@@ -504,17 +493,12 @@ function initLogsSchema(db) {
 }
 async function getLogsDb() {
   if (_logsDb) return _logsDb;
-  if (_logsDbInit) return _logsDbInit;
-  _logsDbInit = (async () => {
-    await mkdir(DATA_DIR, { recursive: true });
-    const db = new Database(LOGS_DB_PATH);
-    db.pragma("journal_mode = WAL");
-    db.pragma("synchronous = NORMAL");
-    initLogsSchema(db);
-    _logsDb = db;
-    return db;
-  })();
-  return _logsDbInit;
+  await mkdir(DATA_DIR, { recursive: true });
+  _logsDb = new DatabaseSync(LOGS_DB_PATH);
+  _logsDb.exec("PRAGMA journal_mode = WAL");
+  _logsDb.exec("PRAGMA synchronous = NORMAL");
+  initLogsSchema(_logsDb);
+  return _logsDb;
 }
 function initSchema(db) {
   db.exec(`
@@ -588,8 +572,8 @@ function initSchema(db) {
     END;
   `);
   try {
-    const info = db.prepare("PRAGMA table_info(items)").all();
-    if (info && !info.some((c) => c.name === "image_url")) {
+    const cols = db.prepare("PRAGMA table_info(items)").all().map((r) => r.name);
+    if (!cols.includes("image_url")) {
       db.exec("ALTER TABLE items ADD COLUMN image_url TEXT");
     }
   } catch {
@@ -597,20 +581,25 @@ function initSchema(db) {
   migrateItemsSourceUrlIfNeeded(db);
 }
 function migrateItemsSourceUrlIfNeeded(db) {
-  const v = db.pragma("user_version", { simple: true });
+  const pragmaResult = db.exec("PRAGMA user_version");
+  const v = pragmaResult?.values?.[0]?.[0] ?? 0;
   if (v >= 2) return;
   const rows = db.prepare("SELECT rowid, source_url FROM items").all();
-  const upd = db.prepare("UPDATE items SET source_url = @next WHERE rowid = @rowid");
-  const run = db.transaction(() => {
+  const updateStmt = db.prepare("UPDATE items SET source_url = @next WHERE rowid = @rowid");
+  db.exec("BEGIN TRANSACTION");
+  try {
     for (const r of rows) {
       const next = canonicalHttpSourceRef(r.source_url);
       if (next !== r.source_url) {
-        upd.run({ next, rowid: r.rowid });
+        updateStmt.run({ next, rowid: r.rowid });
       }
     }
-    db.pragma("user_version = 2");
-  });
-  run();
+    db.exec("PRAGMA user_version = 2");
+    db.exec("COMMIT");
+  } catch (err) {
+    db.exec("ROLLBACK");
+    throw err;
+  }
 }
 async function upsertItems(items, sourceUrlOverride) {
   if (items.length === 0) return { newCount: 0, newIds: /* @__PURE__ */ new Set() };
@@ -621,79 +610,72 @@ async function upsertItems(items, sourceUrlOverride) {
   const sourceUrl = canonicalHttpSourceRef(raw);
   return withWriteLock(async () => {
     const db = await getDb();
-    const stmt = db.prepare(`
-    INSERT OR IGNORE INTO items (id, url, source_url, title, author, summary, image_url, tags, pub_date, fetched_at)
-    VALUES (@id, @url, @sourceUrl, @title, @author, @summary, @imageUrl, @tags, @pubDate, @fetchedAt)
-  `);
-    const selectExistingStmt = db.prepare(`
-    SELECT id, title, author, summary, image_url, pub_date, fetched_at
-    FROM items
-    WHERE id = @id
-  `);
-    const repairExistingStmt = db.prepare(`
-    UPDATE items
-    SET title = @title,
-        author = @author,
-        summary = @summary,
-        image_url = @imageUrl,
-        pub_date = @pubDate,
-        fetched_at = @fetchedAt
-    WHERE id = @id
-  `);
     const now2 = (/* @__PURE__ */ new Date()).toISOString();
     let newCount = 0;
     const newIds = /* @__PURE__ */ new Set();
-    const run = db.transaction((rows) => {
-      for (const item of rows) {
-        const nextTitle = normalizeText(item.title) || null;
-        const nextSummary = normalizeText(item.summary) || null;
-        const nextAuthorArr = normalizeAuthor(item.author);
-        const nextAuthor = nextAuthorArr?.length ? JSON.stringify(nextAuthorArr) : null;
-        const nextPubDate = pubDateToIsoOrNull(item.pubDate);
-        const nextTags = item.tags?.length ? JSON.stringify(item.tags) : null;
-        const nextImageUrl = typeof item.imageUrl === "string" && item.imageUrl.trim() ? item.imageUrl.trim() : null;
-        const info = stmt.run({
-          id: item.guid,
-          url: item.link,
-          sourceUrl,
-          title: nextTitle,
-          author: nextAuthor,
-          summary: nextSummary,
-          imageUrl: nextImageUrl,
-          tags: nextTags,
-          pubDate: nextPubDate,
-          fetchedAt: now2
-        });
-        newCount += info.changes;
-        if (info.changes > 0) newIds.add(item.guid);
-        if (info.changes > 0) continue;
-        const existing = selectExistingStmt.get({ id: item.guid });
-        if (!existing) continue;
-        const shouldRepairTitle = !!nextTitle && !isDateOnlyTitle(nextTitle) && (isDateOnlyTitle(existing.title) || !normalizeText(existing.title));
-        const shouldRepairSummary = !!nextSummary && normalizeText(existing.summary).length < nextSummary.length;
-        const shouldRepairImageUrl = !!nextImageUrl && !existing.image_url?.trim();
-        const existingAuthorArr = parseAuthorFromDb(existing.author);
-        const shouldRepairAuthor = !!nextAuthorArr?.length && !existingAuthorArr?.length;
-        const existingPubDateMs = toMs(existing.pub_date);
-        const existingFetchedAtMs = toMs(existing.fetched_at);
-        const nextPubDateMs = toMs(nextPubDate);
-        const existingPubDateLooksFallback = existingPubDateMs != null && existingFetchedAtMs != null && Math.abs(existingPubDateMs - existingFetchedAtMs) <= 5 * 60 * 1e3;
-        const shouldRepairPubDate = nextPubDateMs != null && (existingPubDateMs == null || existingPubDateLooksFallback && nextPubDateMs < existingPubDateMs - 24 * 60 * 60 * 1e3);
-        if (!(shouldRepairTitle || shouldRepairSummary || shouldRepairImageUrl || shouldRepairAuthor || shouldRepairPubDate)) {
-          continue;
-        }
-        repairExistingStmt.run({
-          id: item.guid,
-          title: shouldRepairTitle ? nextTitle : existing.title,
-          author: shouldRepairAuthor ? nextAuthor : existing.author ?? null,
-          summary: shouldRepairSummary ? nextSummary : existing.summary,
-          imageUrl: shouldRepairImageUrl ? nextImageUrl : existing.image_url ?? null,
-          pubDate: shouldRepairPubDate ? nextPubDate : existing.pub_date,
-          fetchedAt: now2
-        });
+    const insertStmt = db.prepare(`
+      INSERT OR IGNORE INTO items (id, url, source_url, title, author, summary, image_url, tags, pub_date, fetched_at)
+      VALUES (@id, @url, @sourceUrl, @title, @author, @summary, @imageUrl, @tags, @pubDate, @fetchedAt)
+    `);
+    const selectExistingStmt = db.prepare(`
+      SELECT title, author, summary, image_url, pub_date, fetched_at
+      FROM items WHERE id = @id
+    `);
+    const updateStmt = db.prepare(`
+      UPDATE items SET title = @title, author = @author, summary = @summary,
+        image_url = @imageUrl, pub_date = @pubDate, fetched_at = @fetchedAt
+      WHERE id = @id
+    `);
+    for (const item of items) {
+      const nextTitle = normalizeText(item.title) || null;
+      const nextSummary = normalizeText(item.summary) || null;
+      const nextAuthorArr = normalizeAuthor(item.author);
+      const nextAuthor = nextAuthorArr?.length ? JSON.stringify(nextAuthorArr) : null;
+      const nextPubDate = pubDateToIsoOrNull(item.pubDate);
+      const nextTags = item.tags?.length ? JSON.stringify(item.tags) : null;
+      const nextImageUrl = typeof item.imageUrl === "string" && item.imageUrl.trim() ? item.imageUrl.trim() : null;
+      const info = insertStmt.run({
+        id: item.guid,
+        url: item.link,
+        sourceUrl,
+        title: nextTitle,
+        author: nextAuthor,
+        summary: nextSummary,
+        imageUrl: nextImageUrl,
+        tags: nextTags,
+        pubDate: nextPubDate,
+        fetchedAt: now2
+      });
+      newCount += Number(info.changes);
+      if (info.changes > 0) {
+        newIds.add(item.guid);
+        continue;
       }
-    });
-    run(items);
+      const existing = selectExistingStmt.get({ id: item.guid });
+      if (!existing) continue;
+      const shouldRepairTitle = !!nextTitle && !isDateOnlyTitle(nextTitle) && (isDateOnlyTitle(existing.title) || !normalizeText(existing.title));
+      const shouldRepairSummary = !!nextSummary && normalizeText(existing.summary ?? "").length < nextSummary.length;
+      const shouldRepairImageUrl = !!nextImageUrl && !existing.image_url?.trim();
+      const existingAuthorArr = parseAuthorFromDb(existing.author);
+      const shouldRepairAuthor = !!nextAuthorArr?.length && !existingAuthorArr?.length;
+      const existingPubDateMs = toMs(existing.pub_date);
+      const existingFetchedAtMs = toMs(existing.fetched_at);
+      const nextPubDateMs = toMs(nextPubDate);
+      const existingPubDateLooksFallback = existingPubDateMs != null && existingFetchedAtMs != null && Math.abs(existingPubDateMs - existingFetchedAtMs) <= 5 * 60 * 1e3;
+      const shouldRepairPubDate = nextPubDateMs != null && (existingPubDateMs == null || existingPubDateLooksFallback && nextPubDateMs < existingPubDateMs - 24 * 60 * 60 * 1e3);
+      if (!(shouldRepairTitle || shouldRepairSummary || shouldRepairImageUrl || shouldRepairAuthor || shouldRepairPubDate)) {
+        continue;
+      }
+      updateStmt.run({
+        id: item.guid,
+        title: shouldRepairTitle ? nextTitle : existing.title,
+        author: shouldRepairAuthor ? nextAuthor : existing.author ?? null,
+        summary: shouldRepairSummary ? nextSummary : existing.summary,
+        imageUrl: shouldRepairImageUrl ? nextImageUrl : existing.image_url ?? null,
+        pubDate: shouldRepairPubDate ? nextPubDate : existing.pub_date,
+        fetchedAt: now2
+      });
+    }
     return { newCount, newIds };
   });
 }
@@ -701,15 +683,15 @@ async function updateItemContent(item) {
   return withWriteLock(async () => {
     const db = await getDb();
     db.prepare(`
-    UPDATE items
-    SET content      = COALESCE(content, @content),
-        image_url   = COALESCE(@imageUrl, image_url),
-        author      = COALESCE(@author, author),
-        pub_date    = COALESCE(@pubDate, pub_date),
-        tags        = @tags,
+      UPDATE items SET
+        content = COALESCE(content, @content),
+        image_url = COALESCE(@imageUrl, image_url),
+        author = COALESCE(@author, author),
+        pub_date = COALESCE(@pubDate, pub_date),
+        tags = @tags,
         translations = COALESCE(@translations, translations)
-    WHERE id = @id
-  `).run({
+      WHERE id = @id
+    `).run({
       id: item.guid,
       content: item.content ?? null,
       imageUrl: typeof item.imageUrl === "string" && item.imageUrl.trim() ? item.imageUrl.trim() : null,
@@ -734,6 +716,7 @@ async function queryFeedItems(sourceUrls, limit, offset, opts) {
   expanded.forEach((url, i) => {
     params[`u${i}`] = url;
   });
+  const sqlParams = params;
   if (opts?.since) {
     conditions.push("COALESCE(pub_date, fetched_at) >= @since");
     params.since = opts.since.length === 10 ? `${opts.since}T00:00:00.000Z` : opts.since;
@@ -750,11 +733,10 @@ async function queryFeedItems(sourceUrls, limit, offset, opts) {
   }
   const where = conditions.length ? `WHERE ${conditions.join(" AND ")}` : "";
   const rows = db.prepare(`
-    SELECT * FROM items
-    ${where}
-    ORDER BY COALESCE(pub_date, fetched_at) DESC
-    LIMIT @lim OFFSET @off
-  `).all(params);
+      SELECT * FROM items ${where}
+      ORDER BY COALESCE(pub_date, fetched_at) DESC
+      LIMIT ${limit + 1} OFFSET ${offset}
+    `).all(sqlParams);
   const hasMore = rows.length > limit;
   const items = mapRowsToDbItems(hasMore ? rows.slice(0, limit) : rows);
   return { items, hasMore };
@@ -763,22 +745,20 @@ async function queryItems(opts) {
   const db = await getDb();
   const { sourceUrl, sourceUrls, author, q, tags: tagsFilter, limit = 20, offset = 0, since, until } = opts;
   const conditions = [];
-  const params = { limit, offset };
+  const params = {};
   if (sourceUrl) {
     const key = canonicalHttpSourceRef(sourceUrl);
-    if (!key) {
-      return { items: [], total: 0 };
-    }
+    if (!key) return { items: [], total: 0 };
     conditions.push("i.source_url = @sourceUrl");
     params.sourceUrl = key;
   } else if (sourceUrls && sourceUrls.length > 0) {
     const expanded = [...new Set(sourceUrls.map((s) => canonicalHttpSourceRef(s)).filter(Boolean))];
-    if (expanded.length === 0) {
-      return { items: [], total: 0 };
-    }
+    if (expanded.length === 0) return { items: [], total: 0 };
     const placeholders = expanded.map((_, i) => `@src${i}`).join(", ");
     conditions.push(`i.source_url IN (${placeholders})`);
-    expanded.forEach((s, i) => params[`src${i}`] = s);
+    expanded.forEach((s, i) => {
+      params[`src${i}`] = s;
+    });
   }
   if (author && author.trim().length >= 2) {
     conditions.push("instr(i.author, @author) > 0");
@@ -789,9 +769,9 @@ async function queryItems(opts) {
     params.q = q;
   }
   if (tagsFilter && tagsFilter.length > 0) {
-    const trimmed = tagsFilter.filter((t) => typeof t === "string" && t.trim()).map((t) => t.trim());
+    const trimmed = tagsFilter.filter((t) => typeof t === "string" && t.trim().length > 0).map((t) => t.trim());
     if (trimmed.length > 0) {
-      const tagConds = trimmed.map((_, i) => `LOWER(TRIM(json_each.value)) = LOWER(@tag${i})`).join(" OR ");
+      const tagConds = trimmed.map((_, idx) => `LOWER(TRIM(json_each.value)) = LOWER(@tag${idx})`).join(" OR ");
       conditions.push(`i.tags IS NOT NULL AND EXISTS (SELECT 1 FROM json_each(i.tags) WHERE ${tagConds})`);
       trimmed.forEach((t, i) => {
         params[`tag${i}`] = t;
@@ -807,14 +787,19 @@ async function queryItems(opts) {
     params.until = until.toISOString();
   }
   const where = conditions.length ? `WHERE ${conditions.join(" AND ")}` : "";
+  const sqlParams = params;
   const rows = db.prepare(`
-    SELECT i.id, i.url, i.source_url, i.title, i.author, i.summary, i.content, i.tags, i.translations, i.pub_date, i.fetched_at, i.pushed_at
-    FROM items i ${where}
-    ORDER BY COALESCE(i.pub_date, i.fetched_at) DESC
-    LIMIT @limit OFFSET @offset
-  `).all(params);
-  const { count } = db.prepare(`SELECT COUNT(*) as count FROM items i ${where}`).get(params);
-  return { items: mapRowsToDbItems(rows), total: count };
+      SELECT i.id, i.url, i.source_url, i.title, i.author, i.summary, i.content, i.tags, i.translations, i.pub_date, i.fetched_at, i.pushed_at
+      FROM items i ${where}
+      ORDER BY COALESCE(i.pub_date, i.fetched_at) DESC
+      LIMIT ${limit} OFFSET ${offset}
+    `).all(sqlParams);
+  const { count } = db.prepare(`SELECT COUNT(*) as count FROM items i ${where}`).get(sqlParams);
+  return { items: mapRowsToDbItems(rows.map((r) => {
+    const obj = {};
+    for (const [k, v] of Object.entries(r)) obj[k] = v;
+    return obj;
+  })), total: count };
 }
 async function removeTagFromAllItems(tag) {
   const trimmed = String(tag ?? "").trim();
@@ -825,22 +810,19 @@ async function removeTagFromAllItems(tag) {
     const rows = db.prepare("SELECT id, tags FROM items WHERE tags IS NOT NULL AND tags != ''").all();
     const updateStmt = db.prepare("UPDATE items SET tags = @tags WHERE id = @id");
     let count = 0;
-    const run = db.transaction(() => {
-      for (const row of rows) {
-        let itemTags;
-        try {
-          itemTags = JSON.parse(row.tags);
-        } catch {
-          continue;
-        }
-        const filtered = itemTags.filter((t) => String(t).trim().toLowerCase() !== targetLower);
-        if (filtered.length === itemTags.length) continue;
-        const nextTags = filtered.length > 0 ? JSON.stringify(filtered) : null;
-        updateStmt.run({ id: row.id, tags: nextTags });
-        count += 1;
+    for (const row of rows) {
+      let itemTags;
+      try {
+        itemTags = JSON.parse(row.tags);
+      } catch {
+        continue;
       }
-    });
-    run();
+      const filtered = itemTags.filter((t) => String(t).trim().toLowerCase() !== targetLower);
+      if (filtered.length === itemTags.length) continue;
+      const nextTags = filtered.length > 0 ? JSON.stringify(filtered) : null;
+      updateStmt.run({ id: row.id, tags: nextTags });
+      count += 1;
+    }
     return count;
   });
 }
@@ -849,25 +831,19 @@ async function markPushed(ids) {
   return withWriteLock(async () => {
     const db = await getDb();
     const now2 = (/* @__PURE__ */ new Date()).toISOString();
-    const stmt = db.prepare("UPDATE items SET pushed_at = @now WHERE id = @id");
-    const run = db.transaction((list) => {
-      for (const id of list) stmt.run({ now: now2, id });
-    });
-    run(ids);
+    const placeholders = ids.map(() => "?").join(",");
+    db.prepare(`UPDATE items SET pushed_at = ? WHERE id IN (${placeholders})`).run(now2, ...ids);
   });
 }
 async function deleteItem(id) {
   if (!id?.trim()) return false;
   return withWriteLock(async () => {
     const db = await getDb();
-    const run = db.transaction(() => {
-      const row = db.prepare("SELECT rowid FROM items WHERE id = @id").get({ id: id.trim() });
-      if (!row) return 0;
-      db.prepare("DELETE FROM items_fts WHERE rowid = @rowid").run({ rowid: row.rowid });
-      const info = db.prepare("DELETE FROM items WHERE id = @id").run({ id: id.trim() });
-      return info.changes;
-    });
-    return run() > 0;
+    const row = db.prepare("SELECT rowid FROM items WHERE id = @id").get({ id: id.trim() });
+    if (!row) return false;
+    db.prepare("DELETE FROM items_fts WHERE rowid = @rowid").run({ rowid: row.rowid });
+    const info = db.prepare("DELETE FROM items WHERE id = @id").run({ id: id.trim() });
+    return Number(info.changes) > 0;
   });
 }
 async function deleteItemsBySourceUrl(sourceUrl) {
@@ -877,29 +853,33 @@ async function deleteItemsBySourceUrl(sourceUrl) {
   return withWriteLock(async () => {
     const db = await getDb();
     const info = db.prepare("DELETE FROM items WHERE source_url = @sourceUrl").run({ sourceUrl: key });
-    return info.changes;
+    return Number(info.changes);
   });
 }
 async function getPendingPushItems(limit = 100) {
   const db = await getDb();
   const rows = db.prepare(`
-    SELECT * FROM items
-    WHERE pushed_at IS NULL AND content IS NOT NULL
-    ORDER BY fetched_at ASC
-    LIMIT @limit
-  `).all({ limit });
-  return mapRowsToDbItems(rows);
+      SELECT * FROM items
+      WHERE pushed_at IS NULL AND content IS NOT NULL
+      ORDER BY fetched_at ASC
+      LIMIT ${limit}
+    `).all();
+  return mapRowsToDbItems(rows.map((r) => {
+    const obj = {};
+    for (const [k, v] of Object.entries(r)) obj[k] = v;
+    return obj;
+  }));
 }
 async function getSourceStats() {
   const { mergeSourceStatsRows: mergeSourceStatsRows2 } = await Promise.resolve().then(() => httpSourceRef);
   const db = await getDb();
-  const rows = db.prepare(
-    `SELECT source_url,
-              COUNT(*) as count,
-              SUM(CASE WHEN julianday(fetched_at) >= julianday('now', '-7 days') THEN 1 ELSE 0 END) as count_7d,
-              MAX(COALESCE(pub_date, fetched_at)) as latest_at
- FROM items GROUP BY source_url ORDER BY count DESC`
-  ).all();
+  const rows = db.prepare(`
+      SELECT source_url,
+             COUNT(*) as count,
+             SUM(CASE WHEN julianday(fetched_at) >= julianday('now', '-7 days') THEN 1 ELSE 0 END) as count_7d,
+             MAX(COALESCE(pub_date, fetched_at)) as latest_at
+      FROM items GROUP BY source_url ORDER BY count DESC
+    `).all();
   return mergeSourceStatsRows2(rows);
 }
 async function insertLog(entry) {
@@ -919,7 +899,7 @@ async function queryLogs(opts) {
   const db = await getLogsDb();
   const { level, category, limit = 50, offset = 0, since } = opts;
   const conditions = [];
-  const params = { limit, offset };
+  const params = {};
   if (level) {
     conditions.push("level = @level");
     params.level = level;
@@ -933,19 +913,30 @@ async function queryLogs(opts) {
     params.since = since.toISOString();
   }
   const where = conditions.length ? `WHERE ${conditions.join(" AND ")}` : "";
+  const sqlParams = params;
   const rows = db.prepare(`
-    SELECT id, level, category, message, payload, created_at
-    FROM logs ${where}
-    ORDER BY created_at DESC
-    LIMIT @limit OFFSET @offset
-  `).all(params);
-  const { count } = db.prepare(`SELECT COUNT(*) as count FROM logs ${where}`).get(params);
-  return { items: rows, total: count };
+      SELECT id, level, category, message, payload, created_at
+      FROM logs ${where}
+      ORDER BY created_at DESC
+      LIMIT ${limit} OFFSET ${offset}
+    `).all(sqlParams);
+  const { count } = db.prepare(`SELECT COUNT(*) as count FROM logs ${where}`).get(sqlParams);
+  return {
+    items: rows.map((r) => ({
+      id: Number(r.id),
+      level: String(r.level),
+      category: String(r.category),
+      message: String(r.message),
+      payload: r.payload,
+      created_at: String(r.created_at)
+    })),
+    total: Number(count)
+  };
 }
 async function clearAllLogs() {
   const db = await getLogsDb();
   const r = db.prepare("DELETE FROM logs").run();
-  return r.changes;
+  return Number(r.changes);
 }
 async function getSystemTags() {
   try {
@@ -2512,18 +2503,30 @@ function onFeedUpdated(fn) {
   eventBus.on("feed:updated", fn);
   return () => eventBus.off("feed:updated", fn);
 }
+function migrateGatewayFromFile(j) {
+  const g = j?.deliver?.gateway?.trim();
+  if (g) return g;
+  const u = j?.deliver?.url?.trim() ?? "";
+  if (u) {
+    return u.replace(/\/items\/?$/i, "").replace(/\/+$/, "").trim();
+  }
+  const s = j?.deliver?.sourcesUrl?.trim() ?? "";
+  if (s) {
+    return s.replace(/\/sources\/?$/i, "").replace(/\/+$/, "").trim();
+  }
+  return "";
+}
 async function getDeliverConfig() {
   try {
     const raw = await readFile(CONFIG_PATH, "utf-8");
     const j = JSON.parse(raw);
-    const u = j?.deliver?.url;
     const t = j?.deliver?.token;
     return {
-      url: typeof u === "string" ? u.trim() : "",
+      gateway: migrateGatewayFromFile(j),
       token: typeof t === "string" ? t.trim() : ""
     };
   } catch {
-    return { url: "", token: "" };
+    return { gateway: "", token: "" };
   }
 }
 async function saveDeliverConfig(config) {
@@ -2533,13 +2536,11 @@ async function saveDeliverConfig(config) {
     root = JSON.parse(raw);
   } catch {
   }
-  const prev = root.deliver;
-  const base2 = typeof prev === "object" && prev !== null && !Array.isArray(prev) ? { ...prev } : {};
-  const url = config.url.trim();
+  const gateway = config.gateway.trim();
   const token = config.token.trim();
-  const next = { ...base2, url };
+  const next = {};
+  if (gateway) next.gateway = gateway;
   if (token) next.token = token;
-  else delete next.token;
   root.deliver = next;
   await writeFile(CONFIG_PATH, JSON.stringify(root, null, 2) + "\n", "utf-8");
 }
@@ -2557,6 +2558,11 @@ function feedItemsToPayload(items) {
     translations: i.translations
   }));
 }
+function joinGatewayPath(gatewayBase, segment) {
+  const base2 = gatewayBase.trim().replace(/\/+$/, "");
+  if (!base2) return "";
+  return `${base2}/${segment}`;
+}
 async function postDeliverItems(url, sourceRef, items, options) {
   if (!url.trim() || items.length === 0) return;
   const body = JSON.stringify({ sourceRef, items: feedItemsToPayload(items) });
@@ -2585,6 +2591,52 @@ async function postDeliverItemsSafe(url, sourceRef, items, options) {
     });
   }
 }
+async function postDeliverSources(url, sourcesJson, options) {
+  if (!url.trim() || !sourcesJson.trim()) return;
+  const headers = {
+    "Content-Type": "application/json; charset=utf-8"
+  };
+  const t = options?.bearerToken?.trim();
+  if (t) headers.Authorization = `Bearer ${t}`;
+  const res = await fetch(url.trim(), {
+    method: "POST",
+    headers,
+    body: sourcesJson,
+    signal: AbortSignal.timeout(12e4)
+  });
+  if (!res.ok) {
+    const text = await res.text().catch(() => "");
+    throw new Error(`HTTP ${res.status}${text ? `: ${text.slice(0, 200)}` : ""}`);
+  }
+}
+async function postDeliverSourcesSafe(url, sourcesJson, options) {
+  try {
+    await postDeliverSources(url, sourcesJson, options);
+  } catch (err) {
+    logger.warn("deliver", "信源配置投递失败", {
+      err: err instanceof Error ? err.message : String(err)
+    });
+  }
+}
+async function postDeliverGatewayTest(gateway, body, options) {
+  const url = joinGatewayPath(gateway, "test");
+  if (!url) throw new Error("gateway 不能为空");
+  const headers = {
+    "Content-Type": "application/json; charset=utf-8"
+  };
+  const t = options?.bearerToken?.trim();
+  if (t) headers.Authorization = `Bearer ${t}`;
+  const res = await fetch(url, {
+    method: "POST",
+    headers,
+    body: JSON.stringify(body),
+    signal: AbortSignal.timeout(12e4)
+  });
+  if (!res.ok) {
+    const text = await res.text().catch(() => "");
+    throw new Error(`HTTP ${res.status}${text ? `: ${text.slice(0, 200)}` : ""}`);
+  }
+}
 function resolveHeadlessForFeeder(config) {
   if (config.force === true) {
     return config.headless === true ? true : false;
@@ -2642,7 +2694,7 @@ async function generateAndCache(listUrl, key, config, proxy) {
   });
   generatingKeys.delete(key);
   logger.info("scraper", "抓取成功", { source_url: listUrl, count: items.length });
-  const { url: deliverUrl, token: deliverToken } = await getDeliverConfig();
+  const { gateway: deliverGateway, token: deliverToken } = await getDeliverConfig();
   let newCount = 0;
   let newIds = /* @__PURE__ */ new Set();
   const upsertResult = await upsertItems(items).catch((err) => {
@@ -2672,8 +2724,8 @@ async function generateAndCache(listUrl, key, config, proxy) {
     emitFeedUpdated({ sourceUrl: sourceRefStored, newCount: newCount - pipelineDroppedNew });
   }
   const out = items.filter((i) => !isPipelineDroppedItem(i));
-  if (deliverUrl && out.length > 0) {
-    await postDeliverItemsSafe(deliverUrl, sourceRefStored, out, {
+  if (deliverGateway.trim() && out.length > 0) {
+    await postDeliverItemsSafe(joinGatewayPath(deliverGateway, "items"), sourceRefStored, out, {
       bearerToken: deliverToken || void 0
     });
   }
@@ -2899,17 +2951,24 @@ const DEFAULT_REFRESH = "1day";
 const SOURCES_CONCURRENCY = 1;
 function createPullTask(ref, cacheDir, cronExpr) {
   return async () => {
-    try {
-      await getItems(ref, {
-        cacheDir,
-        cron: cronExpr
-      });
-    } catch (err) {
-      throw err;
-    }
+    await getItems(ref, {
+      cacheDir,
+      cron: cronExpr
+    });
   };
 }
 const SOURCES_GROUP = "sources";
+async function deliverSourcesConfigIfConfigured() {
+  const { gateway, token } = await getDeliverConfig();
+  if (!gateway.trim()) return;
+  let raw;
+  try {
+    raw = await getSourcesRaw();
+  } catch {
+    return;
+  }
+  await postDeliverSourcesSafe(joinGatewayPath(gateway, "sources"), raw, { bearerToken: token || void 0 });
+}
 async function rescheduleSources(cacheDir, runNow2) {
   unscheduleGroup(SOURCES_GROUP);
   let sources;
@@ -2939,7 +2998,7 @@ async function initScheduler(cacheDir) {
     const watcher = watch(SOURCES_CONFIG_PATH, () => {
       if (debounceTimer) clearTimeout(debounceTimer);
       debounceTimer = setTimeout(() => {
-        rescheduleSources(cacheDir, false).catch(() => {
+        void rescheduleSources(cacheDir, false).then(() => deliverSourcesConfigIfConfigured()).catch(() => {
         });
       }, 500);
     });
@@ -3326,7 +3385,7 @@ function registerItemsRoutes(app) {
       return c.json({ items: [], total: 0, hasMore: false });
     }
     const result = await queryItems({
-      sourceUrl: effectiveSourceUrl ?? (sourceUrls ? void 0 : ref),
+      sourceUrl: sourceUrls ? void 0 : effectiveSourceUrl ? canonicalHttpSourceRef(effectiveSourceUrl) : void 0,
       sourceUrls,
       author,
       q,
@@ -3533,16 +3592,29 @@ function registerTopicsRoutes(app) {
 }
 function registerDeliverRoutes(app) {
   app.get("/api/deliver", requireAdmin(), async (c) => {
-    const { url, token } = await getDeliverConfig();
-    return c.json({ url, token });
+    const { gateway, token } = await getDeliverConfig();
+    return c.json({ gateway, token });
   });
   app.put("/api/deliver", requireAdmin(), async (c) => {
     try {
       const body = await c.req.json();
-      const url = typeof body?.url === "string" ? body.url.trim() : "";
-      const token = typeof body?.token === "string" ? body.token.trim() : "";
-      await saveDeliverConfig({ url, token });
-      return c.json({ ok: true, url, token });
+      const prev = await getDeliverConfig();
+      const explicitGateway = body != null && "gateway" in body;
+      const explicitUrl = body != null && "url" in body;
+      const explicitToken = body != null && "token" in body;
+      let gateway = typeof body?.gateway === "string" ? body.gateway.trim() : "";
+      if (!gateway && typeof body?.url === "string") {
+        gateway = body.url.trim().replace(/\/items\/?$/i, "").replace(/\/+$/, "");
+      }
+      if (!explicitGateway && !explicitUrl) {
+        gateway = prev.gateway;
+      }
+      let token = typeof body?.token === "string" ? body.token.trim() : "";
+      if (!explicitToken) {
+        token = prev.token;
+      }
+      await saveDeliverConfig({ gateway, token });
+      return c.json({ ok: true, gateway, token });
     } catch (err) {
       return c.json({ ok: false, message: err instanceof Error ? err.message : String(err) }, 400);
     }
@@ -3550,31 +3622,39 @@ function registerDeliverRoutes(app) {
   app.post("/api/deliver/test", requireAdmin(), async (c) => {
     try {
       const body = await c.req.json();
-      const url = typeof body?.url === "string" ? body.url.trim() : "";
-      const token = typeof body?.token === "string" ? body.token.trim() : "";
-      if (!url) return c.json({ ok: false, message: "url 不能为空" }, 400);
+      const prev = await getDeliverConfig();
+      let gateway = typeof body?.gateway === "string" ? body.gateway.trim() : "";
+      if (!gateway && typeof body?.url === "string") {
+        gateway = body.url.trim().replace(/\/items\/?$/i, "").replace(/\/+$/, "");
+      }
+      if (!gateway) gateway = prev.gateway;
+      const token = typeof body?.token === "string" ? body.token.trim() : prev.token;
+      if (!gateway.trim()) return c.json({ ok: false, message: "gateway 不能为空" }, 400);
+      const now2 = Date.now();
       const sample = {
-        guid: "deliver-test-" + Date.now(),
+        guid: "deliver-test-" + now2,
         title: "投递连通性测试",
         link: "https://example.com/rssany-deliver-test",
-        pubDate: (/* @__PURE__ */ new Date()).toISOString(),
-        summary: "若下游收到此条，说明投递 URL 可用。"
+        pubDate: /* @__PURE__ */ new Date(),
+        summary: "若下游 /test 收到此条，说明 Gateway 可用。",
+        sourceRef: "rssany-deliver-test"
       };
-      await postDeliverItems(
-        url,
-        "rssany-deliver-test",
-        [
-          {
-            guid: sample.guid,
-            title: sample.title,
-            link: sample.link,
-            pubDate: new Date(sample.pubDate),
-            summary: sample.summary,
-            sourceRef: "rssany-deliver-test"
-          }
-        ],
-        { bearerToken: token || void 0 }
-      );
+      const raw = await getSourcesRaw();
+      let sourcesDoc;
+      try {
+        sourcesDoc = JSON.parse(raw);
+      } catch {
+        sourcesDoc = { sources: [] };
+      }
+      const payload = {
+        rssanyConnectivityTest: true,
+        items: {
+          sourceRef: "rssany-deliver-test",
+          items: feedItemsToPayload([sample])
+        },
+        sources: sourcesDoc
+      };
+      await postDeliverGatewayTest(gateway.trim(), payload, { bearerToken: token || void 0 });
       return c.json({ ok: true });
     } catch (err) {
       return c.json({ ok: false, message: err instanceof Error ? err.message : String(err) }, 400);
@@ -4440,6 +4520,16 @@ function registerWebUiRoutes(app) {
   };
   app.get("*", spaFallback);
 }
+const here = dirname(fileURLToPath(import.meta.url));
+function getAppVersion() {
+  try {
+    const pkgPath = join(here, "../package.json");
+    const pkg = JSON.parse(readFileSync(pkgPath, "utf8"));
+    return pkg.version ?? "unknown";
+  } catch {
+    return "unknown";
+  }
+}
 const PORT = Number(process.env.PORT) || 18473;
 const IS_DEV = process.env.NODE_ENV === "development" || process.argv.includes("--watch");
 const PLUGIN_WATCH_EXTS = [".rssany.js", ".rssany.ts"];
@@ -4489,7 +4579,9 @@ async function main() {
   const app = createApp();
   const server = serve({ fetch: app.fetch, port: PORT, hostname: "0.0.0.0" });
   server.setMaxListeners(32);
-  console.log(`服务已启动 http://127.0.0.1:${PORT}/（API + 静态前端，需先 pnpm run webui:build）`);
+  console.log(
+    `RssAny ${getAppVersion()} 服务已启动 http://127.0.0.1:${PORT}/（API + 静态前端，需先 pnpm run webui:build）`
+  );
   const lanIp = Object.values(networkInterfaces()).flat().find((iface) => iface?.family === "IPv4" && !iface.internal)?.address;
   if (lanIp) console.log(`局域网访问 http://${lanIp}:${PORT}/`);
   if (IS_DEV) {