alemonjs 2.0.0-rc.99 → 2.0.1

package/bin/alemonc.js

@@ -2,68 +2,65 @@
 import { updateConfig } from './updateConfig.js'
 import { run } from './run.js'
 import { start } from './start.js'
-import { Command } from 'commander';
-const program = new Command();
+import { Command } from 'commander'
+const program = new Command()
 
-program
-  .name('alemonc')
-  .description('CLI to some alemonc actions and scripts')
-  .version('1.0.0');
+program.name('alemonc').description('CLI to some alemonc actions and scripts').version('1.0.0')
 
 program
   .command('add <key> [values...]')
   .description('给key为数据的值添加元素')
   .action((key, values) => {
     updateConfig('add', key, values)
-  });
+  })
 
 program
   .command('remove <key> [values...]')
   .description('给key为数据的值移除元素')
   .action((key, values) => {
     updateConfig('remove', key, values)
-  });
+  })
 
 program
   .command('set <key> [values...]')
   .description('给某个key设置值')
   .action((key, values) => {
     updateConfig('set', key, values)
-  });
+  })
 
 program
   .command('del <key>')
   .description('删除指定配置')
-  .action((key) => {
+  .action(key => {
     updateConfig('del', key)
-  });
+  })
 
 program
   .command('get <key>')
   .description('获取指定配置')
-  .action((key) => {
+  .action(key => {
     updateConfig('get', key)
-  });
+  })
 
 program
   .command('run [script]')
   .description('运行指定脚本')
-  .action((script) => {
+  .action(script => {
     run(script)
-  });
+  })
 
 program
   .command('start')
   .description('启动 package.json 中的 main 入口')
   .action(() => {
     start()
-  });
+  })
 
 program
   .command('help')
   .description('获取帮助')
   .action(() => {
     program.help()
-  });
+  })
 
-program.parse(process.argv);
+program.parse(process.argv)

package/bin/run.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 
 /**
- * 
- * @param {*} dir 
+ *
+ * @param {*} dir
  */
-export const run = (dir) => {
-    import('../lib/index.js').then(res => {
-        res.start(dir)
-    })
-}
+export const run = dir => {
+  import('../lib/index.js').then(res => {
+    res.start(dir)
+  })
+}

package/bin/start.js

@@ -4,15 +4,15 @@ import { readFileSync } from 'fs'
 import { join } from 'path'
 
 /**
- * 
- * @param {*} dir 
+ *
+ * @param {*} dir
  */
 export const start = () => {
-    // 读取配置文件
-    const dir = join(process.cwd(), 'package.json')
-    const start = readFileSync(dir, 'utf-8')
-    const { main } = JSON.parse(start) ?? {}
-    import('../lib/index.js').then(res => {
-        res.start(main)
-    })
-}
+  // 读取配置文件
+  const dir = join(process.cwd(), 'package.json')
+  const start = readFileSync(dir, 'utf-8')
+  const { main } = JSON.parse(start) ?? {}
+  import('../lib/index.js').then(res => {
+    res.start(main)
+  })
+}

package/bin/updateConfig.js

@@ -80,4 +80,4 @@ export function updateConfig(action, key, value = []) {
   }
 
   fs.writeFileSync(configPath, YAML.stringify(config))
-}
+}

package/lib/app/event-bot.d.ts

@@ -1,11 +1,16 @@
 import '../global.js';
-import { DefineBot } from '../typing/event/index.js';
+import { DefinePlatform } from '../typing/event/index.js';
 
 /**
  * 定义机器人
  * @param callback
  * @returns
  */
-declare const defineBot: DefineBot;
+declare const definePlatform: DefinePlatform;
+/**
+ * 废弃
+ * @deprecated
+ */
+declare const defineBot: DefinePlatform;
 
-export { defineBot };
+export { defineBot, definePlatform };

package/lib/app/event-bot.js

@@ -3,7 +3,7 @@
  * @param callback
  * @returns
  */
-const defineBot = callback => {
+const definePlatform = callback => {
     // 判断是否是函数
     if (typeof callback !== 'function') {
         throw new Error('Invalid callback: callback must be a function');
@@ -13,6 +13,12 @@ const defineBot = callback => {
         callback
     };
 };
+global.definePlatform = definePlatform;
+/**
+ * 废弃
+ * @deprecated
+ */
+const defineBot = definePlatform;
 global.defineBot = defineBot;
 
-export { defineBot };
+export { defineBot, definePlatform };

package/lib/app/event-middleware.d.ts

@@ -1,5 +1,5 @@
 import '../global.js';
-import { OnMiddlewareType } from '../typing/event/index.js';
+import { OnMiddlewareType, OnMiddlewareReversalType } from '../typing/event/index.js';
 
 /**
  * @fileoverview 中间件
@@ -7,12 +7,17 @@ import { OnMiddlewareType } from '../typing/event/index.js';
  * @author ningmengchongshui
  */
 
+/**
+ * 废弃
+ * @deprecated
+ */
+declare const OnMiddleware: OnMiddlewareType;
 /**
  * 中间件
  * @param callback
  * @param select
  * @returns
  */
-declare const OnMiddleware: OnMiddlewareType;
+declare const onMiddleware: OnMiddlewareReversalType;
 
-export { OnMiddleware };
+export { OnMiddleware, onMiddleware };

package/lib/app/event-middleware.js

@@ -1,10 +1,19 @@
+/**
+ * 废弃
+ * @deprecated
+ */
+const OnMiddleware = (callback, select) => ({ select, current: callback });
+global.OnMiddleware = OnMiddleware;
 /**
  * 中间件
  * @param callback
  * @param select
  * @returns
  */
-const OnMiddleware = (callback, select) => ({ select, current: callback });
-global.OnMiddleware = OnMiddleware;
+const onMiddleware = (select, callback) => ({
+    select,
+    current: callback
+});
+global.onMiddleware = onMiddleware;
 
-export { OnMiddleware };
+export { OnMiddleware, onMiddleware };

package/lib/app/event-processor-cycle.js

@@ -7,7 +7,7 @@ import { expendSubscribeCreate, expendSubscribeMount, expendSubscribeUnmount } f
  * @param event
  * @param select
  */
-const Log = (event, select) => {
+const showLog = (event, select) => {
     const logs = [`[${select}]`];
     if (typeof event['ChannelId'] == 'string' && event['ChannelId'] != '') {
         logs.push(`[${event['ChannelId']}]`);
@@ -63,7 +63,7 @@ const expendCycle = async (valueEvent, select) => {
         }
         expendMiddleware(valueEvent, select, nextMount);
     };
-    const log = Log(valueEvent, select);
+    const log = showLog(valueEvent, select);
     logger.info(log.join(''));
     // create
     expendSubscribeCreate(valueEvent, select, nextCreate);

package/lib/app/event-processor-event.js

@@ -1,6 +1,6 @@
 import { isAsyncFunction } from 'util/types';
 import { useState } from './hook-use-state.js';
-import { ErrorModule } from './utils.js';
+import { showErrorModule } from './utils.js';
 
 /**
  * @fileoverview 消息处理快
@@ -76,8 +76,8 @@ const expendEvent = async (valueEvent, select, next) => {
                 return;
             }
             // 检查状态
-            if (app?.name) {
-                const [state] = useState(app?.name);
+            if (file?.state) {
+                const [state] = useState(file?.state);
                 if (state == false) {
                     // 继续
                     await nextEvent();
@@ -114,6 +114,7 @@ const expendEvent = async (valueEvent, select, next) => {
                         dir: file.dir,
                         path: file.path,
                         name: file.name,
+                        node: file.node,
                         value: {
                             select: app.default.select
                         }
@@ -162,7 +163,7 @@ const expendEvent = async (valueEvent, select, next) => {
             }
         }
         catch (err) {
-            ErrorModule(err);
+            showErrorModule(err);
         }
     };
     /**
@@ -193,8 +194,8 @@ const expendEvent = async (valueEvent, select, next) => {
                 return;
             }
             // 检查状态
-            if (app?.name) {
-                const [state] = useState(app?.name);
+            if (file?.state) {
+                const [state] = useState(file?.state);
                 if (state == false) {
                     // 继续
                     await nextEvent();
@@ -244,7 +245,7 @@ const expendEvent = async (valueEvent, select, next) => {
             //
         }
         catch (err) {
-            ErrorModule(err);
+            showErrorModule(err);
         }
         //
     };

package/lib/app/event-processor-middleware.js

@@ -1,6 +1,6 @@
 import { isAsyncFunction } from 'util/types';
 import { useState } from './hook-use-state.js';
-import { ErrorModule } from './utils.js';
+import { showErrorModule } from './utils.js';
 
 /**
  * @fileoverview 消息处理快
@@ -75,8 +75,8 @@ const expendMiddleware = async (valueEvent, select, next) => {
                 return;
             }
             // 检查状态
-            if (app?.name) {
-                const [state] = useState(app?.name);
+            if (file?.state) {
+                const [state] = useState(file?.state);
                 if (state == false) {
                     // 继续
                     await nextMiddleware();
@@ -113,6 +113,7 @@ const expendMiddleware = async (valueEvent, select, next) => {
                         dir: file.dir,
                         path: file.path,
                         name: file.name,
+                        node: file.node,
                         value: {
                             select: app.default?.select ?? select
                         }
@@ -150,7 +151,7 @@ const expendMiddleware = async (valueEvent, select, next) => {
             }
         }
         catch (err) {
-            ErrorModule(err);
+            showErrorModule(err);
         }
     };
     /**
@@ -180,8 +181,8 @@ const expendMiddleware = async (valueEvent, select, next) => {
                 await nextMiddleware();
                 return;
             }
-            if (app?.name) {
-                const [state] = useState(app?.name);
+            if (file?.state) {
+                const [state] = useState(file?.state);
                 if (state == false) {
                     // 继续
                     await nextMiddleware();
@@ -219,7 +220,7 @@ const expendMiddleware = async (valueEvent, select, next) => {
             }
         }
         catch (err) {
-            ErrorModule(err);
+            showErrorModule(err);
         }
         //
     };

package/lib/app/event-processor.js

@@ -1,12 +1,6 @@
-import './event-bot.js';
-import './event-chidren.js';
-import './event-middleware.js';
-import './event-utlis.js';
-import './hook-use-state.js';
-import { createHash } from './utils.js';
 import { getConfigValue } from '../config.js';
-import '../global.js';
 import { expendCycle } from './event-processor-cycle.js';
+import { createHash } from './utils.js';
 
 const MIN_TIME = 3000;
 const MAX_TIME = 10000;

package/lib/app/event-utlis.d.ts

@@ -1,5 +1,5 @@
 import '../global.js';
-import { OnResponseType } from '../typing/event/index.js';
+import { OnResponseType, OnResponseReversalType } from '../typing/event/index.js';
 
 /**
  * 处理响应事件
@@ -9,5 +9,10 @@ import { OnResponseType } from '../typing/event/index.js';
  * @returns 回调函数的执行结果
  */
 declare const OnResponse: OnResponseType;
+/**
+ * 废弃
+ * @deprecated
+ */
+declare const onResponse: OnResponseReversalType;
 
-export { OnResponse };
+export { OnResponse, onResponse };

package/lib/app/event-utlis.js

@@ -9,5 +9,13 @@ const OnResponse = (callback, select) => {
     return { current: callback, select };
 };
 global.OnResponse = OnResponse;
+/**
+ * 废弃
+ * @deprecated
+ */
+const onResponse = (select, callback) => {
+    return { current: callback, select };
+};
+global.onResponse = onResponse;
 
-export { OnResponse };
+export { OnResponse, onResponse };

package/lib/app/hook-use-api.d.ts

@@ -1,4 +1,5 @@
 import '../global.js';
+import { Events } from '../typing/event/map.js';
 import { User } from '../typing/event/base/user.js';
 import { DataEnums } from '../typing/message/index.js';
 
@@ -25,6 +26,17 @@ declare const useSend: (event: {
  * @param {string} mainDir - 模块的主目录路径。
  * @throws {Error} - 如果 mainDir 无效，抛出错误。
  */
+declare const unChildren: (mainDir: string) => void;
+/**
+ * 废弃,请使用unChildren
+ * @deprecated
+ */
 declare const unMount: (mainDir: string) => void;
+/**
+ *
+ * @param values
+ * @returns
+ */
+declare const createSelects: <T extends (keyof Events)[] | keyof Events>(values: T) => T;
 
-export { unMount, useMention, useSend };
+export { createSelects, unChildren, unMount, useMention, useSend };

package/lib/app/hook-use-api.js

@@ -28,7 +28,8 @@ const useSend = (event) => {
     }
     return async (...val) => {
         if (!val || val.length === 0) {
-            throw new Error('Invalid data: data cannot be empty');
+            logger.error('Invalid val: val must be a non-empty array');
+            return;
         }
         try {
             return await alemonjsBot.api.use.send(event, val);
@@ -46,7 +47,7 @@ const useSend = (event) => {
  * @param {string} mainDir - 模块的主目录路径。
  * @throws {Error} - 如果 mainDir 无效，抛出错误。
  */
-const unMount = (mainDir) => {
+const unChildren = (mainDir) => {
     if (!mainDir || typeof mainDir !== 'string') {
         throw new Error('Invalid mainDir: mainDir must be a non-empty string');
     }
@@ -78,5 +79,16 @@ const unMount = (mainDir) => {
         }
     }
 };
+/**
+ * 废弃,请使用unChildren
+ * @deprecated
+ */
+const unMount = unChildren;
+/**
+ *
+ * @param values
+ * @returns
+ */
+const createSelects = (values) => values;
 
-export { unMount, useMention, useSend };
+export { createSelects, unChildren, unMount, useMention, useSend };

package/lib/app/hook-use-state.d.ts

@@ -16,12 +16,22 @@ declare const useState: <T extends string>(name: T, defaultValue?: boolean) => [
  * @param name 功能名
  * @param callback 回调函数
  */
+declare const onState: <T extends string>(name: T, callback: (value: boolean) => void) => void;
+/**
+ * 废弃
+ * @deprecated
+ */
 declare const eventState: <T extends string>(name: T, callback: (value: boolean) => void) => void;
 /**
  * 取消订阅状态变化
  * @param name 功能名
  * @param callback 回调函数
  */
+declare const unState: <T extends string>(name: T, callback: (value: boolean) => void) => void;
+/**
+ * 废弃
+ * @deprecated
+ */
 declare const unEventState: <T extends string>(name: T, callback: (value: boolean) => void) => void;
 
-export { eventState, unEventState, useState };
+export { eventState, onState, unEventState, unState, useState };

package/lib/app/hook-use-state.js

@@ -1,21 +1,23 @@
 // 存储订阅者
 const subscriptions = {};
-// 初始化全局状态
-alemonjsCore.storeState = new Proxy({}, {
-    get(target, prop) {
-        return prop in target ? target[prop] : false;
-    },
-    set(target, prop, value) {
-        target[prop] = value;
-        // 通知所有订阅者
-        if (subscriptions[prop]) {
-            for (const callback of subscriptions[prop]) {
-                callback(value);
+if (!alemonjsCore.storeState) {
+    // 初始化全局状态
+    alemonjsCore.storeState = new Proxy({}, {
+        get(target, prop) {
+            return prop in target ? target[prop] : false;
+        },
+        set(target, prop, value) {
+            target[prop] = value;
+            // 通知所有订阅者
+            if (subscriptions[prop]) {
+                for (const callback of subscriptions[prop]) {
+                    callback(value);
+                }
             }
+            return true; // 表示设置成功
         }
-        return true; // 表示设置成功
-    }
-});
+    });
+}
 /**
  * 获取指定功能是启动还是关闭
  * ***
@@ -44,7 +46,7 @@ const useState = (name, defaultValue = true) => {
  * @param name 功能名
  * @param callback 回调函数
  */
-const eventState = (name, callback) => {
+const onState = (name, callback) => {
     if (typeof callback !== 'function') {
         throw new Error('Callback must be a function');
     }
@@ -53,15 +55,25 @@ const eventState = (name, callback) => {
     }
     subscriptions[name].push(callback);
 };
+/**
+ * 废弃
+ * @deprecated
+ */
+const eventState = onState;
 /**
  * 取消订阅状态变化
  * @param name 功能名
  * @param callback 回调函数
  */
-const unEventState = (name, callback) => {
+const unState = (name, callback) => {
     if (subscriptions[name]) {
         subscriptions[name] = subscriptions[name].filter(cb => cb !== callback);
     }
 };
+/**
+ * 废弃
+ * @deprecated
+ */
+const unEventState = unState;
 
-export { eventState, unEventState, useState };
+export { eventState, onState, unEventState, unState, useState };