update:支持传参源

Author: hjdhnx

README.md

@@ -16,12 +16,12 @@ nodejs作为服务端的drpy实现。全面升级异步写法
 
 ## 更新记录
 
-### 20250101
+### 20250102
 
-更新至V1.0.28
+更新至V1.0.29
 
-1. basic授权可以不启用
-2. 设置中心优化AI的回复
+1. 增加 `七猫小说.js`
+1. 支持传参源 `我的哔哩.js`
 
 [点此查看完整更新记录](docs/updateRecord.md)
 

config/map.txt

@@ -0,0 +1,2 @@
+我的哔哩[官]@?render=1&type=url&params=../json/哔哩教育.json@哔哩教育[官]
+我的哔哩[官]@?render=1&type=url&params=../json/哔哩大全.json@哔哩大全[官]

controllers/api.js

@@ -24,13 +24,15 @@ export default (fastify, options, done) => {
             const method = request.method.toUpperCase();
             // 根据请求方法选择参数来源
             const query = method === 'GET' ? request.query : request.body;
+            const moduleExt = query.extend || '';
             const protocol = request.protocol;
             const hostname = request.hostname;
             // const proxyUrl = `${protocol}://${hostname}${request.url}`.split('?')[0].replace('/api/', '/proxy/') + '/?do=js';
             // const proxyUrl = `${protocol}://${hostname}/proxy/${moduleName}/?do=js`;
             // console.log('proxyUrl:', proxyUrl);
 
             const publicUrl = `${protocol}://${hostname}/public/`;
+            const jsonUrl = `${protocol}://${hostname}/json/`;
             const httpUrl = `${protocol}://${hostname}/http`;
             const mediaProxyUrl = `${protocol}://${hostname}/mediaProxy`;
 
@@ -41,7 +43,7 @@ export default (fastify, options, done) => {
                     return proxyUrl
                 };
                 return {
-                    proxyUrl, publicUrl, httpUrl, mediaProxyUrl, getProxyUrl
+                    proxyUrl, publicUrl, jsonUrl, httpUrl, mediaProxyUrl, getProxyUrl, ext: moduleExt
                 }
             }
 

controllers/config.js

@@ -4,9 +4,10 @@ import * as drpy from '../libs/drpyS.js';
 import {naturalSort, urljoin} from '../utils/utils.js'
 import {ENV} from "../utils/env.js";
 import {validatePwd} from "../utils/api_validate.js";
+import {getSitesMap} from "../utils/sites-map.js";
 
 // 工具函数：生成 JSON 数据
-async function generateSiteJSON(jsDir, requestHost, sub, subFilePath, pwd) {
+async function generateSiteJSON(jsDir, configDir, requestHost, sub, subFilePath, pwd) {
     const files = readdirSync(jsDir);
     let valid_files = files.filter((file) => file.endsWith('.js') && !file.startsWith('_')); // 筛选出不是 "_" 开头的 .js 文件
     let sort_list = [];
@@ -39,10 +40,10 @@ async function generateSiteJSON(jsDir, requestHost, sub, subFilePath, pwd) {
     if (ENV.get('hide_adult') === '1') {
         valid_files = valid_files.filter(it => !(new RegExp('\\[[密]\\]|密+')).test(it));
     }
+    let SitesMap = getSitesMap(configDir);
+    // console.log(SitesMap);
     for (const file of valid_files) {
         const baseName = path.basename(file, '.js'); // 去掉文件扩展名
-        let key = `drpyS_${baseName}`;
-        let name = `${baseName}(DS)`;
         let api = `${requestHost}/api/${baseName}`;  // 使用请求的 host 地址，避免硬编码端口
         if (pwd) {
             api += `?pwd=${pwd}`;
@@ -58,22 +59,42 @@ async function generateSiteJSON(jsDir, requestHost, sub, subFilePath, pwd) {
         } catch (e) {
             console.log(`file:${file} error:${e.message}`);
         }
+        let fileSites = [];
         if (baseName === 'push_agent') {
-            key = 'push_agent';
-            name = `${ruleObject.title}(DS)`;
+            let key = 'push_agent';
+            let name = `${ruleObject.title}(DS)`;
+            fileSites.push({key, name})
+        } else if (SitesMap.hasOwnProperty(baseName) && Array.isArray(SitesMap[baseName])) {
+            SitesMap[baseName].forEach((it) => {
+                let key = `drpyS_${it.alias}`;
+                let name = `${it.alias}(DS)`;
+                let ext = '';
+                if (it.queryObject.type === 'url') {
+                    ext = it.queryObject.params;
+                } else {
+                    ext = it.queryStr;
+                }
+                fileSites.push({key: key, name: name, ext: ext})
+            });
+        } else {
+            let key = `drpyS_${baseName}`;
+            let name = `${baseName}(DS)`;
+            fileSites.push({key, name})
         }
-        const site = {
-            key,
-            name,
-            type: 4, // 固定值
-            api,
-            searchable: ruleObject.searchable,
-            filterable: ruleObject.filterable,
-            quickSearch: ruleObject.quickSearch,
-            more: ruleObject.more,
-            ext: "", // 固定为空字符串
-        };
-        sites.push(site);
+        fileSites.forEach((fileSite) => {
+            const site = {
+                key: fileSite.key,
+                name: fileSite.name,
+                type: 4, // 固定值
+                api,
+                searchable: ruleObject.searchable,
+                filterable: ruleObject.filterable,
+                quickSearch: ruleObject.quickSearch,
+                more: ruleObject.more,
+                ext: fileSite.ext || "", // 固定为空字符串
+            };
+            sites.push(site);
+        });
     }
     sites = naturalSort(sites, 'name', sort_list);
     return {sites};
@@ -208,7 +229,7 @@ export default (fastify, options, done) => {
                 }
             }
 
-            const siteJSON = await generateSiteJSON(options.jsDir, requestHost, sub, options.subFilePath, pwd);
+            const siteJSON = await generateSiteJSON(options.jsDir, options.configDir, requestHost, sub, options.subFilePath, pwd);
             const parseJSON = generateParseJSON(options.jxDir, requestHost);
             const livesJSON = generateLivesJSON(requestHost);
             const playerJSON = generatePlayerJSON(options.configDir, requestHost);

custom.json

@@ -1,5 +1,5 @@
 {
-  "sites_count": 40,
+  "sites_count": 43,
   "sites": [
     {
       "key": "drpyS_设置中心",
@@ -76,6 +76,26 @@
       "quickSearch": 0,
       "ext": ""
     },
+    {
+      "key": "drpyS_哔哩大全[官]",
+      "name": "哔哩大全[官](DS)",
+      "type": 4,
+      "api": "http://localhost:5757/api/我的哔哩[官]",
+      "searchable": 2,
+      "filterable": 1,
+      "quickSearch": 0,
+      "ext": "../json/哔哩大全.json"
+    },
+    {
+      "key": "drpyS_哔哩教育[官]",
+      "name": "哔哩教育[官](DS)",
+      "type": 4,
+      "api": "http://localhost:5757/api/我的哔哩[官]",
+      "searchable": 2,
+      "filterable": 1,
+      "quickSearch": 0,
+      "ext": "../json/哔哩教育.json"
+    },
     {
       "key": "drpyS_哔哩直播[官]",
       "name": "哔哩直播[官](DS)",
@@ -216,6 +236,16 @@
       "quickSearch": 0,
       "ext": ""
     },
+    {
+      "key": "drpyS_七猫小说[书]",
+      "name": "七猫小说[书](DS)",
+      "type": 4,
+      "api": "http://localhost:5757/api/七猫小说[书]",
+      "searchable": 2,
+      "filterable": 1,
+      "quickSearch": 0,
+      "ext": ""
+    },
     {
       "key": "drpyS_人人视频",
       "name": "人人视频(DS)",

docs/updateRecord.md

@@ -1,5 +1,13 @@
 # drpyS更新记录
 
+### 20250102
+
+更新至V1.0.29
+
+1. 增加 `七猫小说.js`
+2. 新增 `我的哔哩[官].js`,支持传参源，传参字典可自定义，文件在 `config/map.txt`,格式为 `接口名称@参数@别名`
+3. 支持ipv6监听服务
+
 ### 20250101
 
 更新至V1.0.28

index.js

@@ -24,6 +24,12 @@ fastify.register(fastifyStatic, {
     decorateReply: false, // 禁用 sendFile
 });
 
+fastify.register(fastifyStatic, {
+    root: path.join(__dirname, 'json'),
+    prefix: '/json/', // 新的访问路径前缀
+    decorateReply: false, // 禁用 sendFile
+});
+
 // 注册插件以支持 application/x-www-form-urlencoded
 fastify.register(formBody);
 
@@ -48,7 +54,8 @@ registerRoutes(fastify, {
 const start = async () => {
     try {
         // 启动 Fastify 服务
-        await fastify.listen({port: PORT, host: '0.0.0.0'});
+        // await fastify.listen({port: PORT, host: '0.0.0.0'});
+        await fastify.listen({port: PORT, host: '::'});
 
         // 获取本地和局域网地址
         const localAddress = `http://localhost:${PORT}`;

index.json

@@ -1,5 +1,5 @@
 {
-  "sites_count": 40,
+  "sites_count": 43,
   "sites": [
     {
       "key": "drpyS_设置中心",
@@ -76,6 +76,26 @@
       "quickSearch": 0,
       "ext": ""
     },
+    {
+      "key": "drpyS_哔哩大全[官]",
+      "name": "哔哩大全[官](DS)",
+      "type": 4,
+      "api": "http://localhost:5757/api/我的哔哩[官]",
+      "searchable": 2,
+      "filterable": 1,
+      "quickSearch": 0,
+      "ext": "../json/哔哩大全.json"
+    },
+    {
+      "key": "drpyS_哔哩教育[官]",
+      "name": "哔哩教育[官](DS)",
+      "type": 4,
+      "api": "http://localhost:5757/api/我的哔哩[官]",
+      "searchable": 2,
+      "filterable": 1,
+      "quickSearch": 0,
+      "ext": "../json/哔哩教育.json"
+    },
     {
       "key": "drpyS_哔哩直播[官]",
       "name": "哔哩直播[官](DS)",
@@ -216,6 +236,16 @@
       "quickSearch": 0,
       "ext": ""
     },
+    {
+      "key": "drpyS_七猫小说[书]",
+      "name": "七猫小说[书](DS)",
+      "type": 4,
+      "api": "http://localhost:5757/api/七猫小说[书]",
+      "searchable": 2,
+      "filterable": 1,
+      "quickSearch": 0,
+      "ext": ""
+    },
     {
       "key": "drpyS_人人视频",
       "name": "人人视频(DS)",