rssany 0.1.4 → 0.1.6

package/dist/index.js

@@ -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, stat, unlink } from "node:fs/promises";
+import { mkdir, writeFile, copyFile, access, rename, readFile, readdir, stat, unlink } from "node:fs/promises";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { createHash } from "node:crypto";
 import { JSDOM } from "jsdom";
@@ -188,16 +188,18 @@ function mergeSourceStatsRows(rows) {
   for (const row of rows) {
     const k = canonicalHttpSourceRef(row.source_url);
     const prev = map.get(k);
+    const count7 = row.count_7d ?? 0;
     if (!prev) {
-      map.set(k, { count: row.count, latest_at: row.latest_at });
+      map.set(k, { count: row.count, count_7d: count7, latest_at: row.latest_at });
     } else {
       map.set(k, {
         count: prev.count + row.count,
+        count_7d: prev.count_7d + count7,
         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);
+  return [...map.entries()].map(([source_url, v]) => ({ source_url, count: v.count, count_7d: v.count_7d, latest_at: v.latest_at })).sort((a, b) => b.count - a.count);
 }
 const httpSourceRef = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
@@ -218,6 +220,9 @@ const CONFIG_PATH = join(USER_DIR, "config.json");
 const LEGACY_SUBSCRIPTIONS_PATH = join(USER_DIR, "subscriptions.json");
 const BUILTIN_PLUGINS_DIR = join(PACKAGE_ROOT, "app/plugins/builtin");
 const USER_PLUGINS_DIR = join(USER_DIR, "plugins");
+const USER_DIR_PACKAGE_JSON = join(USER_DIR, "package.json");
+const USER_DIR_PACKAGE_JSON_MINIMAL = `${JSON.stringify({ type: "module", private: true, description: "RssAny user data root; marks plugins as ESM for Node" })}
+`;
 const PLUGIN_SITE_TEMPLATE_PATH = join(PACKAGE_ROOT, "app/plugins/site.rssany.js");
 async function pathExists(p) {
   try {
@@ -262,11 +267,24 @@ async function seedExampleConfigsIfMissing() {
     }
   }
 }
+async function ensureUserDirPackageJsonForPlugins() {
+  if (await pathExists(USER_DIR_PACKAGE_JSON)) return;
+  try {
+    await writeFile(USER_DIR_PACKAGE_JSON, USER_DIR_PACKAGE_JSON_MINIMAL, "utf-8");
+    logger.info("config", "已写入 .rssany/package.json（type: module，消除插件 ESM 歧义）", { path: USER_DIR_PACKAGE_JSON });
+  } catch (err) {
+    logger.warn("config", "写入 .rssany/package.json 失败", {
+      path: USER_DIR_PACKAGE_JSON,
+      err: err instanceof Error ? err.message : String(err)
+    });
+  }
+}
 async function initUserDir() {
   await mkdir(USER_DIR, { recursive: true });
   await mkdir(DATA_DIR, { recursive: true });
   await mkdir(CACHE_DIR, { recursive: true });
   await mkdir(USER_PLUGINS_DIR, { recursive: true });
+  await ensureUserDirPackageJsonForPlugins();
   await seedExampleConfigsIfMissing();
   if (!await pathExists(SOURCES_CONFIG_PATH) && await pathExists(LEGACY_SUBSCRIPTIONS_PATH)) {
     await migrateFile(LEGACY_SUBSCRIPTIONS_PATH, SOURCES_CONFIG_PATH);
@@ -876,7 +894,11 @@ async function getSourceStats() {
   const { mergeSourceStatsRows: mergeSourceStatsRows2 } = await Promise.resolve().then(() => httpSourceRef);
   const db = await getDb();
   const rows = db.prepare(
-    "SELECT source_url, COUNT(*) as count, MAX(COALESCE(pub_date, fetched_at)) as latest_at FROM items GROUP BY source_url ORDER BY count DESC"
+    `SELECT source_url,
+              COUNT(*) as count,
+              SUM(CASE WHEN julianday(fetched_at) >= julianday('now', '-7 days') THEN 1 ELSE 0 END) as count_7d,
+              MAX(COALESCE(pub_date, fetched_at)) as latest_at
+ FROM items GROUP BY source_url ORDER BY count DESC`
   ).all();
   return mergeSourceStatsRows2(rows);
 }
@@ -3381,6 +3403,42 @@ function registerSourcesRoutes(app) {
       return c.json({});
     }
   });
+  app.post("/api/sources/open-browser", requireAdmin(), async (c) => {
+    try {
+      const body = await c.req.json();
+      const raw = typeof body?.url === "string" ? body.url.trim() : "";
+      if (!raw) return c.json({ ok: false, message: "缺少 url" }, 400);
+      const lower = raw.toLowerCase();
+      if (!lower.startsWith("http://") && !lower.startsWith("https://")) {
+        return c.json({ ok: false, message: "仅支持 http(s) URL" }, 400);
+      }
+      const url = raw;
+      const source = getSource(url);
+      const merged = await getEffectiveProxyForListUrl(url, source);
+      const proxy = resolveProxy({ proxy: merged });
+      void launchBrowser({ headless: false, cacheDir: CACHE_DIR, proxy }).then(async (browser) => {
+        try {
+          const page = await browser.newPage();
+          await applyProxyAuthToPage(page, { proxy: merged });
+          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(url, { waitUntil: "domcontentloaded", timeout: 6e4 });
+          page.once("close", () => {
+            void browser.close().catch(() => {
+            });
+          });
+        } catch {
+          await browser.close().catch(() => {
+          });
+        }
+      }).catch(() => {
+      });
+      return c.json({ ok: true, message: "已在爬虫浏览器中打开" });
+    } catch {
+      return c.json({ ok: false, message: "请求体无效" }, 400);
+    }
+  });
   app.get("/api/sources/raw", requireAdmin(), async (c) => {
     try {
       const raw = await getSourcesRaw();