mm_expand 2.0.4 → 2.0.6

package/lib/base.js

@@ -8,41 +8,24 @@ require('./global');
  * 基础类
  */
 class Base extends Event {
-  static config = {
-    // 模块名称
-    name: '',
-    // 模块标题
-    title: '',
-    // 模块描述
-    description: '',
-    // 状态, 可选值: 1-启用, 0-禁用
-    state: 1
-  };
-
   /**
    * 构造函数
    * @param {object} config 配置参数
-   * @param {object} parent 父模块
    */
-  constructor(config, parent = null) {
+  constructor(config) {
     super();
-    /**
-     * 配置参数
-     * @type {object}
-     */
-    this.config = { ...this.constructor.config };
-
     /**
      * 状态
      * @type {string} - 状态, 可选值: creating, created, initing, inited, loading, loaded, starting, running, stopping, stopped, unloading, unloaded, destroying, destroyed
      */
     this.status = 'creating';
 
-    // 设置配置
-    this.setConfig(config);
     // 初始化监听
     this._initListen();
-    
+    // 设置配置
+    this.setConfig(config);
+
+    // 状态变更为 created 已完成
     this.status = 'created';
   }
 }
@@ -54,7 +37,7 @@ class Base extends Event {
  * @param  {...any} params 日志参数
  */
 Base.prototype.log = function (level, message, ...params) {
-  this._logger[level](`[${this.constructor.name}] [${this.config.name}]  ${message}`, ...params);
+  this._logger[level](`[${this.constructor.name}] ${message}`, ...params);
 };
 
 /**
@@ -70,55 +53,11 @@ Base.prototype._initListen = function () {
   this.on('init:after', (ctx) => {
     this.status = 'inited';
   });
-  // 加载
-  this.on('load:before', (ctx) => {
-    status_last = this.status;
-    this.status = 'loading';
-  });
-  this.on('load:after', (ctx) => {
-    this.status = 'loaded';
-  });
-  // 启动
-  this.on('start:before', (ctx) => {
-    status_last = this.status;
-    this.status = 'starting';
-  });
-  this.on('start:success', (ctx) => {
-    this.status = 'running';
-  });
-  this.on('start:error', (ctx) => {
-    this.status = status_last;
-  });
-  // 停止
-  this.on('stop:before', (ctx) => {
-    status_last = this.status;
-    this.status = 'stopping';
-  });
-  this.on('stop:success', (ctx) => {
-    this.status = 'stopped';
-  });
-  this.on('stop:error', (ctx) => {
-    this.status = status_last;
-  });
-  // 卸载
-  this.on('unload:before', (ctx) => {
-    status_last = this.status;
-    this.status = 'unloading';
-  });
-  this.on('unload:after', (ctx) => {
-    this.status = 'unloaded';
-  });
   // 销毁
   this.on('destroy:before', (ctx) => {
     status_last = this.status;
     this.status = 'destroying';
   });
-  this.on('destroy:check', (ctx) => {
-    if (status_last !== 'stopped') {
-      status_last = this.status;
-      ctx.error = new Error('销毁前必须先停止');
-    }
-  });
   this.on('destroy:success', (ctx) => {
     this.status = 'destroyed';
   });
@@ -134,7 +73,10 @@ Base.prototype._initListen = function () {
  */
 Base.prototype.setConfig = function (config) {
   if (config) {
-    Object.assign(this.config, config);
+    if (typeof config !== 'object') {
+      throw new TypeError('配置参数必须是对象');
+    }
+    Object.assign(...this.constructor.config, this.config, config);
   }
   return this.config;
 };
@@ -158,20 +100,6 @@ Base.prototype.init = async function (...params) {
   return this;
 };
 
-/**
- * 启动
- */
-Base.prototype.start = async function () {
-
-};
-
-/**
- * 停止
- */
-Base.prototype.stop = async function () {
-
-};
-
 /**
  * 销毁
  */
@@ -179,31 +107,6 @@ Base.prototype.destroy = async function () {
 
 };
 
-/**
- * 重启
- */
-Base.prototype.restart = async function () {
-  await this.do('stop');
-  await this.do('start');
-};
-
-/**
- * 是否运行中
- * @returns {boolean} 是否运行中
- */
-Base.prototype.isRunning = function () {
-  return this.status === 'running';
-};
-
-/**
- * 结束
- */
-Base.prototype.end = async function () {
-  await this.do('stop');
-  await this.do('destroy');
-};
-
-
 /**
  * 事件驱动
  * @param {string} method 方法名称
@@ -246,22 +149,19 @@ Base.prototype._do = async function (method, ...params) {
     }
 
     await this._doExecuteMethod(method, ctx);
-
-    // 如果执行成功，进行成功处理
-    if (!ctx.error) {
-      await this._doSuccessProcess(method, ctx);
-    }
-
-    // return ctx.result;
   } catch (error) {
     ctx.error = error;
-
+  }
+  if (ctx.error) {
     // 执行错误处理
     await this._doErrorProcess(method, ctx);
-  } finally {
-    // 无论成功失败，都要执行后处理
-    await this._doAfterProcess(method, ctx);
   }
+  else {
+    // 如果执行成功，进行成功处理
+    await this._doSuccessProcess(method, ctx);
+  }
+  // 无论成功失败，都要执行后处理
+  await this._doAfterProcess(method, ctx);
   return ctx;
 };
 

package/lib/event.js

@@ -16,6 +16,10 @@ class Event {
    * @param {object} config 配置参数
    */
   constructor(config) {
+    /**
+     * 配置参数
+     * @type {object} - 配置参数
+     */
     this.config = {
       ...Event.config,
       ...config || {}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mm_expand",
-	"version": "2.0.4",
+	"version": "2.0.6",
 	"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": {