mm_expand 2.3.9 → 2.4.1

package/lib/eventer.js

@@ -628,7 +628,7 @@ Eventer.prototype._execSingleTask = async function (o, params, ctx, options) {
     this._handleSuccessResult({ result, o, ctx, arr, task });
   } catch (e) {
     // 处理错误
-    this._handleTaskError(e, o, ctx, task);
+    this._handleSeqTaskError(e, o, ctx, task);
   }
 };
 
@@ -667,7 +667,7 @@ Eventer.prototype._handleSuccessResult = function (config) {
   task.tasks.splice(task.tasks.indexOf(task.task), 1);
 };
 
-Eventer.prototype._handleTaskError = function (e, o, ctx, task) {
+Eventer.prototype._handleSeqTaskError = function (e, o, ctx, task) {
   ctx.error_count++;
   this.log('error', `事件执行失败 [${ctx.space}:${ctx.event}] - ${o.name}`, e);
 
@@ -1265,7 +1265,7 @@ Eventer.prototype._ensureNs = function (name) {
  */
 Eventer.prototype._execNsEvents = async function (name, key, params) {
   let list = this._dict[name][key];
-  const space_results = [];
+  const name_results = [];
   const arr = []; // 存储需要移除的事件
 
   // 执行事件处理函数
@@ -1274,7 +1274,7 @@ Eventer.prototype._execNsEvents = async function (name, key, params) {
       let obj = list[i];
       // 执行事件处理函数
       let result = await obj.func.apply(obj, params);
-      space_results.push(result);
+      name_results.push(result);
 
       // 处理执行次数限制
       if (obj.times >= 0) {
@@ -1286,7 +1286,7 @@ Eventer.prototype._execNsEvents = async function (name, key, params) {
     } catch (e) {
       // 记录错误但不中断执行
       this.log('error', `事件执行失败 [${name}:${key}] - ${list[i].name}`, e);
-      space_results.push({
+      name_results.push({
         _error: true,
         error: e,
         handler: list[i].name
@@ -1592,7 +1592,7 @@ Eventer.prototype.has = function (key, name) {
 Eventer.prototype.count = function (key) {
   if (key) {
     // 解析可能的命名空间模式
-    if (key.ends_with(':*')) {
+    if (key.endsWith(':*')) {
       // 统计命名空间下所有事件
       let space = key.split(':')[0];
       if (this._dict[space]) {
@@ -1684,10 +1684,10 @@ Eventer.prototype._initEventChain = function (full_from_event) {
 
 Eventer.prototype._addTargetEvents = function (full_from_event, to_events) {
   // 确保目标事件是数组
-  let target_events = Array.is_array(to_events) ? to_events : [to_events];
+  let target_events = Array.isArray(to_events) ? to_events : [to_events];
 
   for (let i = 0; i < target_events.length; i++) {
-    this._addSingleTargetEvent(full_from_event, target_events[i]);
+    this._addTargetEvent(full_from_event, target_events[i]);
   }
 };
 
@@ -1737,7 +1737,7 @@ Eventer.prototype.unchain = function (from_event, to_events) {
 };
 
 Eventer.prototype._removeTargetEvents = function (full_from_event, to_events) {
-  let target_events = Array.is_array(to_events) ? to_events : [to_events];
+  let target_events = Array.isArray(to_events) ? to_events : [to_events];
 
   for (let i = 0; i < target_events.length; i++) {
     this._removeTargetEvent(full_from_event, target_events[i]);
@@ -1981,7 +1981,7 @@ Eventer.prototype.onMany = function (events_map) {
   }
 
   for (let event_name in events_map) {
-    if (events_map.has_own_property(event_name)) {
+    if (Object.prototype.hasOwnProperty.call(events_map, event_name)) {
       this.on(event_name, events_map[event_name]);
     }
   }
@@ -2035,10 +2035,11 @@ Eventer.prototype._sort = function (events) {
  * @private
  */
 Eventer.prototype._runMiddleware = async function (type, ctx) {
-  if (!this._middleware || this._middleware.length === 0) return;
+  if (!this._middleware || !this._middleware[type] || this._middleware[type].length === 0) return;
 
-  for (let i = 0; i < this._middleware.length; i++) {
-    await this._executeSingleMiddleware(this._middleware[i], type, ctx, i);
+  const mwList = this._middleware[type];
+  for (let i = 0; i < mwList.length; i++) {
+    await this._execMiddleware(mwList[i], type, ctx, i);
     // 如果上下文被取消，则停止执行
     if (ctx.cancelled) break;
   }

package/lib/file.js

@@ -173,28 +173,6 @@ File.prototype.getAll = function (dir, keyword, keyword_dir) {
   return list;
 };
 
-/**
- * 搜索目录下所有文件
- * @param {string} dir 目录地址
- * @param {string} keyword 搜索关键词
- * @param {string} keyword_dir 目录搜素关键词
- * @returns {Array} 文件路径数组
- */
-File.prototype.getAll = function (dir, keyword, keyword_dir) {
-  // 文件数组
-  var list = [];
-
-  // 目录数组
-  var dirs = [];
-  // 获取相关目录
-  eachDir(dirs, dir.fullname(), keyword_dir);
-  var len = dirs.length;
-  for (var i = 0; i < len; i++) {
-    getFile(list, dirs[i], keyword);
-  }
-  return list;
-};
-
 /**
  * 搜索目录下所有文件（异步并行极速版）
  * @param {string} dir 目录地址
@@ -217,7 +195,7 @@ File.prototype.getAllAsync = async function (dir, keyword, keyword_dir) {
   async function getFileAsync(directory) {
     var items;
     try {
-      items = await fsp.readdir(directory, { with_file_types: true });
+      items = await fsp.readdir(directory, { withFileTypes: true });
     } catch {
       return [];
     }
@@ -409,7 +387,7 @@ function eachDir(list, dir, keyword) {
 async function eachDirAsync(list, dir, keyword) {
   var items;
   try {
-    items = await fsp.readdir(dir, { with_file_types: true });
+    items = await fsp.readdir(dir, { withFileTypes: true });
   } catch {
     return;
   }
@@ -417,7 +395,7 @@ async function eachDirAsync(list, dir, keyword) {
   var subDirs = [];
   for (var i = 0; i < items.length; i++) {
     var item = items[i];
-    if (item.isDir()) {
+    if (item.isDirectory()) {
       var full_path = join(dir, item.name);
       if (!keyword || item.name.has(keyword)) {
         list.push(full_path);
@@ -620,7 +598,7 @@ String.prototype.copyDir = function (file, func) {
 String.prototype.isDir = function () {
   var bl = false;
   try {
-    bl = statSync(this + '').isDir();
+    bl = statSync(this + '').isDirectory();
   } catch {
     // $.log.error("非路径");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mm_expand",
-	"version": "2.3.9",
+	"version": "2.4.1",
 	"description": "超级美眉原型函数扩展模块 - 增强的字符串、数组、对象、日期操作，具备错误预防功能并简化业务逻辑",
 	"main": "index.js",
 	"scripts": {