alemonjs 2.1.53 → 2.1.55

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

@@ -2,4 +2,5 @@ import { DefineRouterFunc } from '../types';
 export declare const lazy: <T extends {
     default: any;
 }>(fnc: () => Promise<T>) => (() => Promise<T["default"]>);
+export declare function runHandler(loader: () => Promise<any>, args: any[]): Promise<any>;
 export declare const defineRouter: DefineRouterFunc;

package/lib/app/define-router.js

@@ -11,10 +11,15 @@ const lazy = (fnc) => {
     };
     return back;
 };
+async function runHandler(loader, args) {
+    const mod = await loader();
+    const handler = mod.default ?? mod;
+    return handler(...args);
+}
 const defineRouter = routes => {
     return {
         current: routes
     };
 };
 
-export { defineRouter, lazy };
+export { defineRouter, lazy, runHandler };

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-cycleFiles.js

@@ -121,9 +121,7 @@ const createFileTreeStep = (valueEvent, select, next, root, callHandler) => {
             void processContent(node, done);
         }, app => {
             matched = true;
-            const items = Array.isArray(app.default.current)
-                ? app.default.current
-                : [app.default.current];
+            const items = Array.isArray(app.default.current) ? app.default.current : [app.default.current];
             mwCurrents.push(...items);
         });
         if (matched) {
@@ -168,9 +166,7 @@ const createFileTreeStep = (valueEvent, select, next, root, callHandler) => {
         void callHandlerFile(valueEvent, select, file, () => {
             processFiles(node, idx + 1, filesDone, treeDone);
         }, app => {
-            const fileCurrents = Array.isArray(app.default.current)
-                ? app.default.current
-                : [app.default.current];
+            const fileCurrents = Array.isArray(app.default.current) ? app.default.current : [app.default.current];
             callHandler(fileCurrents, (cn, ...cns) => {
                 if (cn) {
                     treeDone(true, ...cns);

package/lib/app/expose.d.ts

@@ -0,0 +1,16 @@
+import { ExposeProvideConfig, ExposeListItem, ExposeWatchEvent, ExposeSchemaItem } from '../types';
+type WatchCallback = (event: ExposeWatchEvent) => void;
+export declare function registerExpose(appName: string, configs: ExposeProvideConfig[]): void;
+export declare class Expose {
+    #private;
+    static create(): Expose;
+    provide(config: ExposeProvideConfig): this;
+    getConfigs(): ExposeProvideConfig[];
+    list(protocol?: string): ExposeListItem[];
+    invoke(protocol: string, appName: string, action: string, value?: any): any;
+    schema(): ExposeSchemaItem[];
+    watch(protocolOrCallback: string | WatchCallback, callback?: WatchCallback): () => void;
+}
+export declare function disposeExpose(appName: string): void;
+export declare function clearAllExpose(): void;
+export {};

package/lib/app/expose.js

@@ -0,0 +1,190 @@
+const storeExpose = new Map();
+const protocolWatchers = new Map();
+const globalWatchers = new Set();
+function emitWatch(event) {
+    const watchers = protocolWatchers.get(event.protocol);
+    if (watchers) {
+        for (const cb of watchers) {
+            try {
+                cb(event);
+            }
+            catch {
+            }
+        }
+    }
+    for (const cb of globalWatchers) {
+        try {
+            cb(event);
+        }
+        catch {
+        }
+    }
+}
+function registerExpose(appName, configs) {
+    for (const config of configs) {
+        const protocol = config.name;
+        if (!storeExpose.has(protocol)) {
+            storeExpose.set(protocol, new Map());
+        }
+        const providers = storeExpose.get(protocol);
+        if (providers.has(appName)) {
+            console.warn(`[expose] ${appName} already provided "${protocol}", overwriting.`);
+        }
+        providers.set(appName, { appName, config });
+    }
+}
+class Expose {
+    #configs = [];
+    static create() {
+        return new Expose();
+    }
+    provide(config) {
+        this.#configs.push(config);
+        return this;
+    }
+    getConfigs() {
+        return this.#configs;
+    }
+    list(protocol) {
+        const result = [];
+        if (protocol) {
+            const providers = storeExpose.get(protocol);
+            if (!providers) {
+                return result;
+            }
+            for (const [, entry] of providers) {
+                result.push(createListItem(entry, protocol));
+            }
+        }
+        else {
+            for (const [proto, providers] of storeExpose) {
+                for (const [, entry] of providers) {
+                    result.push(createListItem(entry, proto));
+                }
+            }
+        }
+        return result;
+    }
+    invoke(protocol, appName, action, value) {
+        const providers = storeExpose.get(protocol);
+        if (!providers) {
+            throw new Error(`[expose] protocol "${protocol}" not found`);
+        }
+        const entry = providers.get(appName);
+        if (!entry) {
+            throw new Error(`[expose] provider "${appName}" not found in protocol "${protocol}"`);
+        }
+        const actionMeta = entry.config.actions[action];
+        if (!actionMeta) {
+            throw new Error(`[expose] action "${action}" not found in "${protocol}" of "${appName}"`);
+        }
+        const result = actionMeta.handler(value);
+        if (action !== 'read') {
+            emitWatch({
+                name: appName,
+                protocol,
+                action,
+                value
+            });
+        }
+        return result;
+    }
+    schema() {
+        const result = [];
+        for (const [protocol, providers] of storeExpose) {
+            const firstEntry = providers.values().next().value;
+            if (!firstEntry) {
+                continue;
+            }
+            const actions = {};
+            for (const [actionName, meta] of Object.entries(firstEntry.config.actions)) {
+                actions[actionName] = {
+                    description: meta.description,
+                    ...(meta.params ? { params: meta.params } : {}),
+                    ...(meta.returns ? { returns: meta.returns } : {})
+                };
+            }
+            result.push({
+                protocol,
+                description: firstEntry.config.description,
+                providers: Array.from(providers.keys()).map(name => ({ name })),
+                actions,
+                invoke: 'Expose.invoke(protocol, appName, action, value?)'
+            });
+        }
+        return result;
+    }
+    watch(protocolOrCallback, callback) {
+        if (typeof protocolOrCallback === 'function') {
+            const cb = protocolOrCallback;
+            globalWatchers.add(cb);
+            return () => {
+                globalWatchers.delete(cb);
+            };
+        }
+        const protocol = protocolOrCallback;
+        if (!callback) {
+            throw new Error('[expose] watch(protocol, callback) requires a callback');
+        }
+        if (!protocolWatchers.has(protocol)) {
+            protocolWatchers.set(protocol, new Set());
+        }
+        protocolWatchers.get(protocol).add(callback);
+        return () => {
+            const set = protocolWatchers.get(protocol);
+            if (set) {
+                set.delete(callback);
+                if (set.size === 0) {
+                    protocolWatchers.delete(protocol);
+                }
+            }
+        };
+    }
+}
+function createListItem(entry, protocol) {
+    const actions = {};
+    for (const [actionName, meta] of Object.entries(entry.config.actions)) {
+        actions[actionName] = {
+            description: meta.description,
+            ...(meta.params ? { params: meta.params } : {}),
+            ...(meta.returns ? { returns: meta.returns } : {})
+        };
+    }
+    return {
+        name: entry.appName,
+        protocol,
+        description: entry.config.description,
+        actions,
+        invoke(action, value) {
+            const actionMeta = entry.config.actions[action];
+            if (!actionMeta) {
+                throw new Error(`[expose] action "${action}" not found in "${protocol}" of "${entry.appName}"`);
+            }
+            const result = actionMeta.handler(value);
+            if (action !== 'read') {
+                emitWatch({
+                    name: entry.appName,
+                    protocol,
+                    action,
+                    value
+                });
+            }
+            return result;
+        }
+    };
+}
+function disposeExpose(appName) {
+    for (const [protocol, providers] of storeExpose) {
+        providers.delete(appName);
+        if (providers.size === 0) {
+            storeExpose.delete(protocol);
+        }
+    }
+}
+function clearAllExpose() {
+    storeExpose.clear();
+    protocolWatchers.clear();
+    globalWatchers.clear();
+}
+
+export { Expose, clearAllExpose, disposeExpose, registerExpose };

package/lib/app/index.d.ts

@@ -1,4 +1,5 @@
 export * from './store.js';
+export * from './expose.js';
 export * from './load_modules/index.js';
 export * from './define-children.js';
 export * from './define-platform.js';

package/lib/app/index.js

@@ -1,11 +1,12 @@
 export { ChildrenApp, Core, Logger, Middleware, MiddlewareRouter, MiddlewareTree, ProcessorEventAutoClearMap, ProcessorEventUserAutoClearMap, Response, ResponseMiddleware, ResponseRouter, ResponseTree, State, StateSubscribe, SubscribeList, bumpStoreVersion, core, getSubscribeList, logger } from './store.js';
+export { Expose, clearAllExpose, disposeExpose, registerExpose } from './expose.js';
 export { loadModels, run } from './load_modules/load.js';
 export { loadChildren, loadChildrenFile } from './load_modules/loadChild.js';
 export { defineChildren } from './define-children.js';
 export { definePlatform } from './define-platform.js';
 export { defineResponse } from './define-response.js';
 export { defineMiddleware } from './define-middleware.js';
-export { defineRouter, lazy } from './define-router.js';
+export { defineRouter, lazy, runHandler } from './define-router.js';
 export { FormatEvent, wrapEvent } from './event-format.js';
 export { onGroup } from './event-group.js';
 export { OnMiddleware, onMiddleware } from './event-middleware.js';

package/lib/app/load_modules/loadChild.js

@@ -2,6 +2,7 @@ import { dirname, join } from 'path';
 import { existsSync } from 'fs';
 import { showErrorModule, getRecursiveDirFiles, createEventName } from '../../core/utils.js';
 import { ChildrenApp } from '../store.js';
+import { registerExpose } from '../expose.js';
 import { ResultCode, fileSuffixMiddleware } from '../../core/variable.js';
 import module$1 from 'module';
 
@@ -67,6 +68,9 @@ const loadChildren = async (mainPath, appName) => {
             if (res && (res?.response || res?.middleware || res?.responseRouter || res?.middlewareRouter)) {
                 App.register(res);
             }
+            if (res?.expose) {
+                registerExpose(appName, res.expose.getConfigs());
+            }
             App.on();
             try {
                 if (app?.onMounted) {

package/lib/app/store.d.ts

@@ -8,11 +8,11 @@ export declare class Logger {
 export declare class Core {
     constructor();
     get value(): {
-        storeState: import("..").ResponseState;
-        storeStateSubscribe: import("..").StateSubscribeMap;
-        storeSubscribeList: import("..").SubscribeKeysMap;
+        storeState: import("../types").ResponseState;
+        storeStateSubscribe: import("../types").StateSubscribeMap;
+        storeSubscribeList: import("../types").SubscribeKeysMap;
         storeChildrenApp: {
-            [key: string]: import("..").StoreChildrenApp;
+            [key: string]: import("../types").StoreChildrenApp;
         };
     };
 }
@@ -75,16 +75,16 @@ export declare class ChildrenApp {
     pushCycle(data: ChildrenCycle): void;
     on(): void;
     un(): void;
-    get value(): import("..").StoreChildrenApp;
+    get value(): import("../types").StoreChildrenApp;
 }
 export declare const ProcessorEventAutoClearMap: Map<any, any>;
 export declare const ProcessorEventUserAutoClearMap: Map<any, any>;
 export declare const logger: any;
 export declare const core: {
-    storeState: import("..").ResponseState;
-    storeStateSubscribe: import("..").StateSubscribeMap;
-    storeSubscribeList: import("..").SubscribeKeysMap;
+    storeState: import("../types").ResponseState;
+    storeStateSubscribe: import("../types").StateSubscribeMap;
+    storeSubscribeList: import("../types").SubscribeKeysMap;
     storeChildrenApp: {
-        [key: string]: import("..").StoreChildrenApp;
+        [key: string]: import("../types").StoreChildrenApp;
     };
 };

package/lib/app/store.js

@@ -1,6 +1,7 @@
 import { SinglyLinkedList } from './SinglyLinkedList.js';
 import { mkdirSync } from 'node:fs';
 import log4js from 'log4js';
+import { disposeExpose } from './expose.js';
 
 const createLogger = () => {
     if (process.env.BROWSER_ENV === 'browser') {
@@ -424,6 +425,7 @@ class ChildrenApp {
         bumpStoreVersion();
     }
     un() {
+        disposeExpose(this.#name);
         delete alemonjsCore.storeChildrenApp[this.#name];
         bumpStoreVersion();
     }

package/lib/index.js

@@ -6,13 +6,14 @@ export { cbpClient } from './cbp/connects/client.js';
 export { cbpPlatform } from './cbp/connects/platform.js';
 export { cbpServer } from './cbp/server/main.js';
 export { ChildrenApp, Core, Logger, Middleware, MiddlewareRouter, MiddlewareTree, ProcessorEventAutoClearMap, ProcessorEventUserAutoClearMap, Response, ResponseMiddleware, ResponseRouter, ResponseTree, State, StateSubscribe, SubscribeList, bumpStoreVersion, core, getSubscribeList, logger } from './app/store.js';
+export { Expose, clearAllExpose, disposeExpose, registerExpose } from './app/expose.js';
 export { loadModels, run } from './app/load_modules/load.js';
 export { loadChildren, loadChildrenFile } from './app/load_modules/loadChild.js';
 export { defineChildren } from './app/define-children.js';
 export { definePlatform } from './app/define-platform.js';
 export { defineResponse } from './app/define-response.js';
 export { defineMiddleware } from './app/define-middleware.js';
-export { defineRouter, lazy } from './app/define-router.js';
+export { defineRouter, lazy, runHandler } from './app/define-router.js';
 export { FormatEvent, wrapEvent } from './app/event-format.js';
 export { onGroup } from './app/event-group.js';
 export { OnMiddleware, onMiddleware } from './app/event-middleware.js';

package/lib/types/event/index.d.ts

@@ -2,6 +2,7 @@ import { ChildrenCycle, Next } from '../cycle';
 import { ClientAPI } from '../client';
 import { EventKeys, Events } from './map';
 import { DataEnums } from '../message';
+import { Expose } from '../../app/expose';
 export type Current<T extends EventKeys> = (event: Events[T], next: Next) => Promise<boolean | void | undefined> | boolean | void | undefined;
 export type OnResponseValue<C, T extends EventKeys> = {
     current: C;
@@ -54,6 +55,7 @@ export type childrenCallbackRes = {
     middleware?: ReturnType<defineMiddlewareFunc>;
     responseRouter?: ReturnType<DefineRouterFunc>;
     middlewareRouter?: ReturnType<DefineRouterFunc>;
+    expose?: Expose;
 } | undefined;
 export type childrenCallback = ChildrenCycle & {
     register?: () => (childrenCallbackRes | undefined) | Promise<childrenCallbackRes | undefined>;

package/lib/types/expose/index.d.ts

@@ -0,0 +1,41 @@
+export interface ExposeActionMeta {
+    description: string;
+    params?: Record<string, string>;
+    returns?: Record<string, string>;
+    handler: (...args: any[]) => any;
+}
+export interface ExposeProvideConfig {
+    name: string;
+    description: string;
+    actions: Record<string, ExposeActionMeta>;
+}
+export interface ExposeListItem {
+    name: string;
+    protocol: string;
+    description: string;
+    actions: Record<string, {
+        description: string;
+        params?: Record<string, string>;
+        returns?: Record<string, string>;
+    }>;
+    invoke: (action: string, value?: any) => any;
+}
+export interface ExposeWatchEvent {
+    name: string;
+    protocol: string;
+    action: string;
+    value?: any;
+}
+export interface ExposeSchemaItem {
+    protocol: string;
+    description: string;
+    providers: {
+        name: string;
+    }[];
+    actions: Record<string, {
+        description: string;
+        params?: Record<string, string>;
+        returns?: Record<string, string>;
+    }>;
+    invoke: string;
+}

package/lib/types/expose/index.js

@@ -0,0 +1 @@
+

package/lib/types/index.d.ts

@@ -23,6 +23,7 @@ export * from './message/index';
 export * from './package/index';
 export * from './state/index';
 export * from './store/res';
+export * from './expose/index';
 export * from './subscribe';
 export * from './standard';
 export * from './actions';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.1.53",
+  "version": "2.1.55",
   "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 };