alemonjs 2.1.0-alpha.4 → 2.1.0-alpha.6

package/lib/app/load.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/cbp/config.js

@@ -26,6 +26,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, childrenBind, childrenClient, deviceId, fullClient, generateUniqueId, platformClient, reconnectInterval, timeoutTime };

package/lib/cbp/connect.js

@@ -1,7 +1,7 @@
 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, actionResolves, actionTimeouts, reconnectInterval, HEARTBEAT_INTERVAL } from './config.js';
 import '../app/define-chidren.js';
 import '../app/event-middleware.js';
 import '../app/event-response.js';
@@ -17,6 +17,63 @@ import '../app/message-api.js';
 import '../app/message-format.js';
 import { createResult } from '../app/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
@@ -31,6 +88,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: {
@@ -39,7 +117,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 {
@@ -96,7 +180,8 @@ const cbpClient = (url, options = {}) => {
             }
         });
         global.chatbotClient.on('close', () => {
-            logger.debug({
+            heartbeatControl.stop(); // 停止心跳
+            logger.warn({
                 code: ResultCode.Fail,
                 message: '连接关闭，尝试重新连接...',
                 data: null
@@ -124,6 +209,27 @@ const cbpPlatform = (url, options = {
         delete global.chatbotPlatform;
     }
     const { open = () => { } } = 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
+                });
+            }
+        }
+    });
     /**
      * 发送数据
      * @param data
@@ -168,7 +274,13 @@ 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());
@@ -192,7 +304,8 @@ const cbpPlatform = (url, options = {
             }
         });
         global.chatbotPlatform.on('close', err => {
-            logger.debug({
+            heartbeatControl.stop(); // 停止心跳
+            logger.warn({
                 code: ResultCode.Fail,
                 message: '平台端连接关闭，尝试重新连接...',
                 data: err

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.1.0-alpha.4",
+  "version": "2.1.0-alpha.6",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",