mm_expand 2.2.1 → 2.2.3

package/lib/base.js

@@ -34,7 +34,7 @@ class Base extends Event {
     // 监听事件
     this._listen();
   }
-  
+
   /**
    * 获取当前状态
    * @returns {string} 当前状态
@@ -101,6 +101,15 @@ Base.prototype._onDestroy = function () {
 Base.prototype._preset = function () {
 };
 
+/**
+ * 设置配置参数 - 内部方法
+ * @private
+ * @param {object} config 主要配置
+ */
+Base.prototype._setConfig = function (config) {
+  Object.assign(this.config, config);
+}
+
 /**
  * 设置配置参数
  * @param {object} config 主要配置
@@ -111,7 +120,7 @@ Base.prototype.setConfig = function (config) {
     if (typeof config !== 'object') {
       throw new TypeError('配置参数必须是对象');
     }
-    Object.assign(this.config, config);
+    this._setConfig(config);
   }
   // 初始化设置
   this._preset();
@@ -135,13 +144,24 @@ Base.prototype._initCore = async function (...params) {
   return this;
 };
 
+
+/**
+ * 初始化模块 - 内部方法
+ * @private
+ * @param {...any} params 初始化参数
+ * @returns {Promise<void>} 初始化完成
+ */
+Base.prototype._init = async function (...params) {
+  return this;
+};
+
 /**
  * 初始化
  * @param {...object} params 参数列表
  * @returns {object} 返回当前对象
  */
 Base.prototype.init = async function (...params) {
-  return this;
+  return this._init(...params);
 };
 
 /**
@@ -152,11 +172,19 @@ Base.prototype._destroyCore = async function () {
   return this;
 };
 
+/**
+ * 销毁模块 - 内部方法
+ * @private
+ */
+Base.prototype._destroy = async function () {
+  return this;
+};
+
 /**
  * 销毁
  */
 Base.prototype.destroy = async function () {
-  return this;
+  return this._destroy();
 };
 
 /**

package/lib/errors.js

@@ -121,7 +121,7 @@ class Errors extends Base {
  * @returns {string|null} 错误信息
  */
 Errors.prototype.get = function (code) {
-  const lang = this._config.lang;
+  const lang = this.config.lang;
   const lang_pack = this._langs[lang];
 
   if (lang_pack && lang_pack[code]) {
@@ -141,7 +141,7 @@ Errors.prototype.get = function (code) {
  * @param {string} lang 语言代码
  */
 Errors.prototype.setLang = function (lang) {
-  this._config.lang = lang;
+  this.config.lang = lang;
 };
 
 /**
@@ -149,7 +149,7 @@ Errors.prototype.setLang = function (lang) {
  * @returns {string} 当前语言代码
  */
 Errors.prototype.getLang = function () {
-  return this._config.lang;
+  return this.config.lang;
 };
 
 /**

package/lib/req.js

@@ -36,7 +36,7 @@ class Req extends Base {
  * @returns {string} 新的ID
  */
 Req.prototype.genId = function () {
-  return this._config.scope + Date.now();
+  return this.config.scope + Date.now();
 };
 
 /**
@@ -49,10 +49,10 @@ Req.prototype.send = function (method, ...args) {
   if (this._methods[method]) {
     return this._methods[method](...args);
   }
-  else if (this._config.format === "json-rpc") {
+  else if (this.config.format === "json-rpc") {
     return this._sendJsonRPC(method, args);
   }
-  else if (this._config.format === "json-rpc3") {
+  else if (this.config.format === "json-rpc3") {
     return this._sendJsonRPC3(method, ...args);
   }
   else {
@@ -159,19 +159,19 @@ Req.prototype.parse = function (req) {
       params.push(req.meta || null);
     }
   }
-  if (this._config.format === "json-rpc") {
+  if (this.config.format === "json-rpc") {
     if (req.params) {
       params = req.params;
     }
   }
-  else if (this._config.format === "json-rpc3") {
+  else if (this.config.format === "json-rpc3") {
     var pm = {};
     pm.query = params.length > 0 ? params[0] || null : null;
     pm.body = params.length > 1 ? params[1] || null : null;
     pm.meta = params.length > 2 ? params[2] || null : null;
     params = pm;
   }
-  else if (this._config.format === "restful") {
+  else if (this.config.format === "restful") {
     var ret = {
       id,
       method,
@@ -251,14 +251,14 @@ Req.prototype.setFormat = function (format) {
   switch (format?.toLowerCase()) {
     case "json":
     case "json-rpc":
-      this._config.format = "json-rpc";
+      this.config.format = "json-rpc";
       break;
     case "json3":
     case "json-rpc3":
-      this._config.format = "json-rpc3";
+      this.config.format = "json-rpc3";
       break;
     default:
-      this._config.format = "restful";
+      this.config.format = "restful";
       break;
   }
 };

package/lib/ret.js

@@ -128,6 +128,10 @@ Ret.prototype._toJsonRPC = function (result, error, id, diy = true) {
  * @returns {Object} RESTful响应格式
  */
 Ret.prototype._toRESTful = function (result, error, id, diy = true) {
+	let ret = {};
+	if (id) {
+		ret.id = id;
+	}
 	var code;
 	var msg;
 	if (result) {
@@ -151,13 +155,13 @@ Ret.prototype._toRESTful = function (result, error, id, diy = true) {
 		code = this.config.error_code;
 		msg = this._getMessage(code);
 	}
-	return {
-		id,
-		code,
-		msg,
-		data: result
-	};
-}
+	ret.code = code;
+	ret.msg = msg;
+	if (result) {
+		ret.data = result;
+	}
+	return ret;
+};
 
 /**
  * 生成响应体
@@ -334,7 +338,8 @@ Ret.prototype.setFormat = function (format) {
 			this.config.format = "restful";
 			break;
 	}
-}
+	return this;
+};
 
 module.exports = {
 	Ret

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mm_expand",
-	"version": "2.2.1",
+	"version": "2.2.3",
 	"description": "Super Meimei Prototype Function Extension Module - Enhanced operations for string, array, object, date manipulation with error prevention and simplified business logic.",
 	"main": "index.js",
 	"scripts": {