feat: 框架完美处理

Author: Taois

README.md

@@ -71,6 +71,10 @@ nodejs作为服务端的drpy实现。全面升级异步写法
 
 ## 更新记录
 
+### 20260315
+
+更新至V1.3.29
+
 ### 20260314
 
 更新至V1.3.28

docs/updateRecord.md

@@ -1,5 +1,15 @@
 # drpyS更新记录
 
+### 20260315
+
+更新至V1.3.29
+
+1. 彻底解决ds代码问题导致的阻止程序退出
+2. 完善全局require处理，支持cjs文件里引入 `axios` 等对象不报错
+3. 彻底优化本地bundle包
+
+注意: 此版本为纯框架更新，不涉及源，只关注源的用户可以不用升级
+
 ### 20260314
 
 更新至V1.3.28

drpy-node-bundle/libs/localDsCore.bundled.js

@@ -32,7 +32,7 @@ import process$1 from "node:process";
 import os from "node:os";
 import tty from "node:tty";
 import util$1 from "node:util";
-import { createRequire as createRequire$1 } from "module";
+import Module, { createRequire as createRequire$1 } from "module";
 import { setTimeout as setTimeout$1 } from "timers";
 import { pipeline } from "stream/promises";
 import diagnosticsChannel from "diagnostics_channel";
@@ -14367,17 +14367,19 @@ let debounceTimers = /* @__PURE__ */ new Map();
 function startJsonWatcher(ENGINES, jsonDir) {
 	if (process.env.NODE_ENV !== "development") return;
 	try {
-		watch(jsonDir, { recursive: true }, (eventType, filename) => {
+		jsonWatcher = watch(jsonDir, { recursive: true }, (eventType, filename) => {
 			if (filename && filename.endsWith(".json")) {
 				if (debounceTimers.has(filename)) clearTimeout(debounceTimers.get(filename));
 				const timer = setTimeout(() => {
 					console.log(`[HotReload] ${filename} changed, clearing cache...`);
 					ENGINES.drpyS.clearAllCache();
 					debounceTimers.delete(filename);
 				}, 100);
+				if (timer.unref) timer.unref();
 				debounceTimers.set(filename, timer);
 			}
 		});
+		if (jsonWatcher.unref) jsonWatcher.unref();
 	} catch (error) {
 		console.error("start json file listening failed with error:", error);
 	}
@@ -374920,6 +374922,20 @@ const __dirname$4 = path.dirname(fileURLToPath(import.meta.url));
 const ROOT_DIR = path.resolve(__dirname$4, "../");
 const LIB_ROOT = path.join(ROOT_DIR, "spider/js");
 const customRequire = createRequire$1(import.meta.url);
+/**
+* Patch Module.prototype.require to handle bundled modules in CJS context
+* This allows native CJS modules (like those loaded via require('./lib.js')) to find
+* bundled dependencies (axios, iconv-lite, etc.) which are exposed on globalThis.
+*/
+const originalRequire = Module.prototype.require;
+Module.prototype.require = function(id) {
+	if (id === "iconv-lite" && globalThis.iconv) return globalThis.iconv;
+	if (id === "axios" && globalThis.axios) return globalThis.axios;
+	if (id === "cheerio" && globalThis.cheerio) return globalThis.cheerio;
+	if (id === "qs" && globalThis.qs) return globalThis.qs;
+	if (id === "crypto-js" && globalThis.CryptoJS) return globalThis.CryptoJS;
+	return originalRequire.apply(this, arguments);
+};
 const rootRequire = (modulePath) => {
 	if (modulePath === "iconv-lite") return globalThis.iconv;
 	if (modulePath === "axios") return globalThis.axios;
@@ -393934,6 +393950,11 @@ var catvod_default = {
 };
 //#endregion
 //#region localDsCore.js
+const ENGINES = {
+	drpyS: drpyS_exports,
+	php: php_default,
+	catvod: catvod_default
+};
 const __dirname$1 = path.dirname(fileURLToPath(import.meta.url));
 const isBundled = __dirname$1.endsWith("dist") || __dirname$1.endsWith("libs") || __dirname$1.endsWith("dist" + path.sep) || __dirname$1.endsWith("libs" + path.sep);
 const possibleRoots = [
@@ -393962,15 +393983,7 @@ const options = {
 	catDir,
 	catLibDir
 };
-/**
-* 支持的引擎映射表
-* 包含drpyS、php、catvod
-*/
-const ENGINES = {
-	drpyS: drpyS_exports,
-	php: php_default,
-	catvod: catvod_default
-};
+startJsonWatcher(ENGINES, jsonDir);
 /**
 * 创建带超时的Promise包装函数
 * 为API操作添加超时控制，防止长时间阻塞
@@ -393987,9 +394000,10 @@ function withTimeout(promise, timeoutMs = null, operation = "API操作", invokeM
 	else defaultTimeout = 20 * 1e3;
 	const actualTimeout = timeoutMs || defaultTimeout;
 	return Promise.race([promise, new Promise((_, reject) => {
-		setTimeout(() => {
+		const timer = setTimeout(() => {
 			reject(/* @__PURE__ */ new Error(`${operation}超时 (${actualTimeout}ms)`));
 		}, actualTimeout);
+		if (timer.unref) timer.unref();
 	})]);
 }
 async function getEngine(moduleName, query, inject_env) {

drpy-node-bundle/localDsCore.js

@@ -7,6 +7,13 @@ import * as drpyS from '../libs/drpyS.js';
 import php from '../libs/php.js';
 import catvod from '../libs/catvod.js';
 
+// 初始化API引擎集合
+const ENGINES = {
+    drpyS,
+    php,
+    catvod,
+};
+
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 // Determine if we are running from the dist/libs directory (bundled) or source
@@ -42,15 +49,9 @@ const options = {
     catDir,
     catLibDir,
 };
-/**
- * 支持的引擎映射表
- * 包含drpyS、php、catvod
- */
-const ENGINES = {
-    drpyS,
-    php,
-    catvod,
-};
+
+// 启动JSON文件监听器 (仅在开发环境下生效)
+startJsonWatcher(ENGINES, jsonDir);
 //const query = {
 //    do: 'ds',
 //    pg: 1,
@@ -83,9 +84,10 @@ function withTimeout(promise, timeoutMs = null, operation = 'API操作', invokeM
     return Promise.race([
         promise,
         new Promise((_, reject) => {
-            setTimeout(() => {
+            const timer = setTimeout(() => {
                 reject(new Error(`${operation}超时 (${actualTimeout}ms)`));
             }, actualTimeout);
+            if (timer.unref) timer.unref();
         })
     ]);
 }

drpy-node-bundle/localDsCoreTest.js

@@ -1,6 +1,6 @@
 // import * as localtDsCore from './localDsCore.js';
-const start = performance.now();
 import * as localtDsCore from './libs/localDsCore.bundled.js';
+const start = performance.now();
 
 console.log(getEngine)
 // const a = await getEngine('爱推图[画]', {}, {proxyUrl: "xx"})
@@ -21,4 +21,14 @@ const e = await getEngine('30wMV[听]', {
 // console.log(e)
 const end = performance.now();
 
-console.log(`耗时: ${end - start} ms`);
+console.log(`耗时: ${end - start} ms`);
+// process.exit(0);
+
+const f = await getEngine('央视大全[官]', {
+    do: 'ds',
+    proxy: 1,
+    url: '',
+}, {requestHost: 'http://127.0.0.1:5757',proxyPath:'https://dh5wswx02.v.cntv.cn/asp/h5e/hls/2000/0303000a/3/default/b90af013c16e44de9e4f1f56dab91f63/1.ts'})
+
+const [statuCode, contentType, buffer, headers] = f;
+console.log('resutl: header:', headers, 'buffer length:', buffer.length);

drpy-node-bundle/spider/js/_lib.cntv2026.cjs

@@ -1,4 +1,5 @@
 const axios = require('axios');
+// const iconv = require('iconv-lite');
 // ==================== 常量定义 ====================
 const TS_PACKET_SIZE = 188;
 const VIDEO_PID = 256;

libs/drpyS.js

@@ -74,6 +74,9 @@ const CACHE_OPTIONS = {
     max: 100,
     ttl: 1000 * 60 * 10, // 10分钟
 };
+// const moduleCache = new Map();
+// const ruleObjectCache = new Map();
+// const jxCache = new Map();
 const moduleCache = new LRUCache(CACHE_OPTIONS);
 const ruleObjectCache = new LRUCache(CACHE_OPTIONS);
 const jxCache = new LRUCache(CACHE_OPTIONS);

libs_drpy/moduleLoader.js

@@ -1,6 +1,6 @@
 import {readFileSync, existsSync} from 'fs';
 import path from "path";
-import {createRequire} from 'module';
+import Module, {createRequire} from 'module';
 import {fileURLToPath} from "url";
 import axios from 'axios';
 import fetchSync from 'sync-fetch';
@@ -11,6 +11,21 @@ const LIB_ROOT = path.join(ROOT_DIR, 'spider/js');
 
 const customRequire = createRequire(import.meta.url);
 
+/**
+ * Patch Module.prototype.require to handle bundled modules in CJS context
+ * This allows native CJS modules (like those loaded via require('./lib.js')) to find
+ * bundled dependencies (axios, iconv-lite, etc.) which are exposed on globalThis.
+ */
+const originalRequire = Module.prototype.require;
+Module.prototype.require = function(id) {
+    if (id === 'iconv-lite' && globalThis.iconv) return globalThis.iconv;
+    if (id === 'axios' && globalThis.axios) return globalThis.axios;
+    if (id === 'cheerio' && globalThis.cheerio) return globalThis.cheerio;
+    if (id === 'qs' && globalThis.qs) return globalThis.qs;
+    if (id === 'crypto-js' && globalThis.CryptoJS) return globalThis.CryptoJS;
+    return originalRequire.apply(this, arguments);
+};
+
 // 导出 rootRequire
 export const rootRequire = (modulePath) => {
     // 处理内置模块或打包模块

package-bundle.js

@@ -1,5 +1,5 @@
 import {execSync} from 'child_process';
-import {existsSync, statSync} from 'fs';
+import {existsSync, statSync, readdirSync, copyFileSync, mkdirSync} from 'fs';
 import {join, basename, dirname, resolve} from 'path';
 import url from 'url';
 
@@ -15,6 +15,41 @@ const INCLUDE_ITEMS = [
 // 获取脚本所在目录 (e:\gitwork\drpy-node)
 const getScriptDir = () => dirname(resolve(url.fileURLToPath(import.meta.url)));
 
+// 复制 _lib 开头的文件到 bundle 目录
+const copyLibFiles = (scriptDir) => {
+    const sourceDir = join(scriptDir, 'spider', 'js');
+    const targetDir = join(scriptDir, 'drpy-node-bundle', 'spider', 'js');
+
+    if (!existsSync(sourceDir)) {
+        console.warn(`警告: 源目录 ${sourceDir} 不存在，跳过复制 lib 文件。`);
+        return;
+    }
+
+    if (!existsSync(targetDir)) {
+        console.log(`创建目标目录: ${targetDir}`);
+        mkdirSync(targetDir, {recursive: true});
+    }
+
+    console.log(`正在从 ${sourceDir} 复制 lib 文件到 ${targetDir}...`);
+
+    try {
+        const files = readdirSync(sourceDir);
+        let count = 0;
+        for (const file of files) {
+            if (file.startsWith('_lib') && (file.endsWith('.js') || file.endsWith('.cjs'))) {
+                const srcPath = join(sourceDir, file);
+                const destPath = join(targetDir, file);
+                copyFileSync(srcPath, destPath);
+                // console.log(`已复制: ${file}`);
+                count++;
+            }
+        }
+        console.log(`成功复制了 ${count} 个 lib 文件。`);
+    } catch (error) {
+        console.error(`复制 lib 文件失败: ${error.message}`);
+    }
+};
+
 // 压缩 drpy-node-bundle 目录
 const compressBundle = (scriptDir) => {
     // drpy-node-bundle 目录路径
@@ -79,6 +114,7 @@ const compressBundle = (scriptDir) => {
 // 主程序入口
 const main = () => {
     const scriptDir = getScriptDir();
+    copyLibFiles(scriptDir);
     compressBundle(scriptDir);
 };
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "drpy-node",
-  "version": "1.3.28",
+  "version": "1.3.29",
   "main": "index.js",
   "type": "module",
   "scripts": {