rssany 0.2.0 → 0.3.1

package/dist/index.js

@@ -242,7 +242,7 @@ async function migrateFile(from, to) {
     logger.warn("config", "配置迁移失败", { from, to, err: err instanceof Error ? err.message : String(err) });
   }
 }
-const INIT_DATA_DIR = join(PACKAGE_ROOT, "init");
+const INIT_DATA_DIR = join(PACKAGE_ROOT, "app/init");
 const EXAMPLE_SOURCES = join(INIT_DATA_DIR, "sources.json");
 const EXAMPLE_CONFIG = join(INIT_DATA_DIR, "config.json");
 async function seedExampleConfigsIfMissing() {
@@ -633,7 +633,8 @@ async function upsertItems(items, sourceUrlOverride) {
       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 rawImageUrl = item.imageUrl ?? item.coverImg ?? item.cover_img;
+      const nextImageUrl = typeof rawImageUrl === "string" && rawImageUrl.trim() ? rawImageUrl.trim() : null;
       const info = insertStmt.run({
         id: item.guid,
         url: item.link,
@@ -654,7 +655,9 @@ async function upsertItems(items, sourceUrlOverride) {
       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 existingSummaryText = normalizeText(existing.summary ?? "");
+      const shouldClearDuplicatedSummary = nextSummary == null && !!nextTitle && existingSummaryText === nextTitle;
+      const shouldRepairSummary = !!nextSummary && (existingSummaryText.length < nextSummary.length || /!\[[^\]]*\]\([^)]*\)/.test(existingSummaryText)) || shouldClearDuplicatedSummary;
       const shouldRepairImageUrl = !!nextImageUrl && !existing.image_url?.trim();
       const existingAuthorArr = parseAuthorFromDb(existing.author);
       const shouldRepairAuthor = !!nextAuthorArr?.length && !existingAuthorArr?.length;
@@ -670,7 +673,7 @@ async function upsertItems(items, sourceUrlOverride) {
         id: item.guid,
         title: shouldRepairTitle ? nextTitle : existing.title,
         author: shouldRepairAuthor ? nextAuthor : existing.author ?? null,
-        summary: shouldRepairSummary ? nextSummary : existing.summary,
+        summary: shouldClearDuplicatedSummary ? null : shouldRepairSummary ? nextSummary : existing.summary,
         imageUrl: shouldRepairImageUrl ? nextImageUrl : existing.image_url ?? null,
         pubDate: shouldRepairPubDate ? nextPubDate : existing.pub_date,
         fetchedAt: now2
@@ -682,6 +685,8 @@ async function upsertItems(items, sourceUrlOverride) {
 async function updateItemContent(item) {
   return withWriteLock(async () => {
     const db = await getDb();
+    const rawImageUrl = item.imageUrl ?? item.coverImg ?? item.cover_img;
+    const nextImageUrl = typeof rawImageUrl === "string" && rawImageUrl.trim() ? rawImageUrl.trim() : null;
     db.prepare(`
       UPDATE items SET
         content = COALESCE(content, @content),
@@ -694,7 +699,7 @@ async function updateItemContent(item) {
     `).run({
       id: item.guid,
       content: item.content ?? null,
-      imageUrl: typeof item.imageUrl === "string" && item.imageUrl.trim() ? item.imageUrl.trim() : null,
+      imageUrl: nextImageUrl,
       author: (() => {
         const arr = normalizeAuthor(item.author);
         return arr?.length ? JSON.stringify(arr) : null;
@@ -705,42 +710,6 @@ 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 = expanded.map((_, i) => `@u${i}`).join(", ");
-  const conditions = [`source_url IN (${placeholders})`];
-  const params = { lim: limit + 1, off: offset };
-  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;
-  }
-  if (opts?.until) {
-    conditions.push("COALESCE(pub_date, fetched_at) < @until");
-    if (opts.until.length === 10) {
-      const d = /* @__PURE__ */ new Date(`${opts.until}T12:00:00Z`);
-      d.setUTCDate(d.getUTCDate() + 1);
-      params.until = d.toISOString();
-    } else {
-      params.until = opts.until;
-    }
-  }
-  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 ${limit + 1} OFFSET ${offset}
-    `).all(sqlParams);
-  const hasMore = rows.length > limit;
-  const items = mapRowsToDbItems(hasMore ? rows.slice(0, limit) : rows);
-  return { items, hasMore };
-}
 async function queryItems(opts) {
   const db = await getDb();
   const { sourceUrl, sourceUrls, author, q, tags: tagsFilter, limit = 20, offset = 0, since, until } = opts;
@@ -789,7 +758,7 @@ async function queryItems(opts) {
   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
+      SELECT i.id, i.url, i.source_url, i.title, i.author, i.summary, i.content, i.image_url, 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}
@@ -1204,6 +1173,22 @@ function isFrameDetachedError(e) {
   const msg = e instanceof Error ? e.message : String(e);
   return /detached|Navigating frame was detached|Session closed/i.test(msg);
 }
+const sharedBrowsers = /* @__PURE__ */ new Map();
+function browserKey(config) {
+  const wantHeadless = config.headless !== false;
+  const executablePath = config.chromeExecutablePath ?? process.env.CHROME_PATH ?? findChromeExecutable() ?? "";
+  const userDataDir = getUserDataDir(config.cacheDir);
+  const proxy = resolveProxy(config) ?? "";
+  return JSON.stringify({
+    headless: wantHeadless,
+    userDataDir: userDataDir ? resolve(userDataDir) : "",
+    proxy,
+    executablePath
+  });
+}
+function isBrowserConnected(browser) {
+  return !!browser && browser.connected !== false;
+}
 async function launchBrowser(config) {
   const wantHeadless = config.headless !== false;
   const executablePath = config.chromeExecutablePath ?? process.env.CHROME_PATH ?? findChromeExecutable();
@@ -1247,29 +1232,53 @@ async function launchBrowser(config) {
   }
   throw lastErr;
 }
+async function getOrCreateBrowser(config) {
+  const key = browserKey(config);
+  const current = sharedBrowsers.get(key);
+  if (isBrowserConnected(current?.browser)) {
+    return current.browser;
+  }
+  if (current?.promise) {
+    return current.promise;
+  }
+  const slot = {};
+  const promise = launchBrowser({ ...config, proxy: resolveProxy(config) }).then((browser) => {
+    slot.browser = browser;
+    slot.promise = void 0;
+    browser.once("disconnected", () => {
+      if (sharedBrowsers.get(key)?.browser === browser) {
+        sharedBrowsers.delete(key);
+      }
+    });
+    return browser;
+  }).catch((err) => {
+    if (sharedBrowsers.get(key) === slot) {
+      sharedBrowsers.delete(key);
+    }
+    throw err;
+  });
+  slot.promise = promise;
+  sharedBrowsers.set(key, slot);
+  return promise;
+}
 async function preCheckAuth(authFlow, cacheDir, opts) {
   const { checkAuth, loginUrl, domain } = authFlow;
   if (domain == null || !cacheDir) return true;
   const isHeadless = opts?.headless !== false;
-  const browser = await launchBrowser({
+  const browser = await getOrCreateBrowser({
     headless: isHeadless,
     cacheDir,
     proxy: resolveProxy(opts)
   });
+  const page = await browser.newPage();
   try {
-    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(() => {
-      });
-    }
+    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 browser.close().catch(() => {
+    await page.close().catch(() => {
     });
   }
 }
@@ -1314,10 +1323,11 @@ async function fetchHtml(url, config = {}) {
     waitAfterLoadMs,
     waitForSelector,
     waitForSelectorTimeoutMs,
+    scrollBeforeSnapshot,
     useHttpResponseBody
   } = config;
   const isHeadless = headless !== false;
-  const browser = await launchBrowser({
+  const browser = await getOrCreateBrowser({
     headless: isHeadless,
     cacheDir,
     proxy: resolveProxy(config),
@@ -1326,84 +1336,105 @@ async function fetchHtml(url, config = {}) {
   const navigationTimeout = timeoutMs ?? 6e4;
   const maxAttempts = 2;
   let lastError;
-  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());
-        }
-        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));
+  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 ?? "" });
         }
-        if (waitForSelector != null && waitForSelector !== "" && !isRetry) {
-          const selectorTimeout = waitForSelectorTimeoutMs ?? 2e4;
-          await page.waitForSelector(waitForSelector, { timeout: selectorTimeout });
+      }
+      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 (scrollBeforeSnapshot && !isRetry) {
+        const scrollSelector = scrollBeforeSnapshot.selector ?? null;
+        const rounds = scrollBeforeSnapshot.rounds ?? 6;
+        const pauseMs = scrollBeforeSnapshot.pauseMs ?? 800;
+        for (let i = 0; i < rounds; i++) {
+          const before = await page.evaluate((sel) => {
+            const target = sel ? document.querySelector(sel) : null;
+            const el = target ?? document.scrollingElement ?? document.documentElement;
+            return el?.scrollHeight ?? 0;
+          }, scrollSelector);
+          await page.evaluate((sel) => {
+            const target = sel ? document.querySelector(sel) : null;
+            const el = target ?? document.scrollingElement ?? document.documentElement;
+            if (!el) return;
+            el.scrollTop = el.scrollHeight;
+            window.scrollBy(0, window.innerHeight);
+          }, scrollSelector);
+          await new Promise((resolve2) => setTimeout(resolve2, pauseMs));
+          const after = await page.evaluate((sel) => {
+            const target = sel ? document.querySelector(sel) : null;
+            const el = target ?? document.scrollingElement ?? document.documentElement;
+            return el?.scrollHeight ?? 0;
+          }, scrollSelector);
+          if (after <= before && i >= 2) break;
         }
-        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 进行预处理登录");
-            }
+      }
+      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 {
+      }
+      let rawBody;
+      if (useHttpResponseBody === true && response != null) {
+        try {
+          rawBody = await response.text();
+        } catch {
           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));
+      } 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));
     }
-    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) {
@@ -1937,6 +1968,7 @@ function buildSiteContext(site, ctx) {
         purify: opts?.purify,
         waitForSelector: opts?.waitForSelector,
         waitForSelectorTimeoutMs: opts?.waitForSelectorTimeoutMs,
+        scrollBeforeSnapshot: opts?.scrollBeforeSnapshot,
         useHttpResponseBody: opts?.useHttpResponseBody
       });
       return { html: res.body, finalUrl: res.finalUrl ?? url, status: res.status };
@@ -1975,6 +2007,7 @@ function createWebSource(site) {
   const authFlow = toAuthFlow(site);
   return {
     id: site.id,
+    name: site.name,
     pattern: site.listUrlPattern,
     priority: 50,
     refreshInterval: site.refreshInterval ?? void 0,
@@ -2731,7 +2764,7 @@ async function generateAndCache(listUrl, key, config, proxy) {
   }
   return { items: out };
 }
-async function getItems(listUrl, config = {}) {
+async function crawlSource(listUrl, config = {}) {
   const source = getSource(listUrl);
   const proxy = await getEffectiveProxyForListUrl(listUrl, source);
   const headless = resolveHeadlessForFeeder(config);
@@ -2756,6 +2789,10 @@ async function getItems(listUrl, config = {}) {
     if (!config.force) generatingKeys.set(key, task);
   }
   const { items } = await task;
+  return { items };
+}
+async function getItems(listUrl, config = {}) {
+  const { items } = await crawlSource(listUrl, config);
   return { items, fromCache: false };
 }
 function feedItemsToRssXml(items, listUrl, lng, opts) {
@@ -2951,7 +2988,7 @@ const DEFAULT_REFRESH = "1day";
 const SOURCES_CONCURRENCY = 1;
 function createPullTask(ref, cacheDir, cronExpr) {
   return async () => {
-    await getItems(ref, {
+    await crawlSource(ref, {
       cacheDir,
       cron: cronExpr
     });
@@ -3068,24 +3105,26 @@ function registerSchedulerRoutes(app) {
   });
 }
 const SITE_TEMPLATE_FALLBACK = `/**
- * Site 插件模板（由 /plugins 页添加，位于 .rssany/plugins/）
- * HTML DOM 解析请用 ctx.deps.parseHtml，勿在插件内 import node_modules。
+ * Site plugin template created from the /plugins page.
+ * Plugin protocol: named exports. No export default is required.
+ * Parse HTML with ctx.deps.parseHtml; do not import app dependencies directly.
  */
-export default {
-  id: "__PLUGIN_ID__",
-  listUrlPattern: __LIST_URL_PATTERN__,
-  refreshInterval: "1day",
 
-  async fetchItems(sourceId, ctx) {
-    const { html, finalUrl } = await ctx.fetchHtml(sourceId, {
-      waitMs: 2000,
-      purify: true,
-    });
-    void ctx.deps.parseHtml(html);
-    void finalUrl;
-    return [];
-  },
-};
+// Predefined fields stay together at the top.
+export const id = "__PLUGIN_ID__";
+export const name = "__PLUGIN_ID__";
+export const listUrlPattern = __LIST_URL_PATTERN__;
+export const refreshInterval = "1day";
+
+export async function fetchItems(sourceId, ctx) {
+  const { html, finalUrl } = await ctx.fetchHtml(sourceId, {
+    waitMs: 2000,
+    purify: true,
+  });
+  void ctx.deps.parseHtml(html);
+  void finalUrl;
+  return [];
+}
 `;
 function isValidNewPluginId(id) {
   return /^[a-zA-Z][a-zA-Z0-9_-]{0,63}$/.test(id) && id !== "generic" && id !== "new";
@@ -3154,6 +3193,7 @@ function registerPluginsRoutes(app) {
     const sites = getPluginSites().map((s) => ({
       kind: "site",
       id: s.id,
+      name: s.name ?? s.id,
       listUrlPattern: typeof s.listUrlPattern === "string" ? s.listUrlPattern : String(s.listUrlPattern),
       hasAuth: !!(s.checkAuth && s.loginUrl)
     }));
@@ -3161,6 +3201,7 @@ function registerPluginsRoutes(app) {
     const sources = registeredSources.filter((src) => src.id !== "generic" && !siteIds.has(src.id)).map((src) => ({
       kind: "source",
       id: src.id,
+      name: src.name ?? src.id,
       listUrlPattern: typeof src.pattern === "string" ? src.pattern : String(src.pattern),
       hasAuth: false
     }));
@@ -3263,8 +3304,25 @@ function registerFeedRoutes(app) {
       ref: resolveRef(s),
       label: s.label ?? resolveRef(s)
     }));
-    const dateOpts = since || until ? { since: since ?? void 0, until: until ?? void 0 } : void 0;
-    const { items: dbItems, hasMore } = await queryFeedItems(sourceRefs, limit, offset, dateOpts);
+    const parseDateBound = (value, endExclusive) => {
+      if (!value) return void 0;
+      if (value.length === 10) {
+        const d2 = /* @__PURE__ */ new Date(endExclusive ? `${value}T12:00:00Z` : `${value}T00:00:00.000Z`);
+        if (endExclusive) d2.setUTCDate(d2.getUTCDate() + 1);
+        return d2;
+      }
+      const d = new Date(value);
+      return Number.isNaN(d.getTime()) ? void 0 : d;
+    };
+    const result = sourceRefs.length > 0 ? await queryItems({
+      sourceUrls: sourceRefs,
+      limit: limit + 1,
+      offset,
+      since: parseDateBound(since ?? void 0, false),
+      until: parseDateBound(until ?? void 0, true)
+    }) : { items: [] };
+    const hasMore = result.items.length > limit;
+    const dbItems = hasMore ? result.items.slice(0, limit) : result.items;
     const items = dbItems.map((item) => {
       const refKey = item.source_url ?? "";
       const base2 = {
@@ -3840,7 +3898,7 @@ function registerTasksRoutes(app) {
         schedule(SOURCES_GROUP, taskId, async () => {
           setTaskRunning(taskId);
           try {
-            await getItems(ref, { cacheDir: CACHE_DIR, force: true });
+            await crawlSource(ref, { cacheDir: CACHE_DIR, force: true });
             setTaskDone(taskId, { ok: true });
           } catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
@@ -4247,7 +4305,7 @@ function registerAuthRoutes(app) {
     return c.json({ ok: true, message: "已打开登录窗口，请在弹出的浏览器中完成登录，完成后刷新订阅页面即可。" });
   });
 }
-const STATICS_DIR = join(PACKAGE_ROOT, "statics");
+const STATICS_DIR = join(PACKAGE_ROOT, "app/statics");
 function parseUrlFromPath(path, prefix) {
   const raw = path.slice(prefix.length) || "";
   const decoded = decodeURIComponent(raw.startsWith("/") ? raw.slice(1) : raw);
@@ -4475,7 +4533,7 @@ function getWebUiBuildDir() {
     if (w.startsWith("/") || /^[A-Za-z]:[\\/]/.test(w)) return w;
     return join(process.cwd(), w);
   }
-  return join(PACKAGE_ROOT, "webui/build");
+  return join(PACKAGE_ROOT, "app/webui/build");
 }
 function isBackendOnlyPath(pathname) {
   if (pathname.startsWith("/api")) return true;
@@ -4491,11 +4549,10 @@ function registerWebUiRoutes(app) {
   const absRoot = getWebUiBuildDir();
   if (!existsSync(absRoot)) {
     console.warn(
-      "未找到 WebUI 构建目录，跳过根路径静态托管:",
+      "未找到 WebUI 构建目录，静态路由已注册，等待前端 watch 构建:",
       absRoot,
-      "（构建前端：pnpm run webui:build）"
+      "（开发模式：npm run dev；单独构建：npm run webui:build）"
     );
-    return;
   }
   const relRoot = relative(process.cwd(), absRoot).replace(/\\/g, "/");
   const staticRoot = relRoot === "" || relRoot === "." ? "." : relRoot.startsWith(".") || relRoot.startsWith("/") || /^[A-Za-z]:/.test(relRoot) ? relRoot : `./${relRoot}`;
@@ -4580,7 +4637,7 @@ async function main() {
   const server = serve({ fetch: app.fetch, port: PORT, hostname: "0.0.0.0" });
   server.setMaxListeners(32);
   console.log(
-    `RssAny ${getAppVersion()} 服务已启动 http://127.0.0.1:${PORT}/（API + 静态前端，需先 pnpm run webui:build）`
+    `RssAny ${getAppVersion()} 服务已启动 http://127.0.0.1:${PORT}/（API + 静态前端单地址）`
   );
   const lanIp = Object.values(networkInterfaces()).flat().find((iface) => iface?.family === "IPv4" && !iface.internal)?.address;
   if (lanIp) console.log(`局域网访问 http://${lanIp}:${PORT}/`);