refactor: server

.github/workflows/unit-test.yml

@@ -26,7 +26,7 @@ jobs:
         cache: 'npm'
 
     - run: npm ci
-    - run: npm run test --workspaces
+    - run: npm test --if-present
       env:
         RSSHUB_TEST: true
         REDIS_URL: redis://localhost:${{ job.services.redis.ports[6379] }}/

.vscode/launch.json

@@ -20,7 +20,7 @@
       "runtimeExecutable": "node",
       "runtimeVersion": "20",
       "outputCapture": "std",
-      "program": "${workspaceFolder}/lib/index.js",
+      "program": "${workspaceFolder}/packages/rss-server/index.js",
       "envFile": "${workspaceFolder}/.env",
       "env": {
         "NODE_ENV": "dev",
@@ -35,7 +35,7 @@
       "runtimeExecutable": "node",
       "runtimeVersion": "20",
       "outputCapture": "std",
-      "program": "${workspaceFolder}/lib/index.js",
+      "program": "${workspaceFolder}/packages/rss-server/index.js",
       "envFile": "${workspaceFolder}/.env",
       "env": {
         "NODE_ENV": "dev",

Dockerfile

@@ -1,4 +1,5 @@
 FROM m.daocloud.io/node:lts-slim
+
 ARG npm_config_registry=https://registry.npmjs.org/
 ENV npm_config_registry=${npm_config_registry}
 
@@ -15,8 +16,8 @@ COPY .npmrc package.json package-lock.json /app/
 
 RUN npm ci --include prod
 
-COPY lib /app/lib
+COPY packages /app/packages
 
 EXPOSE 1200
 
-CMD ["node", "lib/index.js"]
+CMD ["node", "packages/rss-server"]

jsconfig.json

@@ -1,16 +1,4 @@
 {
-  "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      "@/*": [
-        "./lib/*"
-      ]
-    }
-  },
-  "include": [
-    "./lib/**/*"
-  ],
-  "exclude": [
-    "./lib/routes/**/*"
-  ]
+  "include": ["./packages/**/*"],
+  "exclude": ["./packages/rss-server/routes/**/*"]
 }

package.json

@@ -7,12 +7,9 @@
     "node": ">=18",
     "npm": ">=9"
   },
-  "files": [
-    "lib"
-  ],
   "scripts": {
-    "start": "node lib/index.js",
-    "dev": "cross-env NODE_ENV=dev nodemon --inspect lib/index.js"
+    "start": "node packages/rss-server/index.js",
+    "dev": "cross-env NODE_ENV=dev nodemon --inspect packages/rss-server/index.js"
   },
   "repository": {
     "type": "git",
@@ -108,6 +105,7 @@
     "testEnvironment": "node"
   },
   "workspaces": [
-    "packages/rss-libs"
+    "packages/rss-libs",
+    "packages/rss-server"
   ]
 }

packages/rss-libs/test/middleware/access-control.js

@@ -21,7 +21,7 @@ describe("access-control", () => {
     const code = md5("/test/2" + key);
     process.env.BLACKLIST = "/test/1,233.233.233.233";
     process.env.ACCESS_KEY = key;
-    server = require("../../../../lib/index");
+    server = require("rss-server");
     const request = supertest(server);
 
     const response11 = await request.get("/test/1");
@@ -75,7 +75,7 @@ describe("access-control", () => {
     const code = md5("/test/2" + key);
     process.env.WHITELIST = "/test/1,233.233.233.233";
     process.env.ACCESS_KEY = key;
-    server = require("../../../../lib/index");
+    server = require("rss-server");
     const request = supertest(server);
 
     const response01 = await request.get("/");
@@ -130,7 +130,7 @@ describe("access-control", () => {
     const key = "1L0veRSSHub";
     const code = md5("/test/2" + key);
     process.env.ACCESS_KEY = key;
-    server = require("../../../../lib/index");
+    server = require("rss-server");
     const request = supertest(server);
 
     const response01 = await request.get("/");

packages/rss-libs/test/middleware/anti-hotlink.js

@@ -16,7 +16,7 @@ afterEach(() => {
 describe("anti-hotlink", () => {
   it("template", async () => {
     process.env.HOTLINK_TEMPLATE = "https://i3.wp.com/${host}${pathname}";
-    server = require("../../../../lib/index");
+    server = require("rss-server");
     const request = supertest(server);
 
     const response = await request.get("/test/complicated");
@@ -26,7 +26,7 @@ describe("anti-hotlink", () => {
   });
   it("url", async () => {
     process.env.HOTLINK_TEMPLATE = "${protocol}//${host}${pathname}";
-    server = require("../../../../lib/index");
+    server = require("rss-server");
     const request = supertest(server);
 
     const response = await request.get("/test/complicated");
@@ -36,7 +36,7 @@ describe("anti-hotlink", () => {
   });
   it("no-template", async () => {
     process.env.HOTLINK_TEMPLATE = "";
-    server = require("../../../../lib/index");
+    server = require("rss-server");
     const request = supertest(server);
 
     const response = await request.get("/test/complicated");

packages/rss-libs/test/middleware/debug.js

@@ -2,7 +2,7 @@
 process.env.NODE_NAME = "mock";
 
 const supertest = require("supertest");
-const server = require("../../../../lib/index");
+const server = require("rss-server");
 const request = supertest(server);
 const cheerio = require("cheerio");
 

packages/rss-libs/test/middleware/header.js

@@ -1,7 +1,7 @@
 process.env.NODE_NAME = "mock";
 
 const supertest = require("supertest");
-const server = require("../../../../lib/index");
+const server = require("rss-server");
 const request = supertest(server);
 const config = require("../../config").value;
 let etag;

packages/rss-libs/test/middleware/onerror.js

@@ -1,7 +1,7 @@
 process.env.SENTRY = "https://[email protected]/1";
 
 const supertest = require("supertest");
-const server = require("../../../../lib/index");
+const server = require("rss-server");
 const request = supertest(server);
 
 afterAll(() => {

packages/rss-libs/test/middleware/parameter.js

@@ -1,5 +1,5 @@
 const supertest = require("supertest");
-const server = require("../../../../lib/index");
+const server = require("rss-server");
 const request = supertest(server);
 const Parser = require("rss-parser");
 const parser = new Parser();

packages/rss-libs/test/middleware/template.js

@@ -1,5 +1,5 @@
 const supertest = require("supertest");
-const server = require("../../../../lib/index");
+const server = require("rss-server");
 const request = supertest(server);
 const Parser = require("rss-parser");
 const parser = new Parser();

packages/rss-libs/test/router.js

@@ -1,7 +1,7 @@
 process.env.SOCKET = "socket";
 
 const supertest = require("supertest");
-const server = require("../../../lib/index");
+const server = require("rss-server");
 const request = supertest(server);
 const Parser = require("rss-parser");
 const parser = new Parser();

packages/rss-server/package.json

@@ -0,0 +1,3 @@
+{
+  "name": "rss-server"
+}