mm_expand 2.4.0 → 2.4.2

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);
   }
 };
 
@@ -640,8 +640,12 @@ Eventer.prototype._createTask = function (o, full_key) {
     cancel: () => { cancelled = true; }
   };
 
-  // 添加到进行中的任务列表
+  // 添加到进行中的任务列表（防御性处理重入调用导致 key 已被清理的情况）
   let tasks = this._tasks.get(full_key);
+  if (!tasks) {
+    tasks = [];
+    this._tasks.set(full_key, tasks);
+  }
   tasks.push(task);
 
   return { task, tasks, cancelled };
@@ -667,7 +671,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);
 
@@ -780,6 +784,10 @@ Eventer.prototype._createWaterfallTask = function (obj, full_key) {
   };
 
   let tasks = this._tasks.get(full_key);
+  if (!tasks) {
+    tasks = [];
+    this._tasks.set(full_key, tasks);
+  }
   tasks.push(task);
 
   return { task, tasks, cancelled };
@@ -900,6 +908,10 @@ Eventer.prototype._createRaceTask = function (obj, full_key) {
   };
 
   let tasks = this._tasks.get(full_key);
+  if (!tasks) {
+    tasks = [];
+    this._tasks.set(full_key, tasks);
+  }
   tasks.push(task);
 
   return { task, tasks, cancelled };
@@ -969,8 +981,12 @@ Eventer.prototype._createParallelTask = function (obj, full_key) {
     cancel: () => { cancelled = true; }
   };
 
-  // 添加到进行中的任务列表
+  // 添加到进行中的任务列表（防御性处理重入调用导致 key 已被清理的情况）
   let tasks = this._tasks.get(full_key);
+  if (!tasks) {
+    tasks = [];
+    this._tasks.set(full_key, tasks);
+  }
   tasks.push(task);
 
   return { task, tasks, cancelled };
@@ -1265,7 +1281,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 +1290,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 +1302,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
@@ -1687,7 +1703,7 @@ Eventer.prototype._addTargetEvents = function (full_from_event, 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]);
   }
 };
 
@@ -1981,7 +1997,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 +2051,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/package.json

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