alemonjs 2.1.14 → 2.1.16-alpha.1

package/README_CONFIG.md

@@ -12,9 +12,6 @@ input: 'lib/index.js' # 应用入口文件路径，快捷参数 --input
 login: 'discord' # 登录平台标识，快捷参数 --login
 url: 'ws://127.0.0.1:17117' # CBP服务器连接地址，快捷参数 --url
 is_full_receive: false # 是否全量接收消息（用于分流处理）
-
-# === CBP（Chat Bot Protocol）配置 ===
-loadBalanceStrategy: 'least-connections' # 负载均衡策略，快捷参数 --loadBalanceStrategy
 ```
 
 ### 权限管理
@@ -182,45 +179,6 @@ ChatBot Protocol
 
 ALemonJS 的核心通信协议，负责客户端与平台之间的消息传输和负载均衡。
 
-### 负载均衡策略
-
-```yaml
-# 负载均衡策略配置
-loadBalanceStrategy: 'least-connections' # 默认策略
-
-# 支持的策略类型：
-# - 'round-robin': 轮询算法
-# - 'least-connections': 最少连接算法（推荐）
-# - 'random': 随机算法
-# - 'first-available': 首个可用算法
-
-# 支持的策略类型：
-# - 'round-robin': 轮询算法
-# - 'least-connections': 最少连接算法（推荐）
-# - 'random': 随机算法
-# - 'first-available': 首个可用算法
-
-#1. **轮询算法 (round-robin)**
-#   - 按固定顺序依次分配请求
-#   - 适用于客户端处理能力相近的场景
-#   - 请求分布均匀
-
-#2. **最少连接算法 (least-connections)**
-#   - 优选当前连接数最少的客户端
-#   - 适用于客户端处理能力不同的场景
-#   - 提供最优的负载分配
-
-#3. **随机算法 (random)**
-#   - 随机选择可用客户端
-#   - 简单的概率性分布
-#   - 适用于临时测试场景
-
-#4. **首个可用算法 (first-available)**
-#   - 总是选择第一个健康的客户端
-#   - 类似主备模式
-#   - 适用于有优先级需求的场景
-```
-
 ### CBP 连接配置
 
 ```yaml

package/lib/app/SinglyLinkedList.d.ts

@@ -3,14 +3,18 @@ declare class ListNode<T> {
     next: ListNode<T> | null;
     constructor(data: T);
 }
-export declare class SinglyLinkedList<T> {
+export declare class SinglyLinkedList<T extends Record<string, any>> {
     private head;
     private size;
     private current;
+    private indexMap;
     constructor(initialValues?: T[]);
     append(data: T): void;
+    findByKey<K extends keyof T>(key: K, value: T[K]): ListNode<T> | null;
+    updateById(id: any, updater: (data: T) => T): boolean;
     popNext(): ListNode<T> | null;
     removeCurrent(): void;
+    removeById(id: any): boolean;
     getSize(): number;
 }
 export {};

package/lib/app/SinglyLinkedList.js

@@ -10,10 +10,12 @@ class SinglyLinkedList {
     head;
     size;
     current;
+    indexMap;
     constructor(initialValues) {
         this.head = null;
         this.size = 0;
         this.current = null;
+        this.indexMap = new Map();
         if (initialValues) {
             initialValues.forEach(value => this.append(value));
         }
@@ -30,8 +32,38 @@ class SinglyLinkedList {
             }
             current.next = newNode;
         }
+        if (data.id !== undefined) {
+            this.indexMap.set(data.id, newNode);
+        }
         this.size++;
     }
+    findByKey(key, value) {
+        if (key === 'id' && this.indexMap.has(value)) {
+            return this.indexMap.get(value);
+        }
+        let current = this.head;
+        while (current) {
+            if (current.data[key] === value) {
+                return current;
+            }
+            current = current.next;
+        }
+        return null;
+    }
+    updateById(id, updater) {
+        const node = this.findByKey('id', id);
+        if (!node) {
+            return false;
+        }
+        const oldData = node.data;
+        const newData = updater(oldData);
+        node.data = newData;
+        if (oldData.id !== newData.id) {
+            this.indexMap.delete(oldData.id);
+            this.indexMap.set(newData.id, node);
+        }
+        return true;
+    }
     popNext() {
         if (!this.current) {
             this.current = this.head;
@@ -42,9 +74,12 @@ class SinglyLinkedList {
         return this.current;
     }
     removeCurrent() {
-        if (!this.head) {
+        if (!this.head || !this.current) {
             return;
         }
+        if (this.current.data.id !== undefined) {
+            this.indexMap.delete(this.current.data.id);
+        }
         if (this.current === this.head) {
             this.head = this.head.next;
             this.current = null;
@@ -61,6 +96,32 @@ class SinglyLinkedList {
             this.size--;
         }
     }
+    removeById(id) {
+        const node = this.findByKey('id', id);
+        if (!node) {
+            return false;
+        }
+        if (node === this.current) {
+            this.removeCurrent();
+        }
+        else {
+            if (node === this.head) {
+                this.head = node.next;
+            }
+            else {
+                let previous = this.head;
+                while (previous && previous.next !== node) {
+                    previous = previous.next;
+                }
+                if (previous) {
+                    previous.next = node.next;
+                }
+            }
+            this.indexMap.delete(id);
+            this.size--;
+        }
+        return true;
+    }
     getSize() {
         return this.size;
     }

package/lib/app/config.d.ts

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

package/lib/app/config.js

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

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

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

package/lib/app/define-children.js

@@ -0,0 +1,19 @@
+import { ResultCode } from '../core/variable.js';
+
+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-platform.d.ts

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

package/lib/app/define-platform.js

@@ -0,0 +1,32 @@
+const definePlatform = (options) => {
+    const mainProcess = () => {
+        ['SIGINT', 'SIGTERM', 'SIGQUIT', 'disconnect'].forEach(sig => {
+            process?.on?.(sig, () => {
+                logger.info?.(`[@alemonjs/qq-bot][${sig}] 收到信号，正在关闭...`);
+                setImmediate(() => process.exit(0));
+            });
+        });
+        process?.on?.('exit', code => {
+            logger.info?.(`[@alemonjs/qq-bot][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 { }
+        });
+        if (process.send) {
+            process.send(JSON.stringify({ type: 'ready' }));
+        }
+    };
+    mainProcess();
+    return options.main;
+};
+
+export { definePlatform };

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,15 +1,23 @@
 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);
             return;
         }
         const item = subList.value.popNext();
+        const selects = item.data.selects;
+        const ID = item.data.id;
         if (!item) {
-            nextObserver(true);
+            nextObserver();
+            return;
+        }
+        if (item.data.status === SubscribeStatus.paused) {
+            subList.value.removeCurrent();
+            nextObserver();
             return;
         }
         for (const key in item.data.keys) {
@@ -18,38 +26,33 @@ const expendSubscribe = (valueEvent, select, next, chioce) => {
                 return;
             }
         }
-        const clear = () => {
-            const selects = item.data.selects;
-            const ID = item.data.id;
+        const onPaused = () => {
             for (const select of selects) {
-                const subList = new SubscribeList(chioce, select);
-                const remove = () => {
-                    const item = subList.value.popNext();
-                    if (!item || item.data.id !== ID) {
-                        remove();
-                        return;
-                    }
-                    subList.value.removeCurrent();
-                };
-                remove();
+                const subList = new SubscribeList(choose, select);
+                subList.value.updateById(ID, (data) => ({
+                    status: SubscribeStatus.paused,
+                    ...data
+                }));
             }
         };
-        const restore = () => {
-            const selects = item.data.selects;
+        const onActive = () => {
             for (const select of selects) {
-                const subList = new SubscribeList(chioce, select);
-                subList.value.append(item.data);
+                const subList = new SubscribeList(choose, select);
+                subList.value.updateById(ID, (data) => ({
+                    status: SubscribeStatus.active,
+                    ...data
+                }));
             }
         };
-        clear();
+        onPaused();
         const Continue = (cn, ...cns) => {
-            restore();
+            onActive();
             if (cn) {
                 nextObserver(...cns);
                 return;
             }
             if (typeof cn === 'boolean') {
-                clear();
+                onPaused();
                 nextObserver(...cns);
             }
         };

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,10 @@ const useSubscribe = (event, selects) => {
         const ID = value.id;
         for (const select of selects) {
             const subList = new SubscribeList(value.choose, select);
-            const remove = () => {
-                const item = subList.value.popNext();
-                if (!item || item.data.id !== ID) {
-                    remove();
-                    return;
-                }
-                subList.value.removeCurrent();
-            };
-            remove();
+            subList.value.updateById(ID, (data) => ({
+                status: SubscribeStatus.paused,
+                ...data
+            }));
         }
     };
     const subscribe = {

package/lib/app/index.d.ts

@@ -1,6 +1,7 @@
 export * from './store.js';
 export * from './load_modules/index.js';
-export * from './define-chidren.js';
+export * from './define-children.js';
+export * from './define-platform.js';
 export * from './define-response.js';
 export * from './define-middleware.js';
 export * from './event-group.js';

package/lib/app/index.js

@@ -1,7 +1,8 @@
 export { ChildrenApp, Core, Logger, Middleware, MiddlewareRouter, ProcessorEventAutoClearMap, ProcessorEventUserAudoClearMap, 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-chidren.js';
+export { defineChildren } from './define-children.js';
+export { definePlatform } from './define-platform.js';
 export { defineResponse, lazy } from './define-response.js';
 export { defineMiddleware } from './define-middleware.js';
 export { onGroup } from './event-group.js';

package/lib/cbp/connects/client.js

@@ -6,7 +6,7 @@ import 'path';
 import 'yaml';
 import { ResultCode } from '../../core/variable.js';
 import '../../app/load_modules/loadChild.js';
-import '../../app/define-chidren.js';
+import '../../app/define-children.js';
 import '../../app/define-response.js';
 import '../../app/define-middleware.js';
 import '../../app/event-group.js';

package/lib/cbp/server/main.js

@@ -126,7 +126,7 @@ const handleEvent = (message, ID) => {
 const setChildrenClient = (originId, ws) => {
     childrenClient.set(originId, ws);
     ws.on('message', (message) => {
-        if (global.sandbox) {
+        if (global.__sandbox) {
             if (global.testoneClient && global.testoneClient.readyState === WebSocket.OPEN) {
                 global.testoneClient.send(message.toString());
             }
@@ -162,7 +162,7 @@ const setChildrenClient = (originId, ws) => {
 const setFullClient = (originId, ws) => {
     fullClient.set(originId, ws);
     ws.on('message', (message) => {
-        if (global.sandbox) {
+        if (global.__sandbox) {
             if (global.testoneClient && global.testoneClient.readyState === WebSocket.OPEN) {
                 global.testoneClient.send(message.toString());
             }
@@ -318,7 +318,7 @@ const cbpServer = (port, listeningListener) => {
             global.chatbotServer = new WebSocketServer({ server });
             global.chatbotServer.on('connection', (ws, request) => {
                 if (request.url === '/testone') {
-                    if (!global.sandbox) {
+                    if (!global.__sandbox) {
                         ws.close(4000, 'Sandbox mode required');
                         return;
                     }

package/lib/client.js

@@ -16,7 +16,7 @@ import 'fs/promises';
 import './app/store.js';
 import { loadModels } from './app/load_modules/load.js';
 import './app/load_modules/loadChild.js';
-import './app/define-chidren.js';
+import './app/define-children.js';
 import './app/define-response.js';
 import './app/define-middleware.js';
 import './app/event-group.js';

package/lib/core/config.js

@@ -55,9 +55,16 @@ class ConfigCore {
     }
     get value() {
         if (!this.#value) {
-            return this.#update();
+            this.#update();
+            return {
+                ...(this.#value || {}),
+                ...(global?.__options || {})
+            };
         }
-        return this.#value;
+        return {
+            ...(this.#value || {}),
+            ...(global?.__options || {})
+        };
     }
     saveValue(value) {
         if (!this.#dir) {
@@ -119,12 +126,12 @@ class ConfigCore {
     }
 }
 const getConfig = () => {
-    if (global?.config) {
-        return global.config;
+    if (global?.__config) {
+        return global.__config;
     }
     const configDir = process.env.CFG_PATH || 'alemon.config.yaml';
-    global.config = new ConfigCore(configDir);
-    return global.config;
+    global.__config = new ConfigCore(configDir);
+    return global.__config;
 };
 const getConfigValue = () => getConfig()?.value || {};
 

package/lib/index.js

@@ -8,7 +8,8 @@ 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 { loadModels, run } from './app/load_modules/load.js';
 export { loadChildren, loadChildrenFile } from './app/load_modules/loadChild.js';
-export { defineChildren } from './app/define-chidren.js';
+export { defineChildren } from './app/define-children.js';
+export { definePlatform } from './app/define-platform.js';
 export { defineResponse, lazy } from './app/define-response.js';
 export { defineMiddleware } from './app/define-middleware.js';
 export { onGroup } from './app/event-group.js';

package/lib/main.js

@@ -14,7 +14,7 @@ const startPlatform = (options) => {
     const platform = createOptionsByKey(options, 'platform', '');
     const login = createOptionsByKey(options, 'login', '');
     if (!platform && !login) {
-        global.sandbox = true;
+        global.__sandbox = true;
         return;
     }
     if (platform) {
@@ -49,6 +49,7 @@ const start = (options = {}) => {
     if (typeof options === 'string') {
         options = { input: options };
     }
+    global.__options = options;
     const port = createOptionsByKey(options, 'port', defaultPort);
     const serverPort = createOptionsByKey(options, 'serverPort', '');
     process.env.port = port;

package/lib/types/run.d.ts

@@ -1,13 +1,74 @@
 type ServerOptions = {
     port?: number;
+    serverPort?: number;
 };
 type ClientOptions = {
     url?: string;
 };
-export type StartOptions = ServerOptions & ClientOptions & {
+type AppOptions = {
     input?: string;
     platform?: string;
     login?: string;
     is_full_receive?: boolean;
 };
+type MasterOptions = {
+    master_key?: {
+        [key: string]: boolean;
+    };
+    master_id?: {
+        [key: string]: boolean;
+    };
+};
+type BotOptions = {
+    bot_key?: {
+        [key: string]: boolean;
+    };
+    bot_id?: {
+        [key: string]: boolean;
+    };
+};
+type MessageOptions = {
+    disabled_text_regular?: string;
+    disabled_selects?: {
+        [key: string]: boolean;
+    };
+    disabled_user_id?: {
+        [key: string]: boolean;
+    };
+    disabled_user_key?: {
+        [key: string]: boolean;
+    };
+    redirect_text_regular?: string;
+    redirect_text_target?: string;
+    mapping_text?: {
+        regular?: string;
+        target?: string;
+    }[];
+};
+type ProcessorOptions = {
+    processor?: {
+        repeated_event_time?: number;
+        repeated_user_time?: number;
+    };
+};
+type AppsOptions = {
+    apps?: {
+        [key: string]: boolean;
+    };
+};
+type CBPOptions = {
+    cbp?: {
+        timeout?: number;
+        reconnectInterval?: string;
+        heartbeatInterval?: string;
+        healthCheckInterval?: string;
+        headers?: {
+            'user-agent': string;
+            'x-device-id': string;
+            'x-full-receive': '0' | '1';
+            [key: string]: string;
+        };
+    };
+};
+export type StartOptions = ServerOptions & ClientOptions & AppOptions & MasterOptions & BotOptions & MessageOptions & ProcessorOptions & AppsOptions & CBPOptions;
 export {};

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

@@ -7,6 +7,7 @@ export type SubscribeValue = {
     keys: {
         [key: string]: string | number | boolean;
     };
+    status?: 'active' | 'processing' | 'paused';
     current: Function;
     id: string;
 };

package/lib/utils.js

@@ -125,15 +125,15 @@ async function createPicFrom(options) {
 }
 const getPublicIP = async (options = {}) => {
     const { force, ...config } = options;
-    if (global.publicip && !force) {
-        return global.publicip;
+    if (global.__publicIp && !force) {
+        return global.__publicIp;
     }
     return await publicIp({
         onlyHttps: true,
         ...config
     }).then(ip => {
-        global.publicip = ip;
-        return global.publicip;
+        global.__publicIp = ip;
+        return global.__publicIp;
     });
 };
 class Regular extends RegExp {

package/package.json

@@ -1,20 +1,18 @@
 {
   "name": "alemonjs",
-  "version": "2.1.14",
+  "version": "2.1.16-alpha.1",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",
   "type": "module",
   "main": "lib/index.js",
   "scripts": {
-    "build": "lvy build",
-    "bundle": "vite build"
+    "build": "lvy build"
   },
   "types": "lib",
   "exports": {
     "./package": "./package.json",
     ".": {
-      "browser": "./dist/alemonjs.es.js",
       "import": "./lib/index.js",
       "types": "./lib/index.d.ts",
       "require": "./dist/index.js"