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

package/lib/cbp/connect.js

@@ -1,8 +1,66 @@
 import { WebSocket } from 'ws';
 import { onProcessor } from '../app/event-processor.js';
 import { ResultCode } from '../core/code.js';
-import { deviceId, FULL_RECEIVE_HEADER, DEVICE_ID_HEADER, USER_AGENT_HEADER, actionResolves, actionTimeouts, reconnectInterval } from './config.js';
+import { deviceId, FULL_RECEIVE_HEADER, DEVICE_ID_HEADER, USER_AGENT_HEADER, apiResolves, apiTimeouts, actionResolves, actionTimeouts, reconnectInterval, HEARTBEAT_INTERVAL } from './config.js';
+import { createResult } from '../core/utils.js';
 
+// 心跳
+const useHeartbeat = ({ ping, isConnected, terminate }) => {
+    let heartbeatTimer = null;
+    let lastPong = Date.now();
+    const stopHeartbeat = () => {
+        if (heartbeatTimer) {
+            clearInterval(heartbeatTimer);
+            heartbeatTimer = null;
+        }
+    };
+    const callback = () => {
+        if (isConnected()) {
+            const diff = Date.now() - lastPong;
+            const max = HEARTBEAT_INTERVAL * 2; // 最大心跳间隔
+            // 检查上次 pong 是否超时
+            if (diff > max) {
+                logger.debug({
+                    code: ResultCode.Fail,
+                    message: '心跳超时，断开重连',
+                    data: null
+                });
+                terminate(); // 强制断开
+                return;
+            }
+            ping();
+            logger.debug({
+                code: ResultCode.Ok,
+                message: `发送 ping`,
+                data: null
+            });
+            heartbeatTimer = setTimeout(callback, HEARTBEAT_INTERVAL);
+        }
+        else {
+            stopHeartbeat(); // 如果连接已关闭，停止心跳
+            terminate(); // 强制断开
+        }
+    };
+    const startHeartbeat = () => {
+        lastPong = Date.now();
+        stopHeartbeat();
+        callback();
+    };
+    const control = {
+        start: startHeartbeat,
+        stop: stopHeartbeat,
+        pong: () => {
+            // 收到 pong，说明连接正常
+            lastPong = Date.now();
+            logger.debug({
+                code: ResultCode.Ok,
+                message: `收到 pong`,
+                data: null
+            });
+        }
+    };
+    return [control];
+};
 /**
  * CBP 客户端
  * @param url
@@ -17,6 +75,27 @@ const cbpClient = (url, options = {}) => {
         delete global.chatbotClient;
     }
     const { open = () => { }, isFullReceive = true } = options;
+    const [heartbeatControl] = useHeartbeat({
+        ping: () => {
+            global?.chatbotClient?.ping?.();
+        },
+        isConnected: () => {
+            return global?.chatbotClient && global?.chatbotClient?.readyState === WebSocket.OPEN;
+        },
+        terminate: () => {
+            try {
+                // 强制断开连接
+                global?.chatbotClient?.terminate?.();
+            }
+            catch (error) {
+                logger.debug({
+                    code: ResultCode.Fail,
+                    message: '强制断开连接失败',
+                    data: error
+                });
+            }
+        }
+    });
     const start = () => {
         global.chatbotClient = new WebSocket(url, {
             headers: {
@@ -25,7 +104,13 @@ const cbpClient = (url, options = {}) => {
                 [FULL_RECEIVE_HEADER]: isFullReceive ? '1' : '0'
             }
         });
-        global.chatbotClient.on('open', open);
+        global.chatbotClient.on('open', () => {
+            open();
+            heartbeatControl.start(); // 启动心跳
+        });
+        global.chatbotClient.on('pong', () => {
+            heartbeatControl.pong(); // 更新 pong 时间
+        });
         // 客户端接收，被标准化的平台消息
         global.chatbotClient.on('message', message => {
             try {
@@ -33,7 +118,7 @@ const cbpClient = (url, options = {}) => {
                 const parsedMessage = JSON.parse(message.toString());
                 logger.debug({
                     code: ResultCode.Ok,
-                    message: '接收到消息',
+                    message: '客户端接收到消息',
                     data: parsedMessage
                 });
                 if (parsedMessage?.activeId) {
@@ -45,22 +130,48 @@ const cbpClient = (url, options = {}) => {
                         for (const key in env) {
                             process.env[key] = env[key];
                         }
-                        // 
                     }
                 }
-                else if (parsedMessage?.actionID) {
-                    // 如果有 actionID，说明要消费掉本地的行为请求
-                    const resolve = actionResolves.get(parsedMessage.actionID);
+                else if (parsedMessage?.apiId) {
+                    // 如果有 apiId，说明是一个接口请求。要进行处理
+                    const resolve = apiResolves.get(parsedMessage.apiId);
+                    if (resolve) {
+                        apiResolves.delete(parsedMessage.apiId);
+                        // 清除超时器
+                        const timeout = apiTimeouts.get(parsedMessage.apiId);
+                        if (timeout) {
+                            apiTimeouts.delete(parsedMessage.apiId);
+                            clearTimeout(timeout);
+                        }
+                        // 调用回调函数
+                        if (Array.isArray(parsedMessage.payload)) {
+                            resolve(parsedMessage.payload);
+                        }
+                        else {
+                            // 错误处理
+                            resolve([createResult(ResultCode.Fail, '接口处理错误', null)]);
+                        }
+                    }
+                }
+                else if (parsedMessage?.actionId) {
+                    // 如果有 actionId
+                    const resolve = actionResolves.get(parsedMessage.actionId);
                     if (resolve) {
+                        actionResolves.delete(parsedMessage.actionId);
                         // 清除超时器
-                        const timeout = actionTimeouts.get(parsedMessage.actionID);
+                        const timeout = actionTimeouts.get(parsedMessage.actionId);
                         if (timeout) {
+                            actionTimeouts.delete(parsedMessage.actionId);
                             clearTimeout(timeout);
-                            actionTimeouts.delete(parsedMessage.actionID);
                         }
                         // 调用回调函数
-                        resolve(parsedMessage.payload);
-                        actionResolves.delete(parsedMessage.actionID);
+                        if (Array.isArray(parsedMessage.payload)) {
+                            resolve(parsedMessage.payload);
+                        }
+                        else {
+                            // 错误处理
+                            resolve([createResult(ResultCode.Fail, '消费处理错误', null)]);
+                        }
                     }
                 }
                 else if (parsedMessage.name) {
@@ -71,13 +182,14 @@ const cbpClient = (url, options = {}) => {
             catch (error) {
                 logger.error({
                     code: ResultCode.Fail,
-                    message: '解析消息失败',
+                    message: '客户端解析消息失败',
                     data: error
                 });
             }
         });
         global.chatbotClient.on('close', () => {
-            logger.debug({
+            heartbeatControl.stop(); // 停止心跳
+            logger.warn({
                 code: ResultCode.Fail,
                 message: '连接关闭，尝试重新连接...',
                 data: null
@@ -88,6 +200,13 @@ const cbpClient = (url, options = {}) => {
                 start(); // 重新连接
             }, reconnectInterval); // 6秒后重连
         });
+        global.chatbotClient.on('error', err => {
+            logger.error({
+                code: ResultCode.Fail,
+                message: '客户端错误',
+                data: err
+            });
+        });
     };
     start();
 };
@@ -98,6 +217,26 @@ const cbpPlatform = (url, options = {
         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
+                });
+            }
+        }
+    });
     /**
      * 发送数据
      * @param data
@@ -108,29 +247,47 @@ const cbpPlatform = (url, options = {
             global.chatbotPlatform.send(JSON.stringify(data));
         }
     };
-    const msg = [];
+    const actionReplys = [];
+    const apiReplys = [];
     /**
      * 消费数据
      * @param data
      * @param payload
      */
-    const reply = (data, payload) => {
+    const replyAction = (data, payload) => {
         if (global.chatbotPlatform && global.chatbotPlatform.readyState === WebSocket.OPEN) {
+            // 透传消费。也就是对应的设备进行处理消费。
             global.chatbotPlatform.send(JSON.stringify({
                 action: data.action,
                 payload: payload,
-                actionID: data.actionID,
-                // 透传消费。也就是对应的设备进行处理消费。
+                actionId: data.actionId,
                 DeviceId: data.DeviceId
             }));
         }
     };
+    const replyApi = (data, payload) => {
+        if (global.chatbotPlatform && global.chatbotPlatform.readyState === WebSocket.OPEN) {
+            // 透传消费。也就是对应的设备进行处理消费。
+            global.chatbotPlatform.send(JSON.stringify({
+                action: data.action,
+                apiId: data.apiId,
+                DeviceId: data.DeviceId,
+                payload: payload
+            }));
+        }
+    };
     /**
      * 接收行为
      * @param reply
      */
     const onactions = (reply) => {
-        msg.push(reply);
+        actionReplys.push(reply);
+    };
+    /**
+     * 接收接口
+     */
+    const onapis = (reply) => {
+        apiReplys.push(reply);
     };
     /**
      * 启动 WebSocket 连接
@@ -142,19 +299,34 @@ const cbpPlatform = (url, options = {
                 [DEVICE_ID_HEADER]: deviceId
             }
         });
-        global.chatbotPlatform.on('open', open);
+        global.chatbotPlatform.on('open', () => {
+            open();
+            heartbeatControl.start(); // 启动心跳
+        });
+        global.chatbotPlatform.on('pong', () => {
+            heartbeatControl.pong(); // 更新 pong 时间
+        });
         global.chatbotPlatform.on('message', message => {
             try {
                 const data = JSON.parse(message.toString());
                 logger.debug({
                     code: ResultCode.Ok,
-                    message: '平台接收消息',
+                    message: '平台端接收消息',
                     data: data
                 });
-                for (const cb of msg) {
-                    cb(data, 
-                    // 传入一个消费函数
-                    val => reply(data, val));
+                if (data.apiId) {
+                    for (const cb of apiReplys) {
+                        cb(data, 
+                        // 传入一个消费函数
+                        val => replyApi(data, val));
+                    }
+                }
+                else if (data.actionId) {
+                    for (const cb of actionReplys) {
+                        cb(data, 
+                        // 传入一个消费函数
+                        val => replyAction(data, val));
+                    }
                 }
             }
             catch (error) {
@@ -166,9 +338,10 @@ const cbpPlatform = (url, options = {
             }
         });
         global.chatbotPlatform.on('close', err => {
-            logger.debug({
+            heartbeatControl.stop(); // 停止心跳
+            logger.warn({
                 code: ResultCode.Fail,
-                message: '平台连接关闭，尝试重新连接...',
+                message: '平台端连接关闭，尝试重新连接...',
                 data: err
             });
             delete global.chatbotPlatform;
@@ -177,11 +350,19 @@ const cbpPlatform = (url, options = {
                 start(); // 重新连接
             }, reconnectInterval); // 6秒后重连
         });
+        global.chatbotPlatform.on('error', err => {
+            logger.error({
+                code: ResultCode.Fail,
+                message: '平台端错误',
+                data: err
+            });
+        });
     };
     start();
     const client = {
         send,
-        onactions
+        onactions,
+        onapis
     };
     return client;
 };

package/lib/cbp/index.js

@@ -47,9 +47,41 @@ const cbpServer = (port, listeningListener) => {
             try {
                 // 解析消息
                 const parsedMessage = JSON.parse(message.toString());
-                // 1. 解析得到 actionID ，说明是消费行为请求。要广播告诉所有客户端。
+                // 1. 解析得到 actionId ，说明是消费行为请求。要广播告诉所有客户端。
                 // 2. 解析得到 name ，说明是一个事件请求。
-                if (parsedMessage?.actionID) {
+                // 3. 解析得到 apiId ，说明是一个接口请求。
+                logger.debug({
+                    code: ResultCode.Ok,
+                    message: '服务端接收到消息',
+                    data: parsedMessage
+                });
+                if (parsedMessage.apiId) {
+                    // 指定的设备 处理消费。终端有记录每个客户端是谁
+                    const DeviceId = parsedMessage.DeviceId;
+                    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);
+                        }
+                    }
+                }
+                else if (parsedMessage?.actionId) {
                     // 指定的设备 处理消费。终端有记录每个客户端是谁
                     const DeviceId = parsedMessage.DeviceId;
                     if (childrenClient.has(DeviceId)) {
@@ -139,7 +171,7 @@ const cbpServer = (port, listeningListener) => {
                         else {
                             logger.error({
                                 code: ResultCode.Fail,
-                                message: '出现意外，无法绑定客户端',
+                                message: '服务端出现意外，无法绑定客户端',
                                 data: null
                             });
                         }
@@ -171,7 +203,7 @@ const cbpServer = (port, listeningListener) => {
             catch (error) {
                 logger.error({
                     code: ResultCode.Fail,
-                    message: '解析平台消息失败',
+                    message: '服务端解析平台消息失败',
                     data: error
                 });
                 return;
@@ -186,6 +218,13 @@ const cbpServer = (port, listeningListener) => {
                 data: null
             });
         });
+        ws.on('error', err => {
+            logger.error({
+                code: ResultCode.Fail,
+                message: `Client ${originId} error`,
+                data: err
+            });
+        });
     };
     // 设置子客户端
     const setChildrenClient = (originId, ws) => {
@@ -217,6 +256,13 @@ const cbpServer = (port, listeningListener) => {
                 data: null
             });
         });
+        ws.on('error', err => {
+            logger.error({
+                code: ResultCode.Fail,
+                message: `Client ${originId} error`,
+                data: err
+            });
+        });
     };
     // 全量客户端
     const setFullClient = (originId, ws) => {
@@ -278,16 +324,16 @@ const cbpServer = (port, listeningListener) => {
                 value: getConfig().value,
                 args: getConfig().argv,
                 package: {
-                    version: getConfig().package?.version,
+                    version: getConfig().package?.version
                 },
                 env: {
                     login: process.env.login,
                     platform: process.env.platform,
-                    port: process.env.port,
-                },
+                    port: process.env.port
+                }
             },
             // 主动消息
-            activeId: originId,
+            activeId: originId
         }));
         const isFullReceive = headers[FULL_RECEIVE_HEADER] === '1';
         // 如果是全量接收

package/lib/core/utils.d.ts

@@ -0,0 +1,77 @@
+import { Dirent } from 'fs';
+import { ResultCode } from './code.js';
+
+/**
+ * 将字符串转为定长字符串
+ * @param str 输入字符串
+ * @param options 可选项
+ * @returns 固定长度的哈希值
+ */
+declare const createHash: (str: string, options?: {
+    length?: number;
+    algorithm?: string;
+}) => string;
+/**
+ * 使用用户的哈希键
+ * @param e
+ * @returns
+ */
+declare const useUserHashKey: (event: {
+    UserId: string;
+    Platform: string;
+}) => string;
+/**
+ * 创建app名称
+ * @param url
+ * @param app 模块名
+ * @param select 选择事件类型,默认 res
+ * @returns
+ */
+declare const createEventName: (url: string, appKey: string) => string;
+/**
+ * 将字符串转为数字
+ * @param str
+ * @returns
+ */
+declare const stringToNumber: (str: string, size?: number) => number;
+/**
+ * 递归获取所有文件
+ * @param dir
+ * @param condition
+ * @returns
+ */
+declare const getRecursiveDirFiles: (dir: string, condition?: (func: Dirent) => boolean) => {
+    path: string;
+    name: string;
+}[];
+/**
+ * 解析错误并提示缺失的模块
+ * @param e
+ * @returns
+ */
+declare const showErrorModule: (e: Error) => void;
+declare const getInputExportPath: (input?: string) => any;
+/**
+ * 属于直接调用的函数
+ * 参数错误直接抛出错误
+ * 如果函数内部有错误，则使用 Result 进行返回
+ */
+/**
+ * 异步方法。且需要读取返回值的进行判断的，
+ * 都要以 Result 作为返回值
+ */
+type Result = {
+    code: ResultCode;
+    message: string | Object;
+    data: any;
+};
+/**
+ * 创建结果
+ * @param code
+ * @param message
+ * @returns
+ */
+declare const createResult: (code: ResultCode, message: string | Object, data?: any) => Result;
+
+export { createEventName, createHash, createResult, getInputExportPath, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey };
+export type { Result };