alemonjs 2.1.0-alpha.26 → 2.1.0-alpha.28

package/lib/cbp/actions.js

@@ -1,6 +1,6 @@
 import { ResultCode } from '../core/code.js';
 import { createResult } from '../core/utils.js';
-import { generateUniqueId, actionResolves, deviceId, actionTimeouts, timeoutTime } from './config.js';
+import { generateUniqueId, deviceId, actionResolves, actionTimeouts, timeoutTime } from './config.js';
 import * as flattedJSON from 'flatted';
 
 /**
@@ -10,14 +10,24 @@ import * as flattedJSON from 'flatted';
 const sendAction = (data) => {
     const actionId = generateUniqueId();
     return new Promise(resolve => {
-        actionResolves.set(actionId, resolve);
         // 设置唯一标识符
         data.actionId = actionId;
         // 设置设备 ID
         data.DeviceId = deviceId;
-        // 发送消息
-        global.chatbotClient.send(flattedJSON.stringify(data));
-        // 12 秒后超时
+        // 沙盒模式
+        if (global.sandbox) {
+            if (!global.testoneClient) {
+                return resolve([createResult(ResultCode.Fail, '未连接到客户端', null)]);
+            }
+            // 发送消息
+            global.testoneClient.send(flattedJSON.stringify(data));
+        }
+        else {
+            global.chatbotClient.send(flattedJSON.stringify(data));
+        }
+        // 设置回调函数
+        actionResolves.set(actionId, resolve);
+        // 超时
         const timeout = setTimeout(() => {
             // 被清理了
             if (!actionResolves.has(actionId) || !actionTimeouts.has(actionId)) {
@@ -30,6 +40,7 @@ const sendAction = (data) => {
             // 不会当错误进行处理。而是传入错误码
             resolve([createResult(ResultCode.Fail, '行为超时', null)]);
         }, timeoutTime);
+        // 设置超时
         actionTimeouts.set(actionId, timeout);
     });
 };

package/lib/cbp/api.js

@@ -1,6 +1,6 @@
 import { ResultCode } from '../core/code.js';
 import { createResult } from '../core/utils.js';
-import { generateUniqueId, apiResolves, deviceId, apiTimeouts, timeoutTime } from './config.js';
+import { generateUniqueId, deviceId, apiResolves, apiTimeouts, timeoutTime } from './config.js';
 import * as flattedJSON from 'flatted';
 
 /**
@@ -10,14 +10,24 @@ import * as flattedJSON from 'flatted';
 const sendAPI = (data) => {
     const ApiId = generateUniqueId();
     return new Promise(resolve => {
-        apiResolves.set(ApiId, resolve);
         // 设置唯一标识符
         data.apiId = ApiId;
         // 设置设备 ID
         data.DeviceId = deviceId;
-        // 发送消息
-        global.chatbotClient.send(flattedJSON.stringify(data));
-        // 12 秒后超时
+        // 沙盒模式
+        if (global.sandbox) {
+            if (!global.testoneClient) {
+                return resolve([createResult(ResultCode.Fail, '未连接到客户端', null)]);
+            }
+            // 发送消息
+            global.testoneClient.send(flattedJSON.stringify(data));
+        }
+        else {
+            // 发送消息
+            global.chatbotClient.send(flattedJSON.stringify(data));
+        }
+        apiResolves.set(ApiId, resolve);
+        // 超时
         const timeout = setTimeout(() => {
             // 被清理了
             if (!apiResolves.has(ApiId) || !apiTimeouts.has(ApiId)) {
@@ -30,6 +40,7 @@ const sendAPI = (data) => {
             // 不会当错误进行处理。而是传入错误码
             resolve([createResult(ResultCode.Fail, '接口超时', null)]);
         }, timeoutTime);
+        // 设置超时
         apiTimeouts.set(ApiId, timeout);
     });
 };

package/lib/cbp/client.d.ts

@@ -0,0 +1,10 @@
+import { CBPClientOptions } from './typings.js';
+
+/**
+ * CBP 客户端
+ * @param url
+ * @param onopen
+ */
+declare const cbpClient: (url: string, options?: CBPClientOptions) => void;
+
+export { cbpClient };

package/lib/cbp/client.js

@@ -0,0 +1,159 @@
+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, apiResolves, apiTimeouts, actionResolves, actionTimeouts, reconnectInterval } from './config.js';
+import { createResult } from '../core/utils.js';
+import * as flattedJSON from 'flatted';
+import { useHeartbeat } from './connect.js';
+
+/**
+ * CBP 客户端
+ * @param url
+ * @param onopen
+ */
+const cbpClient = (url, options = {}) => {
+    /**
+     * 纯 cbpClient 连接，会没有 一些 全局变量。
+     * 需要在此处进行判断并设置
+     */
+    if (global.chatbotClient) {
+        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: {
+                [USER_AGENT_HEADER]: 'client',
+                [DEVICE_ID_HEADER]: deviceId,
+                [FULL_RECEIVE_HEADER]: isFullReceive ? '1' : '0'
+            }
+        });
+        global.chatbotClient.on('open', () => {
+            open();
+            heartbeatControl.start(); // 启动心跳
+        });
+        global.chatbotClient.on('pong', () => {
+            heartbeatControl.pong(); // 更新 pong 时间
+        });
+        // 客户端接收，被标准化的平台消息
+        global.chatbotClient.on('message', message => {
+            try {
+                // 解析消息
+                const parsedMessage = flattedJSON.parse(message.toString());
+                logger.debug({
+                    code: ResultCode.Ok,
+                    message: '客户端接收到消息',
+                    data: parsedMessage
+                });
+                if (parsedMessage?.activeId) {
+                    // 主端端主动消息。
+                    if (parsedMessage.active === 'sync') {
+                        const configs = parsedMessage.payload;
+                        // env 同步
+                        const env = configs.env || {};
+                        for (const key in env) {
+                            process.env[key] = env[key];
+                        }
+                    }
+                }
+                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);
+                        if (timeout) {
+                            actionTimeouts.delete(parsedMessage.actionId);
+                            clearTimeout(timeout);
+                        }
+                        // 调用回调函数
+                        if (Array.isArray(parsedMessage.payload)) {
+                            resolve(parsedMessage.payload);
+                        }
+                        else {
+                            // 错误处理
+                            resolve([createResult(ResultCode.Fail, '消费处理错误', null)]);
+                        }
+                    }
+                }
+                else if (parsedMessage.name) {
+                    // 如果有 name，说明是一个事件请求。要进行处理
+                    onProcessor(parsedMessage.name, parsedMessage, parsedMessage.value);
+                }
+            }
+            catch (error) {
+                logger.error({
+                    code: ResultCode.Fail,
+                    message: '客户端解析消息失败',
+                    data: error
+                });
+            }
+        });
+        global.chatbotClient.on('close', () => {
+            heartbeatControl.stop(); // 停止心跳
+            logger.warn({
+                code: ResultCode.Fail,
+                message: '连接关闭，尝试重新连接...',
+                data: null
+            });
+            delete global.chatbotClient;
+            // 重新连接逻辑
+            setTimeout(() => {
+                start(); // 重新连接
+            }, reconnectInterval); // 6秒后重连
+        });
+        global.chatbotClient.on('error', err => {
+            logger.error({
+                code: ResultCode.Fail,
+                message: '客户端错误',
+                data: err
+            });
+        });
+    };
+    start();
+};
+
+export { cbpClient };

package/lib/cbp/config.js

@@ -34,7 +34,7 @@ const generateUniqueId = () => {
     return Date.now().toString(36) + Math.random().toString(36).substring(2);
 };
 // 超时时间
-const timeoutTime = 1000 * 12; // 12秒
+const timeoutTime = 1000 * 60 * 3; // 3分钟
 // 失败重连
 const reconnectInterval = 1000 * 6; // 6秒
 // 心跳间隔

package/lib/cbp/connect.js

@@ -1,9 +1,5 @@
-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, apiResolves, apiTimeouts, actionResolves, actionTimeouts, reconnectInterval, HEARTBEAT_INTERVAL } from './config.js';
-import { createResult } from '../core/utils.js';
-import * as flattedJSON from 'flatted';
+import { HEARTBEAT_INTERVAL } from './config.js';
 
 // 心跳
 const useHeartbeat = ({ ping, isConnected, terminate }) => {
@@ -62,310 +58,5 @@ const useHeartbeat = ({ ping, isConnected, terminate }) => {
     };
     return [control];
 };
-/**
- * CBP 客户端
- * @param url
- * @param onopen
- */
-const cbpClient = (url, options = {}) => {
-    /**
-     * 纯 cbpClient 连接，会没有 一些 全局变量。
-     * 需要在此处进行判断并设置
-     */
-    if (!global.chatbotClient) {
-        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: {
-                [USER_AGENT_HEADER]: 'client',
-                [DEVICE_ID_HEADER]: deviceId,
-                [FULL_RECEIVE_HEADER]: isFullReceive ? '1' : '0'
-            }
-        });
-        global.chatbotClient.on('open', () => {
-            open();
-            heartbeatControl.start(); // 启动心跳
-        });
-        global.chatbotClient.on('pong', () => {
-            heartbeatControl.pong(); // 更新 pong 时间
-        });
-        // 客户端接收，被标准化的平台消息
-        global.chatbotClient.on('message', message => {
-            try {
-                // 解析消息
-                const parsedMessage = flattedJSON.parse(message.toString());
-                logger.debug({
-                    code: ResultCode.Ok,
-                    message: '客户端接收到消息',
-                    data: parsedMessage
-                });
-                if (parsedMessage?.activeId) {
-                    // 主端端主动消息。
-                    if (parsedMessage.active === 'sync') {
-                        const configs = parsedMessage.payload;
-                        // env 同步
-                        const env = configs.env || {};
-                        for (const key in env) {
-                            process.env[key] = env[key];
-                        }
-                    }
-                }
-                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);
-                        if (timeout) {
-                            actionTimeouts.delete(parsedMessage.actionId);
-                            clearTimeout(timeout);
-                        }
-                        // 调用回调函数
-                        if (Array.isArray(parsedMessage.payload)) {
-                            resolve(parsedMessage.payload);
-                        }
-                        else {
-                            // 错误处理
-                            resolve([createResult(ResultCode.Fail, '消费处理错误', null)]);
-                        }
-                    }
-                }
-                else if (parsedMessage.name) {
-                    // 如果有 name，说明是一个事件请求。要进行处理
-                    onProcessor(parsedMessage.name, parsedMessage, parsedMessage.value);
-                }
-            }
-            catch (error) {
-                logger.error({
-                    code: ResultCode.Fail,
-                    message: '客户端解析消息失败',
-                    data: error
-                });
-            }
-        });
-        global.chatbotClient.on('close', () => {
-            heartbeatControl.stop(); // 停止心跳
-            logger.warn({
-                code: ResultCode.Fail,
-                message: '连接关闭，尝试重新连接...',
-                data: null
-            });
-            delete global.chatbotClient;
-            // 重新连接逻辑
-            setTimeout(() => {
-                start(); // 重新连接
-            }, reconnectInterval); // 6秒后重连
-        });
-        global.chatbotClient.on('error', err => {
-            logger.error({
-                code: ResultCode.Fail,
-                message: '客户端错误',
-                data: err
-            });
-        });
-    };
-    start();
-};
-const cbpPlatform = (url, options = {
-    open: () => { }
-}) => {
-    if (!global.chatbotPlatform) {
-        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
-     */
-    const send = (data) => {
-        if (global.chatbotPlatform && global.chatbotPlatform.readyState === WebSocket.OPEN) {
-            data.DeviceId = deviceId; // 设置设备 ID
-            global.chatbotPlatform.send(flattedJSON.stringify(data));
-        }
-    };
-    const actionReplys = [];
-    const apiReplys = [];
-    /**
-     * 消费数据
-     * @param data
-     * @param payload
-     */
-    const replyAction = (data, payload) => {
-        if (global.chatbotPlatform && global.chatbotPlatform.readyState === WebSocket.OPEN) {
-            // 透传消费。也就是对应的设备进行处理消费。
-            global.chatbotPlatform.send(flattedJSON.stringify({
-                action: data.action,
-                payload: payload,
-                actionId: data.actionId,
-                DeviceId: data.DeviceId
-            }));
-        }
-    };
-    const replyApi = (data, payload) => {
-        if (global.chatbotPlatform && global.chatbotPlatform.readyState === WebSocket.OPEN) {
-            // 透传消费。也就是对应的设备进行处理消费。
-            global.chatbotPlatform.send(flattedJSON.stringify({
-                action: data.action,
-                apiId: data.apiId,
-                DeviceId: data.DeviceId,
-                payload: payload
-            }));
-        }
-    };
-    /**
-     * 接收行为
-     * @param reply
-     */
-    const onactions = (reply) => {
-        actionReplys.push(reply);
-    };
-    /**
-     * 接收接口
-     */
-    const onapis = (reply) => {
-        apiReplys.push(reply);
-    };
-    /**
-     * 启动 WebSocket 连接
-     */
-    const start = () => {
-        global.chatbotPlatform = new WebSocket(url, {
-            headers: {
-                [USER_AGENT_HEADER]: 'platform',
-                [DEVICE_ID_HEADER]: deviceId
-            }
-        });
-        global.chatbotPlatform.on('open', () => {
-            open();
-            heartbeatControl.start(); // 启动心跳
-        });
-        global.chatbotPlatform.on('pong', () => {
-            heartbeatControl.pong(); // 更新 pong 时间
-        });
-        global.chatbotPlatform.on('message', message => {
-            try {
-                const data = flattedJSON.parse(message.toString());
-                logger.debug({
-                    code: ResultCode.Ok,
-                    message: '平台端接收消息',
-                    data: data
-                });
-                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) {
-                logger.error({
-                    code: ResultCode.Fail,
-                    message: '解析消息失败',
-                    data: error
-                });
-            }
-        });
-        global.chatbotPlatform.on('close', err => {
-            heartbeatControl.stop(); // 停止心跳
-            logger.warn({
-                code: ResultCode.Fail,
-                message: '平台端连接关闭，尝试重新连接...',
-                data: err
-            });
-            delete global.chatbotPlatform;
-            // 重新连接逻辑
-            setTimeout(() => {
-                start(); // 重新连接
-            }, reconnectInterval); // 6秒后重连
-        });
-        global.chatbotPlatform.on('error', err => {
-            logger.error({
-                code: ResultCode.Fail,
-                message: '平台端错误',
-                data: err
-            });
-        });
-    };
-    start();
-    const client = {
-        send,
-        onactions,
-        onapis
-    };
-    return client;
-};
 
-export { cbpClient, cbpPlatform };
+export { useHeartbeat };

package/lib/cbp/platform.d.ts

@@ -0,0 +1,19 @@
+import { EventsEnum } from '../typing/event/map.js';
+import '../global.js';
+import { ActionReplyFunc, ApiReplyFunc } from './typings.js';
+
+/**
+ * CBP 平台端
+ * @param url
+ * @param options
+ * @returns
+ */
+declare const cbpPlatform: (url: string, options?: {
+    open: () => void;
+}) => {
+    send: (data: EventsEnum) => void;
+    onactions: (reply: ActionReplyFunc) => void;
+    onapis: (reply: ApiReplyFunc) => void;
+};
+
+export { cbpPlatform };