mm_machine 2.4.2 → 2.4.4

package/drive.js

@@ -3,6 +3,7 @@ require('mm_tpl');
 let {
   conf
 } = require('mm_config');
+// const { Word } = require('./ulits/word.js');
 const {
   Mod
 } = require('./mod');
@@ -617,7 +618,12 @@ Drive.prototype._delArray = function (file, config, name) {
  * @returns {string} 配置文件名称
  */
 Drive.prototype._getName = function (file) {
-  return file.dirname().basename();
+  let name = file.dirname().basename();
+  return name;
+  // // 提取文件名作为模块名
+  // var word = new Word();
+  // // 将文件名改为驼峰命名法
+  // return word.toCamelCase(name);
 };
 
 /**
@@ -639,8 +645,8 @@ Drive.prototype.loadBefore = function () {
  * 加载处理
  */
 Drive.prototype._loadCore = function () {
-  this.loadConfig();
-  this.loadScript();
+  // this.loadConfig();
+  // this.loadScript();
 };
 
 /**

package/index.js

@@ -86,8 +86,9 @@ class Manager extends Mod {
    * 构造函数
    * @param {object} config 配置项
    * @param {object} parent 父项对象
+   * @param {object} mods 模块对象列表
    */
-  constructor(config, parent) {
+  constructor(config, parent, mods = {}) {
     super({
       ...Manager.config,
       ...config
@@ -96,7 +97,7 @@ class Manager extends Mod {
     // 模块信息列表 { name: '', sort: 0, available: true, enabled: true }
     this.infos = [];
     // 模块
-    this.mods = {};
+    this.mods = mods;
   }
 }
 
@@ -296,7 +297,7 @@ Manager.prototype.newMod = function (config_file, config, script) {
  * @param {object} script 模块对象
  * @returns {object} 模块对象
  */
-Manager.prototype.register = function (config_file, config = {}, script = {}) {
+Manager.prototype.registerMod = function (config_file, config = {}, script = {}) {
   let mod = this.newMod(config_file, config, script);
   this.setMod(mod.config.name, mod);
   return mod;
@@ -307,7 +308,7 @@ Manager.prototype.register = function (config_file, config = {}, script = {}) {
  * @param {string} name 模块名
  * @returns {Promise<any>} 加载结果
  */
-Manager.prototype.load = async function (name) {
+Manager.prototype.loadMod = async function (name) {
   let mod = this.getMod(name);
   if (mod) {
     return await mod.do('load');
@@ -320,7 +321,7 @@ Manager.prototype.load = async function (name) {
  * @param {string} name 模块名
  * @returns {Promise<any>} 卸载结果
  */
-Manager.prototype.unload = async function (name) {
+Manager.prototype.unloadMod = async function (name) {
   let mod = this.getMod(name);
   if (mod) {
     return await mod.do('unload');
@@ -333,7 +334,7 @@ Manager.prototype.unload = async function (name) {
  * @param {string} name 模块名
  * @returns {Promise<any>} 重载结果
  */
-Manager.prototype.reload = async function (name) {
+Manager.prototype.reloadMod = async function (name) {
   let mod = this.getMod(name);
   if (mod) {
     return await mod.do('reload');
@@ -346,11 +347,11 @@ Manager.prototype.reload = async function (name) {
  * @param {string} name 模块名
  * @returns {Promise<any>} 注销结果
  */
-Manager.prototype.unregister = function (name) {
+Manager.prototype.unregisterMod = function (name) {
   // 卸载模块
-  this.unload(name);
+  this.unloadMod(name);
   // 删除模块
-  this.delMod(name);
+  let mod = this.delMod(name);
   return mod;
 };
 
@@ -360,16 +361,16 @@ Manager.prototype.unregister = function (name) {
  * @param {object} config 配置项
  * @param {object} script 模块对象
  */
-Manager.prototype.batchRegister = function (files, config = {}, script = {}) {
+Manager.prototype.registerMods = function (files, config = {}, script = {}) {
   for (let file of files) {
-    this.register(file, config, script);
+    this.registerMod(file, config, script);
   }
 };
 
 /**
  * 加载所有模块
  */
-Manager.prototype.loads = async function () {
+Manager.prototype.loadMods = async function () {
   var promises = [];
   for (let name in this.mods) {
     let mod = this.mods[name];
@@ -473,7 +474,7 @@ Manager.prototype.update = async function (dir, clear = true) {
   // 查找所有json文件
   let files = this._findFiles(dir || this.config.dir);
   // 批量注册模块
-  this.batchRegister(files);
+  this.registerMods(files);
   // 更新配置信息
   this.updateInfo();
   if (!this.config.lazy_load) {
@@ -614,25 +615,28 @@ Manager.prototype._initManager = function () {
 /**
  * 加载资源
  */
-Manager.prototype._loadSources = function () {
+Manager.prototype._loadSources = async function () {
+  // 通过更新函数加载资源信息
+  await this.call('update');
 };
 
 /**
  * 初始化资源
  */
-Manager.prototype._initSources = function () {
+Manager.prototype._initSources = async function () {
+  // 通过
 };
 
 /**
  * 初始化公共属性
  */
-Manager.prototype._initCore = function () {
+Manager.prototype._initCore = async function () {
   // 初始化管理器
   this._initManager();
   // 加载资源
-  this._loadSources();
+  await this._loadSources();
   // 初始化AI客户端
-  this._initSources();
+  await this._initSources();
 };
 
 module.exports = {

package/mod.js

@@ -238,11 +238,19 @@ Mod.prototype._onDestroy = async function (ctx) {
   });
 };
 
+/**
+ * 加载 - 内部方法
+ * @private
+ */
+Mod.prototype._load = async function () {
+  return this;
+};
+
 /**
  * 加载
  */
 Mod.prototype.load = async function () {
-
+  return await this._load();
 };
 
 /**
@@ -253,38 +261,65 @@ Mod.prototype._loadCore = async function () {
 };
 
 /**
- * 启动
+ * 启动 - 内部方法
+ * @private
+ * @param {...any} args 初始化参数
  */
-Mod.prototype.start = async function () {
+Mod.prototype._start = async function (...args) {
+  return this;
+};
 
+/**
+ * 启动
+ */
+Mod.prototype.start = async function (...args) {
+  return await this._start(...args);
 };
 
 /**
  * 启动核心
+ * @private
  */
 Mod.prototype._startCore = async function () {
 
 };
 
+/**
+ * 停止 - 内部方法
+ * @private
+ */
+Mod.prototype._stop = async function () {
+  return this;
+};
+
 /**
  * 停止
  */
 Mod.prototype.stop = async function () {
-
+  return await this._stop();
 };
 
 /**
  * 停止核心
+ * @private
  */
 Mod.prototype._stopCore = async function () {
 
 };
 
+/**
+ * 卸载 - 内部方法
+ * @private
+ */
+Mod.prototype._unload = async function () {
+  return this;
+};
+
 /**
  * 卸载
  */
 Mod.prototype.unload = async function () {
-
+  return await this._unload();
 };
 
 /**
@@ -329,13 +364,29 @@ Mod.prototype.end = async function () {
   await this.do('destroy');
 };
 
+/**
+ * 获取事件管理器
+ * @returns {Eventer|null} 事件管理器
+ */
+Mod.prototype.getEventer = function () {
+  return this._eventer || $.eventer;
+};
+
+/**
+ * 设置事件管理器
+ * @param {Eventer} eventer 事件管理器
+ */
+Mod.prototype.setEventer = function (eventer) {
+  this._eventer = eventer;
+};
+
 /**
  * 触发事件
  * @param {string} event 事件名
  * @param {...any} args 事件参数
  */
 Mod.prototype.emitEvent = function (event, ...args) {
-  this._eventer?.emit(event, ...args);
+  this.getEventer()?.emit(event, ...args);
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_machine",
-  "version": "2.4.2",
+  "version": "2.4.4",
   "description": "A flexible Node.js plugin mechanism system for dynamic loading, management and execution of modules. Supports hot reload, lifecycle management, and modern JavaScript features.",
   "main": "index.js",
   "scripts": {