alemonjs 2.1.16 → 2.1.18

package/README_CONFIG.md

@@ -12,7 +12,6 @@ input: 'lib/index.js' # 应用入口文件路径，快捷参数 --input
 login: 'discord' # 登录平台标识，快捷参数 --login
 url: 'ws://127.0.0.1:17117' # CBP服务器连接地址，快捷参数 --url
 is_full_receive: false # 是否全量接收消息（用于分流处理）
-
 ```
 
 ### 权限管理

package/lib/app/SinglyLinkedList.d.ts

@@ -5,6 +5,7 @@ declare class ListNode<T> {
 }
 export declare class SinglyLinkedList<T> {
     private head;
+    private tail;
     private size;
     private current;
     constructor(initialValues?: T[]);

package/lib/app/SinglyLinkedList.js

@@ -8,10 +8,12 @@ class ListNode {
 }
 class SinglyLinkedList {
     head;
+    tail;
     size;
     current;
     constructor(initialValues) {
         this.head = null;
+        this.tail = null;
         this.size = 0;
         this.current = null;
         if (initialValues) {
@@ -22,13 +24,11 @@ class SinglyLinkedList {
         const newNode = new ListNode(data);
         if (!this.head) {
             this.head = newNode;
+            this.tail = newNode;
         }
         else {
-            let current = this.head;
-            while (current.next) {
-                current = current.next;
-            }
-            current.next = newNode;
+            this.tail.next = newNode;
+            this.tail = newNode;
         }
         this.size++;
     }
@@ -42,11 +42,14 @@ class SinglyLinkedList {
         return this.current;
     }
     removeCurrent() {
-        if (!this.head) {
+        if (!this.head || !this.current) {
             return;
         }
         if (this.current === this.head) {
             this.head = this.head.next;
+            if (!this.head) {
+                this.tail = null;
+            }
             this.current = null;
             this.size--;
             return;
@@ -57,6 +60,9 @@ class SinglyLinkedList {
         }
         if (previous && this.current) {
             previous.next = this.current.next;
+            if (this.current === this.tail) {
+                this.tail = previous;
+            }
             this.current = null;
             this.size--;
         }

package/lib/app/config.d.ts

@@ -0,0 +1,4 @@
+export declare const SubscribeStatus: {
+    active: 'active';
+    paused: 'paused';
+};

package/lib/app/config.js

@@ -0,0 +1,6 @@
+const SubscribeStatus = {
+    active: 'active',
+    paused: 'paused'
+};
+
+export { SubscribeStatus };

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

@@ -1,5 +1,6 @@
 type Options = {
     main: () => any;
+    name?: string;
 };
 export declare const definePlatform: (options: Options) => () => any;
 export {};

package/lib/app/define-platform.js

@@ -1,13 +1,14 @@
 const definePlatform = (options) => {
+    const platformName = options.name || process.env.platform || 'unknown';
     const mainProcess = () => {
         ['SIGINT', 'SIGTERM', 'SIGQUIT', 'disconnect'].forEach(sig => {
             process?.on?.(sig, () => {
-                logger.info?.(`[@alemonjs/qq-bot][${sig}] 收到信号，正在关闭...`);
+                logger.info?.(`[${platformName}][${sig}] 收到信号，正在关闭...`);
                 setImmediate(() => process.exit(0));
             });
         });
         process?.on?.('exit', code => {
-            logger.info?.(`[@alemonjs/qq-bot][exit] 进程退出，code=${code}`);
+            logger.info?.(`[${platformName}][exit] 进程退出，code=${code}`);
         });
         process.on('message', msg => {
             try {

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

@@ -1,4 +1,3 @@
-import { isAsyncFunction } from 'util/types';
 import 'fs';
 import 'path';
 import 'yaml';
@@ -42,20 +41,11 @@ const createCallHandler = valueEvent => {
                 return;
             }
             try {
-                if (isAsyncFunction(currents[index])) {
-                    const res = await currents[index](valueEvent, (...cns) => {
-                        isNext = true;
-                        nextEvent(...cns);
-                    });
-                    onRes(res);
-                }
-                else {
-                    const res = currents[index](valueEvent, (...cns) => {
-                        isNext = true;
-                        nextEvent(...cns);
-                    });
-                    onRes(res);
-                }
+                const res = await currents[index](valueEvent, (...cns) => {
+                    isNext = true;
+                    nextEvent(...cns);
+                });
+                onRes(res);
             }
             catch (err) {
                 showErrorModule(err);

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

@@ -1,2 +1,3 @@
 import { Next, Events, EventKeys, StoreResponseItem } from '../types';
+export declare const clearModuleCache: (path?: string) => void;
 export declare const createNextStep: <T extends EventKeys>(valueEvent: Events[T], select: T, next: Next, files: StoreResponseItem[], callHandler: (currents: any, nextEvent: any) => void) => Next;

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

@@ -3,9 +3,26 @@ import { showErrorModule } from '../core/utils.js';
 import { EventMessageText } from '../core/variable.js';
 import { ResponseMiddleware } from './store.js';
 
+const moduleCache = new Map();
+const clearModuleCache = (path) => {
+    if (path) {
+        moduleCache.delete(path);
+    }
+    else {
+        moduleCache.clear();
+    }
+};
+const loadModule = async (filePath) => {
+    if (moduleCache.has(filePath)) {
+        return moduleCache.get(filePath);
+    }
+    const mod = await import(`file://${filePath}`);
+    moduleCache.set(filePath, mod);
+    return mod;
+};
 const callHandlerFile = async (valueEvent, select, file, nextStep, callback) => {
     try {
-        const app = await import(`file://${file.path}`);
+        const app = await loadModule(file.path);
         if (!app?.default?.current || !app?.default?.select) {
             nextStep();
             return;
@@ -88,4 +105,4 @@ const createNextStep = (valueEvent, select, next, files, callHandler) => {
     return nextStep;
 };
 
-export { createNextStep };
+export { clearModuleCache, createNextStep };

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

@@ -1,4 +1,3 @@
-import { isAsyncFunction } from 'util/types';
 import { EventMessageText } from '../core/variable.js';
 import 'fs';
 import 'path';
@@ -45,7 +44,7 @@ const createRouteProcessChildren = (valueEvent, select, nextCycle, callHandler)
             try {
                 const currents = [];
                 for (const item of currentsAndMiddleware) {
-                    const app = isAsyncFunction(item) ? await item() : item();
+                    const app = await item();
                     const selects = Array.isArray(app.select) ? app.select : [app.select];
                     if (!selects.includes(select)) {
                         void nextNode();

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

@@ -3,13 +3,13 @@ import { createCallHandler } from './event-processor-callHandler.js';
 import { createNextStep } from './event-processor-cycleFiles.js';
 import { createRouteProcessChildren } from './event-processor-cycleRoute.js';
 
+const responseSingleton = new Response();
+const responseRouterSingleton = new ResponseRouter();
 const expendEvent = (valueEvent, select, next) => {
-    const res = new Response();
-    const StoreResponse = res.value;
+    const StoreResponse = responseSingleton.value;
     const callHandler = createCallHandler(valueEvent);
     const nextEvent = createNextStep(valueEvent, select, next, StoreResponse, callHandler);
-    const resRoute = new ResponseRouter();
-    const routes = resRoute.value;
+    const routes = responseRouterSingleton.value;
     const callRouteHandler = createCallHandler(valueEvent);
     const processChildren = createRouteProcessChildren(valueEvent, select, nextEvent, callRouteHandler);
     void processChildren(routes, [], nextEvent);

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

@@ -3,13 +3,13 @@ import { createCallHandler } from './event-processor-callHandler.js';
 import { createNextStep } from './event-processor-cycleFiles.js';
 import { createRouteProcessChildren } from './event-processor-cycleRoute.js';
 
+const middlewareSingleton = new Middleware();
+const middlewareRouterSingleton = new MiddlewareRouter();
 const expendMiddleware = (valueEvent, select, next) => {
-    const mw = new Middleware();
-    const mwFiles = mw.value;
+    const mwFiles = middlewareSingleton.value;
     const callHandler = createCallHandler(valueEvent);
     const nextMiddleware = createNextStep(valueEvent, select, next, mwFiles, callHandler);
-    const resRoute = new MiddlewareRouter();
-    const routes = resRoute.value;
+    const routes = middlewareRouterSingleton.value;
     const callRouteHandler = createCallHandler(valueEvent);
     const processChildren = createRouteProcessChildren(valueEvent, select, nextMiddleware, callRouteHandler);
     void processChildren(routes, [], nextMiddleware);

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

@@ -1,5 +1,5 @@
 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 expendSubscribe: <T extends EventKeys>(valueEvent: Events[T], select: T, next: Next, choose: 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,7 +1,8 @@
 import { SubscribeList } from './store.js';
+import { SubscribeStatus } from './config.js';
 
-const expendSubscribe = (valueEvent, select, next, chioce) => {
-    const subList = new SubscribeList(chioce, select);
+const expendSubscribe = (valueEvent, select, next, choose) => {
+    const subList = new SubscribeList(choose, select);
     const nextObserver = (cn, ...cns) => {
         if (cn) {
             next(...cns);
@@ -12,45 +13,58 @@ const expendSubscribe = (valueEvent, select, next, chioce) => {
             nextObserver(true);
             return;
         }
+        const selects = item.data.selects;
+        const ID = item.data.id;
+        if (item.data.status === SubscribeStatus.paused) {
+            subList.value.removeCurrent();
+            nextObserver();
+            return;
+        }
         for (const key in item.data.keys) {
             if (item.data.keys[key] !== valueEvent[key]) {
                 nextObserver();
                 return;
             }
         }
-        const clear = () => {
-            const selects = item.data.selects;
-            const ID = item.data.id;
+        const onActive = () => {
             for (const select of selects) {
-                const subList = new SubscribeList(chioce, select);
-                const remove = () => {
+                const subList = new SubscribeList(choose, select);
+                const find = () => {
                     const item = subList.value.popNext();
-                    if (!item || item.data.id !== ID) {
-                        remove();
+                    if (!item) {
+                        return;
+                    }
+                    if (item.data.id !== ID) {
+                        find();
                         return;
                     }
-                    subList.value.removeCurrent();
+                    item.data.status = SubscribeStatus.active;
                 };
-                remove();
+                find();
             }
         };
-        const restore = () => {
-            const selects = item.data.selects;
+        const onPaused = () => {
             for (const select of selects) {
-                const subList = new SubscribeList(chioce, select);
-                subList.value.append(item.data);
+                const subList = new SubscribeList(choose, select);
+                const find = () => {
+                    const item = subList.value.popNext();
+                    if (!item) {
+                        return;
+                    }
+                    if (item.data.id !== ID) {
+                        find();
+                        return;
+                    }
+                    item.data.status = SubscribeStatus.paused;
+                };
+                find();
             }
         };
-        clear();
+        onPaused();
         const Continue = (cn, ...cns) => {
-            restore();
+            onActive();
             if (cn) {
                 nextObserver(...cns);
-                return;
-            }
-            if (typeof cn === 'boolean') {
-                clear();
-                nextObserver(...cns);
             }
         };
         item.data.current(valueEvent, Continue);

package/lib/app/event-processor.js

@@ -1,7 +1,7 @@
 import { getConfigValue } from '../core/config.js';
-import { processorRepeatedClearTimeMin, processorRepeatedClearTimeMax, processorRepeatedEventTime, processorRepeatedUserTime, processorPepeatedClearSize } from '../core/variable.js';
+import { processorRepeatedClearTimeMin, processorRepeatedClearTimeMax, processorRepeatedEventTime, processorRepeatedUserTime, processorRepeatedClearSize, processorMaxMapSize } from '../core/variable.js';
 import { expendCycle } from './event-processor-cycle.js';
-import { ProcessorEventAutoClearMap, ProcessorEventUserAudoClearMap } from './store.js';
+import { ProcessorEventAutoClearMap, ProcessorEventUserAutoClearMap } from './store.js';
 import { createHash } from '../core/utils.js';
 
 const filter = ({ Now, store, INTERVAL }, MessageId) => {
@@ -12,6 +12,15 @@ const filter = ({ Now, store, INTERVAL }, MessageId) => {
             return true;
         }
     }
+    if (store.size >= processorMaxMapSize) {
+        cleanupStore({ Now, store, INTERVAL });
+        if (store.size >= processorMaxMapSize) {
+            const firstKey = store.keys().next().value;
+            if (firstKey !== undefined) {
+                store.delete(firstKey);
+            }
+        }
+    }
     store.set(MessageId, Date.now());
 };
 const cleanupStore = ({ Now, store, INTERVAL }) => {
@@ -27,12 +36,12 @@ const cleanupStoreAll = () => {
     const EVENT_INTERVAL = value?.processor?.repeated_event_time ?? processorRepeatedEventTime;
     const USER_INTERVAL = value?.processor?.repeated_user_time ?? processorRepeatedUserTime;
     cleanupStore({ Now, INTERVAL: EVENT_INTERVAL, store: ProcessorEventAutoClearMap });
-    cleanupStore({ Now, INTERVAL: USER_INTERVAL, store: ProcessorEventUserAudoClearMap });
+    cleanupStore({ Now, INTERVAL: USER_INTERVAL, store: ProcessorEventUserAutoClearMap });
 };
 const callback = () => {
     cleanupStoreAll();
-    const length = ProcessorEventAutoClearMap.size + ProcessorEventUserAudoClearMap.size;
-    const time = length > processorPepeatedClearSize ? processorRepeatedClearTimeMin : processorRepeatedClearTimeMax;
+    const length = ProcessorEventAutoClearMap.size + ProcessorEventUserAutoClearMap.size;
+    const time = length > processorRepeatedClearSize ? processorRepeatedClearTimeMin : processorRepeatedClearTimeMax;
     setTimeout(callback, time);
 };
 setTimeout(callback, processorRepeatedClearTimeMin);
@@ -103,7 +112,7 @@ const onProcessor = (name, event, data) => {
     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)) {
+        if (filter({ Now, INTERVAL: USER_INTERVAL, store: ProcessorEventUserAutoClearMap }, UserId)) {
             return;
         }
     }

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

@@ -1,5 +1,6 @@
 import { ResultCode } from '../core/variable.js';
 import { SubscribeList } from './store.js';
+import { SubscribeStatus } from './config.js';
 
 const useSubscribe = (event, selects) => {
     if (typeof event !== 'object') {
@@ -44,6 +45,7 @@ const useSubscribe = (event, selects) => {
                 selects: curSelects,
                 keys: values,
                 current: callback,
+                status: SubscribeStatus.active,
                 id: ID
             });
         }
@@ -67,15 +69,18 @@ const useSubscribe = (event, selects) => {
         const ID = value.id;
         for (const select of selects) {
             const subList = new SubscribeList(value.choose, select);
-            const remove = () => {
+            const find = () => {
                 const item = subList.value.popNext();
-                if (!item || item.data.id !== ID) {
-                    remove();
+                if (!item) {
                     return;
                 }
-                subList.value.removeCurrent();
+                if (item.data.id !== ID) {
+                    find();
+                    return;
+                }
+                item.data.status = SubscribeStatus.paused;
             };
-            remove();
+            find();
         }
     };
     const subscribe = {

package/lib/app/index.js

@@ -1,4 +1,4 @@
-export { ChildrenApp, Core, Logger, Middleware, MiddlewareRouter, ProcessorEventAutoClearMap, ProcessorEventUserAudoClearMap, Response, ResponseMiddleware, ResponseRouter, State, StateSubscribe, SubscribeList, core, logger } from './store.js';
+export { ChildrenApp, Core, Logger, Middleware, MiddlewareRouter, ProcessorEventAutoClearMap, ProcessorEventUserAutoClearMap, Response, ResponseMiddleware, ResponseRouter, State, StateSubscribe, SubscribeList, core, logger } from './store.js';
 export { loadModels, run } from './load_modules/load.js';
 export { loadChildren, loadChildrenFile } from './load_modules/loadChild.js';
 export { defineChildren } from './define-children.js';

package/lib/app/load_modules/loadChild.js

@@ -40,7 +40,7 @@ const loadChildren = async (mainPath, appName) => {
         else {
             app = await moduleApp.default.callback();
         }
-        App.pushSycle(app);
+        App.pushCycle(app);
         const unMounted = async (e) => {
             showErrorModule(e);
             App.un();
@@ -87,7 +87,7 @@ const loadChildren = async (mainPath, appName) => {
             for (const file of files) {
                 const url = file.path.replace(mainDir, '');
                 const stateKey = createEventName(url, appName);
-                const reesponse = {
+                const responseItem = {
                     input: mainDir,
                     dir: dirname(file.path),
                     path: file.path,
@@ -95,7 +95,7 @@ const loadChildren = async (mainPath, appName) => {
                     stateKey,
                     appName: appName
                 };
-                resData.push(reesponse);
+                resData.push(responseItem);
             }
             App.pushResponse(resData);
             const responseAndMiddlewareFiles = getRecursiveDirFiles(responseDir, item => fileSuffixMiddleware.test(item.name));
@@ -103,7 +103,7 @@ const loadChildren = async (mainPath, appName) => {
             for (const file of responseAndMiddlewareFiles) {
                 const url = file.path.replace(mainDir, '');
                 const stateKey = createEventName(url, appName);
-                const reesponse = {
+                const responseItem = {
                     input: mainDir,
                     dir: dirname(file.path),
                     path: file.path,
@@ -111,7 +111,7 @@ const loadChildren = async (mainPath, appName) => {
                     stateKey,
                     appName: appName
                 };
-                resAndMwData[stateKey] = reesponse;
+                resAndMwData[stateKey] = responseItem;
             }
             App.pushResponseMiddleware(resAndMwData);
             const mwDir = join(mainDir, 'middleware');

package/lib/app/store.d.ts

@@ -33,7 +33,7 @@ export declare class Middleware {
 }
 export declare class SubscribeList<T extends EventKeys> {
     #private;
-    constructor(chioce: EventCycleEnum, select: T);
+    constructor(choice: EventCycleEnum, select: T);
     get value(): SinglyLinkedList<SubscribeValue>;
 }
 export declare class StateSubscribe {
@@ -58,13 +58,13 @@ export declare class ChildrenApp {
         [key: string]: StoreResponseItem;
     }): void;
     pushMiddleware(data: StoreMiddlewareItem[]): void;
-    pushSycle(data: ChildrenCycle): void;
+    pushCycle(data: ChildrenCycle): void;
     on(): void;
     un(): void;
     get value(): import("..").StoreChildrenApp;
 }
 export declare const ProcessorEventAutoClearMap: Map<any, any>;
-export declare const ProcessorEventUserAudoClearMap: Map<any, any>;
+export declare const ProcessorEventUserAutoClearMap: Map<any, any>;
 export declare const logger: any;
 export declare const core: {
     storeState: import("..").ResponseState;

package/lib/app/store.js

@@ -178,16 +178,16 @@ class Middleware {
 }
 class SubscribeList {
     #select;
-    #chioce;
-    constructor(chioce, select) {
+    #choice;
+    constructor(choice, select) {
         this.#select = select;
-        this.#chioce = chioce;
-        if (!alemonjsCore.storeSubscribeList[this.#chioce].has(this.#select)) {
-            alemonjsCore.storeSubscribeList[this.#chioce].set(this.#select, new SinglyLinkedList());
+        this.#choice = choice;
+        if (!alemonjsCore.storeSubscribeList[this.#choice].has(this.#select)) {
+            alemonjsCore.storeSubscribeList[this.#choice].set(this.#select, new SinglyLinkedList());
         }
     }
     get value() {
-        return alemonjsCore.storeSubscribeList[this.#chioce].get(this.#select);
+        return alemonjsCore.storeSubscribeList[this.#choice].get(this.#select);
     }
 }
 class StateSubscribe {
@@ -269,7 +269,7 @@ class ChildrenApp {
     pushMiddleware(data) {
         this.#middleware = this.#middleware.concat(data);
     }
-    pushSycle(data) {
+    pushCycle(data) {
         this.#cycle = data;
     }
     on() {
@@ -293,7 +293,7 @@ class ChildrenApp {
     }
 }
 const ProcessorEventAutoClearMap = new Map();
-const ProcessorEventUserAudoClearMap = new Map();
+const ProcessorEventUserAutoClearMap = new Map();
 const logger = new Logger().value;
 const core = new Core().value;
 ['SIGINT', 'SIGTERM', 'SIGQUIT', 'disconnect'].forEach(sig => {
@@ -305,4 +305,4 @@ process?.on?.('exit', code => {
     logger.info?.(`[alemonjs][exit] 进程退出，code=${code}`);
 });
 
-export { ChildrenApp, Core, Logger, Middleware, MiddlewareRouter, ProcessorEventAutoClearMap, ProcessorEventUserAudoClearMap, Response, ResponseMiddleware, ResponseRouter, State, StateSubscribe, SubscribeList, core, logger };
+export { ChildrenApp, Core, Logger, Middleware, MiddlewareRouter, ProcessorEventAutoClearMap, ProcessorEventUserAutoClearMap, Response, ResponseMiddleware, ResponseRouter, State, StateSubscribe, SubscribeList, core, logger };

package/lib/cbp/connects/base.d.ts

@@ -0,0 +1,15 @@
+export type WSConnectorOptions = {
+    url: string;
+    role: 'client' | 'platform';
+    onOpen?: () => void;
+    onMessage: (message: string) => void;
+    extraHeaders?: Record<string, string>;
+    globalKey: 'chatbotClient' | 'chatbotPlatform';
+};
+export declare const createWSConnector: (options: WSConnectorOptions) => {
+    heartbeatControl: {
+        start: () => void;
+        stop: () => void;
+        pong: () => void;
+    };
+};

package/lib/cbp/connects/base.js

@@ -0,0 +1,77 @@
+import { WebSocket } from 'ws';
+import { ResultCode } from '../../core/variable.js';
+import 'fs';
+import 'path';
+import 'yaml';
+import '../../core/utils.js';
+import { deviceId, DEVICE_ID_HEADER, USER_AGENT_HEADER, reconnectInterval } from '../processor/config.js';
+import { useHeartbeat } from './connect.js';
+
+const createWSConnector = (options) => {
+    const { url, role, onOpen, onMessage, extraHeaders = {}, globalKey } = options;
+    if (global[globalKey]) {
+        delete global[globalKey];
+    }
+    const [heartbeatControl] = useHeartbeat({
+        ping: () => {
+            global?.[globalKey]?.ping?.();
+        },
+        isConnected: () => {
+            return global?.[globalKey] && global?.[globalKey]?.readyState === WebSocket.OPEN;
+        },
+        terminate: () => {
+            try {
+                global?.[globalKey]?.terminate?.();
+            }
+            catch (error) {
+                logger.debug({
+                    code: ResultCode.Fail,
+                    message: '强制断开连接失败',
+                    data: error
+                });
+            }
+        }
+    });
+    const start = () => {
+        global[globalKey] = new WebSocket(url, {
+            headers: {
+                [USER_AGENT_HEADER]: role,
+                [DEVICE_ID_HEADER]: deviceId,
+                ...extraHeaders
+            }
+        });
+        global[globalKey].on('open', () => {
+            onOpen?.();
+            heartbeatControl.start();
+        });
+        global[globalKey].on('pong', () => {
+            heartbeatControl.pong();
+        });
+        global[globalKey].on('message', (message) => {
+            onMessage(message.toString());
+        });
+        global[globalKey].on('close', (code) => {
+            heartbeatControl.stop();
+            logger.warn({
+                code: ResultCode.Fail,
+                message: `${role} 连接关闭，尝试重新连接...`,
+                data: code
+            });
+            delete global[globalKey];
+            setTimeout(() => {
+                start();
+            }, reconnectInterval);
+        });
+        global[globalKey].on('error', (err) => {
+            logger.error({
+                code: ResultCode.Fail,
+                message: `${role} 端错误`,
+                data: err
+            });
+        });
+    };
+    start();
+    return { heartbeatControl };
+};
+
+export { createWSConnector };

package/lib/cbp/connects/client.js

@@ -1,4 +1,3 @@
-import { WebSocket } from 'ws';
 import * as flattedJSON from 'flatted';
 import '../../app/store.js';
 import 'fs';
@@ -13,57 +12,26 @@ import '../../app/event-group.js';
 import '../../app/event-middleware.js';
 import { onProcessor } from '../../app/event-processor.js';
 import '../../app/event-response.js';
-import 'util/types';
 import { createResult } from '../../core/utils.js';
 import '../../app/hook-use-api.js';
 import '../../app/message-api.js';
 import '../../app/message-format.js';
-import { deviceId, FULL_RECEIVE_HEADER, DEVICE_ID_HEADER, USER_AGENT_HEADER, apiResolves, apiTimeouts, actionResolves, actionTimeouts, reconnectInterval } from '../processor/config.js';
-import { useHeartbeat } from './connect.js';
+import { apiResolves, apiTimeouts, actionResolves, actionTimeouts, FULL_RECEIVE_HEADER } from '../processor/config.js';
+import { createWSConnector } from './base.js';
 
 const cbpClient = (url, options = {}) => {
-    if (global.chatbotClient) {
-        delete global.chatbotClient;
-    }
     const { open = () => { }, isFullReceive = true } = options;
-    const [heartbeatControl] = useHeartbeat({
-        ping: () => {
-            global?.chatbotClient?.ping?.();
+    createWSConnector({
+        url,
+        role: 'client',
+        globalKey: 'chatbotClient',
+        extraHeaders: {
+            [FULL_RECEIVE_HEADER]: isFullReceive ? '1' : '0'
         },
-        isConnected: () => {
-            return global?.chatbotClient && global?.chatbotClient?.readyState === WebSocket.OPEN;
-        },
-        terminate: () => {
+        onOpen: open,
+        onMessage: (messageStr) => {
             try {
-                global?.chatbotClient?.terminate?.();
-            }
-            catch (error) {
-                logger.debug({
-                    code: ResultCode.Fail,
-                    message: '强制断开连接失败',
-                    data: error
-                });
-            }
-        }
-    });
-    const start = () => {
-        global.chatbotClient = new WebSocket(url, {
-            headers: {
-                [USER_AGENT_HEADER]: 'client',
-                [DEVICE_ID_HEADER]: deviceId,
-                [FULL_RECEIVE_HEADER]: isFullReceive ? '1' : '0'
-            }
-        });
-        global.chatbotClient.on('open', () => {
-            open();
-            heartbeatControl.start();
-        });
-        global.chatbotClient.on('pong', () => {
-            heartbeatControl.pong();
-        });
-        global.chatbotClient.on('message', message => {
-            try {
-                const parsedMessage = flattedJSON.parse(message.toString());
+                const parsedMessage = flattedJSON.parse(messageStr);
                 if (parsedMessage?.activeId) {
                     if (parsedMessage.active === 'sync') {
                         const configs = parsedMessage.payload;
@@ -118,28 +86,8 @@ const cbpClient = (url, options = {}) => {
                     data: error
                 });
             }
-        });
-        global.chatbotClient.on('close', () => {
-            heartbeatControl.stop();
-            logger.warn({
-                code: ResultCode.Fail,
-                message: '连接关闭，尝试重新连接...',
-                data: null
-            });
-            delete global.chatbotClient;
-            setTimeout(() => {
-                start();
-            }, reconnectInterval);
-        });
-        global.chatbotClient.on('error', err => {
-            logger.error({
-                code: ResultCode.Fail,
-                message: '客户端错误',
-                data: err
-            });
-        });
-    };
-    start();
+        }
+    });
 };
 
 export { cbpClient };

package/lib/cbp/connects/platform.js

@@ -1,40 +1,17 @@
 import * as flattedJSON from 'flatted';
 import { WebSocket } from 'ws';
-import { deviceId, DEVICE_ID_HEADER, USER_AGENT_HEADER, reconnectInterval } from '../processor/config.js';
+import { deviceId } from '../processor/config.js';
 import { ResultCode } from '../../core/variable.js';
 import 'fs';
 import 'path';
 import 'yaml';
 import '../../core/utils.js';
-import { useHeartbeat } from './connect.js';
+import { createWSConnector } from './base.js';
 
 const cbpPlatform = (url, options = {
     open: () => { }
 }) => {
-    if (global.chatbotPlatform) {
-        delete global.chatbotPlatform;
-    }
     const { open = () => { } } = options;
-    const [heartbeatControl] = useHeartbeat({
-        ping: () => {
-            global?.chatbotPlatform?.ping?.();
-        },
-        isConnected: () => {
-            return global?.chatbotPlatform && global?.chatbotPlatform?.readyState === WebSocket.OPEN;
-        },
-        terminate: () => {
-            try {
-                global?.chatbotPlatform?.terminate?.();
-            }
-            catch (error) {
-                logger.debug({
-                    code: ResultCode.Fail,
-                    message: '强制断开连接失败',
-                    data: error
-                });
-            }
-        }
-    });
     const send = (data) => {
         if (global.chatbotPlatform && global.chatbotPlatform.readyState === WebSocket.OPEN) {
             data.DeviceId = deviceId;
@@ -69,23 +46,14 @@ const cbpPlatform = (url, options = {
     const onapis = (reply) => {
         apiReplys.push(reply);
     };
-    const start = () => {
-        global.chatbotPlatform = new WebSocket(url, {
-            headers: {
-                [USER_AGENT_HEADER]: 'platform',
-                [DEVICE_ID_HEADER]: deviceId
-            }
-        });
-        global.chatbotPlatform.on('open', () => {
-            open();
-            heartbeatControl.start();
-        });
-        global.chatbotPlatform.on('pong', () => {
-            heartbeatControl.pong();
-        });
-        global.chatbotPlatform.on('message', message => {
+    createWSConnector({
+        url,
+        role: 'platform',
+        globalKey: 'chatbotPlatform',
+        onOpen: open,
+        onMessage: (messageStr) => {
             try {
-                const data = flattedJSON.parse(message.toString());
+                const data = flattedJSON.parse(messageStr);
                 if (data.apiId) {
                     for (const cb of apiReplys) {
                         void cb(data, val => replyApi(data, val));
@@ -104,28 +72,8 @@ const cbpPlatform = (url, options = {
                     data: error
                 });
             }
-        });
-        global.chatbotPlatform.on('close', err => {
-            heartbeatControl.stop();
-            logger.warn({
-                code: ResultCode.Fail,
-                message: '平台端连接关闭，尝试重新连接...',
-                data: err
-            });
-            delete global.chatbotPlatform;
-            setTimeout(() => {
-                start();
-            }, reconnectInterval);
-        });
-        global.chatbotPlatform.on('error', err => {
-            logger.error({
-                code: ResultCode.Fail,
-                message: '平台端错误',
-                data: err
-            });
-        });
-    };
-    start();
+        }
+    });
     const client = {
         send,
         onactions,

package/lib/cbp/processor/handle.d.ts

@@ -0,0 +1,3 @@
+import { Result } from '../../core';
+import type { Apis } from '../../types';
+export declare const sendAPI: (data: Apis) => Promise<Result[]>;

package/lib/cbp/processor/handle.js

@@ -0,0 +1,32 @@
+import { ResultCode } from '../../core/variable.js';
+import 'fs';
+import 'path';
+import 'yaml';
+import { createResult } from '../../core/utils.js';
+import { generateUniqueId, deviceId, apiResolves, apiTimeouts, timeoutTime } from './config.js';
+import * as flattedJSON from 'flatted';
+
+const sendAPI = (data) => {
+    const ApiId = generateUniqueId();
+    return new Promise(resolve => {
+        if (!global.chatbotClient?.send) {
+            resolve([createResult(ResultCode.Fail, 'Chatbot client is not available', null)]);
+            return;
+        }
+        data.apiId = ApiId;
+        data.DeviceId = deviceId;
+        global.chatbotClient?.send(flattedJSON.stringify(data));
+        apiResolves.set(ApiId, resolve);
+        const timeout = setTimeout(() => {
+            if (!apiResolves.has(ApiId) || !apiTimeouts.has(ApiId)) {
+                return;
+            }
+            apiResolves.delete(ApiId);
+            apiTimeouts.delete(ApiId);
+            resolve([createResult(ResultCode.Fail, '接口超时', null)]);
+        }, timeoutTime);
+        apiTimeouts.set(ApiId, timeout);
+    });
+};
+
+export { sendAPI };

package/lib/cbp/server/main.js

@@ -11,27 +11,7 @@ import '../../core/utils.js';
 import { USER_AGENT_HEADER, USER_AGENT_HEADER_VALUE_MAP, DEVICE_ID_HEADER, FULL_RECEIVE_HEADER, platformClient, childrenClient, fullClient, childrenBind } from '../processor/config.js';
 import { createTestOneController } from './testone.js';
 
-const handleApi = (DeviceId, message) => {
-    if (childrenClient.has(DeviceId)) {
-        const clientWs = childrenClient.get(DeviceId);
-        if (clientWs && clientWs.readyState === WebSocket.OPEN) {
-            clientWs.send(message);
-        }
-        else {
-            childrenClient.delete(DeviceId);
-        }
-    }
-    else if (fullClient.has(DeviceId)) {
-        const clientWs = fullClient.get(DeviceId);
-        if (clientWs && clientWs.readyState === WebSocket.OPEN) {
-            clientWs.send(message);
-        }
-        else {
-            fullClient.delete(DeviceId);
-        }
-    }
-};
-const handleAction = (DeviceId, message) => {
+const routeMessageToDevice = (DeviceId, message) => {
     if (childrenClient.has(DeviceId)) {
         const clientWs = childrenClient.get(DeviceId);
         if (clientWs && clientWs.readyState === WebSocket.OPEN) {
@@ -209,11 +189,11 @@ const setPlatformClient = (originId, ws) => {
             });
             if (parsedMessage.apiId) {
                 const DeviceId = parsedMessage.DeviceId;
-                handleApi(DeviceId, message);
+                routeMessageToDevice(DeviceId, message);
             }
             else if (parsedMessage?.actionId) {
                 const DeviceId = parsedMessage.DeviceId;
-                handleAction(DeviceId, message);
+                routeMessageToDevice(DeviceId, message);
             }
             else if (parsedMessage?.name) {
                 const ID = parsedMessage.ChannelId || parsedMessage.GuildId || parsedMessage.DeviceId;
@@ -260,11 +240,11 @@ const setTestOnePlatformClient = (ws) => {
             });
             if (parsedMessage.apiId) {
                 const DeviceId = parsedMessage.DeviceId;
-                handleApi(DeviceId, message);
+                routeMessageToDevice(DeviceId, message);
             }
             else if (parsedMessage?.actionId) {
                 const DeviceId = parsedMessage.DeviceId;
-                handleAction(DeviceId, message);
+                routeMessageToDevice(DeviceId, message);
             }
             else if (parsedMessage?.name) {
                 const ID = parsedMessage.ChannelId || parsedMessage.GuildId || parsedMessage.DeviceId;

package/lib/client.js

@@ -23,7 +23,6 @@ import './app/event-group.js';
 import './app/event-middleware.js';
 import './app/event-processor.js';
 import './app/event-response.js';
-import 'util/types';
 import './app/hook-use-api.js';
 import './app/message-api.js';
 import './app/message-format.js';

package/lib/core/config.js

@@ -6,6 +6,8 @@ import { ResultCode } from './variable.js';
 class ConfigCore {
     #dir = null;
     #value = null;
+    #mergedValue = null;
+    #watcher = null;
     #initValue = {
         gui: {
             port: 17127
@@ -14,6 +16,9 @@ class ConfigCore {
     constructor(dir) {
         this.#dir = dir;
     }
+    #invalidateMergedCache() {
+        this.#mergedValue = null;
+    }
     #update() {
         if (!this.#dir) {
             return this.#value;
@@ -27,6 +32,7 @@ class ConfigCore {
             const data = readFileSync(dir, 'utf-8');
             const d = YAML.parse(data);
             this.#value = d;
+            this.#invalidateMergedCache();
         }
         catch (err) {
             logger.error({
@@ -34,13 +40,17 @@ class ConfigCore {
                 message: 'Config file parse error',
                 data: err
             });
-            process.cwd();
         }
-        watch(dir, () => {
+        if (this.#watcher) {
+            this.#watcher.close();
+            this.#watcher = null;
+        }
+        this.#watcher = watch(dir, () => {
             try {
                 const data = readFileSync(dir, 'utf-8');
                 const d = YAML.parse(data);
                 this.#value = d;
+                this.#invalidateMergedCache();
             }
             catch (err) {
                 logger.error({
@@ -48,7 +58,6 @@ class ConfigCore {
                     message: 'Config file parse error',
                     data: err
                 });
-                process.cwd();
             }
         });
         return this.#value;
@@ -56,15 +65,15 @@ class ConfigCore {
     get value() {
         if (!this.#value) {
             this.#update();
-            return {
-                ...(this.#value || {}),
-                ...(global?.__options || {})
-            };
         }
-        return {
+        if (this.#mergedValue) {
+            return this.#mergedValue;
+        }
+        this.#mergedValue = {
             ...(this.#value || {}),
             ...(global?.__options || {})
         };
+        return this.#mergedValue;
     }
     saveValue(value) {
         if (!this.#dir) {

package/lib/core/variable.d.ts

@@ -3,7 +3,8 @@ export declare const processorRepeatedEventTime: number;
 export declare const processorRepeatedUserTime: number;
 export declare const processorRepeatedClearTimeMin: number;
 export declare const processorRepeatedClearTimeMax: number;
-export declare const processorPepeatedClearSize = 37;
+export declare const processorRepeatedClearSize = 37;
+export declare const processorMaxMapSize = 10000;
 export declare const fileSuffixMiddleware: RegExp;
 export declare const fileSuffixResponse: RegExp;
 export declare const filePrefixCommon: RegExp;

package/lib/core/variable.js

@@ -2,7 +2,8 @@ const processorRepeatedEventTime = 1000 * 60;
 const processorRepeatedUserTime = 1000 * 1;
 const processorRepeatedClearTimeMin = 1000 * 3;
 const processorRepeatedClearTimeMax = 1000 * 10;
-const processorPepeatedClearSize = 37;
+const processorRepeatedClearSize = 37;
+const processorMaxMapSize = 10000;
 const fileSuffixMiddleware = /^mw(\.|\..*\.)(js|ts|jsx|tsx)$/;
 const fileSuffixResponse = /^res(\.|\..*\.)(js|ts|jsx|tsx)$/;
 const filePrefixCommon = /^(@alemonjs\/|alemonjs-)/;
@@ -26,4 +27,4 @@ const ResultCode = {
     FailInternal
 };
 
-export { EventMessageText, Fail, FailAuth, FailInternal, FailParams, Ok, ResultCode, Warn, defaultLogin, defaultPlatformCommonPrefix, defaultPlatformPrefix, defaultPort, filePrefixCommon, fileSuffixMiddleware, fileSuffixResponse, processorPepeatedClearSize, processorRepeatedClearTimeMax, processorRepeatedClearTimeMin, processorRepeatedEventTime, processorRepeatedUserTime };
+export { EventMessageText, Fail, FailAuth, FailInternal, FailParams, Ok, ResultCode, Warn, defaultLogin, defaultPlatformCommonPrefix, defaultPlatformPrefix, defaultPort, filePrefixCommon, fileSuffixMiddleware, fileSuffixResponse, processorMaxMapSize, processorRepeatedClearSize, processorRepeatedClearTimeMax, processorRepeatedClearTimeMin, processorRepeatedEventTime, processorRepeatedUserTime };

package/lib/index.js

@@ -5,7 +5,7 @@ export { createEventName, createHash, createResult, getInputExportPath, getRecur
 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, ProcessorEventAutoClearMap, ProcessorEventUserAudoClearMap, Response, ResponseMiddleware, ResponseRouter, State, StateSubscribe, SubscribeList, core, logger } from './app/store.js';
+export { ChildrenApp, Core, Logger, Middleware, MiddlewareRouter, ProcessorEventAutoClearMap, ProcessorEventUserAutoClearMap, Response, ResponseMiddleware, ResponseRouter, State, StateSubscribe, SubscribeList, core, logger } from './app/store.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';

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

@@ -7,7 +7,8 @@ export type SubscribeValue = {
     keys: {
         [key: string]: string | number | boolean;
     };
-    current: Function;
+    status?: 'active' | 'paused';
+    current: (...arg: any[]) => any;
     id: string;
 };
 export type SubscribeMap = Map<string, SinglyLinkedList<SubscribeValue>>;

package/package.json

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