update:md文档兼容移动端

Author: hjdhnx

README.md

@@ -32,3 +32,4 @@ todo:
 2. jsonpath
 3. underscore
 4. pino-pretty
+5. deasync

index.js

@@ -3,9 +3,9 @@ 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 {readdirSync, readFileSync} from 'fs';
 import {base64Decode} from "./libs_drpy/crypto-util.js";
-import {marked}  from './utils/marked.esm.min.js';
+import './utils/marked.min.js';
 
 const fastify = Fastify({logger: true});
 
@@ -14,14 +14,13 @@ console.log('__dirname:', __dirname);
 
 // 添加 / 接口
 fastify.get('/', async (request, reply) => {
-    const rootDir = path.resolve('.'); // 当前根目录
     let readmePath = null;
 
     // 查找根目录下的 README.md 文件（不区分大小写）
-    const files = readdirSync(rootDir);
+    const files = readdirSync(__dirname);
     for (const file of files) {
         if (/^readme\.md$/i.test(file)) {
-            readmePath = path.join(rootDir, file);
+            readmePath = path.join(__dirname, file);
             break;
         }
     }
@@ -36,7 +35,7 @@ fastify.get('/', async (request, reply) => {
     const markdownContent = readFileSync(readmePath, 'utf-8');
 
     // 将 Markdown 转换为 HTML
-    const htmlContent = marked(markdownContent);
+    const htmlContent = marked.parse(markdownContent);
 
     // 返回 HTML 内容
     reply.type('text/html').send(`
@@ -79,7 +78,7 @@ fastify.get('/api/:module', async (request, reply) => {
                 }
             }
             // 分类逻辑
-            const result = await drpy.cate(modulePath, query.t, pg, 1,extend);
+            const result = await drpy.cate(modulePath, query.t, pg, 1, extend);
             return reply.send(result);
         }
 
@@ -125,7 +124,7 @@ fastify.get('/api/:module', async (request, reply) => {
 const start = async () => {
     try {
         // 监听 0.0.0.0
-        await fastify.listen({ port: 5757, host: '0.0.0.0' });
+        await fastify.listen({port: 5757, host: '0.0.0.0'});
 
         // 获取本地地址
         const localAddress = `http://localhost:5757`;

libs_drpy/crypto-util.js

@@ -75,7 +75,7 @@ function window_b64() {
     }
 }
 
-// export const {atob, btoa} = window_b64();
+export const {atob, btoa} = window_b64();
 
 export function base64Encode(text) {
     return CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(text));

libs_drpy/moduleLoader.js

@@ -1,11 +1,51 @@
-import { readFileSync, existsSync } from 'fs';
+import {readFileSync, existsSync} from 'fs';
 import path from "path";
-import { fileURLToPath } from "url";
+import {fileURLToPath} from "url";
 import axios from "./axios.min.js"; // 引入 axios
-import deasync from "deasync"; // 使用 deasync 实现同步行为
+// import deasync from "deasync"; // 使用 deasync 实现同步行为
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
+// 创建一个函数，接受一个回调来模拟同步行为
+function fetchModuleCodeSync(jsm_path) {
+    let result = null;
+    let error = null;
+
+    // 返回一个 Promise，用于等待异步请求完成
+    return new Promise((resolve, reject) => {
+        axios.get(jsm_path)
+            .then((response) => {
+                result = response.data;  // 保存结果
+                resolve(result);  // 成功时 resolve
+            })
+            .catch((err) => {
+                error = new Error(`Error fetching module from URL: ${err.message}`);  // 错误信息
+                reject(error);  // 失败时 reject
+            });
+    });
+}
+
+// 模拟同步的处理方法
+function requireModule(jsm_path) {
+    let result = null;
+    let error = null;
+
+    // 阻塞直到 Promise 完成
+    try {
+        result = fetchModuleCodeSync(jsm_path);  // 等待异步请求完成
+        result.then(data => {
+            console.log("Module Code:", data);
+        }).catch(err => {
+            throw err;
+        });
+    } catch (err) {
+        error = err;
+        console.error(error.message);
+    }
+
+    return result;  // 返回模块内容
+}
+
 globalThis.$ = {
     /**
      * 加载指定的 JavaScript 模块
@@ -21,6 +61,7 @@ globalThis.$ = {
 
         if (isURL) {
             // 从网络同步获取模块代码
+            /*
             let error = null;
             let result = null;
 
@@ -38,6 +79,8 @@ globalThis.$ = {
             if (error) throw error;
 
             js_code = result;
+            */
+            js_code = requireModule(jsm_path);
         } else {
             // 本地路径处理
             jsm_path = path.join(__dirname, '../js', jsm_path);
@@ -62,7 +105,7 @@ globalThis.$ = {
             console,
             $,
             exports: {},
-            module: { exports: {} }
+            module: {exports: {}}
         };
 
         try {

package.json

@@ -11,7 +11,6 @@
   "license": "MIT",
   "dependencies": {
     "cheerio": "^1.0.0",
-    "deasync": "^0.1.30",
     "fastify": "^4.15.0",
     "lodash": "^4.17.21",
     "qs": "^6.13.1",