alemonjs 2.1.54 → 2.1.56

package/lib/app/event-format.js

@@ -11,7 +11,7 @@ class FormatEvent {
         Object.assign(this.#data, otherParams);
         Object.defineProperty(this.#data, 'value', {
             value,
-            enumerable: false
+            enumerable: true
         });
         return this;
     }

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

@@ -118,6 +118,7 @@ const createRouteProcessChildren = (valueEvent, select, nextCycle, callHandler)
             }
             catch (err) {
                 showErrorModule(err);
+                void nextNode();
             }
         };
         void nextNode();

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

@@ -1,5 +1,6 @@
 import { getSubscribeList } from './store.js';
 import { SubscribeStatus } from './config.js';
+import { withEventContext } from './hook-event-context.js';
 
 const expendSubscribe = (valueEvent, select, next, choose) => {
     const subListValue = getSubscribeList(choose, select);
@@ -56,7 +57,7 @@ const expendSubscribe = (valueEvent, select, next, choose) => {
                 nextObserver(...cns);
             }
         };
-        item.data.current(valueEvent, Continue);
+        withEventContext(valueEvent, Continue, () => item.data.current(valueEvent, Continue));
     };
     nextObserver();
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.1.54",
+  "version": "2.1.56",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",

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

@@ -1,8 +0,0 @@
-import { DefineChildrenFunc } from '../../types';
-/**
- * 定义子事件
- * @param callback
- * @throws {Error} - 如果 callback 无效，抛出错误。
- * @returns
- */
-export declare const defineChildren: DefineChildrenFunc;

package/lib/app/define/define-children.js

@@ -1,25 +0,0 @@
-import { ResultCode } from '../../core/variable.js';
-
-/**
- * 定义子事件
- * @param callback
- * @throws {Error} - 如果 callback 无效，抛出错误。
- * @returns
- */
-const defineChildren = callback => {
-    if (typeof callback === 'function' || typeof callback === 'object') {
-        return {
-            _name: 'app',
-            callback
-        };
-    }
-    logger.error({
-        code: ResultCode.FailParams,
-        message: 'Invalid callback: callback must be a object or function',
-        data: null
-    });
-    throw new Error('Invalid callback: callback must be a object or function');
-};
-global.defineChildren = defineChildren;
-
-export { defineChildren };

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

@@ -1,2 +0,0 @@
-import { defineMiddlewareFunc } from '../../types';
-export declare const defineMiddleware: defineMiddlewareFunc;

package/lib/app/define/define-middleware.js

@@ -1,8 +0,0 @@
-const defineMiddleware = middleware => {
-    return {
-        current: middleware
-    };
-};
-global.defineMiddleware = defineMiddleware;
-
-export { defineMiddleware };

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

@@ -1,13 +0,0 @@
-type Options = {
-    /**
-     * 注册入口
-     * @returns
-     */
-    main: () => any;
-    /**
-     * 平台名称，用于日志标识
-     */
-    name?: string;
-};
-export declare const definePlatform: (options: Options) => () => any;
-export {};

package/lib/app/define/define-platform.js

@@ -1,40 +0,0 @@
-const definePlatform = (options) => {
-    const platformName = options.name || process.env.platform || 'unknown';
-    // 开始注册子进程交互
-    const mainProcess = () => {
-        ['SIGINT', 'SIGTERM', 'SIGQUIT', 'disconnect'].forEach(sig => {
-            process?.on?.(sig, () => {
-                logger.info?.(`[${platformName}][${sig}] 收到信号，正在关闭...`);
-                setImmediate(() => process.exit(0));
-            });
-        });
-        process?.on?.('exit', code => {
-            logger.info?.(`[${platformName}][exit] 进程退出，code=${code}`);
-        });
-        // 监听主进程消息
-        process.on('message', msg => {
-            try {
-                const data = typeof msg === 'string' ? JSON.parse(msg) : msg;
-                if (data?.type === 'start') {
-                    options.main();
-                }
-                else if (data?.type === 'stop') {
-                    process.exit(0);
-                }
-            }
-            catch { }
-        });
-        // 主动发送 ready 消息
-        if (process.send) {
-            process.send(JSON.stringify({ type: 'ready' }));
-        }
-    };
-    // 仅当作为平台进程入口加载时才执行 mainProcess，
-    if (!global.__client_loaded) {
-        mainProcess();
-    }
-    // 这里是旧兼容性返回
-    return options.main;
-};
-
-export { definePlatform };

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

@@ -1,2 +0,0 @@
-import { DefineResponseFunc } from '../../types';
-export declare const defineResponse: DefineResponseFunc;

package/lib/app/define/define-response.js

@@ -1,8 +0,0 @@
-const defineResponse = responses => {
-    return {
-        current: responses
-    };
-};
-global.defineResponse = defineResponse;
-
-export { defineResponse };

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

@@ -1,17 +0,0 @@
-import { DefineRouterFunc } from '../../types';
-/**
- * Lazy load a response handler
- * @param fnc
- * @returns
- */
-export declare const lazy: <T extends {
-    default: any;
-}>(fnc: () => Promise<T>) => (() => Promise<T["default"]>);
-/**
- * 定义路由
- * 与 defineResponse 类似，但路由处理器是纯异步函数组件，
- * 内部自动根据 selects 来分类。
- * @param routes 路由配置数组
- * @returns
- */
-export declare const defineRouter: DefineRouterFunc;

package/lib/app/define/define-router.js

@@ -1,34 +0,0 @@
-/**
- * Lazy load a response handler
- * @param fnc
- * @returns
- */
-const lazy = (fnc) => {
-    let c = null;
-    // fnc 是一个 ()=> imoprt(); 函数。
-    const back = async () => {
-        if (c) {
-            return c;
-        }
-        const mod = await fnc();
-        if (!mod || !mod.default) ;
-        c = mod.default;
-        // 当back被调用时。
-        return c;
-    };
-    return back;
-};
-/**
- * 定义路由
- * 与 defineResponse 类似，但路由处理器是纯异步函数组件，
- * 内部自动根据 selects 来分类。
- * @param routes 路由配置数组
- * @returns
- */
-const defineRouter = routes => {
-    return {
-        current: routes
-    };
-};
-
-export { defineRouter, lazy };

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

@@ -1,9 +0,0 @@
-import { OnGroupFunc } from '../../types';
-/**
- * 定义一组标准执行导出
- * @param calls
- * @deprecated 废弃
- * @returns
- */
-declare const onGroup: OnGroupFunc;
-export { onGroup };

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

@@ -1,29 +0,0 @@
-/**
- * 定义一组标准执行导出
- * @param calls
- * @deprecated 废弃
- * @returns
- */
-const onGroup = (...calls) => {
-    if (calls.length === 0) {
-        throw new Error('onGroup: 至少需要一个响应或中间件');
-    }
-    const firstItem = calls[0];
-    const baseSelects = firstItem.select;
-    // 把如果item是数组的，豆扁平起来。
-    const currents = calls.reduce((acc, item) => {
-        if (Array.isArray(item.current)) {
-            return acc.concat(item.current);
-        }
-        else {
-            return acc.concat(item.current);
-        }
-    }, []);
-    return {
-        select: baseSelects,
-        current: currents
-    };
-};
-global.onGroup = onGroup;
-
-export { onGroup };

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

@@ -1,23 +0,0 @@
-/**
- * @fileoverview 中间件
- * @module middleware
- * @author ningmengchongshui
- */
-import { OnMiddlewareReversalFunc, OnMiddlewareReversalFuncBack } from '../../types';
-/**
- * 中间件
- * @param select 事件选择
- * @param callback 回调函数，处理事件和 API
- * @throws {Error} - 如果 select 无效，抛出错误。
- * @throws {Error} - 如果 callback 无效，抛出错误。
- * @returns
- */
-export declare const onMiddleware: OnMiddlewareReversalFunc;
-/**
- * 废弃，请使用 onMiddleware
- * @deprecated
- * @param select
- * @param callback
- * @returns
- */
-export declare const OnMiddleware: OnMiddlewareReversalFuncBack;

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

@@ -1,44 +0,0 @@
-import { ResultCode } from '../../core/variable.js';
-
-/**
- * 中间件
- * @param select 事件选择
- * @param callback 回调函数，处理事件和 API
- * @throws {Error} - 如果 select 无效，抛出错误。
- * @throws {Error} - 如果 callback 无效，抛出错误。
- * @returns
- */
-const onMiddleware = (select, callback) => {
-    // 参数检查
-    if (typeof callback !== 'function') {
-        logger.error({
-            code: ResultCode.FailParams,
-            message: 'Invalid callback: callback must be a function',
-            data: null
-        });
-        throw new Error('Invalid callback: callback must be a function');
-    }
-    if (typeof select === 'string' || typeof select === 'object') {
-        return { current: callback, select };
-    }
-    logger.error({
-        code: ResultCode.FailParams,
-        message: 'Invalid select: select must be a string or object',
-        data: null
-    });
-    throw new Error('Invalid select: select must be a string or object');
-};
-global.onMiddleware = onMiddleware;
-/**
- * 废弃，请使用 onMiddleware
- * @deprecated
- * @param select
- * @param callback
- * @returns
- */
-const OnMiddleware = (callback, select) => {
-    return onMiddleware(select, callback);
-};
-global.OnMiddleware = OnMiddleware;
-
-export { OnMiddleware, onMiddleware };

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

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

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

@@ -1,23 +0,0 @@
-/**
- * 处理响应事件
- * @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);
-};
-global.OnResponse = OnResponse;
-
-export { OnResponse, onResponse };

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

@@ -1,13 +0,0 @@
-import { EventKeys } from '../../types';
-/**
- * 创建选择器
- * @param values
- * @returns
- */
-export declare const onSelects: <T extends EventKeys[] | EventKeys>(values: T) => T;
-/**
- * @deprecated 废弃,请使用onSelects
- * @param values
- * @returns
- */
-export declare const createSelects: <T extends EventKeys[] | EventKeys>(values: T) => T;

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

@@ -1,15 +0,0 @@
-/**
- * 创建选择器
- * @param values
- * @returns
- */
-const onSelects = (values) => values;
-global.onSelects = onSelects;
-/**
- * @deprecated 废弃,请使用onSelects
- * @param values
- * @returns
- */
-const createSelects = onSelects;
-
-export { createSelects, onSelects };

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

@@ -1 +0,0 @@
-export declare const createCallHandler: (valueEvent: any) => (currents: any, nextEvent: any) => void;

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

@@ -1,43 +0,0 @@
-import { showErrorModule } from '../../core/utils.js';
-
-const createCallHandler = valueEvent => {
-    // 开始处理 handler
-    const callHandler = (currents, nextEvent) => {
-        let index = 0;
-        let isClose = false;
-        let isNext = false;
-        const start = async () => {
-            if (index >= currents.length) {
-                return;
-            }
-            if (isNext) {
-                return;
-            }
-            if (isClose) {
-                return;
-            }
-            try {
-                // 统一使用 await，无需区分同步/异步函数
-                const res = await currents[index](valueEvent, (...cns) => {
-                    isNext = true;
-                    nextEvent(...cns);
-                });
-                // return true → 局部中间件放行，继续执行 children handler
-                // return void/false → 处理完毕或拦截，停止当前链
-                if (res !== true) {
-                    isClose = true;
-                }
-            }
-            catch (err) {
-                showErrorModule(err);
-                return;
-            }
-            ++index;
-            void start();
-        };
-        void start();
-    };
-    return callHandler;
-};
-
-export { createCallHandler };

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

@@ -1,14 +0,0 @@
-/**
- * @fileoverview 消息处理快
- * 登录模块向核心模块发送数据
- * 核心模块调用模块索引
- * @module processor
- * @author ningmengchongshui
- */
-import { Events, EventKeys } from '../../types';
-/**
- * 消息体处理机制
- * @param event
- * @param key
- */
-export declare const expendCycle: <T extends EventKeys>(valueEvent: Events[T], select: T, config?: any) => void;

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

@@ -1,97 +0,0 @@
-import { ResultCode } from '../../core/variable.js';
-import { expendEvent } from './event-processor-event.js';
-import { expendMiddleware } from './event-processor-middleware.js';
-import { expendSubscribeCreate, expendSubscribeMount, expendSubscribeUnmount } from './event-processor-subscribe.js';
-import { getConfigValue } from '../../core/config.js';
-
-/**
- * 打印日志
- * @param event
- * @param select
- */
-const showLog = (event, select) => {
-    if (process.env.NODE_ENV === 'development') {
-        const log = {
-            Name: select
-        };
-        for (const key in event) {
-            if (Object.prototype.hasOwnProperty.call(event, key)) {
-                const value = event[key];
-                if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
-                    log[key] = value;
-                }
-            }
-        }
-        logger.debug({
-            code: ResultCode.Ok,
-            message: 'new event',
-            data: log
-        });
-    }
-    else {
-        // 批量收集非空字段后一次 join — 避免多次 typeof 检查 + 字符串 += 拼接
-        const parts = [`[Name:${select}]`];
-        const fields = ['GuildId', 'ChannelId', 'UserKey', 'UserId', 'MessageId', 'MessageText'];
-        for (const f of fields) {
-            const v = event[f];
-            if (typeof v === 'string' && v !== '') {
-                parts.push(`[${f}:${v}]`);
-            }
-        }
-        logger.info(parts.join(''));
-    }
-};
-/**
- * 消息体处理机制
- * @param event
- * @param key
- */
-const expendCycle = (valueEvent, select, config) => {
-    const nextEnd = () => { };
-    // unmount
-    const nextUnMount = (cn, ...cns) => {
-        if (cn) {
-            nextEnd(...cns);
-            return;
-        }
-        void expendSubscribeUnmount(valueEvent, select, nextEnd);
-    };
-    // event
-    const nextEvent = (cn, ...cns) => {
-        if (cn) {
-            nextUnMount(...cns);
-            return;
-        }
-        void expendEvent(valueEvent, select, nextUnMount);
-    };
-    // mount
-    const nextMount = (cn, ...cns) => {
-        if (cn) {
-            nextEvent(...cns);
-            return;
-        }
-        void expendSubscribeMount(valueEvent, select, nextEvent);
-    };
-    // middleware
-    const nextCreate = (cn, ...cns) => {
-        if (cn) {
-            nextMount(...cns);
-            return;
-        }
-        void expendMiddleware(valueEvent, select, nextMount);
-    };
-    const value = config ?? getConfigValue() ?? {};
-    if (Array.isArray(value?.logs?.channel_id)) {
-        const channelIds = value?.logs?.channel_id;
-        if (channelIds && channelIds.length > 0 && channelIds.includes(valueEvent['ChannelId'])) {
-            showLog(valueEvent, select);
-        }
-    }
-    else {
-        showLog(valueEvent, select);
-    }
-    // create
-    void expendSubscribeCreate(valueEvent, select, nextCreate);
-};
-
-export { expendCycle };

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

@@ -1,11 +0,0 @@
-import { Next, Events, EventKeys, StoreResponseItem } from '../../types';
-/**
- * 清除模块缓存（用于热更新等场景）
- */
-export declare const clearModuleCache: (path?: string) => void;
-/**
- * 创建 next 处理函数
- * @param event
- * @param select
- */
-export declare const createNextStep: <T extends EventKeys>(valueEvent: Events[T], select: T, next: Next, files: StoreResponseItem[], callHandler: (currents: any, nextEvent: any) => void) => Next;