rssany 0.3.1 → 0.3.3

package/package.json

@@ -1,103 +1,107 @@
-{
-  "name": "rssany",
-  "version": "0.3.1",
-  "description": "Universal RSS/Atom/JSON Feed pipeline — fetches, extracts, parses and converts any web content into consumable feeds with plugin support",
-  "author": "Joo",
-  "type": "module",
-  "main": "./dist/index.js",
-  "exports": {
-    ".": "./dist/index.js"
-  },
-  "bin": {
-    "rssany": "./bin/rssany.js"
-  },
-  "files": [
-    "dist",
-    "bin",
-    "app/plugins/builtin",
-    "app/plugins/site.rssany.js",
-    "statics",
-    "app/webui/build",
-    ".env.example",
-    "README.md",
-    "init",
-    "scripts/reset.mjs",
-    "scripts/dev.mjs"
-  ],
-  "engines": {
-    "node": ">=20 <24"
-  },
-  "scripts": {
-    "build": "vite build",
-    "dev": "node scripts/dev.mjs",
-    "dev:backend": "cross-env PORT=3999 tsx app/index.ts",
-    "start": "node dist/index.js",
-    "serve:route": "node scripts/serve-route.mjs",
-    "serve:app": "npx tsx app/index.ts",
-    "test": "vitest",
-    "test:run": "vitest run",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix",
-    "typecheck": "tsc --noEmit",
-    "reset": "node scripts/reset.mjs",
-    "proxy-browser": "tsx scripts/proxy-browser.ts",
-    "webui:install": "cd app/webui && npm install",
-    "webui:dev": "cd app/webui && npm run build:watch",
-    "webui:build": "cd app/webui && npm run build",
-    "webui:watch": "cd app/webui && npm run build:watch",
-    "dev:all": "npm run dev",
-    "build:all": "npm run build && npm run webui:build",
-    "prepublishOnly": "npm run build:all",
-    "docker:build": "bash scripts/docker-build.sh",
-    "docker:build:tag": "bash scripts/docker-build.sh",
-    "landing:install": "cd landing && npm install",
-    "landing:dev": "cd landing && npm run dev",
-    "landing:build": "cd landing && npm run build",
-    "deploy": "node scripts/deploy-landing.mjs",
-    "deploy:landing": "node scripts/deploy-landing.mjs"
-  },
-  "keywords": [
-    "rss",
-    "atom",
-    "json-feed",
-    "subscription",
-    "pipeline"
-  ],
-  "license": "MIT",
-  "devDependencies": {
-    "@eslint/js": "^9.15.0",
-    "@types/jsdom": "^28.0.3",
-    "@types/mailparser": "^3.4.6",
-    "@types/node": "^25.2.0",
-    "@types/node-cron": "^3.0.11",
-    "@types/nodemailer": "^7.0.11",
-    "concurrently": "^9.2.1",
-    "cross-env": "^7.0.3",
-    "eslint": "^9.15.0",
-    "globals": "^15.12.0",
-    "ssh2": "^1.17.0",
-    "tsx": "^4.19.0",
-    "typescript": "~5.6.0",
-    "typescript-eslint": "^8.15.0",
-    "vite": "^6.4.2",
-    "vitest": "^2.1.0"
-  },
-  "dependencies": {
-    "@hono/node-server": "^1.19.10",
-    "@mozilla/readability": "^0.6.0",
-    "cron-parser": "^5.0.0",
-    "dotenv": "^16.4.7",
-    "hono": "^4.12.12",
-    "https-proxy-agent": "^7.0.6",
-    "imapflow": "^1.2.10",
-    "jsdom": "^29.1.1",
-    "mailparser": "^3.9.3",
-    "marked": "^17.0.3",
-    "node-cron": "^4.2.1",
-    "node-html-parser": "^7.0.2",
-    "nodemailer": "^8.0.2",
-    "openai": "^6.42.0",
-    "puppeteer-core": "^24.36.0",
-    "rss-parser": "^3.13.0"
-  }
-}
+{
+  "name": "rssany",
+  "version": "0.3.3",
+  "description": "Universal RSS/Atom/JSON Feed pipeline — fetches, extracts, parses and converts any web content into consumable feeds with plugin support",
+  "author": "Joo",
+  "type": "module",
+  "main": "./dist/index.js",
+  "exports": {
+    ".": "./dist/index.js"
+  },
+  "bin": {
+    "rssany": "./bin/rssany.js"
+  },
+  "files": [
+    "dist",
+    "bin",
+    "scripts/user-dir.mjs",
+    "app/plugins/builtin",
+    "app/plugins/site.rssany.js",
+    "statics",
+    "app/webui/build",
+    ".env.example",
+    "README.md",
+    "init",
+    "scripts/reset.mjs",
+    "scripts/postinstall.mjs",
+    "scripts/user-dir.mjs",
+    "scripts/dev.mjs"
+  ],
+  "engines": {
+    "node": ">=20 <24"
+  },
+  "scripts": {
+    "build": "vite build",
+    "dev": "node scripts/dev.mjs",
+    "dev:backend": "cross-env PORT=3999 tsx app/index.ts",
+    "start": "node dist/index.js",
+    "serve:route": "node scripts/serve-route.mjs",
+    "serve:app": "npx tsx app/index.ts",
+    "test": "vitest",
+    "test:run": "vitest run --passWithNoTests",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "typecheck": "tsc --noEmit",
+    "reset": "node scripts/reset.mjs",
+    "postinstall": "node scripts/postinstall.mjs",
+    "proxy-browser": "tsx scripts/proxy-browser.ts",
+    "webui:install": "cd app/webui && npm install",
+    "webui:dev": "cd app/webui && npm run build:watch",
+    "webui:build": "cd app/webui && npm run build",
+    "webui:watch": "cd app/webui && npm run build:watch",
+    "dev:all": "npm run dev",
+    "build:all": "npm run build && npm run webui:build",
+    "prepublishOnly": "npm run build:all",
+    "docker:build": "bash scripts/docker-build.sh",
+    "docker:build:tag": "bash scripts/docker-build.sh",
+    "landing:install": "cd landing && npm install",
+    "landing:dev": "cd landing && npm run dev",
+    "landing:build": "cd landing && npm run build",
+    "deploy": "node scripts/deploy-landing.mjs",
+    "deploy:landing": "node scripts/deploy-landing.mjs"
+  },
+  "keywords": [
+    "rss",
+    "atom",
+    "json-feed",
+    "subscription",
+    "pipeline"
+  ],
+  "license": "MIT",
+  "devDependencies": {
+    "@eslint/js": "^9.15.0",
+    "@types/jsdom": "^28.0.3",
+    "@types/mailparser": "^3.4.6",
+    "@types/node": "^25.2.0",
+    "@types/node-cron": "^3.0.11",
+    "@types/nodemailer": "^7.0.11",
+    "concurrently": "^9.2.1",
+    "cross-env": "^7.0.3",
+    "eslint": "^9.15.0",
+    "globals": "^15.12.0",
+    "ssh2": "^1.17.0",
+    "tsx": "^4.19.0",
+    "typescript": "~5.6.0",
+    "typescript-eslint": "^8.15.0",
+    "vite": "^6.4.3",
+    "vitest": "^4.1.8"
+  },
+  "dependencies": {
+    "@hono/node-server": "^1.19.10",
+    "@mozilla/readability": "^0.6.0",
+    "cron-parser": "^5.0.0",
+    "dotenv": "^16.4.7",
+    "hono": "^4.12.12",
+    "https-proxy-agent": "^7.0.6",
+    "imapflow": "^1.2.10",
+    "jsdom": "^29.1.1",
+    "mailparser": "^3.9.3",
+    "marked": "^17.0.3",
+    "node-cron": "^4.2.1",
+    "node-html-parser": "^7.0.2",
+    "nodemailer": "^8.0.2",
+    "openai": "^6.42.0",
+    "puppeteer-core": "^24.36.0",
+    "rss-parser": "^3.13.0"
+  }
+}

package/scripts/dev.mjs

@@ -73,7 +73,11 @@ function waitForInitialWebuiBuild(child) {
     }, 500);
     child.stdout?.on("data", (chunk) => {
       const text = chunk.toString();
-      if (text.includes('Wrote site to "build"') || text.includes("Wrote site to 'build'")) {
+      if (
+        text.includes('Wrote site to "build"') ||
+        text.includes("Wrote site to 'build'") ||
+        text.includes("[webui:watch] build complete")
+      ) {
         finish();
       }
     });

package/scripts/postinstall.mjs

@@ -0,0 +1,44 @@
+#!/usr/bin/env node
+/**
+ * 全局安装后输出用户数据目录位置（{npm prefix}/var/rssany）。
+ */
+
+import { execSync } from "node:child_process";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { isGlobalNpmInstall, resolveDefaultUserDir, resolveNpmPrefixFromPackageRoot } from "./user-dir.mjs";
+
+const scriptDir = dirname(fileURLToPath(import.meta.url));
+const packageRoot = join(scriptDir, "..");
+
+function getGlobalNpmPrefix() {
+  try {
+    return execSync("npm prefix -g", { encoding: "utf8", env: process.env }).trim();
+  } catch {
+    return null;
+  }
+}
+
+function isSystemOwnedPrefix(prefix) {
+  if (!prefix) return false;
+  const normalized = prefix.replace(/\\/g, "/");
+  return normalized === "/usr/local" || normalized.startsWith("/usr/local/");
+}
+
+async function main() {
+  if (!isGlobalNpmInstall(packageRoot)) return;
+
+  const userDir = resolveDefaultUserDir(packageRoot);
+  const npmPrefix = resolveNpmPrefixFromPackageRoot(packageRoot) ?? getGlobalNpmPrefix();
+  console.log(`[rssany] 用户数据目录: ${userDir}`);
+  if (npmPrefix) {
+    console.log(`[rssany] npm 全局 prefix: ${npmPrefix}`);
+  }
+  if (isSystemOwnedPrefix(getGlobalNpmPrefix())) {
+    console.log(
+      "[rssany] 若此前 npm install -g 报 EACCES，请先执行: npm config set prefix \"$HOME/.local\"，并将 \"$HOME/.local/bin\" 加入 PATH",
+    );
+  }
+}
+
+await main();

package/scripts/reset.mjs

@@ -1,136 +1,138 @@
-#!/usr/bin/env node
-/**
- * 停止占用 HTTP 服务端口的进程，并删除用户数据目录（与 app 中 PORT / RSSANY_USER_DIR 约定一致）。
+#!/usr/bin/env node
+/**
+ * 停止占用 HTTP 服务端口的进程，并删除用户数据目录（与 app 中 PORT / RSSANY_USER_DIR 约定一致）。
  * 用法：npm run reset  或  PORT=3000 npm run reset
- */
-
-import { execFileSync } from "node:child_process";
-import { existsSync, rmSync } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
-import { config } from "dotenv";
-
-config({ path: join(process.cwd(), ".env") });
-
-const DEFAULT_PORT = 18473;
-const port = Number(process.env.PORT) || DEFAULT_PORT;
-const userDirRaw = process.env.RSSANY_USER_DIR?.trim();
-const userDir =
-  userDirRaw && userDirRaw.length > 0 ? userDirRaw : join(homedir(), ".rssany");
-
-function pidsListeningWin32(p) {
-  const cmd = `Get-NetTCPConnection -LocalPort ${p} -State Listen -ErrorAction SilentlyContinue | ForEach-Object { $_.OwningProcess } | Sort-Object -Unique`;
-  try {
-    const out = execFileSync("powershell.exe", ["-NoProfile", "-Command", cmd], {
-      encoding: "utf8",
-      windowsHide: true,
-    });
-    return [
-      ...new Set(
-        out
-          .trim()
-          .split(/\r?\n/)
-          .map((s) => s.trim())
-          .filter(Boolean)
-          .map(Number)
-          .filter((n) => Number.isFinite(n) && n > 0),
-      ),
-    ];
-  } catch {
-    return [];
-  }
-}
-
-function pidsListeningNetstatWin32(p) {
-  const pids = new Set();
-  try {
-    const out = execFileSync("netstat", ["-ano"], { encoding: "utf8", windowsHide: true });
-    const needle = `:${p}`;
-    for (const line of out.split(/\r?\n/)) {
-      if (!line.includes("LISTENING") || !line.includes(needle)) continue;
-      const m = line.trim().match(/LISTENING\s+(\d+)\s*$/);
-      if (m) pids.add(Number(m[1]));
-    }
-  } catch {
-    // ignore
-  }
-  return [...pids];
-}
-
-function pidsListeningUnix(p) {
-  const argsList = [
-    ["-nP", `-iTCP:${p}`, "-sTCP:LISTEN", "-t"],
-    ["-ti", `:${p}`],
-  ];
-  for (const args of argsList) {
-    try {
-      const out = execFileSync("lsof", args, { encoding: "utf8" });
-      const pids = out
-        .trim()
-        .split(/\n/)
-        .map((s) => Number(s.trim()))
-        .filter((n) => Number.isFinite(n) && n > 0);
-      if (pids.length) return [...new Set(pids)];
-    } catch {
-      // try next
-    }
-  }
-  return [];
-}
-
-function killPidsWin32(pids) {
-  for (const pid of pids) {
-    if (pid === process.pid) continue;
-    try {
-      execFileSync("taskkill", ["/F", "/PID", String(pid)], { stdio: "inherit", windowsHide: true });
-      console.log(`已结束进程 PID ${pid}`);
-    } catch {
-      console.warn(`无法结束进程 PID ${pid}（可能已退出）`);
-    }
-  }
-}
-
-function killPidsUnix(pids) {
-  for (const pid of pids) {
-    if (pid === process.pid) continue;
-    try {
-      process.kill(pid, "SIGTERM");
-      console.log(`已发送 SIGTERM 至 PID ${pid}`);
-    } catch {
-      try {
-        process.kill(pid, "SIGKILL");
-        console.log(`已发送 SIGKILL 至 PID ${pid}`);
-      } catch {
-        console.warn(`无法结束进程 PID ${pid}`);
-      }
-    }
-  }
-}
-
-function main() {
-  console.log(`端口: ${port}（来自 PORT 或默认 ${DEFAULT_PORT}）`);
-  console.log(`用户数据目录: ${userDir}`);
-
-  let pids =
-    process.platform === "win32" ? pidsListeningWin32(port) : pidsListeningUnix(port);
-  if (process.platform === "win32" && pids.length === 0) {
-    pids = pidsListeningNetstatWin32(port);
-  }
-
-  if (pids.length === 0) {
-    console.log("未发现占用该端口的监听进程。");
-  } else {
-    console.log(`将结束占用端口的进程: ${pids.join(", ")}`);
-    if (process.platform === "win32") killPidsWin32(pids);
-    else killPidsUnix(pids);
-  }
-
-  if (!existsSync(userDir)) {
-    console.log("用户数据目录不存在，跳过删除。");
-    return;
-  }
-  rmSync(userDir, { recursive: true, force: true });
-  console.log("已删除用户数据目录。");
-}
-
-main();
+ */
+
+import { execFileSync } from "node:child_process";
+import { existsSync, rmSync } from "node:fs";
+import { join, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+import { config } from "dotenv";
+import { resolveDefaultUserDir } from "./user-dir.mjs";
+
+config({ path: join(process.cwd(), ".env") });
+
+const scriptDir = dirname(fileURLToPath(import.meta.url));
+const packageRoot = join(scriptDir, "..");
+
+const DEFAULT_PORT = 18473;
+const port = Number(process.env.PORT) || DEFAULT_PORT;
+const userDir = resolveDefaultUserDir(packageRoot);
+
+function pidsListeningWin32(p) {
+  const cmd = `Get-NetTCPConnection -LocalPort ${p} -State Listen -ErrorAction SilentlyContinue | ForEach-Object { $_.OwningProcess } | Sort-Object -Unique`;
+  try {
+    const out = execFileSync("powershell.exe", ["-NoProfile", "-Command", cmd], {
+      encoding: "utf8",
+      windowsHide: true,
+    });
+    return [
+      ...new Set(
+        out
+          .trim()
+          .split(/\r?\n/)
+          .map((s) => s.trim())
+          .filter(Boolean)
+          .map(Number)
+          .filter((n) => Number.isFinite(n) && n > 0),
+      ),
+    ];
+  } catch {
+    return [];
+  }
+}
+
+function pidsListeningNetstatWin32(p) {
+  const pids = new Set();
+  try {
+    const out = execFileSync("netstat", ["-ano"], { encoding: "utf8", windowsHide: true });
+    const needle = `:${p}`;
+    for (const line of out.split(/\r?\n/)) {
+      if (!line.includes("LISTENING") || !line.includes(needle)) continue;
+      const m = line.trim().match(/LISTENING\s+(\d+)\s*$/);
+      if (m) pids.add(Number(m[1]));
+    }
+  } catch {
+    // ignore
+  }
+  return [...pids];
+}
+
+function pidsListeningUnix(p) {
+  const argsList = [
+    ["-nP", `-iTCP:${p}`, "-sTCP:LISTEN", "-t"],
+    ["-ti", `:${p}`],
+  ];
+  for (const args of argsList) {
+    try {
+      const out = execFileSync("lsof", args, { encoding: "utf8" });
+      const pids = out
+        .trim()
+        .split(/\n/)
+        .map((s) => Number(s.trim()))
+        .filter((n) => Number.isFinite(n) && n > 0);
+      if (pids.length) return [...new Set(pids)];
+    } catch {
+      // try next
+    }
+  }
+  return [];
+}
+
+function killPidsWin32(pids) {
+  for (const pid of pids) {
+    if (pid === process.pid) continue;
+    try {
+      execFileSync("taskkill", ["/F", "/PID", String(pid)], { stdio: "inherit", windowsHide: true });
+      console.log(`已结束进程 PID ${pid}`);
+    } catch {
+      console.warn(`无法结束进程 PID ${pid}（可能已退出）`);
+    }
+  }
+}
+
+function killPidsUnix(pids) {
+  for (const pid of pids) {
+    if (pid === process.pid) continue;
+    try {
+      process.kill(pid, "SIGTERM");
+      console.log(`已发送 SIGTERM 至 PID ${pid}`);
+    } catch {
+      try {
+        process.kill(pid, "SIGKILL");
+        console.log(`已发送 SIGKILL 至 PID ${pid}`);
+      } catch {
+        console.warn(`无法结束进程 PID ${pid}`);
+      }
+    }
+  }
+}
+
+function main() {
+  console.log(`端口: ${port}（来自 PORT 或默认 ${DEFAULT_PORT}）`);
+  console.log(`用户数据目录: ${userDir}`);
+
+  let pids =
+    process.platform === "win32" ? pidsListeningWin32(port) : pidsListeningUnix(port);
+  if (process.platform === "win32" && pids.length === 0) {
+    pids = pidsListeningNetstatWin32(port);
+  }
+
+  if (pids.length === 0) {
+    console.log("未发现占用该端口的监听进程。");
+  } else {
+    console.log(`将结束占用端口的进程: ${pids.join(", ")}`);
+    if (process.platform === "win32") killPidsWin32(pids);
+    else killPidsUnix(pids);
+  }
+
+  if (!existsSync(userDir)) {
+    console.log("用户数据目录不存在，跳过删除。");
+    return;
+  }
+  rmSync(userDir, { recursive: true, force: true });
+  console.log("已删除用户数据目录。");
+}
+
+main();

package/scripts/user-dir.mjs

@@ -0,0 +1,52 @@
+// 与 app/config/userDir.ts 保持同步（bin/、scripts/ 运行时直接加载）
+import { homedir } from "node:os";
+import { join } from "node:path";
+
+const LEGACY_HOME_DIR = ".rssany";
+
+export function resolveNpmPrefixFromPackageRoot(packageRoot) {
+  const normalized = packageRoot.replace(/\\/g, "/");
+  const libSuffix = "/lib/node_modules/rssany";
+  if (normalized.endsWith(libSuffix)) {
+    return packageRoot.slice(0, packageRoot.length - libSuffix.length);
+  }
+  const flatSuffix = "/node_modules/rssany";
+  if (normalized.endsWith(flatSuffix)) {
+    return packageRoot.slice(0, packageRoot.length - flatSuffix.length);
+  }
+  return null;
+}
+
+export function isGlobalNpmInstall(packageRoot) {
+  const normalized = packageRoot.replace(/\\/g, "/");
+  if (normalized.endsWith("/lib/node_modules/rssany")) return true;
+  const globalPatterns = [
+    /\/npm\/node_modules\/rssany$/,
+    /\/\.local\/lib\/node_modules\/rssany$/,
+    /\/\.local\/node_modules\/rssany$/,
+    /\/\.npm-global\/lib\/node_modules\/rssany$/,
+    /\/\.nvm\/versions\/node\/[^/]+\/lib\/node_modules\/rssany$/,
+    /\/\.fnm\/node-versions\/[^/]+\/installation\/lib\/node_modules\/rssany$/,
+  ];
+  return globalPatterns.some((pattern) => pattern.test(normalized));
+}
+
+export function resolveDefaultUserDir(packageRoot) {
+  const env = process.env.RSSANY_USER_DIR?.trim();
+  if (env) return env;
+
+  const npmPrefix = resolveNpmPrefixFromPackageRoot(packageRoot);
+  if (npmPrefix && isGlobalNpmInstall(packageRoot)) {
+    return join(npmPrefix, "var", "rssany");
+  }
+
+  if (!packageRoot.replace(/\\/g, "/").includes("/node_modules/")) {
+    return join(packageRoot, ".rssany");
+  }
+
+  return join(homedir(), LEGACY_HOME_DIR);
+}
+
+export function getLegacyHomeUserDir() {
+  return join(homedir(), LEGACY_HOME_DIR);
+}