rssany 0.1.1 → 0.1.2

package/dist/index.js

@@ -1,5 +1,5 @@
 import "dotenv/config";
-import { existsSync, unlinkSync, openSync, writeSync, closeSync, readFileSync, watch } from "node:fs";
+import { existsSync, unlinkSync, openSync, writeSync, closeSync, readFileSync, statSync, watch } from "node:fs";
 import { platform, homedir, networkInterfaces } from "node:os";
 import { serve } from "@hono/node-server";
 import { Hono } from "hono";
@@ -10,7 +10,7 @@ import { promisify } from "node:util";
 import puppeteerCore from "puppeteer-core";
 import { parse, NodeType } from "node-html-parser";
 import Database from "better-sqlite3";
-import { mkdir, copyFile, access, rename, readFile, writeFile, readdir } from "node:fs/promises";
+import { mkdir, copyFile, access, rename, readFile, writeFile, readdir, stat, unlink } from "node:fs/promises";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { createHash } from "node:crypto";
 import { JSDOM } from "jsdom";
@@ -148,6 +148,50 @@ function markPipelineDrop(item) {
 function isPipelineDroppedItem(item) {
   return item.extra?.[PIPELINE_DROP_EXTRA_KEY] === true;
 }
+function canonicalHttpSourceRef(ref) {
+  const t = ref.trim();
+  if (!t) return t;
+  if (!/^https?:\/\//i.test(t)) return t.toLowerCase();
+  try {
+    const u = new URL(t);
+    const protocol = u.protocol.toLowerCase();
+    const host = u.host.toLowerCase();
+    let path = u.pathname;
+    if (path.length > 1 && path.endsWith("/")) {
+      path = path.slice(0, -1);
+    }
+    path = path.toLowerCase();
+    return `${protocol}//${host}${path}${u.search}${u.hash}`;
+  } catch {
+    return t.toLowerCase();
+  }
+}
+function maxIso(a, b) {
+  if (!a) return b;
+  if (!b) return a;
+  return a >= b ? a : b;
+}
+function mergeSourceStatsRows(rows) {
+  const map = /* @__PURE__ */ new Map();
+  for (const row of rows) {
+    const k = canonicalHttpSourceRef(row.source_url);
+    const prev = map.get(k);
+    if (!prev) {
+      map.set(k, { count: row.count, latest_at: row.latest_at });
+    } else {
+      map.set(k, {
+        count: prev.count + row.count,
+        latest_at: maxIso(prev.latest_at, row.latest_at)
+      });
+    }
+  }
+  return [...map.entries()].map(([source_url, v]) => ({ source_url, count: v.count, latest_at: v.latest_at })).sort((a, b) => b.count - a.count);
+}
+const httpSourceRef = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null,
+  canonicalHttpSourceRef,
+  mergeSourceStatsRows
+}, Symbol.toStringTag, { value: "Module" }));
 const __dir = dirname(fileURLToPath(import.meta.url));
 const base = basename(__dir);
 const PACKAGE_ROOT = base === "app" || base === "dist" ? join(__dir, "..") : __dir;
@@ -181,8 +225,9 @@ async function migrateFile(from, to) {
     logger.warn("config", "配置迁移失败", { from, to, err: err instanceof Error ? err.message : String(err) });
   }
 }
-const EXAMPLE_SOURCES = join(PACKAGE_ROOT, "sources.example.json");
-const EXAMPLE_CONFIG = join(PACKAGE_ROOT, "config.examples.json");
+const INIT_DATA_DIR = join(PACKAGE_ROOT, "init");
+const EXAMPLE_SOURCES = join(INIT_DATA_DIR, "sources.json");
+const EXAMPLE_CONFIG = join(INIT_DATA_DIR, "config.json");
 async function seedExampleConfigsIfMissing() {
   if (!await pathExists(SOURCES_CONFIG_PATH) && await pathExists(EXAMPLE_SOURCES)) {
     try {
@@ -519,13 +564,31 @@ function initSchema(db) {
     }
   } catch {
   }
+  migrateItemsSourceUrlIfNeeded(db);
+}
+function migrateItemsSourceUrlIfNeeded(db) {
+  const v = db.pragma("user_version", { simple: true });
+  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(() => {
+    for (const r of rows) {
+      const next = canonicalHttpSourceRef(r.source_url);
+      if (next !== r.source_url) {
+        upd.run({ next, rowid: r.rowid });
+      }
+    }
+    db.pragma("user_version = 2");
+  });
+  run();
 }
 async function upsertItems(items, sourceUrlOverride) {
   if (items.length === 0) return { newCount: 0, newIds: /* @__PURE__ */ new Set() };
-  const sourceUrl = items[0].sourceRef;
-  if (!sourceUrl) {
+  const raw = items[0].sourceRef?.trim();
+  if (!raw) {
     throw new Error("upsertItems: 每条 item 须有 sourceRef，或传入 sourceUrlOverride");
   }
+  const sourceUrl = canonicalHttpSourceRef(raw);
   return withWriteLock(async () => {
     const db = await getDb();
     const stmt = db.prepare(`
@@ -632,11 +695,13 @@ async function updateItemContent(item) {
 }
 async function queryFeedItems(sourceUrls, limit, offset, opts) {
   if (sourceUrls.length === 0) return { items: [], hasMore: false };
+  const expanded = [...new Set(sourceUrls.map((u) => canonicalHttpSourceRef(u)).filter(Boolean))];
+  if (expanded.length === 0) return { items: [], hasMore: false };
   const db = await getDb();
-  const placeholders = sourceUrls.map((_, i) => `@u${i}`).join(", ");
+  const placeholders = expanded.map((_, i) => `@u${i}`).join(", ");
   const conditions = [`source_url IN (${placeholders})`];
   const params = { lim: limit + 1, off: offset };
-  sourceUrls.forEach((url, i) => {
+  expanded.forEach((url, i) => {
     params[`u${i}`] = url;
   });
   if (opts?.since) {
@@ -670,12 +735,20 @@ async function queryItems(opts) {
   const conditions = [];
   const params = { limit, offset };
   if (sourceUrl) {
+    const key = canonicalHttpSourceRef(sourceUrl);
+    if (!key) {
+      return { items: [], total: 0 };
+    }
     conditions.push("i.source_url = @sourceUrl");
-    params.sourceUrl = sourceUrl;
+    params.sourceUrl = key;
   } else if (sourceUrls && sourceUrls.length > 0) {
-    const placeholders = sourceUrls.map((_, i) => `@src${i}`).join(", ");
+    const expanded = [...new Set(sourceUrls.map((s) => canonicalHttpSourceRef(s)).filter(Boolean))];
+    if (expanded.length === 0) {
+      return { items: [], total: 0 };
+    }
+    const placeholders = expanded.map((_, i) => `@src${i}`).join(", ");
     conditions.push(`i.source_url IN (${placeholders})`);
-    sourceUrls.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");
@@ -769,9 +842,11 @@ async function deleteItem(id) {
 }
 async function deleteItemsBySourceUrl(sourceUrl) {
   if (!sourceUrl?.trim()) return 0;
+  const key = canonicalHttpSourceRef(sourceUrl.trim());
+  if (!key) return 0;
   return withWriteLock(async () => {
     const db = await getDb();
-    const info = db.prepare("DELETE FROM items WHERE source_url = @sourceUrl").run({ sourceUrl: sourceUrl.trim() });
+    const info = db.prepare("DELETE FROM items WHERE source_url = @sourceUrl").run({ sourceUrl: key });
     return info.changes;
   });
 }
@@ -786,10 +861,12 @@ async function getPendingPushItems(limit = 100) {
   return mapRowsToDbItems(rows);
 }
 async function getSourceStats() {
+  const { mergeSourceStatsRows: mergeSourceStatsRows2 } = await Promise.resolve().then(() => httpSourceRef);
   const db = await getDb();
-  return db.prepare(
+  const rows = db.prepare(
     "SELECT source_url, COUNT(*) as count, 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) {
   const db = await getLogsDb();
@@ -969,6 +1046,9 @@ const logger = {
   }
 };
 const execAsync = promisify(exec);
+const VIEWPORT_WIDTH = 1366;
+const VIEWPORT_HEIGHT_HEADLESS = 5e3;
+const VIEWPORT_HEIGHT_HEADFUL = 1200;
 function resolveProxy(config) {
   return config?.proxy ?? process.env.HTTP_PROXY ?? process.env.HTTPS_PROXY;
 }
@@ -979,6 +1059,14 @@ function parseProxy(proxy) {
   const password = u.password || void 0;
   return { serverUrl, username, password };
 }
+async function applyProxyAuthToPage(page, opts) {
+  const proxy = resolveProxy(opts);
+  if (!proxy) return;
+  const { username, password } = parseProxy(proxy);
+  if (username !== void 0 || password !== void 0) {
+    await page.authenticate({ username: username ?? "", password: password ?? "" });
+  }
+}
 function launchArgs(config) {
   const base2 = [
     "--disable-blink-features=AutomationControlled",
@@ -990,8 +1078,8 @@ function launchArgs(config) {
     "--disable-site-isolation-trials",
     "--disable-infobars"
   ];
-  const height = config?.headless !== false ? 5e3 : 960;
-  base2.push(`--window-size=1366,${height}`);
+  const height = config?.headless !== false ? VIEWPORT_HEIGHT_HEADLESS : VIEWPORT_HEIGHT_HEADFUL;
+  base2.push(`--window-size=${VIEWPORT_WIDTH},${height}`);
   const proxy = resolveProxy(config);
   if (proxy) {
     const { serverUrl } = parseProxy(proxy);
@@ -1081,150 +1169,130 @@ function headersToRecord(headers) {
 async function setupPage(page, headless = true) {
   const realUserAgent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36";
   await page.setUserAgent(realUserAgent);
-  await page.setViewport({ width: 1366, height: headless ? 5e3 : 960 });
+  await page.setViewport({
+    width: VIEWPORT_WIDTH,
+    height: headless ? VIEWPORT_HEIGHT_HEADLESS : VIEWPORT_HEIGHT_HEADFUL
+  });
   await stealthPage(page);
 }
-let _browser = null;
-let _browserHeadless = true;
-let _launchPromise = null;
 function isFrameDetachedError(e) {
   const msg = e instanceof Error ? e.message : String(e);
   return /detached|Navigating frame was detached|Session closed/i.test(msg);
 }
-async function isBrowserAlive() {
-  if (!_browser) return false;
-  try {
-    await _browser.version();
-    return true;
-  } catch {
-    _browser = null;
-    return false;
-  }
-}
-async function getOrCreateBrowser(config) {
+async function launchBrowser(config) {
   const wantHeadless = config.headless !== false;
-  if (await isBrowserAlive()) {
-    if (_browserHeadless === wantHeadless) {
-      return _browser;
-    }
-    logger.info("scraper", "浏览器切换模式", { from: _browserHeadless ? "无头" : "有头", to: wantHeadless ? "无头" : "有头" });
-    await _browser.close().catch(() => {
-    });
-    _browser = null;
-    _launchPromise = null;
-  }
-  if (!_launchPromise) {
-    _launchPromise = (async () => {
-      const executablePath = config.chromeExecutablePath ?? process.env.CHROME_PATH ?? findChromeExecutable();
-      if (!executablePath) {
-        throw new Error("未找到 Chrome 可执行文件，请安装 Google Chrome 或设置 CHROME_PATH 环境变量");
+  const executablePath = config.chromeExecutablePath ?? process.env.CHROME_PATH ?? findChromeExecutable();
+  if (!executablePath) {
+    throw new Error("未找到 Chrome 可执行文件，请安装 Google Chrome 或设置 CHROME_PATH 环境变量");
+  }
+  const userDataDir = getUserDataDir(config.cacheDir);
+  const maxRetries = 2;
+  let lastErr;
+  for (let attempt = 0; attempt <= maxRetries; attempt++) {
+    try {
+      if (attempt === 0 && userDataDir) {
+        const absUserDataDir = resolve(userDataDir);
+        await killStaleChromeProcesses(absUserDataDir);
       }
-      const userDataDir = getUserDataDir(config.cacheDir);
-      const maxRetries = 2;
-      let lastErr;
-      for (let attempt = 0; attempt <= maxRetries; attempt++) {
-        try {
-          if (attempt === 0 && userDataDir) {
-            const absUserDataDir = resolve(userDataDir);
-            await killStaleChromeProcesses(absUserDataDir);
-          }
-          if (attempt > 0) {
-            const waitMs = attempt * 2e3;
-            logger.info("scraper", "userDataDir 曾被占用，等待后重试", { waitMs, attempt });
-            await new Promise((r) => setTimeout(r, waitMs));
-          }
-          logger.info("scraper", "启动 Chrome", { headless: wantHeadless, executablePath });
-          const browser = await puppeteerCore.launch({
-            headless: wantHeadless,
-            args: launchArgs({ proxy: config.proxy, headless: wantHeadless }),
-            userDataDir,
-            executablePath,
-            ignoreDefaultArgs: ["--enable-automation"]
-          });
-          browser.on("disconnected", () => {
-            _browser = null;
-            _launchPromise = null;
-          });
-          _browser = browser;
-          _browserHeadless = wantHeadless;
-          return browser;
-        } catch (e) {
-          lastErr = e;
-          if (attempt < maxRetries && isAlreadyRunningError(e)) {
-            continue;
-          }
-          if (isAlreadyRunningError(e)) {
-            const dir = userDataDir ?? "browser_data/main";
-            throw new Error(
-              `Chrome 的 profile 目录已被占用（${dir}）。通常是因为上次未正常退出或同时运行了多个本服务实例。请关闭占用该目录的 Chrome 进程后重试，或设置环境变量 CACHE_DIR 使用不同缓存目录。`
-            );
-          }
-          throw e;
-        }
+      if (attempt > 0) {
+        const waitMs = attempt * 2e3;
+        logger.info("scraper", "userDataDir 曾被占用，等待后重试", { waitMs, attempt });
+        await new Promise((r) => setTimeout(r, waitMs));
+      }
+      return await puppeteerCore.launch({
+        headless: wantHeadless,
+        args: launchArgs({ proxy: config.proxy, headless: wantHeadless }),
+        userDataDir,
+        executablePath,
+        ignoreDefaultArgs: ["--enable-automation"]
+      });
+    } catch (e) {
+      lastErr = e;
+      if (attempt < maxRetries && isAlreadyRunningError(e)) {
+        continue;
+      }
+      if (isAlreadyRunningError(e)) {
+        const dir = userDataDir ?? "browser_data/main";
+        throw new Error(
+          `Chrome 的 profile 目录已被占用（${dir}）。通常是因为上次未正常退出或同时运行了多个本服务实例。请关闭占用该目录的 Chrome 进程后重试，或设置环境变量 CACHE_DIR 使用不同缓存目录。`
+        );
       }
-      throw lastErr;
-    })().catch((e) => {
-      _launchPromise = null;
       throw e;
-    });
+    }
   }
-  return _launchPromise;
+  throw lastErr;
 }
-process.once("exit", () => {
-  _browser?.close().catch(() => {
-  });
-});
-process.once("SIGINT", async () => {
-  await _browser?.close().catch(() => {
-  });
-  process.exit(0);
-});
-process.once("SIGTERM", async () => {
-  await _browser?.close().catch(() => {
-  });
-  process.exit(0);
-});
-async function preCheckAuth(authFlow, cacheDir) {
+async function preCheckAuth(authFlow, cacheDir, opts) {
   const { checkAuth, loginUrl, domain } = authFlow;
   if (domain == null || !cacheDir) return true;
-  const browser = await getOrCreateBrowser({ headless: true, cacheDir });
-  const page = await browser.newPage();
+  const isHeadless = opts?.headless !== false;
+  const browser = await launchBrowser({
+    headless: isHeadless,
+    cacheDir,
+    proxy: resolveProxy(opts)
+  });
   try {
-    await setupPage(page, true);
-    await page.goto(loginUrl, { waitUntil: "domcontentloaded", timeout: 6e4 });
-    await new Promise((resolve2) => setTimeout(resolve2, 3e3));
-    return await checkAuth(page, page.url());
+    const page = await browser.newPage();
+    try {
+      await setupPage(page, isHeadless);
+      await applyProxyAuthToPage(page, opts);
+      await page.goto(loginUrl, { waitUntil: "domcontentloaded", timeout: 6e4 });
+      await new Promise((resolve2) => setTimeout(resolve2, 3e3));
+      return await checkAuth(page, page.url());
+    } finally {
+      await page.close().catch(() => {
+      });
+    }
   } finally {
-    await page.close().catch(() => {
+    await browser.close().catch(() => {
     });
   }
 }
-async function ensureAuth(authFlow, cacheDir) {
+async function ensureAuth(authFlow, cacheDir, opts) {
   const { checkAuth, loginUrl, loginTimeoutMs = 60 * 1e3, pollIntervalMs = 2e3 } = authFlow;
-  const browser = await getOrCreateBrowser({ headless: false, cacheDir });
-  const page = await browser.newPage();
+  const browser = await launchBrowser({ headless: false, cacheDir, proxy: resolveProxy(opts) });
   try {
-    await setupPage(page, false);
-    await page.goto(loginUrl, { waitUntil: "domcontentloaded", timeout: 6e4 });
-    await new Promise((resolve2) => setTimeout(resolve2, 3e3));
-    const authenticated = await checkAuth(page, page.url());
-    if (authenticated) return;
-    const startTime = Date.now();
-    while (Date.now() - startTime < loginTimeoutMs) {
-      await new Promise((resolve2) => setTimeout(resolve2, pollIntervalMs));
-      const authenticated2 = await checkAuth(page, page.url());
-      if (authenticated2) return;
-    }
-    throw new Error(`登录超时（${loginTimeoutMs}ms）`);
+    const page = await browser.newPage();
+    try {
+      await setupPage(page, false);
+      await applyProxyAuthToPage(page, opts);
+      await page.goto(loginUrl, { waitUntil: "domcontentloaded", timeout: 6e4 });
+      await new Promise((resolve2) => setTimeout(resolve2, 3e3));
+      const authenticated = await checkAuth(page, page.url());
+      if (authenticated) return;
+      const startTime = Date.now();
+      while (Date.now() - startTime < loginTimeoutMs) {
+        await new Promise((resolve2) => setTimeout(resolve2, pollIntervalMs));
+        const authenticated2 = await checkAuth(page, page.url());
+        if (authenticated2) return;
+      }
+      throw new Error(`登录超时（${loginTimeoutMs}ms）`);
+    } finally {
+      await page.close().catch(() => {
+      });
+    }
   } finally {
-    await page.close().catch(() => {
+    await browser.close().catch(() => {
     });
   }
 }
 async function fetchHtml(url, config = {}) {
-  const { timeoutMs, headers, cookies, cacheDir, checkAuth, authFlow, purify, headless, waitAfterLoadMs, waitForSelector, waitForSelectorTimeoutMs } = config;
+  const {
+    timeoutMs,
+    headers,
+    cookies,
+    cacheDir,
+    checkAuth,
+    authFlow,
+    purify,
+    headless,
+    waitAfterLoadMs,
+    waitForSelector,
+    waitForSelectorTimeoutMs,
+    useHttpResponseBody
+  } = config;
   const isHeadless = headless !== false;
-  const browser = await getOrCreateBrowser({
+  const browser = await launchBrowser({
     headless: isHeadless,
     cacheDir,
     proxy: resolveProxy(config),
@@ -1233,70 +1301,84 @@ async function fetchHtml(url, config = {}) {
   const navigationTimeout = timeoutMs ?? 6e4;
   const maxAttempts = 2;
   let lastError;
-  for (let attempt = 0; attempt < maxAttempts; attempt++) {
-    const page = await browser.newPage();
-    const isRetry = attempt === 1;
-    const waitUntil = isRetry ? "domcontentloaded" : "load";
-    const extraWaitMs = isRetry ? Math.min(500, Math.max(0, waitAfterLoadMs ?? 2e3)) : Math.max(0, waitAfterLoadMs ?? 2e3);
-    try {
-      if (config.browserContext) {
-        await config.browserContext(page.browserContext());
-      }
-      await setupPage(page, isHeadless);
-      const extraHeaders = { "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8", ...headers ?? {} };
-      if (cookies != null && cookies !== "") {
-        extraHeaders.cookie = cookies;
-      }
-      await page.setExtraHTTPHeaders(extraHeaders);
-      const proxy = resolveProxy(config);
-      if (proxy) {
-        const { username, password } = parseProxy(proxy);
-        if (username !== void 0 || password !== void 0) {
-          await page.authenticate({ username: username ?? "", password: password ?? "" });
+  try {
+    for (let attempt = 0; attempt < maxAttempts; attempt++) {
+      const page = await browser.newPage();
+      const isRetry = attempt === 1;
+      const waitUntil = isRetry ? "domcontentloaded" : "load";
+      const extraWaitMs = isRetry ? Math.min(500, Math.max(0, waitAfterLoadMs ?? 2e3)) : Math.max(0, waitAfterLoadMs ?? 2e3);
+      try {
+        if (config.browserContext) {
+          await config.browserContext(page.browserContext());
         }
-      }
-      if (timeoutMs != null) {
-        await page.setDefaultNavigationTimeout(timeoutMs);
-      }
-      const response = await page.goto(url, { waitUntil, timeout: navigationTimeout });
-      if (extraWaitMs > 0) {
-        await new Promise((resolve2) => setTimeout(resolve2, extraWaitMs));
-      }
-      if (waitForSelector != null && waitForSelector !== "" && !isRetry) {
-        const selectorTimeout = waitForSelectorTimeoutMs ?? 2e4;
-        await page.waitForSelector(waitForSelector, { timeout: selectorTimeout });
-      }
-      if (checkAuth != null || authFlow != null) {
-        const authCheck = checkAuth ?? authFlow?.checkAuth;
-        if (authCheck != null) {
-          const ok = await authCheck(page, url);
-          if (!ok) {
-            throw new Error("checkAuth failed: 未通过认证检查，请先调用 ensureAuth 进行预处理登录");
+        await setupPage(page, isHeadless);
+        const extraHeaders = { "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8", ...headers ?? {} };
+        if (cookies != null && cookies !== "") {
+          extraHeaders.cookie = cookies;
+        }
+        await page.setExtraHTTPHeaders(extraHeaders);
+        const proxy = resolveProxy(config);
+        if (proxy) {
+          const { username, password } = parseProxy(proxy);
+          if (username !== void 0 || password !== void 0) {
+            await page.authenticate({ username: username ?? "", password: password ?? "" });
           }
         }
+        if (timeoutMs != null) {
+          await page.setDefaultNavigationTimeout(timeoutMs);
+        }
+        const response = await page.goto(url, { waitUntil, timeout: navigationTimeout });
+        if (extraWaitMs > 0) {
+          await new Promise((resolve2) => setTimeout(resolve2, extraWaitMs));
+        }
+        if (waitForSelector != null && waitForSelector !== "" && !isRetry) {
+          const selectorTimeout = waitForSelectorTimeoutMs ?? 2e4;
+          await page.waitForSelector(waitForSelector, { timeout: selectorTimeout });
+        }
+        if (checkAuth != null || authFlow != null) {
+          const authCheck = checkAuth ?? authFlow?.checkAuth;
+          if (authCheck != null) {
+            const ok = await authCheck(page, url);
+            if (!ok) {
+              throw new Error("checkAuth failed: 未通过认证检查，请先调用 ensureAuth 进行预处理登录");
+            }
+          }
+        }
+        let rawBody;
+        if (useHttpResponseBody === true && response != null) {
+          try {
+            rawBody = await response.text();
+          } catch {
+            rawBody = await page.content();
+          }
+        } else {
+          rawBody = await page.content();
+        }
+        const finalUrl = response?.url() ?? page.url() ?? String(url);
+        const status = response?.status() ?? 0;
+        const statusText = response?.statusText() ?? "";
+        const rawHeaders = response?.headers() ?? {};
+        const normalizedHeaders = headersToRecord(rawHeaders);
+        const body = applyPurify(rawBody, purify);
+        await page.close().catch(() => {
+        });
+        return { finalUrl, status, statusText, headers: normalizedHeaders, body };
+      } catch (e) {
+        lastError = e;
+        await page.close().catch(() => {
+        });
+        if (isRetry || !isFrameDetachedError(e)) {
+          throw e;
+        }
+        logger.warn("scraper", "fetchHtml 因 frame 分离重试", { url, attempt: attempt + 1, err: e instanceof Error ? e.message : String(e) });
+        await new Promise((r) => setTimeout(r, 800));
       }
-      const rawBody = await page.content();
-      const finalUrl = response?.url() ?? page.url() ?? String(url);
-      const status = response?.status() ?? 0;
-      const statusText = response?.statusText() ?? "";
-      const rawHeaders = response?.headers() ?? {};
-      const normalizedHeaders = headersToRecord(rawHeaders);
-      const body = applyPurify(rawBody, purify);
-      await page.close().catch(() => {
-      });
-      return { finalUrl, status, statusText, headers: normalizedHeaders, body };
-    } catch (e) {
-      lastError = e;
-      await page.close().catch(() => {
-      });
-      if (isRetry || !isFrameDetachedError(e)) {
-        throw e;
-      }
-      logger.warn("scraper", "fetchHtml 因 frame 分离重试", { url, attempt: attempt + 1, err: e instanceof Error ? e.message : String(e) });
-      await new Promise((r) => setTimeout(r, 800));
     }
+    throw lastError;
+  } finally {
+    await browser.close().catch(() => {
+    });
   }
-  throw lastError;
 }
 const VALID_INTERVALS = ["1min", "5min", "10min", "30min", "1h", "6h", "12h", "1day", "3day", "7day"];
 function cronToRefreshInterval(cronExpr) {
@@ -1468,19 +1550,78 @@ async function extractFromLink(link, extractorConfig = {}, fetchConfig = {}) {
     cacheKey: extractorConfig.cacheKey ?? (cacheDir ? cacheKey(link, "forever") : void 0)
   });
 }
+const DEFAULT_BASE_URL = "https://api.openai.com/v1";
+const DEFAULT_MODEL = "gpt-4o-mini";
+let fileCache = null;
+function invalidateLLMConfigCache() {
+  fileCache = null;
+}
+function readLlmFromFileSync() {
+  if (!existsSync(CONFIG_PATH)) return {};
+  try {
+    const st = statSync(CONFIG_PATH);
+    if (fileCache && fileCache.mtimeMs === st.mtimeMs) return fileCache.llm;
+    const raw = readFileSync(CONFIG_PATH, "utf-8");
+    const j = JSON.parse(raw);
+    const llmRaw = j?.llm;
+    const llm = {};
+    if (llmRaw && typeof llmRaw === "object") {
+      const o = llmRaw;
+      if (typeof o.apiKey === "string" && o.apiKey.length > 0) llm.apiKey = o.apiKey;
+      if (typeof o.baseUrl === "string" && o.baseUrl.trim()) llm.baseUrl = o.baseUrl.trim();
+      if (typeof o.model === "string" && o.model.trim()) llm.model = o.model.trim();
+    }
+    fileCache = { mtimeMs: st.mtimeMs, llm };
+    return llm;
+  } catch {
+    return {};
+  }
+}
 function getLLMConfig() {
-  return {
-    apiKey: process.env.OPENAI_API_KEY,
-    baseUrl: process.env.OPENAI_BASE_URL || "https://api.openai.com/v1",
-    model: process.env.OPENAI_MODEL || "gpt-4o-mini"
-  };
+  const file = readLlmFromFileSync();
+  const apiKey = file.apiKey ?? process.env.OPENAI_API_KEY;
+  const baseUrl = file.baseUrl ?? process.env.OPENAI_BASE_URL ?? DEFAULT_BASE_URL;
+  const model = file.model ?? process.env.OPENAI_MODEL ?? DEFAULT_MODEL;
+  return { apiKey, baseUrl, model };
+}
+function extractAssistantText(completion) {
+  const choice = completion.choices[0];
+  if (!choice) throw new Error("LLM 返回无 choices");
+  const msg = choice.message;
+  const raw = msg.content;
+  if (typeof raw === "string") {
+    const t = raw.trim();
+    if (t.length > 0) return t;
+  }
+  const extra = msg;
+  const rc = extra.reasoning_content;
+  if (typeof rc === "string" && rc.trim().length > 0) {
+    return rc.trim();
+  }
+  const refusal = msg.refusal;
+  if (typeof refusal === "string" && refusal.trim()) {
+    throw new Error(`模型拒绝: ${refusal.trim()}`);
+  }
+  const fr = choice.finish_reason;
+  if (fr === "tool_calls") {
+    throw new Error("LLM 返回了工具调用而非文本，请换一个模型或关闭工具调用");
+  }
+  if (fr === "content_filter") {
+    throw new Error("内容被内容策略过滤");
+  }
+  if (fr === "length") {
+    throw new Error(
+      "LLM 输出在 content / reasoning_content 均为空前已用尽"
+    );
+  }
+  throw new Error(`LLM 返回空内容 (finish_reason=${String(fr)})`);
 }
 function mergeConfig(override) {
   const env = getLLMConfig();
   const apiKey = override?.apiKey ?? env.apiKey;
   const baseUrl = override?.apiUrl ?? override?.baseUrl ?? env.baseUrl;
   const model = override?.model ?? env.model;
-  if (!apiKey) throw new Error("LLM API Key 未配置，请设置 OPENAI_API_KEY 或传入 apiKey");
+  if (!apiKey) throw new Error("LLM API Key 未配置：请在管理后台「设置 → LLM」或环境变量 OPENAI_API_KEY 中设置");
   return { apiKey, baseUrl, model };
 }
 async function chatJson(prompt, config, options) {
@@ -1492,8 +1633,7 @@ async function chatJson(prompt, config, options) {
     max_tokens: options?.maxTokens ?? 8192,
     response_format: { type: "json_object" }
   });
-  const content = completion.choices[0]?.message?.content;
-  if (!content) throw new Error("LLM 返回空内容");
+  const content = extractAssistantText(completion);
   return JSON.parse(content);
 }
 async function chatText(prompt, config, options) {
@@ -1504,9 +1644,7 @@ async function chatText(prompt, config, options) {
     messages: [{ role: "user", content: prompt }],
     max_tokens: options?.maxTokens ?? 8192
   });
-  const content = completion.choices[0]?.message?.content;
-  if (!content) throw new Error("LLM 返回空内容");
-  return content;
+  return extractAssistantText(completion);
 }
 function generateGuid(link) {
   return createHash("sha256").update(link).digest("hex");
@@ -1590,7 +1728,7 @@ async function parseHtml(html, config = {}) {
   const actualMode = mode ?? (llmConfig != null ? "llm" : customParser != null ? "custom" : "llm");
   if (actualMode === "llm") {
     if (llmConfig == null && !getLLMConfig().apiKey) {
-      throw new Error('mode 为 "llm" 时必须提供 llmConfig 或设置 OPENAI_API_KEY 环境变量');
+      throw new Error('mode 为 "llm" 时必须提供 llmConfig，或在后台「设置 → LLM」/ OPENAI_API_KEY 中配置 Key');
     }
     const htmlForLLM = applyPurify(html, purify !== false);
     entries = await parseWithLLM(htmlForLLM, url, llmConfig ?? {});
@@ -1773,7 +1911,8 @@ function buildSiteContext(site, ctx) {
         waitAfterLoadMs: opts?.waitMs,
         purify: opts?.purify,
         waitForSelector: opts?.waitForSelector,
-        waitForSelectorTimeoutMs: opts?.waitForSelectorTimeoutMs
+        waitForSelectorTimeoutMs: opts?.waitForSelectorTimeoutMs,
+        useHttpResponseBody: opts?.useHttpResponseBody
       });
       return { html: res.body, finalUrl: res.finalUrl ?? url, status: res.status };
     },
@@ -1817,7 +1956,10 @@ function createWebSource(site) {
     proxy: site.proxy ?? void 0,
     preCheck: authFlow ? async (ctx) => {
       if (!ctx.cacheDir) return;
-      const passed = await preCheckAuth(authFlow, ctx.cacheDir);
+      const passed = await preCheckAuth(authFlow, ctx.cacheDir, {
+        proxy: ctx.proxy,
+        headless: ctx.headless
+      });
       if (!passed) throw new AuthRequiredError(`站点 ${site.id} 需要登录，请先执行 ensureAuth`);
     } : void 0,
     async fetchItems(sourceId, ctx) {
@@ -1870,7 +2012,25 @@ const PLUGIN_HOST_DEPS = {
   logger
 };
 function buildSourceContext(partial) {
-  return { ...partial, deps: PLUGIN_HOST_DEPS };
+  const { cacheDir, headless, proxy } = partial;
+  return {
+    ...partial,
+    deps: PLUGIN_HOST_DEPS,
+    async fetchHtml(url, opts) {
+      const res = await fetchHtml(url, {
+        cacheDir,
+        useCache: false,
+        headless,
+        proxy,
+        waitAfterLoadMs: opts?.waitMs,
+        purify: opts?.purify,
+        waitForSelector: opts?.waitForSelector,
+        waitForSelectorTimeoutMs: opts?.waitForSelectorTimeoutMs,
+        useHttpResponseBody: opts?.useHttpResponseBody
+      });
+      return { html: res.body, finalUrl: res.finalUrl ?? url, status: res.status };
+    }
+  };
 }
 const registeredSources = [];
 function sourcePatternToRegex(pattern) {
@@ -1915,6 +2075,38 @@ async function initSources() {
 function resolveRef(src) {
   return src.ref ?? src.url ?? "";
 }
+async function readGlobalProxyFromConfig() {
+  try {
+    const raw = await readFile(CONFIG_PATH, "utf-8");
+    const j = JSON.parse(raw);
+    if (typeof j.globalProxy === "string") {
+      const t = j.globalProxy.trim();
+      return t.length > 0 ? t : void 0;
+    }
+  } catch {
+  }
+  return void 0;
+}
+async function saveGlobalProxyToConfig(proxy) {
+  let root = {};
+  try {
+    const raw = await readFile(CONFIG_PATH, "utf-8");
+    root = JSON.parse(raw);
+  } catch {
+  }
+  const t = proxy.trim();
+  if (t.length === 0) {
+    delete root.globalProxy;
+  } else {
+    root.globalProxy = t;
+  }
+  await writeFile(CONFIG_PATH, JSON.stringify(root, null, 2) + "\n", "utf-8");
+}
+async function resolveProxyForSite(site) {
+  const s = site.proxy?.trim();
+  if (s) return s;
+  return readGlobalProxyFromConfig();
+}
 async function loadSourcesFile() {
   try {
     const raw = await readFile(SOURCES_CONFIG_PATH, "utf-8");
@@ -1960,6 +2152,15 @@ async function saveSourcesFile(sources) {
     "utf-8"
   );
 }
+async function getEffectiveProxyForListUrl(listUrl, source) {
+  const list = await getAllSources();
+  const sub = list.find((s) => resolveRef(s) === listUrl);
+  const fromSub = sub?.proxy?.trim();
+  if (fromSub) return fromSub;
+  const fromPlugin = source.proxy?.trim();
+  if (fromPlugin) return fromPlugin;
+  return readGlobalProxyFromConfig();
+}
 async function getSourcesRaw() {
   try {
     const raw = await readFile(SOURCES_CONFIG_PATH, "utf-8");
@@ -2277,24 +2478,35 @@ function onFeedUpdated(fn) {
   eventBus.on("feed:updated", fn);
   return () => eventBus.off("feed:updated", fn);
 }
-async function getDeliverUrl() {
+async function getDeliverConfig() {
   try {
     const raw = await readFile(CONFIG_PATH, "utf-8");
     const j = JSON.parse(raw);
     const u = j?.deliver?.url;
-    return typeof u === "string" ? u.trim() : "";
+    const t = j?.deliver?.token;
+    return {
+      url: typeof u === "string" ? u.trim() : "",
+      token: typeof t === "string" ? t.trim() : ""
+    };
   } catch {
-    return "";
+    return { url: "", token: "" };
   }
 }
-async function saveDeliverUrl(url) {
+async function saveDeliverConfig(config) {
   let root = {};
   try {
     const raw = await readFile(CONFIG_PATH, "utf-8");
     root = JSON.parse(raw);
   } catch {
   }
-  root.deliver = { url: url.trim() };
+  const prev = root.deliver;
+  const base2 = typeof prev === "object" && prev !== null && !Array.isArray(prev) ? { ...prev } : {};
+  const url = config.url.trim();
+  const token = config.token.trim();
+  const next = { ...base2, url };
+  if (token) next.token = token;
+  else delete next.token;
+  root.deliver = next;
   await writeFile(CONFIG_PATH, JSON.stringify(root, null, 2) + "\n", "utf-8");
 }
 function feedItemsToPayload(items) {
@@ -2311,12 +2523,15 @@ function feedItemsToPayload(items) {
     translations: i.translations
   }));
 }
-async function postDeliverItems(url, sourceRef, items) {
+async function postDeliverItems(url, sourceRef, items, options) {
   if (!url.trim() || items.length === 0) return;
   const body = JSON.stringify({ sourceRef, items: feedItemsToPayload(items) });
+  const headers = { "Content-Type": "application/json" };
+  const t = options?.bearerToken?.trim();
+  if (t) headers.Authorization = `Bearer ${t}`;
   const res = await fetch(url.trim(), {
     method: "POST",
-    headers: { "Content-Type": "application/json" },
+    headers,
     body,
     signal: AbortSignal.timeout(12e4)
   });
@@ -2325,9 +2540,9 @@ async function postDeliverItems(url, sourceRef, items) {
     throw new Error(`HTTP ${res.status}${text ? `: ${text.slice(0, 200)}` : ""}`);
   }
 }
-async function postDeliverItemsSafe(url, sourceRef, items) {
+async function postDeliverItemsSafe(url, sourceRef, items, options) {
   try {
-    await postDeliverItems(url, sourceRef, items);
+    await postDeliverItems(url, sourceRef, items, options);
   } catch (err) {
     logger.warn("deliver", "投递失败", {
       sourceRef,
@@ -2336,6 +2551,12 @@ async function postDeliverItemsSafe(url, sourceRef, items) {
     });
   }
 }
+function resolveHeadlessForFeeder(config) {
+  if (config.force === true) {
+    return config.headless === true ? true : false;
+  }
+  return config.headless;
+}
 function buildChannelFromItems(listUrl, items, lng) {
   const channel = {
     title: items[0]?.author?.length ? `${items[0].author[0]} 的订阅` : "RSS 订阅",
@@ -2366,10 +2587,11 @@ const pipelineCtx = {
 async function runPipelineOnItem(item, ctx) {
   return runPipeline(item, { ...pipelineCtx, ...ctx });
 }
-async function generateAndCache(listUrl, key, config) {
-  const { cacheDir = "cache", headless } = config;
+async function generateAndCache(listUrl, key, config, proxy) {
+  const { cacheDir = "cache" } = config;
+  const headless = resolveHeadlessForFeeder(config);
   const source = getSource(listUrl);
-  const ctx = buildSourceContext({ cacheDir, headless, proxy: config.proxy ?? source.proxy });
+  const ctx = buildSourceContext({ cacheDir, headless, proxy });
   let items;
   try {
     items = await source.fetchItems(listUrl, ctx);
@@ -2379,13 +2601,14 @@ async function generateAndCache(listUrl, key, config) {
     logger.error("scraper", "抓取失败", { source_url: listUrl, err: message });
     throw err;
   }
+  const sourceRefStored = canonicalHttpSourceRef(listUrl);
   items.forEach((i) => {
-    i.sourceRef = listUrl;
+    i.sourceRef = sourceRefStored;
     i.author = normalizeAuthor(i.author);
   });
   generatingKeys.delete(key);
   logger.info("scraper", "抓取成功", { source_url: listUrl, count: items.length });
-  const deliverUrl = await getDeliverUrl();
+  const { url: deliverUrl, token: deliverToken } = await getDeliverConfig();
   let newCount = 0;
   let newIds = /* @__PURE__ */ new Set();
   const upsertResult = await upsertItems(items).catch((err) => {
@@ -2398,7 +2621,7 @@ async function generateAndCache(listUrl, key, config) {
   const shouldRunPipelineRow = (guid) => newIds.has(guid);
   for (let i = 0; i < items.length; i++) {
     if (!shouldRunPipelineRow(items[i].guid)) continue;
-    const processed = await runPipelineOnItem(items[i], { sourceUrl: listUrl });
+    const processed = await runPipelineOnItem(items[i], { sourceUrl: sourceRefStored });
     items[i] = processed;
     if (isPipelineDroppedItem(processed)) {
       await deleteItem(processed.guid).catch(
@@ -2412,24 +2635,28 @@ async function generateAndCache(listUrl, key, config) {
     }
   }
   if (newCount > 0) {
-    emitFeedUpdated({ sourceUrl: listUrl, newCount: newCount - pipelineDroppedNew });
+    emitFeedUpdated({ sourceUrl: sourceRefStored, newCount: newCount - pipelineDroppedNew });
   }
   const out = items.filter((i) => !isPipelineDroppedItem(i));
   if (deliverUrl && out.length > 0) {
-    await postDeliverItemsSafe(deliverUrl, listUrl, out);
+    await postDeliverItemsSafe(deliverUrl, sourceRefStored, out, {
+      bearerToken: deliverToken || void 0
+    });
   }
   return { items: out };
 }
 async function getItems(listUrl, config = {}) {
   const source = getSource(listUrl);
+  const proxy = await getEffectiveProxyForListUrl(listUrl, source);
+  const headless = resolveHeadlessForFeeder(config);
   const key = config.cron ? cacheKeyFromCron(listUrl, config.cron) : cacheKey(listUrl, config.refreshInterval ?? source.refreshInterval ?? "1day");
   if (source.preCheck != null) {
     try {
       await source.preCheck(
         buildSourceContext({
           cacheDir: config.cacheDir ?? "cache",
-          headless: config.headless,
-          proxy: config.proxy ?? source.proxy
+          headless,
+          proxy
         })
       );
     } catch (err) {
@@ -2439,7 +2666,7 @@ async function getItems(listUrl, config = {}) {
   }
   let task = config.force ? void 0 : generatingKeys.get(key);
   if (!task) {
-    task = generateAndCache(listUrl, key, config);
+    task = generateAndCache(listUrl, key, config, proxy);
     if (!config.force) generatingKeys.set(key, task);
   }
   const { items } = await task;
@@ -2635,7 +2862,7 @@ function getGroupStats() {
   return result;
 }
 const DEFAULT_REFRESH = "1day";
-const SOURCES_CONCURRENCY = 5;
+const SOURCES_CONCURRENCY = 1;
 function createPullTask(ref, cacheDir, cronExpr) {
   return async () => {
     try {
@@ -2672,7 +2899,7 @@ async function rescheduleSources(cacheDir, runNow2) {
   }
 }
 async function initScheduler(cacheDir) {
-  await rescheduleSources(cacheDir, true);
+  await rescheduleSources(cacheDir, false);
   let debounceTimer = null;
   try {
     const watcher = watch(SOURCES_CONFIG_PATH, () => {
@@ -2748,12 +2975,12 @@ function registerSchedulerRoutes(app) {
   });
 }
 const SITE_TEMPLATE_FALLBACK = `/**
- * Site 插件模板（由管理页添加，位于 .rssany/plugins/）
+ * Site 插件模板（由 /plugins 页添加，位于 .rssany/plugins/）
  * HTML DOM 解析请用 ctx.deps.parseHtml，勿在插件内 import node_modules。
  */
 export default {
   id: "__PLUGIN_ID__",
-  listUrlPattern: "https://example.com/{segment}",
+  listUrlPattern: __LIST_URL_PATTERN__,
   refreshInterval: "1day",
 
   async fetchItems(sourceId, ctx) {
@@ -2770,6 +2997,11 @@ export default {
 function isValidNewPluginId(id) {
   return /^[a-zA-Z][a-zA-Z0-9_-]{0,63}$/.test(id) && id !== "generic" && id !== "new";
 }
+function isValidNewListUrlPattern(pattern) {
+  if (pattern.length === 0 || pattern.length > 2048) return false;
+  if (/[\r\n]/.test(pattern)) return false;
+  return true;
+}
 async function fileExists(p) {
   try {
     await access(p);
@@ -2799,6 +3031,13 @@ function registerPluginsRoutes(app) {
     if (!isValidNewPluginId(id)) {
       return c.json({ error: "id 须为字母开头，仅含字母数字、下划线、连字符；不能为 generic 或 new" }, 400);
     }
+    const listUrlPatternRaw = typeof body.listUrlPattern === "string" ? body.listUrlPattern.trim() : "";
+    if (!listUrlPatternRaw) {
+      return c.json({ error: "缺少支持的站点（listUrlPattern），例如 https://example.com/*" }, 400);
+    }
+    if (!isValidNewListUrlPattern(listUrlPatternRaw)) {
+      return c.json({ error: "支持的站点须为非空字符串，不超过 2048 字符，且不能含换行" }, 400);
+    }
     await mkdir(USER_PLUGINS_DIR, { recursive: true });
     const outPath = join(USER_PLUGINS_DIR, `${id}.rssany.js`);
     if (await fileExists(outPath)) return c.json({ error: "该 id 已存在同名文件" }, 409);
@@ -2807,7 +3046,8 @@ function registerPluginsRoutes(app) {
       tpl = await readFile(PLUGIN_SITE_TEMPLATE_PATH, "utf-8");
     } catch {
     }
-    const content = tpl.replace(/__PLUGIN_ID__/g, id);
+    const patternLiteral = JSON.stringify(listUrlPatternRaw);
+    const content = tpl.replace(/__PLUGIN_ID__/g, id).replace(/__LIST_URL_PATTERN__/g, patternLiteral);
     if (!isAllowedPluginPath(outPath)) return c.json({ error: "路径不允许" }, 403);
     try {
       await writeFile(outPath, content, "utf-8");
@@ -2989,6 +3229,12 @@ function registerItemsRoutes(app) {
       return c.json({ ok: false, message: err instanceof Error ? err.message : String(err) }, 400);
     }
   });
+  app.delete("/api/items/by-source", requireAdmin(), async (c) => {
+    const sourceUrl = (c.req.query("source_url") ?? "").trim();
+    if (!sourceUrl) return c.json({ ok: false, message: "source_url 不能为空" }, 400);
+    const deleted = await deleteItemsBySourceUrl(sourceUrl);
+    return c.json({ ok: true, deleted });
+  });
   app.delete("/api/items/:id", async (c) => {
     const id = decodeURIComponent(c.req.param("id") ?? "").trim();
     if (!id) return c.json({ ok: false, message: "id 不能为空" }, 400);
@@ -2996,12 +3242,6 @@ function registerItemsRoutes(app) {
     if (!deleted) return c.json({ ok: false, message: "条目不存在或已删除" }, 404);
     return c.json({ ok: true });
   });
-  app.delete("/api/items/by-source", requireAdmin(), async (c) => {
-    const sourceUrl = (c.req.query("source_url") ?? "").trim();
-    if (!sourceUrl) return c.json({ ok: false, message: "source_url 不能为空" }, 400);
-    const deleted = await deleteItemsBySourceUrl(sourceUrl);
-    return c.json({ ok: true, deleted });
-  });
   app.get("/api/items", async (c) => {
     const ref = c.req.query("ref") ?? c.req.query("source") ?? void 0;
     const subscribed = parseSubscribedFlag$1(c.req.query("subscribed"));
@@ -3149,7 +3389,7 @@ function registerSourcesRoutes(app) {
         const w = s.weight;
         const weight = typeof w === "number" ? w : void 0;
         return {
-          ref: String(s.ref),
+          ref: canonicalHttpSourceRef(String(s.ref)),
           type,
           label: s.label,
           description: s.description,
@@ -3223,15 +3463,16 @@ function registerTopicsRoutes(app) {
 }
 function registerDeliverRoutes(app) {
   app.get("/api/deliver", requireAdmin(), async (c) => {
-    const url = await getDeliverUrl();
-    return c.json({ url });
+    const { url, token } = await getDeliverConfig();
+    return c.json({ url, token });
   });
   app.put("/api/deliver", requireAdmin(), async (c) => {
     try {
       const body = await c.req.json();
       const url = typeof body?.url === "string" ? body.url.trim() : "";
-      await saveDeliverUrl(url);
-      return c.json({ ok: true, url });
+      const token = typeof body?.token === "string" ? body.token.trim() : "";
+      await saveDeliverConfig({ url, token });
+      return c.json({ ok: true, url, token });
     } catch (err) {
       return c.json({ ok: false, message: err instanceof Error ? err.message : String(err) }, 400);
     }
@@ -3240,6 +3481,7 @@ function registerDeliverRoutes(app) {
     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 sample = {
         guid: "deliver-test-" + Date.now(),
@@ -3248,22 +3490,150 @@ function registerDeliverRoutes(app) {
         pubDate: (/* @__PURE__ */ new Date()).toISOString(),
         summary: "若下游收到此条，说明投递 URL 可用。"
       };
-      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"
-        }
-      ]);
+      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 }
+      );
       return c.json({ ok: true });
     } catch (err) {
       return c.json({ ok: false, message: err instanceof Error ? err.message : String(err) }, 400);
     }
   });
 }
+function trimOrUndef(s) {
+  if (typeof s !== "string") return void 0;
+  const t = s.trim();
+  return t.length > 0 ? t : void 0;
+}
+async function readLlmFileConfig() {
+  try {
+    const raw = await readFile(CONFIG_PATH, "utf-8");
+    const j = JSON.parse(raw);
+    const llm = j?.llm;
+    if (!llm || typeof llm !== "object") return {};
+    const o = llm;
+    return {
+      apiKey: typeof o.apiKey === "string" ? o.apiKey : void 0,
+      baseUrl: trimOrUndef(o.baseUrl),
+      model: trimOrUndef(o.model)
+    };
+  } catch {
+    return {};
+  }
+}
+async function saveLlmSettings(input) {
+  let root = {};
+  try {
+    const raw = await readFile(CONFIG_PATH, "utf-8");
+    root = JSON.parse(raw);
+  } catch {
+  }
+  const prev = await readLlmFileConfig();
+  const next = {
+    baseUrl: input.baseUrl.trim(),
+    model: input.model.trim()
+  };
+  const newKey = typeof input.apiKey === "string" && input.apiKey.length > 0 ? input.apiKey : void 0;
+  if (newKey) {
+    next.apiKey = newKey;
+  } else if (prev.apiKey) {
+    next.apiKey = prev.apiKey;
+  }
+  root.llm = next;
+  await writeFile(CONFIG_PATH, JSON.stringify(root, null, 2) + "\n", "utf-8");
+  invalidateLLMConfigCache();
+}
+function registerLlmRoutes(app) {
+  app.get("/api/llm", requireAdmin(), async (c) => {
+    const resolved = getLLMConfig();
+    const file = await readLlmFileConfig();
+    const hasApiKey = !!resolved.apiKey;
+    const apiKeyInFile = !!(file.apiKey && file.apiKey.length > 0);
+    return c.json({
+      baseUrl: resolved.baseUrl,
+      model: resolved.model,
+      hasApiKey,
+      apiKeyInFile
+    });
+  });
+  app.put("/api/llm", requireAdmin(), async (c) => {
+    try {
+      const body = await c.req.json();
+      const baseUrl = typeof body.baseUrl === "string" ? body.baseUrl : "";
+      const model = typeof body.model === "string" ? body.model : "";
+      const apiKey = typeof body.apiKey === "string" ? body.apiKey : void 0;
+      await saveLlmSettings({
+        baseUrl,
+        model,
+        ...apiKey !== void 0 ? { apiKey } : {}
+      });
+      const resolved = getLLMConfig();
+      const file = await readLlmFileConfig();
+      return c.json({
+        ok: true,
+        baseUrl: resolved.baseUrl,
+        model: resolved.model,
+        hasApiKey: !!resolved.apiKey,
+        apiKeyInFile: !!(file.apiKey && file.apiKey.length > 0)
+      });
+    } catch (err) {
+      return c.json(
+        { ok: false, message: err instanceof Error ? err.message : String(err) },
+        400
+      );
+    }
+  });
+  app.post("/api/llm/test", requireAdmin(), async (c) => {
+    const t0 = Date.now();
+    try {
+      const cfg = getLLMConfig();
+      if (!cfg.apiKey) {
+        return c.json({ ok: false, message: "未配置 API Key（请在界面或 OPENAI_API_KEY 中设置）" }, 400);
+      }
+      const reply = await chatText("Reply with exactly the single word: ok", void 0, {
+        maxTokens: 32768,
+        debugLabel: "llmSettingsTest"
+      });
+      return c.json({ ok: true, reply });
+    } catch (err) {
+      const ms = Date.now() - t0;
+      const message = err instanceof Error ? err.message : String(err);
+      console.error("[llm/test] fail", { ms, message });
+      return c.json({ ok: false, message }, 400);
+    }
+  });
+}
+function registerProxySettingsRoutes(app) {
+  app.get("/api/proxy", requireAdmin(), async (c) => {
+    const globalProxy = await readGlobalProxyFromConfig() ?? "";
+    return c.json({ globalProxy });
+  });
+  app.put("/api/proxy", requireAdmin(), async (c) => {
+    try {
+      const body = await c.req.json().catch(() => ({}));
+      const globalProxy = typeof body.globalProxy === "string" ? body.globalProxy : "";
+      await saveGlobalProxyToConfig(globalProxy);
+      const saved = await readGlobalProxyFromConfig() ?? "";
+      return c.json({ ok: true, globalProxy: saved });
+    } catch (err) {
+      return c.json(
+        { ok: false, message: err instanceof Error ? err.message : String(err) },
+        400
+      );
+    }
+  });
+}
 const tasks = /* @__PURE__ */ new Map();
 let idCounter = 0;
 function nextId() {
@@ -3337,8 +3707,310 @@ function registerTasksRoutes(app) {
     }
   });
 }
+const CACHE_SUBDIR = "feed-favicons";
+const CACHE_KEY_PREFIX = "feed-favicon:v1:";
+const CACHE_MAX_AGE_SEC = 3 * 24 * 60 * 60;
+const CACHE_MAX_AGE_MS = CACHE_MAX_AGE_SEC * 1e3;
+const CACHE_CONTROL = `public, max-age=${CACHE_MAX_AGE_SEC}`;
+const FETCH_TIMEOUT_MS = 6e3;
+const MAX_ICON_BYTES = 2 * 1024 * 1024;
+const MAX_HTML_BYTES = 512 * 1024;
+const inflightByDomain = /* @__PURE__ */ new Map();
+const MAX_DOMAIN_LEN = 253;
+function isPlausibleHostname(s) {
+  if (s.length === 0 || s.length > MAX_DOMAIN_LEN) return false;
+  return /^[a-z0-9]([a-z0-9.-]*[a-z0-9])?$/i.test(s);
+}
+function cacheFilePath(domainKey) {
+  const h = createHash("sha256").update(CACHE_KEY_PREFIX + domainKey.toLowerCase()).digest("hex");
+  return join(CACHE_DIR, CACHE_SUBDIR, h);
+}
+function originFaviconUrls(domain) {
+  const d = domain.toLowerCase();
+  const hosts = [`https://${d}`];
+  if (d.startsWith("www.")) {
+    const bare = d.slice(4);
+    if (bare) hosts.push(`https://${bare}`);
+  } else {
+    hosts.push(`https://www.${d}`);
+  }
+  const paths = ["/favicon.ico", "/favicon.png", "/apple-touch-icon.png"];
+  const urls = [];
+  for (const base2 of [...new Set(hosts)]) {
+    for (const p of paths) {
+      urls.push(`${base2}${p}`);
+    }
+  }
+  return urls;
+}
+function homepageUrlsForDomain(domain) {
+  const d = domain.toLowerCase();
+  const urls = [`https://${d}/`];
+  if (d.startsWith("www.")) {
+    const bare = d.slice(4);
+    if (bare) urls.push(`https://${bare}/`);
+  } else {
+    urls.push(`https://www.${d}/`);
+  }
+  return [...new Set(urls)];
+}
+function isIconLinkRel(rel) {
+  const tokens = rel.toLowerCase().trim().split(/\s+/).filter(Boolean);
+  if (tokens.some((x) => x === "mask-icon")) return true;
+  if (tokens.some((x) => x === "apple-touch-icon" || x === "apple-touch-icon-precomposed")) return true;
+  if (tokens.includes("shortcut") && tokens.includes("icon")) return true;
+  return tokens.includes("icon");
+}
+function parseLinkIconHrefs(html, pageUrl) {
+  const root = parse(html, { lowerCaseTagName: true });
+  let base2 = pageUrl;
+  const baseEl = root.querySelector("base[href]");
+  if (baseEl) {
+    const bh = baseEl.getAttribute("href")?.trim();
+    if (bh) {
+      try {
+        base2 = new URL(bh, pageUrl).href;
+      } catch {
+      }
+    }
+  }
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const el of root.querySelectorAll("link[href]")) {
+    const rel = el.getAttribute("rel") ?? "";
+    if (!isIconLinkRel(rel)) continue;
+    const href = el.getAttribute("href")?.trim();
+    if (!href || href.startsWith("data:") || href.startsWith("blob:")) continue;
+    try {
+      const abs = new URL(href, base2).href;
+      if ((abs.startsWith("http:") || abs.startsWith("https:")) && !seen.has(abs)) {
+        seen.add(abs);
+        out.push(abs);
+      }
+    } catch {
+    }
+  }
+  return out;
+}
+async function fetchHtmlPage(url) {
+  try {
+    const upstream = await fetch(url, {
+      redirect: "follow",
+      headers: {
+        Accept: "text/html,application/xhtml+xml;q=0.9,*/*;q=0.1",
+        "User-Agent": "Mozilla/5.0 (compatible; RssAny/1.0; +https://github.com/rssany/rssany) favicon"
+      },
+      signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
+    });
+    if (!upstream.ok) return null;
+    const ab = await upstream.arrayBuffer();
+    const buf = Buffer.from(ab);
+    const slice = buf.subarray(0, Math.min(buf.length, MAX_HTML_BYTES));
+    return slice.toString("utf-8");
+  } catch {
+    return null;
+  }
+}
+async function discoverIconUrlsFromHomepage(domain) {
+  if (process.env.FAVICON_SKIP_HTML === "1" || process.env.FAVICON_SKIP_HTML === "true") {
+    return [];
+  }
+  for (const pageUrl of homepageUrlsForDomain(domain)) {
+    const html = await fetchHtmlPage(pageUrl);
+    if (!html) continue;
+    const hrefs = parseLinkIconHrefs(html, pageUrl);
+    if (hrefs.length > 0) return hrefs;
+  }
+  return [];
+}
+function duckduckgoFaviconUrl(domain) {
+  return `https://icons.duckduckgo.com/ip3/${domain}.ico`;
+}
+function iconHorseUrl(domain) {
+  return `https://icon.horse/icon/${encodeURIComponent(domain)}`;
+}
+function unavatarUrl(domain) {
+  return `https://unavatar.io/${encodeURIComponent(domain)}`;
+}
+function googleFaviconUrl(domain) {
+  return `https://www.google.com/s2/favicons?domain=${encodeURIComponent(domain)}&sz=64`;
+}
+function letterCharFromDomain(domain) {
+  const d = domain.toLowerCase().replace(/^www\./, "");
+  const m = d.match(/[a-z0-9]/);
+  return m ? m[0].toUpperCase() : "?";
+}
+function hueFromDomain(domain) {
+  const h = createHash("sha256").update(domain.toLowerCase()).digest();
+  return (h[0] << 8 | h[1]) % 360;
+}
+function escapeXmlText(s) {
+  return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+}
+function letterAvatarSvg(domain) {
+  const letter = escapeXmlText(letterCharFromDomain(domain));
+  const hue = hueFromDomain(domain);
+  const bg = `hsl(${hue} 42% 44%)`;
+  const svg = `<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
+  <rect width="64" height="64" rx="12" fill="${bg}"/>
+  <text x="32" y="32" dominant-baseline="central" text-anchor="middle" fill="#ffffff" font-family="system-ui,Segoe UI,Helvetica,sans-serif" font-size="28" font-weight="600">${letter}</text>
+</svg>`;
+  return Buffer.from(svg.trim(), "utf-8");
+}
+function letterAvatarForDomain(domain) {
+  return { buf: letterAvatarSvg(domain), mime: "image/svg+xml" };
+}
+function isEnoent(e) {
+  return typeof e === "object" && e !== null && e.code === "ENOENT";
+}
+function sniffImageMime(buf) {
+  if (buf.length < 4) return null;
+  if (buf[0] === 137 && buf[1] === 80 && buf[2] === 78 && buf[3] === 71) return "image/png";
+  if (buf.length >= 6 && buf[0] === 71 && buf[1] === 73 && buf[2] === 70) return "image/gif";
+  if (buf.length >= 3 && buf[0] === 255 && buf[1] === 216 && buf[2] === 255) return "image/jpeg";
+  if (buf.length >= 12 && buf.subarray(0, 4).toString("ascii") === "RIFF" && buf.subarray(8, 12).toString("ascii") === "WEBP") {
+    return "image/webp";
+  }
+  if (buf.length >= 6 && buf.readUInt16LE(0) === 0 && (buf[2] === 1 || buf[2] === 2) && buf[3] === 0) {
+    return "image/x-icon";
+  }
+  const head = buf.subarray(0, Math.min(256, buf.length)).toString("utf-8").trimStart();
+  if (head.startsWith("<svg") || head.startsWith("<?xml")) return "image/svg+xml";
+  return null;
+}
+const IMAGE_CT_PREFIX = "image/";
+function mimeFromFetch(ct) {
+  if (!ct) return null;
+  const base2 = ct.split(";")[0].trim().toLowerCase();
+  return base2.startsWith(IMAGE_CT_PREFIX) ? base2 : null;
+}
+function resolveImageMime(buf, ct) {
+  return sniffImageMime(buf) ?? mimeFromFetch(ct);
+}
+async function fetchIconCandidate(url) {
+  let upstream;
+  try {
+    upstream = await fetch(url, {
+      redirect: "follow",
+      headers: {
+        Accept: "image/avif,image/webp,image/apng,image/*,*/*;q=0.8",
+        "User-Agent": "Mozilla/5.0 (compatible; RssAny/1.0; +https://github.com/rssany/rssany) favicon"
+      },
+      signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
+    });
+  } catch {
+    return null;
+  }
+  if (!upstream.ok) return null;
+  const ab = await upstream.arrayBuffer();
+  const buf = Buffer.from(ab);
+  if (buf.length === 0 || buf.length > MAX_ICON_BYTES) return null;
+  return { buf, ct: upstream.headers.get("content-type") };
+}
+function isValidIcon(got) {
+  if (!got) return false;
+  const mime = resolveImageMime(got.buf, got.ct);
+  return !!(mime && mime.startsWith(IMAGE_CT_PREFIX));
+}
+function upstreamFaviconUrls(domain, htmlIconUrls) {
+  const urls = [...originFaviconUrls(domain), ...htmlIconUrls];
+  const thirdPartyOff = process.env.FAVICON_THIRD_PARTY === "0" || process.env.FAVICON_THIRD_PARTY === "false";
+  if (!thirdPartyOff) {
+    urls.push(duckduckgoFaviconUrl(domain), iconHorseUrl(domain), unavatarUrl(domain));
+  }
+  const includeGoogle = process.env.FAVICON_INCLUDE_GOOGLE === "1" || process.env.FAVICON_INCLUDE_GOOGLE === "true";
+  if (includeGoogle) urls.push(googleFaviconUrl(domain));
+  return urls;
+}
+async function fetchFaviconFromNetwork(domain) {
+  const htmlIconUrls = await discoverIconUrlsFromHomepage(domain);
+  const urls = upstreamFaviconUrls(domain, htmlIconUrls);
+  const tasks2 = urls.map(async (url) => {
+    const got = await fetchIconCandidate(url);
+    if (!isValidIcon(got)) {
+      throw new Error("not-an-icon");
+    }
+    const mime = resolveImageMime(got.buf, got.ct);
+    return { buf: got.buf, mime };
+  });
+  try {
+    return await Promise.any(tasks2);
+  } catch {
+    return letterAvatarForDomain(domain);
+  }
+}
+function fetchFaviconDeduped(domain) {
+  let p = inflightByDomain.get(domain);
+  if (p) return p;
+  p = fetchFaviconFromNetwork(domain).finally(() => {
+    if (inflightByDomain.get(domain) === p) inflightByDomain.delete(domain);
+  });
+  inflightByDomain.set(domain, p);
+  return p;
+}
+function registerFeedFaviconRoutes(app) {
+  app.get("/api/feed-favicon", async (c) => {
+    const raw = (c.req.query("domain") ?? "").trim();
+    if (!raw || !isPlausibleHostname(raw)) {
+      return new Response(null, { status: 400 });
+    }
+    const domain = raw.toLowerCase();
+    const path = cacheFilePath(domain);
+    let diskStale = false;
+    try {
+      const st = await stat(path);
+      if (Date.now() - st.mtimeMs >= CACHE_MAX_AGE_MS) {
+        diskStale = true;
+        await unlink(path).catch(() => {
+        });
+      }
+    } catch (e) {
+      if (!isEnoent(e)) {
+        return new Response(null, { status: 500 });
+      }
+    }
+    if (!diskStale) {
+      try {
+        const cached = await readFile(path);
+        const mime2 = resolveImageMime(cached, null);
+        if (mime2) {
+          return new Response(new Uint8Array(cached), {
+            status: 200,
+            headers: {
+              "Content-Type": mime2,
+              "Cache-Control": CACHE_CONTROL
+            }
+          });
+        }
+        await unlink(path).catch(() => {
+        });
+      } catch (e) {
+        if (!isEnoent(e)) {
+          return new Response(null, { status: 500 });
+        }
+      }
+    }
+    const resolved = await fetchFaviconDeduped(domain);
+    const { buf, mime } = resolved;
+    try {
+      await mkdir(join(CACHE_DIR, CACHE_SUBDIR), { recursive: true });
+      await writeFile(path, buf);
+    } catch {
+      return new Response(null, { status: 500 });
+    }
+    return new Response(new Uint8Array(buf), {
+      status: 200,
+      headers: {
+        "Content-Type": mime,
+        "Cache-Control": CACHE_CONTROL
+      }
+    });
+  });
+}
 function registerApiRoutes(app) {
   registerServerRoutes(app);
+  registerFeedFaviconRoutes(app);
   registerRssApiRoutes(app);
   registerSchedulerRoutes(app);
   registerPluginsRoutes(app);
@@ -3350,6 +4022,8 @@ function registerApiRoutes(app) {
   registerSourcesRoutes(app);
   registerTopicsRoutes(app);
   registerDeliverRoutes(app);
+  registerLlmRoutes(app);
+  registerProxySettingsRoutes(app);
   registerTasksRoutes(app);
 }
 function registerAuthRoutes(app) {
@@ -3363,7 +4037,7 @@ function registerAuthRoutes(app) {
     const authFlow = toAuthFlow(site);
     if (!authFlow) return c.json({ ok: false, message: "该站点无需登录" }, 400);
     try {
-      const authenticated = await preCheckAuth(authFlow, CACHE_DIR);
+      const authenticated = await preCheckAuth(authFlow, CACHE_DIR, { proxy: await resolveProxyForSite(site) });
       return c.json({ ok: true, authenticated });
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
@@ -3380,12 +4054,23 @@ function registerAuthRoutes(app) {
     const authFlow = toAuthFlow(site);
     if (!authFlow) return c.json({ ok: false, message: "该站点无需登录" }, 400);
     const { loginUrl } = authFlow;
-    getOrCreateBrowser({ headless: false, cacheDir: CACHE_DIR }).then(async (browser) => {
-      const page = await browser.newPage();
-      const realUserAgent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36";
-      await page.setUserAgent(realUserAgent);
-      await page.setViewport({ width: 1366, height: 960 });
-      await page.goto(loginUrl, { waitUntil: "domcontentloaded", timeout: 6e4 });
+    const proxy = await resolveProxyForSite(site);
+    void launchBrowser({ headless: false, cacheDir: CACHE_DIR, proxy: resolveProxy({ proxy }) }).then(async (browser) => {
+      try {
+        const page = await browser.newPage();
+        await applyProxyAuthToPage(page, { proxy });
+        const realUserAgent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36";
+        await page.setUserAgent(realUserAgent);
+        await page.setViewport({ width: 1366, height: 960 });
+        await page.goto(loginUrl, { waitUntil: "domcontentloaded", timeout: 6e4 });
+        page.once("close", () => {
+          void browser.close().catch(() => {
+          });
+        });
+      } catch {
+        await browser.close().catch(() => {
+        });
+      }
     }).catch(() => {
     });
     return c.json({ ok: true, message: "已打开登录页面" });
@@ -3406,7 +4091,7 @@ function registerAuthRoutes(app) {
     }
     const authFlow = toAuthFlow(site);
     if (!authFlow) return c.json({ ok: false, message: "该站点无需登录" }, 400);
-    ensureAuth(authFlow, CACHE_DIR).then(() => {
+    ensureAuth(authFlow, CACHE_DIR, { proxy: await resolveProxyForSite(site) }).then(() => {
     }).catch(() => {
     });
     return c.json({ ok: true, message: "已打开登录窗口，请在弹出的浏览器中完成登录，完成后刷新订阅页面即可。" });
@@ -3429,6 +4114,24 @@ async function readStaticHtml(name, fallback) {
 function escapeHtml(s) {
   return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
 }
+function effectiveProxyUsed(override, mergedFromSource) {
+  const o = override?.trim();
+  if (o) return o;
+  const s = mergedFromSource?.trim();
+  if (s) return s;
+  return process.env.HTTP_PROXY?.trim() || process.env.HTTPS_PROXY?.trim();
+}
+function redactProxyForLog(p) {
+  if (!p) return null;
+  try {
+    const u = new URL(p);
+    if (u.username) u.username = "***";
+    if (u.password) u.password = "***";
+    return u.toString();
+  } catch {
+    return null;
+  }
+}
 function registerAdminRoutes(app) {
   async function render401(listUrl) {
     const raw = await readStaticHtml("401", '<!DOCTYPE html><html><head><meta charset="utf-8"><title>401</title></head><body><h1>401 需要登录</h1></body></html>');
@@ -3439,12 +4142,25 @@ function registerAdminRoutes(app) {
     if (!url) return c.text("无效 URL，格式: /admin/parse/https://... 或 /admin/parse/example.com/...", 400);
     try {
       const headlessParam = c.req.query("headless");
-      const headless = headlessParam === "false" || headlessParam === "0" ? false : void 0;
+      const headless = headlessParam === "true" || headlessParam === "1";
+      const proxyOverride = c.req.query("proxy")?.trim();
       const source = getSource(url);
-      const ctx = buildSourceContext({ cacheDir: CACHE_DIR, headless, proxy: source.proxy });
+      const fromSource = await getEffectiveProxyForListUrl(url, source);
+      const ctx = buildSourceContext({
+        cacheDir: CACHE_DIR,
+        headless,
+        proxy: proxyOverride || fromSource
+      });
       const items = await source.fetchItems(url, ctx);
       const mode = source.id === "generic" ? "generic" : "plugin";
-      return c.json({ items, url, mode, pluginId: source.id });
+      const effective = effectiveProxyUsed(proxyOverride, fromSource);
+      return c.json({
+        items,
+        url,
+        mode,
+        pluginId: source.id,
+        effectiveProxy: redactProxyForLog(effective)
+      });
     } catch (err) {
       if (err instanceof AuthRequiredError) {
         const html = await render401(url);
@@ -3459,16 +4175,20 @@ function registerAdminRoutes(app) {
     if (!url) return c.text("无效 URL，格式: /admin/extractor/https://... 或 /admin/extractor/example.com/...", 400);
     try {
       const headlessParam = c.req.query("headless");
-      const headless = headlessParam === "false" || headlessParam === "0" ? false : void 0;
-      const site = getBestSite(url);
-      const proxy = site?.proxy;
+      const headless = headlessParam === "true" || headlessParam === "1";
+      const proxyOverride = c.req.query("proxy")?.trim();
+      const source = getSource(url);
+      const fromSource = await getEffectiveProxyForListUrl(url, source);
+      const proxy = proxyOverride || fromSource;
       const result = await extractFromLink(url, {}, { timeoutMs: 6e4, headless, proxy });
+      const effective = effectiveProxyUsed(proxyOverride, fromSource);
       return c.json({
         title: result.title ?? null,
         author: result.author ?? null,
         pubDate: result.pubDate ?? null,
         content: result.content ?? null,
-        _extractor: "readability"
+        _extractor: "readability",
+        effectiveProxy: redactProxyForLog(effective)
       });
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);