alemonjs 2.1.0-alpha.0 → 2.1.0-alpha.10

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

@@ -1,6 +1,6 @@
 import { isAsyncFunction } from 'util/types';
 import { useState } from './hook-use-state.js';
-import { showErrorModule } from './utils.js';
+import { showErrorModule } from '../core/utils.js';
 import { Response } from './store.js';
 import { useMessage } from './hook-use-api.js';
 import { EventMessageText } from '../core/variable.js';

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

@@ -1,6 +1,6 @@
 import { isAsyncFunction } from 'util/types';
 import { useState } from './hook-use-state.js';
-import { showErrorModule } from './utils.js';
+import { showErrorModule } from '../core/utils.js';
 import { Middleware } from './store.js';
 import { useMessage } from './hook-use-api.js';
 import { EventMessageText } from '../core/variable.js';

package/lib/app/event-processor.js

@@ -2,7 +2,7 @@ import { getConfigValue } from '../core/config.js';
 import { processor_repeated_clear_time_min, processor_repeated_clear_time_max, processor_repeated_event_time, processor_repeated_user_time, processor_repeated_clear_size } from '../core/variable.js';
 import { expendCycle } from './event-processor-cycle.js';
 import { ProcessorEventAutoClearMap, ProcessorEventUserAudoClearMap } from './store.js';
-import { createHash } from './utils.js';
+import { createHash } from '../core/utils.js';
 
 /**
  * 过滤掉重复消息

package/lib/app/hook-use-api.d.ts

@@ -1,5 +1,5 @@
 import { EventKeys, Events } from '../typing/event/map.js';
-import { Result } from './utils.js';
+import { Result } from '../core/utils.js';
 import '../global.js';
 import { DataEnums } from '../typing/message/index.js';
 
@@ -91,5 +91,12 @@ declare const onSelects: <T extends EventKeys[] | EventKeys>(values: T) => T;
  * @deprecated
  */
 declare const createSelects: <T extends EventKeys[] | EventKeys>(values: T) => T;
+/**
+ * 使用客户端
+ * @param event
+ * @param _ApiClass
+ * @returns
+ */
+declare const useClient: <T extends object>(event: any, _ApiClass: new (...args: any[]) => T) => T[];
 
-export { createSelects, onSelects, unChildren, useChannel, useMenber, useMention, useMessage, useSend, useSends };
+export { createSelects, onSelects, unChildren, useChannel, useClient, useMenber, useMention, useMessage, useSend, useSends };

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

@@ -1,7 +1,8 @@
 import { ResultCode } from '../core/code.js';
 import { ChildrenApp } from './store.js';
-import { createResult } from './utils.js';
+import { createResult } from '../core/utils.js';
 import { sendAction } from '../cbp/actions.js';
+import { sendAPI } from '../cbp/api.js';
 
 /**
  * 使用提及。
@@ -22,20 +23,16 @@ const useMention = (event) => {
         find: async (options) => {
             try {
                 if (!res) {
-                    const result = await sendAction({
+                    const results = await sendAction({
                         action: 'mention.get',
                         payload: {
                             event
                         }
                     });
-                    // mention 不能是 数组
-                    if (Array.isArray(result)) {
-                        return createResult(ResultCode.Ok, 'Successfully retrieved mention data', null);
+                    const result = results.find(item => item.code === ResultCode.Ok);
+                    if (result) {
+                        res = result.data;
                     }
-                    if (result.code !== ResultCode.Ok) {
-                        return createResult(result.code, result.message, null);
-                    }
-                    res = result.data;
                 }
             }
             catch (err) {
@@ -70,20 +67,16 @@ const useMention = (event) => {
         }) => {
             try {
                 if (!res) {
-                    const result = await sendAction({
+                    const results = await sendAction({
                         action: 'mention.get',
                         payload: {
                             event
                         }
                     });
-                    // mention 不能是 数组
-                    if (Array.isArray(result)) {
-                        return createResult(ResultCode.Ok, 'Successfully retrieved mention data', null);
-                    }
-                    if (result.code !== ResultCode.Ok) {
-                        return createResult(result.code, result.message, null);
+                    const result = results.find(item => item.code === ResultCode.Ok);
+                    if (result) {
+                        res = result.data;
                     }
-                    res = result.data;
                 }
             }
             catch (err) {
@@ -140,7 +133,9 @@ const useMessage = (event) => {
      */
     const send = async (val) => {
         if (!val || val.length === 0) {
-            return [createResult(ResultCode.FailParams, 'Invalid val: val must be a non-empty array', null)];
+            return [
+                createResult(ResultCode.FailParams, 'Invalid val: val must be a non-empty array', null)
+            ];
         }
         const result = await sendAction({
             action: 'message.send',
@@ -345,5 +340,28 @@ global.onSelects = onSelects;
  * @deprecated
  */
 const createSelects = onSelects;
+/**
+ * 使用客户端
+ * @param event
+ * @param _ApiClass
+ * @returns
+ */
+const useClient = (event, _ApiClass) => {
+    const client = new Proxy({}, {
+        get(_target, prop) {
+            return (...args) => {
+                return sendAPI({
+                    action: 'client.api',
+                    payload: {
+                        event,
+                        key: String(prop),
+                        params: args
+                    }
+                });
+            };
+        }
+    });
+    return [client];
+};
 
-export { createSelects, onSelects, unChildren, useChannel, useMenber, useMention, useMessage, useSend, useSends };
+export { createSelects, onSelects, unChildren, useChannel, useClient, useMenber, useMention, useMessage, useSend, useSends };

package/lib/app/load.js

@@ -1,6 +1,6 @@
 import { dirname, join } from 'path';
 import { existsSync } from 'fs';
-import { showErrorModule, getRecursiveDirFiles, createEventName } from './utils.js';
+import { showErrorModule, getRecursiveDirFiles, createEventName } from '../core/utils.js';
 import { createRequire } from 'module';
 import { ChildrenApp } from './store.js';
 import { ResultCode } from '../core/code.js';
@@ -51,7 +51,7 @@ const loadChildren = async (mainPath, appName) => {
             // 卸载
             App.un();
             try {
-                await app?.unMounted(e);
+                app?.unMounted && (await app.unMounted(e));
             }
             catch (e) {
                 // 卸载周期出意外，不需要进行卸载
@@ -59,15 +59,13 @@ const loadChildren = async (mainPath, appName) => {
             }
         };
         // onCreated 创建
-        if (typeof app?.onCreated == 'function') {
-            try {
-                await app?.onCreated();
-            }
-            catch (e) {
-                unMounted(e);
-                // 出错了，结束后续的操作。
-                return;
-            }
+        try {
+            app?.onCreated && (await app?.onCreated());
+        }
+        catch (e) {
+            unMounted(e);
+            // 出错了，结束后续的操作。
+            return;
         }
         // onMounted 加载
         try {
@@ -119,9 +117,7 @@ const loadChildren = async (mainPath, appName) => {
             App.pushMiddleware(mwData);
             App.on();
             try {
-                if (typeof app?.onMounted == 'function') {
-                    await app?.onMounted({ response: resData, middleware: mwData });
-                }
+                app?.onMounted && (await app.onMounted({ response: resData, middleware: mwData }));
             }
             catch (e) {
                 unMounted(e);

package/lib/app/message-api.d.ts

@@ -1,7 +1,7 @@
-import { Result } from './utils.js';
 import { OnDataFormatFunc } from '../typing/event/index.js';
-import '../global.js';
+import { Result } from '../core/utils.js';
 import { DataEnums } from '../typing/message/index.js';
+import '../global.js';
 
 /**
  * 创建数据格式。
@@ -16,13 +16,13 @@ declare const format: OnDataFormatFunc;
  * @param {DataEnums[]} data - 要发送的数据。
  * @throws {Error} - 如果 channel_id 无效或发送失败，抛出错误。
  */
-declare const sendToChannel: (channel_id: string, data: DataEnums[]) => Promise<Result | Result[]>;
+declare const sendToChannel: (channel_id: string, data: DataEnums[]) => Promise<Result[]>;
 /**
  * 向指定用户发送消息。
  * @param {string} user_id - 目标用户的 ID。
  * @param {DataEnums[]} data - 要发送的数据。
  * @throws {Error} - 如果 user_id 无效或发送失败，抛出错误。
  */
-declare const sendToUser: (user_id: string, data: DataEnums[]) => Promise<Result | Result[]>;
+declare const sendToUser: (user_id: string, data: DataEnums[]) => Promise<Result[]>;
 
 export { format, sendToChannel, sendToUser };

package/lib/app/message-format.d.ts

@@ -39,7 +39,7 @@ declare const ImageFile: (val: DataImageFile["value"]) => DataImageFile;
  * @returns
  */
 declare const Image: {
-    (val: DataImage["value"]): DataImage;
+    (val: Buffer): DataImage;
     url: (val: DataImageURL["value"]) => DataImageURL;
     file: (val: DataImageFile["value"]) => DataImageFile;
 };

package/lib/app/message-format.js

@@ -54,7 +54,7 @@ const ImageFile = (val) => {
 const Image = (val) => {
     return {
         type: 'Image',
-        value: val
+        value: val.toString('base64')
     };
 };
 Image.url = ImageURL;

package/lib/app/store.js

@@ -15,6 +15,8 @@ import log4js from 'log4js';
 const createLogger = () => {
     const logDir = process.env?.LOG_PATH ?? `./logs/${process.env.LOG_NAME ?? ''}`;
     mkdirSync(logDir, { recursive: true });
+    // 当环境被设置为 development 时。被视为 trace
+    const level = process.env.NODE_ENV === 'development' ? 'trace' : 'info';
     log4js.configure({
         appenders: {
             console: {
@@ -48,13 +50,12 @@ const createLogger = () => {
             }
         },
         categories: {
-            default: { appenders: ['console'], level: 'error' },
-            // 记录级别
+            default: { appenders: ['console'], level: level },
             command: { appenders: ['console', 'command'], level: 'info' },
             error: { appenders: ['console', 'command', 'error'], level: 'warn' }
         }
     });
-    const defaultLogger = log4js.getLogger('message');
+    const defaultLogger = log4js.getLogger('default');
     const commandLogger = log4js.getLogger('command');
     const errorLogger = log4js.getLogger('error');
     return {

package/lib/cbp/actions.js

@@ -1,20 +1,5 @@
 import { ResultCode } from '../core/code.js';
-import '../app/define-chidren.js';
-import '../app/event-middleware.js';
-import '../app/event-processor.js';
-import '../app/event-response.js';
-import '../app/hook-use-api.js';
-import '../typing/event/actions.js';
-import 'fs';
-import 'path';
-import 'yaml';
-import 'node:fs';
-import 'log4js';
-import '../app/load.js';
-import '../app/message-api.js';
-import '../app/message-format.js';
-import { createResult } from '../app/utils.js';
-import 'ws';
+import { createResult } from '../core/utils.js';
 import { generateUniqueId, actionResolves, deviceId, actionTimeouts, timeoutTime } from './config.js';
 
 /**
@@ -26,20 +11,23 @@ const sendAction = (data) => {
     return new Promise(resolve => {
         actionResolves.set(actionId, resolve);
         // 设置唯一标识符
-        data.actionID = actionId;
+        data.actionId = actionId;
         // 设置设备 ID
         data.DeviceId = deviceId;
+        // 发送消息
         global.chatbotClient.send(JSON.stringify(data));
         // 12 秒后超时
         const timeout = setTimeout(() => {
-            // 不会当错误进行处理
-            resolve(createResult(ResultCode.Fail, '请求超时', null));
-            // 手动清理
-            clearTimeout(timeout);
+            // 被清理了
+            if (!actionResolves.has(actionId) || !actionTimeouts.has(actionId)) {
+                return;
+            }
             // 删除回调
             actionResolves.delete(actionId);
             // 删除超时器
             actionTimeouts.delete(actionId);
+            // 不会当错误进行处理。而是传入错误码
+            resolve([createResult(ResultCode.Fail, '行为超时', null)]);
         }, timeoutTime);
         actionTimeouts.set(actionId, timeout);
     });

package/lib/cbp/api.js

@@ -0,0 +1,36 @@
+import { ResultCode } from '../core/code.js';
+import { createResult } from '../core/utils.js';
+import { generateUniqueId, apiResolves, deviceId, apiTimeouts, timeoutTime } from './config.js';
+
+/**
+ * 发送行为
+ * @param data
+ */
+const sendAPI = (data) => {
+    const ApiId = generateUniqueId();
+    return new Promise(resolve => {
+        apiResolves.set(ApiId, resolve);
+        // 设置唯一标识符
+        data.apiId = ApiId;
+        // 设置设备 ID
+        data.DeviceId = deviceId;
+        // 发送消息
+        global.chatbotClient.send(JSON.stringify(data));
+        // 12 秒后超时
+        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/config.js

@@ -15,8 +15,12 @@ const DEVICE_ID_HEADER = 'x-device-id';
 const FULL_RECEIVE_HEADER = 'x-full-receive';
 // 行为回调
 const actionResolves = new Map();
+// 接口回调
+const apiResolves = new Map();
 // 超时器
 const actionTimeouts = new Map();
+// 接口超时器
+const apiTimeouts = new Map();
 // 分配绑定记录
 const childrenBind = new Map();
 // 生成唯一标识符
@@ -26,6 +30,8 @@ const generateUniqueId = () => {
 // 超时时间
 const timeoutTime = 1000 * 12; // 12秒
 // 失败重连
-const reconnectInterval = 6000; // 6秒
+const reconnectInterval = 1000 * 6; // 6秒
+// 心跳间隔
+const HEARTBEAT_INTERVAL = 1000 * 18; // 18秒
 
-export { DEVICE_ID_HEADER, FULL_RECEIVE_HEADER, USER_AGENT_HEADER, actionResolves, actionTimeouts, childrenBind, childrenClient, deviceId, fullClient, generateUniqueId, platformClient, reconnectInterval, timeoutTime };
+export { DEVICE_ID_HEADER, FULL_RECEIVE_HEADER, HEARTBEAT_INTERVAL, USER_AGENT_HEADER, actionResolves, actionTimeouts, apiResolves, apiTimeouts, childrenBind, childrenClient, deviceId, fullClient, generateUniqueId, platformClient, reconnectInterval, timeoutTime };

package/lib/cbp/connect.d.ts

@@ -1,6 +1,8 @@
 import { Actions } from '../typing/actions.js';
 import { EventsEnum } from '../typing/event/map.js';
+import { Result } from '../core/utils.js';
 import '../global.js';
+import { Apis } from '../typing/apis.js';
 
 type CBPClientOptions = {
     open?: () => void;
@@ -12,12 +14,14 @@ type CBPClientOptions = {
  * @param onopen
  */
 declare const cbpClient: (url: string, options?: CBPClientOptions) => void;
-type ReplyFunc = (data: Actions, consume: (payload: any) => void) => void;
+type ActionReplyFunc = (data: Actions, consume: (payload: Result[]) => void) => void;
+type ApiReplyFunc = (data: Apis, consume: (payload: Result[]) => void) => void;
 declare const cbpPlatform: (url: string, options?: {
     open: () => void;
 }) => {
     send: (data: EventsEnum) => void;
-    onactions: (reply: ReplyFunc) => void;
+    onactions: (reply: ActionReplyFunc) => void;
+    onapis: (reply: ApiReplyFunc) => void;
 };
 
 export { cbpClient, cbpPlatform };