mm_os 4.2.4 → 4.2.7

package/com/socket/index.js

@@ -56,7 +56,7 @@ class Socket extends Manager {
      * 是否懒加载
      * @type {boolean}
      */
-    lazy_load: true,
+    lazy_load: false,
     /**
      * 模式
      * 1.生产模式，改变文件不会重新加载
@@ -66,7 +66,7 @@ class Socket extends Manager {
      * 5.热更新+重载模式，改变配置文件重新加载配置和脚本，执行完后重新加载脚本
      * @type {number}
      */
-    mode: 3
+    mode: process.env.NODE_ENV === 'production' ? 1 : 3,
   };
 
   /**
@@ -77,7 +77,12 @@ class Socket extends Manager {
   constructor(config, parent) {
     super({ ...Socket.config, ...config }, parent);
     this.dict = {};
-    
+
+    /**
+     * 消息ID索引 (id => message对象), 用于O(1)查找
+     */
+    this.dict_msg = {};
+
     /**
      * 消息队列
      */
@@ -116,17 +121,23 @@ Socket.prototype.Drive = Drive;
  * @param {Function} next 跳过当前, 然后继续执行函数
  */
 Socket.prototype.run = async function (ctx, next) {
-  await next();
+  if (typeof next === 'function') {
+    await next();
+  }
+  if (!ctx || !ctx.path) {
+    return;
+  }
   let path = ctx.path.toLocaleLowerCase();
-  var infos = this.getInfos();
-  for (var i = 0, info; info = infos[i++];) {
-    // console.log("监听webscoket路径是否正确", path === info.path);
-    if (info.state === 1) {
-      let mod = this.getMod(info.name);
-      if (path === info.path) {
-        if (mod) {
-          mod.add(ctx);
+  var mods = this.getMods();
+  for (var name in mods) {
+    var mod = mods[name];
+    var mod_path = mod.config && mod.config.path;
+    if (mod.config && mod.config.state === 1 && mod_path) {
+      if (path === mod_path) {
+        if (!mod.isLoaded()) {
+          await mod.do('load');
         }
+        mod.add(ctx);
         break;
       }
     }
@@ -135,19 +146,19 @@ Socket.prototype.run = async function (ctx, next) {
 
 /**
  * 发送消息到指定客户端
- * @param {string} client_id 客户端ID
+ * @param {string} clientid 客户端ID
  * @param {string} method 方法名称
  * @param {object} params 请求参数
  * @returns {boolean} 发送是否成功
  */
-Socket.prototype.send = function (client_id, method, params) {
+Socket.prototype.send = function (clientid, method, params) {
   var mods = this.getMods();
   for (var k in mods) {
     var o = mods[k];
     if (o.config.state === 1 && o.send) {
       // 设置管理器引用，用于消息回复处理
       o.manager = this;
-      return o.send(client_id, method, params);
+      return o.send(clientid, method, params);
     }
   }
   return false;
@@ -172,21 +183,21 @@ Socket.prototype.sendAll = function (method, params) {
 
 /**
  * 发送请求到指定客户端
- * @param {string} client_id 客户端ID
+ * @param {string} clientid 客户端ID
  * @param {string} method 方法名称
  * @param {object} params 请求参数
  * @param {Function} func 回调函数
  * @param {number} timeout 超时时间（毫秒）
  * @returns {boolean} 发送是否成功
  */
-Socket.prototype.req = function (client_id, method, params, func, timeout = 0) {
+Socket.prototype.req = function (clientid, method, params, func, timeout = 0) {
   var mods = this.getMods();
   for (var k in mods) {
     var o = mods[k];
     if (o.config.state === 1 && o.req) {
       // 设置管理器引用，用于消息回复处理
       o.manager = this;
-      return o.req(client_id, method, params, func, timeout);
+      return o.req(clientid, method, params, func, timeout);
     }
   }
   return false;
@@ -213,18 +224,35 @@ Socket.prototype.reqAll = function (method, params, func, timeout = 0) {
 
 /**
  * 同步请求到指定客户端 - 可及时取回消息
- * @param {string} client_id 客户端ID
+ * @param {string} clientid 客户端ID
  * @param {string} method 请求方法
  * @param {object} params 传递参数
  * @param {number} timeout 超时时间（毫秒）
  * @returns {Promise} 返回响应结果的Promise
  */
-Socket.prototype.reqAsync = function (client_id, method, params, timeout = 0) {
+Socket.prototype.reqAsync = function (clientid, method, params, timeout = 0) {
   var _this = this;
+  var timeout_ms = timeout || 3000;
   return new Promise((resolve, reject) => {
-    _this.req(client_id, method, params, (res) => {
-      resolve(res);
-    }, timeout);
+    var has_res = false;
+    var timer = setTimeout(() => {
+      if (!has_res) {
+        reject(new Error('Socket请求超时'));
+      }
+    }, timeout_ms);
+    _this.req(
+      clientid,
+      method,
+      params,
+      (res) => {
+        if (!has_res) {
+          has_res = true;
+          clearTimeout(timer);
+          resolve(res);
+        }
+      },
+      timeout,
+    );
   });
 };
 
@@ -237,10 +265,20 @@ Socket.prototype.reqAsync = function (client_id, method, params, timeout = 0) {
  */
 Socket.prototype.reqAsyncAll = function (method, params, timeout = 0) {
   var _this = this;
+  var timeout_ms = timeout || 3000;
   return new Promise((resolve, reject) => {
-    _this.reqAll(method, params, (res) => {
-      resolve(res);
-    }, timeout);
+    var timer = setTimeout(() => {
+      reject(new Error('Socket广播请求超时'));
+    }, timeout_ms);
+    _this.reqAll(
+      method,
+      params,
+      (res) => {
+        clearTimeout(timer);
+        resolve(res);
+      },
+      timeout,
+    );
   });
 };
 
@@ -250,7 +288,12 @@ Socket.prototype.reqAsyncAll = function (method, params, timeout = 0) {
  * @private
  */
 Socket.prototype._genId = function () {
-  return 'socket_' + Date.parse(new Date()) + '_' + Math.random().toString(36).substr(2, 9);
+  return (
+    'socket_' +
+    Date.parse(new Date()) +
+    '_' +
+    Math.random().toString(36).substr(2, 9)
+  );
 };
 
 /**
@@ -259,12 +302,19 @@ Socket.prototype._genId = function () {
  * @private
  */
 Socket.prototype._delMsgById = function (msg_id) {
+  var o = this.dict_msg[msg_id];
+  if (!o) {
+    return;
+  }
+  // 清除定时器
+  if (o.timer) {
+    clearTimeout(o.timer);
+  }
+  delete this.dict_msg[msg_id];
+
+  // 从数组中移除 (保持list_msg与dict_msg同步)
   for (var i = 0; i < this.list_msg.length; i++) {
     if (this.list_msg[i].id === msg_id) {
-      // 清除定时器
-      if (this.list_msg[i].timer) {
-        clearTimeout(this.list_msg[i].timer);
-      }
       this.list_msg.splice(i, 1);
       break;
     }
@@ -280,21 +330,18 @@ Socket.prototype._handleResponse = function (msg) {
   if (!msg || !msg.id) {
     return;
   }
-  
-  for (var i = 0; i < this.list_msg.length; i++) {
-    let o = this.list_msg[i];
-    if (o.id === msg.id && o.func) {
-      try {
-        // 执行回调函数
-        o.func(msg);
-      } catch (error) {
-        console.error('Socket回调函数执行错误:', error);
-      }
-      
-      // 从列表中移除已处理的消息
-      this._delMsgById(o.id);
-      break;
+
+  var o = this.dict_msg[msg.id];
+  if (o && o.func) {
+    try {
+      // 执行回调函数
+      o.func(msg);
+    } catch (error) {
+      console.error('Socket回调函数执行错误:', error);
     }
+
+    // 从列表中移除已处理的消息
+    this._delMsgById(o.id);
   }
 };
 
@@ -308,7 +355,7 @@ Socket.prototype.updateConfigAll = async function (path) {
   var list_scope = $.dir.getAll(p, 'socket');
 
   // 遍历目录路径
-  for (var i = 0, f; f = list_scope[i++];) {
+  for (var i = 0, f; (f = list_scope[i++]);) {
     var list_file = $.file.getAll(f, '*' + this.type + '.json');
     await this.loadList(list_file);
   }
@@ -316,7 +363,6 @@ Socket.prototype.updateConfigAll = async function (path) {
 
 exports.Socket = Socket;
 
-
 /**
  * Socket组件池
  */
@@ -336,7 +382,7 @@ function socketAdmin(scope, title) {
   if (!obj) {
     $.pool.socket[sc] = new Socket({
       name: sc,
-      title: title
+      title: title,
     });
     obj = $.pool.socket[sc];
   }