update:支持分类

hjdhnx · hjdhnx · commit 6ab9a19aa18e · 2025-01-18T22:53:09.000+08:00
diff --git a/README.md b/README.md
@@ -40,3 +40,9 @@ yarn build
 * 批量搜索会出问题，没法识别指定key
 * 暂未兼容漫画小说播放逻辑
 * 采王二级有问题暂未适配
+
+# 更新记录
+
+### 20250118
+
+1. 支持通用嗅探
diff --git a/nodejs/esbuild-config.js b/nodejs/esbuild-config.js
@@ -1,6 +1,6 @@
 import * as esbuild from 'esbuild';
 import fs from 'fs';
-import { createHash } from 'crypto';
+import {createHash} from 'crypto';
 
 esbuild.build({
     entryPoints: ['src/index.config.js'],
@@ -12,7 +12,7 @@ esbuild.build({
     format: 'cjs',
     platform: 'node',
     target: 'node18',
-    sourcemap: process.env.NODE_ENV === 'development' ? 'inline' : false,
+    sourcemap: process.env.NODE_ENV === 'development',
     plugins: [genMd5()],
 });
 
diff --git a/nodejs/esbuild.js b/nodejs/esbuild.js
@@ -1,6 +1,6 @@
 import * as esbuild from 'esbuild';
 import fs from 'fs';
-import { createHash } from 'crypto';
+import {createHash} from 'crypto';
 
 esbuild.build({
     entryPoints: ['src/index.js'],
@@ -11,7 +11,7 @@ esbuild.build({
     format: 'cjs',
     platform: 'node',
     target: 'node18',
-    sourcemap: process.env.NODE_ENV === 'development' ? 'inline' : false,
+    sourcemap: process.env.NODE_ENV === 'development',
     plugins: [genMd5()],
 });
 
diff --git a/nodejs/package.json b/nodejs/package.json
@@ -6,13 +6,14 @@
     "scripts": {
         "dev": "cross-env DEV_HTTP_PORT=3006 nodemon --config nodemon.json src/dev.js",
         "_build": "rimraf dist && node esbuild.js && node esbuild-config.js",
-        "build": "cross-env NODE_ENV=production npm run _build",
+        "build": "cross-env NODE_ENV=production npm run _build && node copyDist.js D:\\soft\\猫影视\\Release\\data\\flutter_assets\\asset\\js",
         "build:copy": "cross-env NODE_ENV=production npm run _build && node copyDist.js D:\\soft\\猫影视\\Release\\data\\flutter_assets\\asset\\js",
+        "build:dbg:copy": "cross-env NODE_ENV=development npm run _build && node copyDist.js D:\\soft\\猫影视\\Release\\data\\flutter_assets\\asset\\js",
         "build:dbg": "cross-env NODE_ENV=development npm run _build",
         "build:config": "cross-env NODE_ENV=production node esbuild-config.js",
         "build:rollup(obsolete)": "rimraf dist && cross-env NODE_ENV=production node rollup.js && cross-env NODE_ENV=production node rollup-config.js",
         "build:rollup:config(obsolete)": "cross-env NODE_ENV=production node rollup-config.js",
-        "build-old:copy": "rimraf dist && cross-env NODE_ENV=production node esbuild.js && cross-env NODE_ENV=production node esbuild-config.js && node copyDist.js E:\\soft\\windows_release_open_2.0.3_beta2\\Release\\data\\flutter_assets\\asset\\js"
+        "build-old:dbg:copy": "rimraf dist && cross-env NODE_ENV=development node esbuild.js && cross-env NODE_ENV=development node esbuild-config.js && node copyDist.js D:\\soft\\猫影视\\Release\\data\\flutter_assets\\asset\\js"
     },
     "author": "道长",
     "devDependencies": {
diff --git a/nodejs/src/dev.js b/nodejs/src/dev.js
@@ -1,15 +1,26 @@
-import { createServer } from 'http';
+import {createServer} from 'http';
 import os from 'os';
-import { start } from './index.js';
+import {start} from './index.js';
 import * as config from './index.config.js';
+import axios from "axios";
 
 globalThis.catServerFactory = (handle) => {
     let port = 0;
     const server = createServer((req, res) => {
         handle(req, res);
     });
 
-    server.on('listening', () => {
+    // 自动 GET 请求逻辑
+    async function autoRequest(url) {
+        try {
+            const response = await axios.get(url); // 替换为目标接口
+            console.log(`Auto-request successful: ${response.data.message || ''}`);
+        } catch (error) {
+            console.log(`Auto-request failed: ${error.message}`);
+        }
+    }
+
+    server.on('listening', async () => {
         port = server.address().port;
 
         // Get local IP addresses
@@ -22,13 +33,15 @@ globalThis.catServerFactory = (handle) => {
                 }
             }
         }
+        const localConfigUrl = `http://localhost:${port}/config`;
 
         console.log(`Server is running:`);
-        console.log(`- Local:    http://localhost:${port}/config`);
+        console.log(`- Local:    ${localConfigUrl}`);
         if (addresses.length > 0) {
             console.log(`- Network:  http://${addresses[0]}:${port}/config`);
         }
         console.log(`- Node.js version: ${process.version}`);
+        await autoRequest(localConfigUrl);
     });
 
     server.on('close', () => {
diff --git a/nodejs/src/index.config.js b/nodejs/src/index.config.js
@@ -4,6 +4,7 @@ export default {
         home_site: 'http://localhost:5757/api/设置中心',
         enable_dspush: 1,
         enable_home_site: 0,
+        sniffer_rule: 'http((?!http).){12,}?\\.(m3u8|mp4|flv|avi|mkv|rm|wmv|mpg|m4a|mp3)\\?.*|http((?!http).){12,}\\.(m3u8|mp4|flv|avi|mkv|rm|wmv|mpg|m4a|mp3)|http((?!http).)*?video/tos*|http((?!http).)*?obj/tos*',
     },
     ffm3u8: {
         url: 'https://cj.ffzyapi.com/api.php/provide/vod/from/ffm3u8',
diff --git a/nodejs/src/index.js b/nodejs/src/index.js
@@ -1,6 +1,6 @@
 import fastify from 'fastify';
 import router from './router.js';
-import { JsonDB, Config } from 'node-json-db';
+import {JsonDB, Config} from 'node-json-db';
 import axios from 'axios';
 
 let server = null;
@@ -59,7 +59,7 @@ export async function start(config) {
     server.db = new JsonDB(new Config((process.env['NODE_PATH'] || '.') + '/db.json', true, true, '/', true));
     server.register(router);
     // 注意 一定要监听ipv4地址 build后 app中使用时 端口使用0让系统自动分配可用端口
-    server.listen({ port: process.env['DEV_HTTP_PORT'] || 0, host: '127.0.0.1' });
+    server.listen({port: process.env['DEV_HTTP_PORT'] || 0, host: '::'});
 }
 
 /**
diff --git a/nodejs/src/router.js b/nodejs/src/router.js
@@ -62,9 +62,14 @@ export default async function router(fastify) {
                             meta.type = 10;
                         } else if (stags.includes('画')) {
                             meta.type = 20;
-                        } else if (stags.includes('听')) {
-                            meta.type = 30;
-                        } else {
+                        }
+                            // else if (stags.includes('听')) {
+                            //     meta.type = 30;
+                            // }
+                            // else if (stags.includes('盘')) {
+                            //     meta.type = 40;
+                        // }
+                        else {
                             meta.type = 7;
                         }
                         meta.key = skey === 'push_agent' ? 'push' : skey;
@@ -158,10 +163,27 @@ export default async function router(fastify) {
                             config.pan.sites.push(meta);
                         }
                     }
+                    // ds源内容分类放
+                    dsSites.forEach((site) => {
+                        const stype = site.type;
+                        if (stype < 10) {
+                            config.video.sites.push(site);
+                        } else if (stype >= 10 && stype < 20) {
+                            config.read.sites.push(site);
+                        } else if (stype >= 20 && stype < 30) {
+                            config.comic.sites.push(site);
+                        } else if (stype >= 30 && stype < 40) {
+                            config.music.sites.push(site);
+                        } else if (stype >= 40 && stype < 50) {
+                            config.pan.sites.push(site);
+                        }
+                    });
 
-                    config.video.sites = config.video.sites.concat(dsSites);
+                    // 把所有内容放影视分类里
+                    // config.video.sites = config.video.sites.concat(dsSites);
                     drpyS.updateSiteMap(dsSites);
                     config.parses = dsParses;
+                    drpyS.updateDsCache('parses', dsParses);
                     console.log(JSON.stringify(config));
                     reply.send(config);
                 }
diff --git a/nodejs/src/spider/video/drpyS.js b/nodejs/src/spider/video/drpyS.js
