alemonjs 2.0.2 → 2.0.4

package/bin/start.js

@@ -1,27 +1,27 @@
 #!/usr/bin/env node
 
-import path from 'path';
+import path from 'path'
 import fs from 'fs'
-import { createRequire } from 'module';
-const require = createRequire(import.meta.url);
+import { createRequire } from 'module'
+const require = createRequire(import.meta.url)
 
-const createExports = (packageJson) => {
+const createExports = packageJson => {
   if (packageJson?.exports) {
     if (typeof packageJson.exports === 'string') {
-      return packageJson.exports;
+      return packageJson.exports
     } else if (typeof packageJson.exports === 'object') {
-      return packageJson.exports['.'] || packageJson.exports['./index.js'];
+      return packageJson.exports['.'] || packageJson.exports['./index.js']
     }
   }
 }
 
-const getInputExportPath = (input) => {
-  const packageJsonPath = path.join(input ?? process.cwd(), 'package.json');
+const getInputExportPath = input => {
+  const packageJsonPath = path.join(input ?? process.cwd(), 'package.json')
   if (fs.existsSync(packageJsonPath)) {
-    const packageJson = require(packageJsonPath);
-    const main = packageJson?.main || createExports(packageJson);
+    const packageJson = require(packageJsonPath)
+    const main = packageJson?.main || createExports(packageJson)
     if (main) {
-      return main;
+      return main
     }
   }
 }
@@ -32,7 +32,7 @@ const getInputExportPath = (input) => {
  */
 export const start = () => {
   // 读取配置文件
-  const main = getInputExportPath();
+  const main = getInputExportPath()
   import('../lib/index.js').then(res => {
     res.start(main)
   })

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

@@ -0,0 +1,15 @@
+import { DefinePlatformFunc } from '../typing/event/index.js';
+
+/**
+ * 定义机器人
+ * @param callback
+ * @returns
+ */
+declare const definePlatform: DefinePlatformFunc;
+/**
+ * 废弃，请使用 definePlatform
+ * @deprecated
+ */
+declare const defineBot: DefinePlatformFunc;
+
+export { defineBot, definePlatform };

package/lib/app/{event-bot.js → define-bot.js}

@@ -15,7 +15,7 @@ const definePlatform = callback => {
 };
 global.definePlatform = definePlatform;
 /**
- * 废弃
+ * 废弃，请使用 definePlatform
  * @deprecated
  */
 const defineBot = definePlatform;

package/lib/app/define-chidren.d.ts

@@ -0,0 +1,10 @@
+import { DefineChildrenFunc } from '../typing/event/index.js';
+
+/**
+ * 定义子事件
+ * @param callback
+ * @returns
+ */
+declare const defineChildren: DefineChildrenFunc;
+
+export { defineChildren };

package/lib/app/{event-chidren.js → define-chidren.js}

@@ -6,7 +6,7 @@
 const defineChildren = callback => {
     if (typeof callback === 'function' || typeof callback === 'object') {
         return {
-            _name: 'apps',
+            _name: 'app',
             callback
         };
     }

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

@@ -1,5 +1,4 @@
-import '../global.js';
-import { OnMiddlewareType, OnMiddlewareReversalType } from '../typing/event/index.js';
+import { OnMiddlewareReversalFunc, OnMiddlewareFunc } from '../typing/event/index.js';
 
 /**
  * @fileoverview 中间件
@@ -7,17 +6,17 @@ import { OnMiddlewareType, OnMiddlewareReversalType } from '../typing/event/inde
  * @author ningmengchongshui
  */
 
-/**
- * 废弃
- * @deprecated
- */
-declare const OnMiddleware: OnMiddlewareType;
 /**
  * 中间件
- * @param callback
- * @param select
+ * @param select 事件选择
+ * @param callback 回调函数，处理事件和 API
  * @returns
  */
-declare const onMiddleware: OnMiddlewareReversalType;
+declare const onMiddleware: OnMiddlewareReversalFunc;
+/**
+ * 废弃，请使用 onMiddleware
+ * @deprecated
+ */
+declare const OnMiddleware: OnMiddlewareFunc;
 
 export { OnMiddleware, onMiddleware };

package/lib/app/event-middleware.js

@@ -1,13 +1,7 @@
-/**
- * 废弃
- * @deprecated
- */
-const OnMiddleware = (callback, select) => ({ select, current: callback });
-global.OnMiddleware = OnMiddleware;
 /**
  * 中间件
- * @param callback
- * @param select
+ * @param select 事件选择
+ * @param callback 回调函数，处理事件和 API
  * @returns
  */
 const onMiddleware = (select, callback) => ({
@@ -15,5 +9,11 @@ const onMiddleware = (select, callback) => ({
     current: callback
 });
 global.onMiddleware = onMiddleware;
+/**
+ * 废弃，请使用 onMiddleware
+ * @deprecated
+ */
+const OnMiddleware = (callback, select) => ({ select, current: callback });
+global.OnMiddleware = OnMiddleware;
 
 export { OnMiddleware, onMiddleware };

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

@@ -1,6 +1,8 @@
 import { isAsyncFunction } from 'util/types';
 import { useState } from './hook-use-state.js';
 import { showErrorModule } from './utils.js';
+import { Response } from './store.js';
+import { useSend } from './hook-use-api.js';
 
 /**
  * @fileoverview 消息处理快
@@ -15,12 +17,11 @@ import { showErrorModule } from './utils.js';
  * @param key
  */
 const expendEvent = async (valueEvent, select, next) => {
-    // 得到所有 apps
-    const StoreResponse = [...alemonjsCore.storeResponse];
-    // 得到对应类型的消息
-    const StoreResponseGather = [...alemonjsCore.storeResponseGather[select]];
+    const res = new Response();
+    const Send = useSend(valueEvent);
+    // 得到所有 res
+    const StoreResponse = res.value;
     let valueI = 0;
-    let valueJ = 0;
     /**
      * 下一步
      * @returns
@@ -30,18 +31,12 @@ const expendEvent = async (valueEvent, select, next) => {
             next(...cns);
             return;
         }
-        // i 结束了
+        // 结束了
         if (valueI >= StoreResponse.length) {
-            // j 结束了
-            if (valueJ >= StoreResponseGather.length) {
-                next();
-                return;
-            }
-            // 走 j，检查所有分毫类型的
-            callj();
+            next();
             return;
         }
-        // 走 i，检查所有 apps
+        // 检查所有
         calli();
     };
     /**
@@ -67,20 +62,20 @@ const expendEvent = async (valueEvent, select, next) => {
             const app = await import(`file://${file.path}`);
             if (!app?.default) {
                 // 继续
-                await nextEvent();
+                nextEvent();
                 return;
             }
             if (!app.default?.current) {
                 // 继续
-                await nextEvent();
+                nextEvent();
                 return;
             }
             // 检查状态
-            if (file?.state) {
-                const [state] = useState(file?.state);
+            if (file?.stateKey) {
+                const [state] = useState(file?.stateKey);
                 if (state == false) {
                     // 继续
-                    await nextEvent();
+                    nextEvent();
                     return;
                 }
             }
@@ -101,33 +96,14 @@ const expendEvent = async (valueEvent, select, next) => {
                     nextEvent();
                     return;
                 }
-                // 不是数组写法的。会触发分类
-                // 判断是否已经分类
-                if (!alemonjsCore.storeResponseGather[select].find(v => v.path === file.path)) {
-                    // 得到index
-                    const index = alemonjsCore.storeResponse.findIndex(v => v.path === file.path);
-                    // 分类
-                    alemonjsCore.storeResponse.splice(index, 1);
-                    // 转移存储
-                    alemonjsCore.storeResponseGather[select].push({
-                        source: file.source,
-                        dir: file.dir,
-                        path: file.path,
-                        name: file.name,
-                        node: file.node,
-                        value: {
-                            select: app.default.select
-                        }
-                    });
-                }
             }
             // 消息类型数据
-            if (select == 'message.create' || select == 'private.message.create') {
+            if (['message.create', 'private.message.create'].includes(select)) {
                 if (app?.regular) {
                     const reg = new RegExp(app.regular);
                     if (!reg.test(valueEvent['MessageText'])) {
                         // 继续
-                        await nextEvent();
+                        nextEvent();
                         return;
                     }
                 }
@@ -135,6 +111,31 @@ const expendEvent = async (valueEvent, select, next) => {
             if (Array.isArray(app.default.current)) {
                 let i = 0;
                 let T = true;
+                let isNext = false;
+                const onRes = (res) => {
+                    if (isNext) {
+                        // 内部调用了next
+                        return;
+                    }
+                    if (typeof res === 'boolean') {
+                        T = res;
+                    }
+                    else if (Array.isArray(res)) {
+                        if (res.length > 0) {
+                            // 发送数据
+                            Send(...res);
+                        }
+                    }
+                    else if (typeof res === 'object') {
+                        if (typeof res?.allowGrouping === 'boolean') {
+                            T = res.allowGrouping;
+                        }
+                        if (Array.isArray(res.data)) {
+                            // 发送数据
+                            Send(...res.data);
+                        }
+                    }
+                };
                 const start = async () => {
                     if (i >= app.default.current.length)
                         return;
@@ -142,10 +143,18 @@ const expendEvent = async (valueEvent, select, next) => {
                     if (!T)
                         return;
                     if (isAsyncFunction(app.default.current[i])) {
-                        T = await app.default.current[i](valueEvent, nextEvent);
+                        const res = await app.default.current[i](valueEvent, (...cns) => {
+                            isNext = true;
+                            nextEvent(...cns);
+                        });
+                        onRes(res);
                     }
                     else {
-                        T = await app.default.current[i](valueEvent, nextEvent);
+                        const res = app.default.current[i](valueEvent, (...cns) => {
+                            isNext = true;
+                            nextEvent(...cns);
+                        });
+                        onRes(res);
                     }
                     ++i;
                     await start();
@@ -153,101 +162,51 @@ const expendEvent = async (valueEvent, select, next) => {
                 await start();
             }
             else {
-                // 这里是否继续时 next 说了算
-                if (isAsyncFunction(app.default?.current)) {
-                    app.default?.current(valueEvent, nextEvent);
-                }
-                else {
-                    app.default?.current(valueEvent, nextEvent);
-                }
-            }
-        }
-        catch (err) {
-            showErrorModule(err);
-        }
-    };
-    /**
-     * 被分类好的
-     * @returns
-     */
-    const callj = async () => {
-        // 调用完了
-        if (valueJ >= StoreResponseGather.length) {
-            return;
-        }
-        valueJ++;
-        const file = StoreResponseGather[valueJ - 1];
-        if (!file?.path) {
-            nextEvent();
-            return;
-        }
-        try {
-            const app = await import(`file://${file.path}`);
-            if (!app?.default) {
-                // 继续
-                await nextEvent();
-                return;
-            }
-            if (!app.default?.current) {
-                // 继续
-                await nextEvent();
-                return;
-            }
-            // 检查状态
-            if (file?.state) {
-                const [state] = useState(file?.state);
-                if (state == false) {
-                    // 继续
-                    await nextEvent();
-                    return;
-                }
-            }
-            // 消息类型数据
-            if (select == 'message.create' || select == 'private.message.create') {
-                if (app?.regular) {
-                    const reg = new RegExp(app.regular);
-                    if (!reg.test(valueEvent['MessageText'])) {
-                        // 继续
-                        await nextEvent();
+                let isNext = false;
+                const onRes = (res) => {
+                    if (isNext) {
+                        // 内部调用了next
                         return;
                     }
-                }
-            }
-            if (Array.isArray(app.default.current)) {
-                let i = 0;
-                let T = true;
-                const start = async () => {
-                    if (i >= app.default.current.length)
-                        return;
-                    // 不是真的事件 退出
-                    if (!T)
-                        return;
-                    if (isAsyncFunction(app.default.current[i])) {
-                        T = await app.default.current[i](valueEvent, nextEvent);
+                    if (typeof res === 'boolean') {
+                        // T = res
                     }
-                    else {
-                        T = await app.default.current[i](valueEvent, nextEvent);
+                    else if (Array.isArray(res)) {
+                        if (res.length > 0) {
+                            // 发送数据
+                            Send(...res);
+                        }
+                    }
+                    else if (typeof res === 'object') {
+                        if (typeof res?.allowGrouping === 'boolean') {
+                            // T = res.allowGrouping
+                        }
+                        if (Array.isArray(res.data)) {
+                            // 发送数据
+                            Send(...res.data);
+                        }
                     }
-                    ++i;
-                    await start();
                 };
-                await start();
-            }
-            else {
                 // 这里是否继续时 next 说了算
                 if (isAsyncFunction(app.default?.current)) {
-                    app.default?.current(valueEvent, nextEvent);
+                    const res = await app.default?.current(valueEvent, (...cns) => {
+                        isNext = true;
+                        nextEvent(...cns);
+                    });
+                    onRes(res);
                 }
                 else {
-                    app.default?.current(valueEvent, nextEvent);
+                    const res = app.default?.current(valueEvent, (...cns) => {
+                        isNext = true;
+                        nextEvent(...cns);
+                    });
+                    onRes(res);
                 }
             }
-            //
         }
         catch (err) {
             showErrorModule(err);
         }
-        //
     };
     nextEvent();
 };