alemonjs 2.1.0-alpha.5 → 2.1.0-alpha.7

package/lib/app/load.js

@@ -51,7 +51,7 @@ const loadChildren = async (mainPath, appName) => {
             // 卸载
             App.un();
             try {
-                app?.unMounted && await app.unMounted(e);
+                app?.unMounted && (await app.unMounted(e));
             }
             catch (e) {
                 // 卸载周期出意外，不需要进行卸载
@@ -60,7 +60,7 @@ const loadChildren = async (mainPath, appName) => {
         };
         // onCreated 创建
         try {
-            app?.onCreated && await app?.onCreated();
+            app?.onCreated && (await app?.onCreated());
         }
         catch (e) {
             unMounted(e);
@@ -117,7 +117,7 @@ const loadChildren = async (mainPath, appName) => {
             App.pushMiddleware(mwData);
             App.on();
             try {
-                app?.onMounted && 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,6 +180,7 @@ const cbpClient = (url, options = {}) => {
             }
         });
         global.chatbotClient.on('close', () => {
+            heartbeatControl.stop(); // 停止心跳
             logger.warn({
                 code: ResultCode.Fail,
                 message: '连接关闭，尝试重新连接...',
@@ -124,6 +209,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
@@ -168,7 +273,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,6 +303,7 @@ const cbpPlatform = (url, options = {
             }
         });
         global.chatbotPlatform.on('close', err => {
+            heartbeatControl.stop(); // 停止心跳
             logger.warn({
                 code: ResultCode.Fail,
                 message: '平台端连接关闭，尝试重新连接...',

package/lib/cbp/index.d.ts

@@ -1,32 +1,3 @@
-import { Actions } from '../typing/actions.js'
-import { EventsEnum } from '../typing/event/map.js'
-import '../global.js'
-
 declare const cbpServer: (port: number, listeningListener?: () => void) => void
-/**
- * 发送行为
- * @param data
- */
-declare const sendAction: (data: Actions) => Promise<any>
-type CBPClientOptions = {
-  open?: () => void
-  isFullReceive?: boolean
-}
-/**
- * CBP 客户端
- * @param url
- * @param onopen
- */
-declare const cbpClient: (url: string, options?: CBPClientOptions) => void
-type ReplyFunc = (data: Actions, consume: (payload: any) => void) => void
-declare const cbpPlatform: (
-  url: string,
-  options?: {
-    open: () => void
-  }
-) => {
-  send: (data: EventsEnum) => void
-  onactions: (reply: ReplyFunc) => void
-}
 
-export { cbpClient, cbpPlatform, cbpServer, sendAction }
+export { cbpServer }

package/package.json

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

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

@@ -1,17 +0,0 @@
-import { DefinePlatformFunc } from '../typing/event/index.js'
-import '../global.js'
-
-/**
- * 定义机器人
- * @param callback
- * @throws {Error} - 如果 callback 无效，抛出错误。
- * @returns
- */
-declare const definePlatform: DefinePlatformFunc
-/**
- * 废弃，请使用 definePlatform
- * @deprecated
- */
-declare const defineBot: DefinePlatformFunc
-
-export { defineBot, definePlatform }

package/lib/app/define-bot.js

@@ -1,39 +0,0 @@
-import { ResultCode } from '../core/code.js'
-
-/**
- * 定义机器人
- * @param callback
- * @throws {Error} - 如果 callback 无效，抛出错误。
- * @returns
- */
-const definePlatform = callback => {
-  // 判断是否是函数
-  if (typeof callback !== 'function') {
-    logger.error({
-      code: ResultCode.FailParams,
-      message: 'Invalid callback: callback must be a function',
-      data: null
-    })
-    throw new Error('Invalid callback: callback must be a function')
-  }
-  return {
-    _name: 'platform',
-    callback
-  }
-}
-global.definePlatform = definePlatform
-/**
- * 废弃，请使用 definePlatform
- * @deprecated
- */
-const defineBot = callback => {
-  logger.warn({
-    code: ResultCode.Warn,
-    message: 'defineBot is deprecated, please use definePlatform',
-    data: null
-  })
-  return definePlatform(callback)
-}
-global.defineBot = defineBot
-
-export { defineBot, definePlatform }

package/lib/cbp/message.js

@@ -1,9 +0,0 @@
-import KoaRouter from 'koa-router'
-
-const router = new KoaRouter({
-  prefix: '/message'
-})
-// 消息发送
-router.post('/send', () => {})
-
-export { router as default }

package/lib/jsx.d.ts

@@ -1,142 +0,0 @@
-import { EventKeys, Events } from './typing/event/map.js'
-import { ClientAPIMessageResult } from './typing/client/index.js'
-import { DataEnums } from './typing/message/index.js'
-import { Result } from './app/utils.js'
-import React from 'react'
-import { DataImage, DataImageURL, DataImageFile } from './typing/message/image.js'
-import { DataButton } from './typing/message/button.js'
-import { DataText } from './typing/message/text.js'
-import { DataMention } from './typing/message/mention.js'
-
-/**
- *
- * @param _props
- * @returns
- */
-declare function Text(
-  _props:
-    | {
-        children?: DataText['value'] | DataText['value'][]
-        style?: DataText['options']['style']
-      }
-    | {
-        value?: DataText['value'] | DataText['value'][]
-        style?: DataText['options']['style']
-      }
-): React.ReactElement<
-  {
-    dataType: string
-  },
-  string | React.JSXElementConstructor<any>
->
-declare const Image: React.FC<{
-  value: DataImage['value']
-}> & {
-  url: React.FC<{
-    src: DataImageURL['value']
-  }>
-  file: React.FC<{
-    src: DataImageURL['value']
-  }>
-}
-
-/**
- *
- * @param _props
- * @returns
- */
-declare function ImageFile(_props: { src: DataImageFile['value'] }): React.ReactElement<
-  {
-    dataType: string
-  },
-  string | React.JSXElementConstructor<any>
->
-/**
- *
- * @param _props
- * @returns
- */
-declare function ImageURL(_props: { src: DataImageURL['value'] }): React.ReactElement<
-  {
-    dataType: string
-  },
-  string | React.JSXElementConstructor<any>
->
-/**
- *
- * @param _props
- * @returns
- */
-declare function Mention(_props: {
-  belong?: DataMention['options']['belong']
-  value: DataMention['value']
-}): React.ReactElement<
-  {
-    dataType: string
-  },
-  string | React.JSXElementConstructor<any>
->
-interface BTProps {
-  text: DataButton['value']
-  data: DataButton['options']['data']
-  autoEnter?: DataButton['options']['autoEnter']
-  toolTip?: DataButton['options']['toolTip']
-  showList?: DataButton['options']['showList']
-  isLink?: DataButton['options']['isLink']
-  children?: DataButton['value']
-}
-declare const BT: React.FC<BTProps> & {
-  group: React.FC<{
-    children?: React.ReactNode
-  }>
-  row: React.FC<{
-    children?: React.ReactNode
-  }>
-  template: React.FC<{
-    id: string
-  }>
-}
-
-/**
- *  转换数据
- * ***
- * 原则上，显示文本。使用 children 属性
- * ***
- * 其他类型使用 value 属性
- * ***
- * 如果是资源文件，使用 src 属性
- * ***
- * @param arg
- * @returns
- */
-declare function JSX(...arg: React.JSX.Element[]): DataEnums[]
-/**
- * 发送消息
- * @param e
- * @returns
- */
-declare const useSend: <T extends EventKeys>(
-  e: Events[T]
-) => (...arg: React.JSX.Element[]) => Promise<Result | ClientAPIMessageResult[]>
-/**
- *
- * @param channel_id
- * @param data
- * @returns
- */
-declare const sendToChannel: (
-  channel_id: string,
-  data: React.JSX.Element[]
-) => Promise<ClientAPIMessageResult[]>
-/**
- *
- * @param user_id
- * @param data
- * @returns
- */
-declare const sendToUser: (
-  user_id: string,
-  data: React.JSX.Element[]
-) => Promise<ClientAPIMessageResult[]>
-
-export { BT, Image, ImageFile, ImageURL, JSX, Mention, Text, sendToChannel, sendToUser, useSend }

package/lib/jsx.js

@@ -1,234 +0,0 @@
-import React from 'react'
-import { logger } from './global.js'
-import './app/define-bot.js'
-import './app/define-chidren.js'
-import './app/event-middleware.js'
-import './app/event-processor.js'
-import './app/event-response.js'
-import { useSend as useSend$1 } from './app/hook-use-api.js'
-import './typing/event/actions.js'
-import 'fs'
-import 'path'
-import 'yaml'
-import { ResultCode } from './core/code.js'
-import 'node:fs'
-import 'log4js'
-import './app/load.js'
-import { sendToChannel as sendToChannel$1, sendToUser as sendToUser$1 } from './app/message-api.js'
-import {
-  Text as Text$1,
-  ImageURL as ImageURL$1,
-  ImageFile as ImageFile$1,
-  Image as Image$1,
-  Mention as Mention$1,
-  BT as BT$1
-} from './app/message-format.js'
-import './app/utils.js'
-
-/**
- *
- * @param _props
- * @returns
- */
-function Text(_props) {
-  return React.createElement('div', {
-    dataType: 'Text'
-  })
-}
-const Image = _props => {
-  return React.createElement('div', {
-    dataType: 'Image'
-  })
-}
-// BT.group 子组件
-Image.url = _props => {
-  return React.createElement('div', {
-    dataType: 'ImageURL'
-  })
-}
-Image.file = _props => {
-  return React.createElement('div', {
-    dataType: 'ImageFile'
-  })
-}
-/**
- *
- * @param _props
- * @returns
- */
-function ImageFile(_props) {
-  return React.createElement('div', {
-    dataType: 'ImageFile'
-  })
-}
-/**
- *
- * @param _props
- * @returns
- */
-function ImageURL(_props) {
-  return React.createElement('div', {
-    dataType: 'ImageURL'
-  })
-}
-/**
- *
- * @param _props
- * @returns
- */
-function Mention(_props) {
-  return React.createElement('div', {
-    dataType: 'Mention'
-  })
-}
-const BT = _props => {
-  return React.createElement('div', {
-    dataType: 'Button'
-  })
-}
-function ButtonGroup(_props) {
-  return React.createElement('div', {
-    dataType: 'BT.group'
-  })
-}
-function ButtonRows(_props) {
-  return React.createElement('div', {
-    dataType: 'BT.row'
-  })
-}
-function ButtonTemplate(_props) {
-  return React.createElement('div', {
-    dataType: 'BT.group'
-  })
-}
-// BT.group 子组件
-BT.group = ButtonGroup
-// BT.template 子组件
-BT.template = ButtonTemplate
-// BT.row 子组件
-BT.row = ButtonRows
-/**
- *  转换数据
- * ***
- * 原则上，显示文本。使用 children 属性
- * ***
- * 其他类型使用 value 属性
- * ***
- * 如果是资源文件，使用 src 属性
- * ***
- * @param arg
- * @returns
- */
-function JSX(...arg) {
-  const data = []
-  for (const item of arg) {
-    const props = item.props
-    const dataType = item.type()?.props?.dataType
-    if (dataType === 'Text') {
-      if (props?.value) {
-        data.push(
-          Text$1(props.value, {
-            style: props?.style
-          })
-        )
-      } else if (props?.children) {
-        data.push(
-          Text$1(Array.isArray(props.children) ? props.children.join('') : props.children, {
-            style: props?.style
-          })
-        )
-      }
-    } else if (dataType === 'ImageURL') {
-      data.push(ImageURL$1(props.src))
-    } else if (dataType === 'ImageFile') {
-      data.push(ImageFile$1(props.src))
-    } else if (dataType === 'Image') {
-      data.push(Image$1(props.value))
-    } else if (dataType === 'Mention') {
-      // <@!123456>  文本的显示会被平台显示。不用自己定义显示的文本，此处不使用 children
-      data.push(
-        Mention$1(
-          props.value,
-          props?.belong
-            ? {
-                belong: props?.belong
-              }
-            : null
-        )
-      )
-    } else if (dataType === 'BT.group') {
-      const id = props?.id
-      if (id) {
-        data.push(BT$1.template(id))
-      } else {
-        if (Array.isArray(props?.children)) {
-          const rows = []
-          for (const child of props?.children) {
-            // 拿到每个子组件
-            const bts = []
-            if (Array.isArray(child.children)) {
-              for (const chi of child.children) {
-                // const type = chi.children
-                const value = chi.props?.text
-                const data = chi.props?.data
-                const options = {}
-                if (chi.props?.autoEnter) {
-                  options['autoEnter'] = chi.props?.autoEnter ? true : false
-                }
-                if (chi.props?.toolTip) {
-                  options['toolTip'] = chi.props?.toolTip ?? ''
-                }
-                if (chi.props?.showList) {
-                  options['showList'] = chi.props?.showList ? true : false
-                }
-                if (chi.props?.isLink) {
-                  options['isLink'] = chi.props?.isLink ? true : false
-                }
-                bts.push(BT$1(value, data, options))
-              }
-            }
-            rows.push(BT$1.row(...bts))
-          }
-          data.push(BT$1.group(...rows))
-        }
-      }
-    }
-  }
-  if (data.length === 0) {
-    logger.warn({
-      code: ResultCode.FailParams,
-      message: 'Invalid data: data must be a non-empty array',
-      data: null
-    })
-  }
-  return data
-}
-/**
- * 发送消息
- * @param e
- * @returns
- */
-const useSend = e => {
-  const Send = useSend$1(e)
-  return (...arg) => Send(...JSX(...arg))
-}
-/**
- *
- * @param channel_id
- * @param data
- * @returns
- */
-const sendToChannel = async (channel_id, data) => {
-  return sendToChannel$1(channel_id, JSX(...data))
-}
-/**
- *
- * @param user_id
- * @param data
- * @returns
- */
-const sendToUser = async (user_id, data) => {
-  return sendToUser$1(user_id, JSX(...data))
-}
-
-export { BT, Image, ImageFile, ImageURL, JSX, Mention, Text, sendToChannel, sendToUser, useSend }