update:增加首页接口，引入markdown相关库

hjdhnx · hjdhnx · commit de6e7a788c10 · 2024-12-03T01:22:33.000+08:00
diff --git a/README.md b/README.md
@@ -10,6 +10,11 @@ nodejs作为服务端的drpy实现。全面升级异步写法
 3. 更新atob、btoa函数逻辑
 4. 导出pq函数
 5. 增加模块系统,$.require和$.exports
+6. 修复drpyS源筛选不生效问题
+7. 增加局域网可访问接口
+8. 打印所有req发出的请求
+9. 增加主页的html
+10. 番茄小说示例源增加导入模块的用法
 
 ## 基础框架
 
diff --git a/index.js b/index.js
@@ -1,14 +1,59 @@
 import Fastify from 'fastify';
 import * as drpy from './libs/drpyS.js';
 import path from 'path';
+import os from "os";
 import {fileURLToPath} from 'url';
+import {readdirSync,readFileSync} from 'fs';
 import {base64Decode} from "./libs_drpy/crypto-util.js";
+import {marked}  from './utils/marked.esm.min.js';
 
 const fastify = Fastify({logger: true});
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 console.log('__dirname:', __dirname);
 
+// 添加 / 接口
+fastify.get('/', async (request, reply) => {
+    const rootDir = path.resolve('.'); // 当前根目录
+    let readmePath = null;
+
+    // 查找根目录下的 README.md 文件（不区分大小写）
+    const files = readdirSync(rootDir);
+    for (const file of files) {
+        if (/^readme\.md$/i.test(file)) {
+            readmePath = path.join(rootDir, file);
+            break;
+        }
+    }
+
+    // 如果未找到 README.md 文件
+    if (!readmePath) {
+        reply.code(404).send('<h1>README.md not found</h1>');
+        return;
+    }
+
+    // 读取 README.md 文件内容
+    const markdownContent = readFileSync(readmePath, 'utf-8');
+
+    // 将 Markdown 转换为 HTML
+    const htmlContent = marked(markdownContent);
+
+    // 返回 HTML 内容
+    reply.type('text/html').send(`
+                <!DOCTYPE html>
+                <html lang="en">
+                <head>
+                    <meta charset="UTF-8">
+                    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                    <title>README</title>
+                </head>
+                <body>
+                    ${htmlContent}
+                </body>
+                </html>
+            `);
+});
+
 // 动态加载模块并根据 query 执行不同逻辑
 fastify.get('/api/:module', async (request, reply) => {
     const moduleName = request.params.module;
@@ -34,7 +79,7 @@ fastify.get('/api/:module', async (request, reply) => {
                 }
             }
             // 分类逻辑
-            const result = await drpy.cate(modulePath, query.t, pg, extend);
+            const result = await drpy.cate(modulePath, query.t, pg, 1,extend);
             return reply.send(result);
         }
 
@@ -79,8 +124,29 @@ fastify.get('/api/:module', async (request, reply) => {
 // 启动服务
 const start = async () => {
     try {
-        await fastify.listen(5757);
-        console.log('Server listening at http://localhost:5757');
+        // 监听 0.0.0.0
+        await fastify.listen({ port: 5757, host: '0.0.0.0' });
+
+        // 获取本地地址
+        const localAddress = `http://localhost:5757`;
+
+        // 获取局域网地址
+        const interfaces = os.networkInterfaces();
+        let lanAddress = 'Not available';
+        for (const iface of Object.values(interfaces)) {
+            if (!iface) continue;
+            for (const config of iface) {
+                if (config.family === 'IPv4' && !config.internal) {
+                    lanAddress = `http://${config.address}:5757`;
+                    break;
+                }
+            }
+        }
+
+        // 打印服务地址
+        console.log(`Server listening at:`);
+        console.log(`- Local: ${localAddress}`);
+        console.log(`- LAN:   ${lanAddress}`);
     } catch (err) {
         fastify.log.error(err);
         process.exit(1);
diff --git a/js/番茄小说[书].js b/js/番茄小说[书].js
@@ -2,6 +2,9 @@
 // http://localhost:5757/api/番茄小说[书]?ac=detail&ids=https://fanqienovel.com/page/7431786294105099289
 // http://localhost:5757/api/番茄小说[书]?wd=斩神&pg=2
 // http://localhost:5757/api/番茄小说[书]?play=7432172914662720025&flag=番茄小说
+
+const {getRandomFromList} = $.require('./_lib.random.js');
+
 var rule = {
     类型: '小说',
     title: '番茄小说[书]',
@@ -220,15 +223,6 @@ function decodeText(text, _type) {
     return _decodeText2(text);
 }
 
-function getRandomFromList(list) {
-    // 将列表转换为数组
-    const array = Array.isArray(list) ? list : Array.from(list);
-    // 获取随机索引
-    const randomIndex = Math.floor(Math.random() * array.length);
-    // 返回随机选取的元素
-    return array[randomIndex];
-}
-
 function getFqCookie() {
     let cookies = [
         'novel_web_id=78444872394737941004',
diff --git a/libs/drpyS.js b/libs/drpyS.js
@@ -51,7 +51,7 @@ export async function init(filePath, refresh) {
         if (moduleCache.has(filePath) && !refresh) {
             const cached = moduleCache.get(filePath);
             if (cached.hash === fileHash) {
-                log(`Module ${filePath} already initialized and unchanged, returning cached instance.`);
+                // log(`Module ${filePath} already initialized and unchanged, returning cached instance.`);
                 return cached.moduleObject;
             }
         }
@@ -485,7 +485,7 @@ async function searchParseAfter(d, pg) {
 
 async function playParse(rule, flag, id, flags) {
     let url = id;
-    log('playParse:', url)
+    // log('playParse:', url)
     if (!/http/.test(url)) {
         try {
             url = base64Decode(url);
@@ -494,7 +494,7 @@ async function playParse(rule, flag, id, flags) {
         }
     }
     url = decodeURIComponent(url);
-    log('playParse:', url)
+    // log('playParse:', url)
     return {
         TYPE: 'play',
         MY_FLAG: flag,
diff --git a/libs_drpy/drpyInject.js b/libs_drpy/drpyInject.js
@@ -75,6 +75,7 @@ async function request(url, opt = {}) {
         } else {
             agent = https.Agent({rejectUnauthorized: false,})
         }
+        console.log(`request:${url} headers:${JSON.stringify(headers)}`);
         var resp = await axios(url, {
             responseType: respType,
             method: opt ? opt.method || 'get' : 'get',
diff --git a/utils/marked.esm.js b/utils/marked.esm.js
diff --git a/utils/marked.esm.min.js b/utils/marked.esm.min.js

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ export async function init(filePath, refresh) {`
`51`	`51`	`if (moduleCache.has(filePath) && !refresh) {`
`52`	`52`	`const cached = moduleCache.get(filePath);`
`53`	`53`	`if (cached.hash === fileHash) {`
`54`		- log(`Module ${filePath} already initialized and unchanged, returning cached instance.`);
	`54`	+ // log(`Module ${filePath} already initialized and unchanged, returning cached instance.`);
`55`	`55`	`return cached.moduleObject;`
`56`	`56`	`}`
`57`	`57`	`}`
`@@ -485,7 +485,7 @@ async function searchParseAfter(d, pg) {`
`485`	`485`
`486`	`486`	`async function playParse(rule, flag, id, flags) {`
`487`	`487`	`let url = id;`
`488`		`- log('playParse:', url)`
	`488`	`+ // log('playParse:', url)`
`489`	`489`	`if (!/http/.test(url)) {`
`490`	`490`	`try {`
`491`	`491`	`url = base64Decode(url);`
`@@ -494,7 +494,7 @@ async function playParse(rule, flag, id, flags) {`
`494`	`494`	`}`
`495`	`495`	`}`
`496`	`496`	`url = decodeURIComponent(url);`
`497`		`- log('playParse:', url)`
	`497`	`+ // log('playParse:', url)`
`498`	`498`	`return {`
`499`	`499`	`TYPE: 'play',`
`500`	`500`	`MY_FLAG: flag,`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ async function request(url, opt = {}) {`
`75`	`75`	`} else {`
`76`	`76`	`agent = https.Agent({rejectUnauthorized: false,})`
`77`	`77`	`}`
	`78`	+ console.log(`request:${url} headers:${JSON.stringify(headers)}`);
`78`	`79`	`var resp = await axios(url, {`
`79`	`80`	`responseType: respType,`
`80`	`81`	`method: opt ? opt.method \|\| 'get' : 'get',`