alemonjs 2.1.0-alpha.50 → 2.1.0-alpha.52

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

@@ -1,101 +1,18 @@
-import { useState } from './hook-use-state.js';
-import { showErrorModule } from '../core/utils.js';
-import { Response } from './store.js';
-import { EventMessageText } from '../core/variable.js';
-import { expendEventRoute } from './event-processor-event-route.js';
+import { Response, ResponseRouter } from './store.js';
 import { createCallHandler } from './event-processor-callHandler.js';
+import { createNextStep } from './event-processor-cycleFiles.js';
+import { createRouteProcessChildren } from './event-processor-cycleRoute.js';
 
-/**
- * 消息体处理机制
- * @param event
- * @param key
- */
 const expendEvent = (valueEvent, select, next) => {
     const res = new Response();
-    // 得到所有 response
     const StoreResponse = res.value;
-    let valueI = 0;
-    // 开始处理 heandler
     const callHandler = createCallHandler(valueEvent);
-    /**
-     * 下一步
-     * @returns
-     */
-    const nextEvent = (cn, ...cns) => {
-        if (cn) {
-            next(...cns);
-            return;
-        }
-        // 结束了
-        if (valueI >= StoreResponse.length) {
-            next();
-            return;
-        }
-        // 检查所有
-        void calli();
-    };
-    /**
-     * 执行 i
-     * @returns
-     */
-    const calli = async () => {
-        // 调用完了
-        if (valueI >= StoreResponse.length) {
-            // 开始调用j
-            nextEvent();
-            return;
-        }
-        valueI++;
-        const file = StoreResponse[valueI - 1];
-        if (!file?.path) {
-            // 继续
-            nextEvent();
-            return;
-        }
-        //
-        try {
-            const app = await import(`file://${file.path}`);
-            if (!app?.default?.current || !app?.default?.select) {
-                // 继续
-                nextEvent();
-                return;
-            }
-            // 检查状态
-            if (file?.stateKey) {
-                const [state] = useState(file?.stateKey);
-                if (state === false) {
-                    // 继续
-                    nextEvent();
-                    return;
-                }
-            }
-            const selects = Array.isArray(app.default.select) ? app.default.select : [app.default.select];
-            // 没有匹配到
-            if (!selects.includes(select)) {
-                // 继续
-                nextEvent();
-                return;
-            }
-            // 消息类型数据
-            if (EventMessageText.includes(select)) {
-                if (app?.regular) {
-                    const reg = new RegExp(app.regular);
-                    if (!reg.test(valueEvent['MessageText'])) {
-                        // 继续
-                        nextEvent();
-                        return;
-                    }
-                }
-            }
-            const currents = Array.isArray(app.default.current) ? app.default.current : [app.default.current];
-            callHandler(currents, nextEvent);
-        }
-        catch (err) {
-            showErrorModule(err);
-        }
-    };
-    // 路由优先。路由的搞完了。再处理其他
-    expendEventRoute(valueEvent, select, nextEvent);
+    const nextEvent = createNextStep(valueEvent, select, next, StoreResponse, callHandler);
+    const resRoute = new ResponseRouter();
+    const routes = resRoute.value;
+    const callRouteHandler = createCallHandler(valueEvent);
+    const processChildren = createRouteProcessChildren(valueEvent, select, nextEvent, callRouteHandler);
+    void processChildren(routes, [], nextEvent);
 };
 
 export { expendEvent };

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

@@ -1,19 +1,2 @@
-import { Next } from '../types/cycle/index.js';
-import { EventKeys, Events } from '../types/event/map.js';
-
-/**
- * @fileoverview 消息处理快
- * 登录模块向核心模块发送数据
- * 核心模块调用模块索引
- * @module processor
- * @author ningmengchongshui
- */
-
-/**
- * 处理中间件
- * @param event
- * @param select
- */
-declare const expendMiddleware: <T extends EventKeys>(valueEvent: Events[T], select: T, next: Next) => void;
-
-export { expendMiddleware };
+import { Next, Events, EventKeys } from '../types';
+export declare const expendMiddleware: <T extends EventKeys>(valueEvent: Events[T], select: T, next: Next) => void;

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

@@ -1,98 +1,18 @@
-import { useState } from './hook-use-state.js';
-import { showErrorModule } from '../core/utils.js';
-import { Middleware } from './store.js';
-import { EventMessageText } from '../core/variable.js';
-import { expendMiddlewareRoute } from './event-processor-middleware-route.js';
+import { Middleware, MiddlewareRouter } from './store.js';
 import { createCallHandler } from './event-processor-callHandler.js';
+import { createNextStep } from './event-processor-cycleFiles.js';
+import { createRouteProcessChildren } from './event-processor-cycleRoute.js';
 
-/**
- * 处理中间件
- * @param event
- * @param select
- */
 const expendMiddleware = (valueEvent, select, next) => {
     const mw = new Middleware();
-    // 得到所有 mws
     const mwFiles = mw.value;
-    let valueI = 0;
-    // let valueJ = 0
     const callHandler = createCallHandler(valueEvent);
-    /**
-     * 下一步
-     * @returns
-     */
-    const nextMiddleware = (cn, ...cns) => {
-        if (cn) {
-            next(...cns);
-            return;
-        }
-        // 结束了
-        if (valueI >= mwFiles.length) {
-            next();
-            return;
-        }
-        // 检查所有
-        void calli();
-    };
-    /**
-     * 执行 i
-     * @returns
-     */
-    const calli = async () => {
-        // 调用完了
-        if (valueI >= mwFiles.length) {
-            // 开始调用j
-            nextMiddleware();
-            return;
-        }
-        valueI++;
-        const file = mwFiles[valueI - 1];
-        if (!file?.path) {
-            // 继续
-            nextMiddleware();
-            return;
-        }
-        try {
-            const app = await import(`file://${file.path}`);
-            if (!app?.default?.current || !app?.default?.select) {
-                // 继续
-                nextMiddleware();
-                return;
-            }
-            // 检查状态
-            if (file?.stateKey) {
-                const [state] = useState(file?.stateKey);
-                if (state === false) {
-                    // 继续
-                    nextMiddleware();
-                    return;
-                }
-            }
-            if (EventMessageText.includes(select)) {
-                if (app?.regular) {
-                    const reg = new RegExp(app.regular);
-                    if (!reg.test(valueEvent['MessageText'])) {
-                        // 继续
-                        nextMiddleware();
-                        return;
-                    }
-                }
-            }
-            const selects = Array.isArray(app.default.select) ? app.default.select : [app.default.select];
-            if (!selects.includes(select)) {
-                // 继续
-                nextMiddleware();
-                return;
-            }
-            const currents = Array.isArray(app.default.current) ? app.default.current : [app.default.current];
-            callHandler(currents, nextMiddleware);
-        }
-        catch (err) {
-            showErrorModule(err);
-        }
-    };
-    // 开始修正模式
-    expendMiddlewareRoute(valueEvent, select, nextMiddleware);
+    const nextMiddleware = createNextStep(valueEvent, select, next, mwFiles, callHandler);
+    const resRoute = new MiddlewareRouter();
+    const routes = resRoute.value;
+    const callRouteHandler = createCallHandler(valueEvent);
+    const processChildren = createRouteProcessChildren(valueEvent, select, nextMiddleware, callRouteHandler);
+    void processChildren(routes, [], nextMiddleware);
 };
 
 export { expendMiddleware };

package/lib/app/event-processor-subscribe.d.ts

@@ -1,40 +1,5 @@
-import { Next, EventCycleEnum } from '../types/cycle/index.js';
-import { EventKeys, Events } from '../types/event/map.js';
-
-/**
- * @fileoverview 观察者
- * @module processor
- * @author ningmengchongshui
- */
-
-/**
- * 处理订阅
- * @param valueEvent
- * @param select
- * @param next
- * @param chioce
- */
-declare const expendSubscribe: <T extends EventKeys>(valueEvent: Events[T], select: T, next: Next, chioce: EventCycleEnum) => void;
-/**
- *
- * @param valueEvent
- * @param select
- * @param next
- */
-declare const expendSubscribeCreate: <T extends EventKeys>(valueEvent: Events[T], select: T, next: Next) => void;
-/**
- *
- * @param valueEvent
- * @param select
- * @param next
- */
-declare const expendSubscribeMount: <T extends EventKeys>(valueEvent: Events[T], select: T, next: Next) => void;
-/**
- *
- * @param valueEvent
- * @param select
- * @param next
- */
-declare const expendSubscribeUnmount: <T extends EventKeys>(valueEvent: Events[T], select: T, next: Next) => void;
-
-export { expendSubscribe, expendSubscribeCreate, expendSubscribeMount, expendSubscribeUnmount };
+import { Next, Events, EventCycleEnum, EventKeys } from '../types';
+export declare const expendSubscribe: <T extends EventKeys>(valueEvent: Events[T], select: T, next: Next, chioce: EventCycleEnum) => void;
+export declare const expendSubscribeCreate: <T extends EventKeys>(valueEvent: Events[T], select: T, next: Next) => void;
+export declare const expendSubscribeMount: <T extends EventKeys>(valueEvent: Events[T], select: T, next: Next) => void;
+export declare const expendSubscribeUnmount: <T extends EventKeys>(valueEvent: Events[T], select: T, next: Next) => void;

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

@@ -1,33 +1,18 @@
 import { SubscribeList } from './store.js';
 
-/**
- * 处理订阅
- * @param valueEvent
- * @param select
- * @param next
- * @param chioce
- */
 const expendSubscribe = (valueEvent, select, next, chioce) => {
     const subList = new SubscribeList(chioce, select);
-    /**
-     * 观察者下一步
-     * @returns
-     */
     const nextObserver = (cn, ...cns) => {
         if (cn) {
             next(...cns);
             return;
         }
-        const item = subList.value.popNext(); // 弹出下一个节点
-        // 可能是 undefined
+        const item = subList.value.popNext();
         if (!item) {
-            // 继续 next
             nextObserver(true);
             return;
         }
-        // 检查 keys
         for (const key in item.data.keys) {
-            // 只要发现不符合的，就继续
             if (item.data.keys[key] !== valueEvent[key]) {
                 nextObserver();
                 return;
@@ -35,21 +20,20 @@ const expendSubscribe = (valueEvent, select, next, chioce) => {
         }
         const clear = () => {
             const selects = item.data.selects;
-            const ID = item.data.id; // 订阅的 ID
+            const ID = item.data.id;
             for (const select of selects) {
                 const subList = new SubscribeList(chioce, select);
                 const remove = () => {
-                    const item = subList.value.popNext(); // 弹出下一个节点
+                    const item = subList.value.popNext();
                     if (!item || item.data.id !== ID) {
                         remove();
                         return;
                     }
-                    subList.value.removeCurrent(); // 移除当前节点
+                    subList.value.removeCurrent();
                 };
                 remove();
             }
         };
-        // 恢复
         const restore = () => {
             const selects = item.data.selects;
             for (const select of selects) {
@@ -57,18 +41,13 @@ const expendSubscribe = (valueEvent, select, next, chioce) => {
                 subList.value.append(item.data);
             }
         };
-        // 订阅是执行则销毁
         clear();
         const Continue = (cn, ...cns) => {
-            // next() 订阅继续
-            // 重新注册。
             restore();
-            // true
             if (cn) {
                 nextObserver(...cns);
                 return;
             }
-            // false
             if (typeof cn === 'boolean') {
                 clear();
                 nextObserver(...cns);
@@ -76,33 +55,14 @@ const expendSubscribe = (valueEvent, select, next, chioce) => {
         };
         item.data.current(valueEvent, Continue);
     };
-    // 先从观察者开始
     nextObserver();
 };
-/**
- *
- * @param valueEvent
- * @param select
- * @param next
- */
 const expendSubscribeCreate = (valueEvent, select, next) => {
     expendSubscribe(valueEvent, select, next, 'create');
 };
-/**
- *
- * @param valueEvent
- * @param select
- * @param next
- */
 const expendSubscribeMount = (valueEvent, select, next) => {
     expendSubscribe(valueEvent, select, next, 'mount');
 };
-/**
- *
- * @param valueEvent
- * @param select
- * @param next
- */
 const expendSubscribeUnmount = (valueEvent, select, next) => {
     expendSubscribe(valueEvent, select, next, 'unmount');
 };

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

@@ -1,20 +1,3 @@
-import { EventKeys, Events } from '../types/event/map.js';
-
-/**
- * 消息处理器
- * @param name
- * @param event
- * @param data
- * @returns
- */
-declare const onProcessor: <T extends EventKeys>(name: T, event: Events[T], data?: any) => void;
-/**
- * 消息处理器
- * @param event
- * @param name
- * @deprecated 该方法已被弃用，请使用 onProcessor() 替代。
- * @returns
- */
-declare const OnProcessor: <T extends EventKeys>(event: Events[T], name: T) => void;
-
-export { OnProcessor, onProcessor };
+import { EventKeys, Events } from '../types';
+export declare const onProcessor: <T extends EventKeys>(name: T, event: Events[T], data?: any) => void;
+export declare const OnProcessor: <T extends EventKeys>(event: Events[T], name: T) => void;

package/lib/app/event-processor.js

@@ -4,38 +4,23 @@ import { expendCycle } from './event-processor-cycle.js';
 import { ProcessorEventAutoClearMap, ProcessorEventUserAudoClearMap } from './store.js';
 import { createHash } from '../core/utils.js';
 
-/**
- * 过滤掉重复消息
- * @param param0
- * @param MessageId
- * @returns
- */
 const filter = ({ Now, store, INTERVAL }, MessageId) => {
     if (store.has(MessageId)) {
         const time = store.get(MessageId);
         if (Now - time < INTERVAL) {
-            // 1s内重复消息
             store.set(MessageId, Date.now());
             return true;
         }
     }
     store.set(MessageId, Date.now());
 };
-/**
- * 清理旧消息
- */
 const cleanupStore = ({ Now, store, INTERVAL }) => {
     for (const [ID, timestamp] of store.entries()) {
-        // 超过时间间隔
         if (Now - timestamp > INTERVAL) {
-            // 删除
             store.delete(ID);
         }
     }
 };
-/**
- * 清理所有消息
- */
 const cleanupStoreAll = () => {
     const Now = Date.now();
     const value = getConfigValue();
@@ -44,28 +29,16 @@ const cleanupStoreAll = () => {
     cleanupStore({ Now, INTERVAL: EVENT_INTERVAL, store: ProcessorEventAutoClearMap });
     cleanupStore({ Now, INTERVAL: USER_INTERVAL, store: ProcessorEventUserAudoClearMap });
 };
-// 清理消息
 const callback = () => {
     cleanupStoreAll();
-    // 下一次清理的时间，应该随着长度的增加而减少
     const length = ProcessorEventAutoClearMap.size + ProcessorEventUserAudoClearMap.size;
-    // 长度控制在37个以内
     const time = length > processorPepeatedClearSize ? processorRepeatedClearTimeMin : processorRepeatedClearTimeMax;
     setTimeout(callback, time);
 };
 setTimeout(callback, processorRepeatedClearTimeMin);
-/**
- * 消息处理器
- * @param name
- * @param event
- * @param data
- * @returns
- */
 const onProcessor = (name, event, data) => {
-    // 禁用规则设置
     const value = getConfigValue();
     const disabledTextRegular = value?.disabled_text_regular;
-    // 检查文本禁用规则
     if (disabledTextRegular && event['MessageText']) {
         const reg = new RegExp(disabledTextRegular);
         if (reg.test(event['MessageText'])) {
@@ -73,23 +46,19 @@ const onProcessor = (name, event, data) => {
         }
     }
     const disabledSelects = value?.disabled_selects ?? {};
-    // 检查事件禁用规则
     if (disabledSelects[name]) {
         return;
     }
     const disabledUserId = value?.disabled_user_id ?? {};
-    // 检查用户禁用规则
     if (event['UserId'] && disabledUserId[event['UserId']]) {
         return;
     }
     const disabledUserKey = value?.disabled_user_key ?? {};
-    // 检查用户禁用规则
     if (event['UserKey'] && disabledUserKey[event['UserKey']]) {
         return;
     }
     const redirectRegular = value?.redirect_regular ?? value?.redirect_text_regular;
     const redirectTarget = value?.redirect_target ?? value?.redirect_text_target;
-    // 检查文本重定向规则
     if (redirectRegular && redirectTarget && event['MessageText']) {
         const reg = new RegExp(redirectRegular);
         if (reg.test(event['MessageText'])) {
@@ -97,7 +66,6 @@ const onProcessor = (name, event, data) => {
         }
     }
     const mappingText = value?.mapping_text ?? [];
-    // 检查文本映射规则
     for (const mapping of mappingText) {
         const { regular, target } = mapping ?? {};
         if (!regular) {
@@ -110,7 +78,6 @@ const onProcessor = (name, event, data) => {
     }
     const masterId = value?.master_id ?? {};
     const masterKey = value?.master_key ?? {};
-    // 检查是否是 master
     if (event['UserId'] && masterId[event['UserId']]) {
         event['isMaster'] = true;
     }
@@ -119,7 +86,6 @@ const onProcessor = (name, event, data) => {
     }
     const botId = value?.bot_id ?? {};
     const botKey = value?.bot_key ?? {};
-    // 检查是否是 bot
     if (event['UserId'] && botId[event['UserId']]) {
         event['isBot'] = true;
     }
@@ -129,24 +95,19 @@ const onProcessor = (name, event, data) => {
     const Now = Date.now();
     const EVENT_INTERVAL = value?.processor?.repeated_event_time ?? processorRepeatedEventTime;
     if (event['MessageId']) {
-        // 消息过长，要减少消息的长度
         const MessageId = createHash(event['MessageId']);
-        // 重复消息
         if (filter({ Now, INTERVAL: EVENT_INTERVAL, store: ProcessorEventAutoClearMap }, MessageId)) {
             return;
         }
     }
     const USER_INTERVAL = value?.processor?.repeated_user_time ?? processorRepeatedUserTime;
     if (event['UserId']) {
-        // 编号过长，要减少编号的长度
         const UserId = createHash(event['UserId']);
-        // 频繁操作
         if (filter({ Now, INTERVAL: USER_INTERVAL, store: ProcessorEventUserAudoClearMap }, UserId)) {
             return;
         }
     }
     if (data) {
-        // 当访问value的时候获取原始的data
         Object.defineProperty(event, 'value', {
             get() {
                 return data;
@@ -156,13 +117,6 @@ const onProcessor = (name, event, data) => {
     event['name'] = name;
     expendCycle(event, name);
 };
-/**
- * 消息处理器
- * @param event
- * @param name
- * @deprecated 该方法已被弃用，请使用 onProcessor() 替代。
- * @returns
- */
 const OnProcessor = (event, name) => {
     onProcessor(name, event);
 };

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

@@ -1,19 +1,3 @@
-import { OnResponseReversalFunc, OnResponseReversalFuncBack } from '../types/event/index.js';
-
-/**
- * 处理响应事件
- * @param select 事件选择
- * @param callback 回调函数，处理事件和 API
- * @returns 回调函数的执行结果
- */
-declare const onResponse: OnResponseReversalFunc;
-/**
- * 废弃，请使用 onResponse
- * @deprecated
- * @param callback
- * @param select
- * @returns
- */
-declare const OnResponse: OnResponseReversalFuncBack;
-
-export { OnResponse, onResponse };
+import { OnResponseReversalFunc, OnResponseReversalFuncBack } from '../types';
+export declare const onResponse: OnResponseReversalFunc;
+export declare const OnResponse: OnResponseReversalFuncBack;

package/lib/app/event-response.js

@@ -1,20 +1,7 @@
-/**
- * 处理响应事件
- * @param select 事件选择
- * @param callback 回调函数，处理事件和 API
- * @returns 回调函数的执行结果
- */
 const onResponse = (select, callback) => {
     return { current: callback, select };
 };
 global.onResponse = onResponse;
-/**
- * 废弃，请使用 onResponse
- * @deprecated
- * @param callback
- * @param select
- * @returns
- */
 const OnResponse = (callback, select) => {
     return onResponse(select, callback);
 };