@ray-js/robot-data-stream 0.0.14 → 0.0.15-beta.1

package/lib/mqtt/useSpotClean.js

@@ -1,123 +1,73 @@
 import "core-js/modules/esnext.iterator.map.js";
 // 定点清扫
 
-import { isArray } from 'lodash-es';
-import { createSetCommonParams } from './createCommonOptions';
-import { normalResolve } from './promise';
-import { SpotCleanEnum } from './type';
 import { useContext } from 'react';
+import { SpotCleanEnum } from './type';
 import { SingletonContext } from './mqttProvider';
 import { encodeSpotClean0x16 } from '@ray-js/robot-protocol';
 import { pointsToString } from '../utils';
+import { useStructuredMessage, handleMqttError } from './hooks/useStructuredMessage';
+import { validator } from './type/fun';
 /**
- * 定点清扫
- * @returns
+ * 自定义 Hook，用于定点清扫
+ * @returns 包含 requestSpotClean 和 setSpotClean 函数的对象
  */
-export const useSpotClean = devId => {
+export const useSpotClean = () => {
   const {
     useMqtt,
     commandVersion,
     devices
   } = useContext(SingletonContext);
+  const {
+    sendStructuredMessage
+  } = useStructuredMessage();
 
-  // 请求定点清扫数据
+  /**
+   * 请求定点清扫数据
+   * @param data 可选参数（目前为空对象）
+   * @returns Promise<SpotCleanResponse> 响应结果
+   */
 
-  // 设置定点清扫
-  // 定点清扫的清扫属性，使用全局的清扫属性
+  /**
+   * 设置定点清扫
+   * 定点清扫的清扫属性，使用全局的清扫属性
+   * @param message 包含定点清扫设置参数的对象
+   * @param message.spots 定点清扫的点数组
+   * @param message.origin 原点坐标（可选）
+   * @returns Promise<SpotCleanResponse> 响应结果
+   */
 
   return {
     requestSpotClean: () => {
-      const params = createSetCommonParams({
-        deviceId: devId,
-        reqType: SpotCleanEnum.query
+      return new Promise((resolve, reject) => {
+        try {
+          sendStructuredMessage(SpotCleanEnum.query, {}, resolve, error => reject(handleMqttError(error, 'Failed to request spot clean')));
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to request spot clean'));
+        }
       });
-      ty.device.sendMqttMessage(params);
-      return normalResolve(SpotCleanEnum.query, params.message.taskId);
     },
     setSpotClean: message => {
-      const {
-        spots,
-        origin
-      } = message;
-      if (useMqtt) {
-        // if (!isArray(spots) || (isArray(spots) && spots.length === 0)) {
-        //   return Promise.reject(new Error('message is required'));
-        // }
-
-        const num = spots.length;
-        const {
-          suctions = new Array(num).fill(''),
-          cisterns = new Array(num).fill(''),
-          cleanCounts = new Array(num).fill(1),
-          yMops = new Array(num).fill(-1),
-          sweepMopModes = new Array(num).fill('only_sweep')
-        } = message;
-        if (suctions && !isArray(suctions)) {
-          return Promise.reject(new Error('suctions is illegal'));
-        }
-        if (cisterns && !isArray(cisterns)) {
-          return Promise.reject(new Error('cisterns is illegal'));
-        }
-        if (cleanCounts && !isArray(cleanCounts)) {
-          return Promise.reject(new Error('cleanCounts is illegal'));
-        }
-        if (yMops && !isArray(yMops)) {
-          return Promise.reject(new Error('yMops is illegal'));
-        }
-        if (sweepMopModes && !isArray(sweepMopModes)) {
-          return Promise.reject(new Error('sweepMopModes is illegal'));
-        }
-        if (num !== suctions.length || num !== cisterns.length || num !== cleanCounts.length || num !== yMops.length || num !== sweepMopModes.length) {
-          return Promise.reject(new Error('The length of the parameters is inconsistent'));
-        }
-        const params = createSetCommonParams({
-          deviceId: devId,
-          reqType: SpotCleanEnum.set,
-          message: {
-            num,
-            polygons: spots.map(spot => pointsToString([spot], origin)),
-            suctions,
-            cisterns,
-            cleanCounts,
-            yMops,
-            sweepMopModes
-          }
-        });
-        ty.device.sendMqttMessage(params);
-        return normalResolve(SpotCleanEnum.query, params.message.taskId);
-      }
-      try {
-        if (useMqtt) {
+      return new Promise((resolve, reject) => {
+        try {
+          // 使用 TypeBox Schema 进行参数验证（包含自定义验证逻辑）
+          const validatedData = validator.validate('set_spot_clean', message);
+          const {
+            spots,
+            origin
+          } = validatedData;
           const num = spots.length;
+
+          // 为可选字段设置默认值
           const {
             suctions = new Array(num).fill(''),
             cisterns = new Array(num).fill(''),
             cleanCounts = new Array(num).fill(1),
             yMops = new Array(num).fill(-1),
             sweepMopModes = new Array(num).fill('only_sweep')
-          } = message;
-          if (suctions && !isArray(suctions)) {
-            throw new Error('suctions is illegal');
-          }
-          if (cisterns && !isArray(cisterns)) {
-            throw new Error('cisterns is illegal');
-          }
-          if (cleanCounts && !isArray(cleanCounts)) {
-            throw new Error('cleanCounts is illegal');
-          }
-          if (yMops && !isArray(yMops)) {
-            throw new Error('yMops is illegal');
-          }
-          if (sweepMopModes && !isArray(sweepMopModes)) {
-            throw new Error('sweepMopModes is illegal');
-          }
-          if (num !== suctions.length || num !== cisterns.length || num !== cleanCounts.length || num !== yMops.length || num !== sweepMopModes.length) {
-            throw new Error('The length of the parameters is inconsistent');
-          }
-          const params = createSetCommonParams({
-            deviceId: devId,
-            reqType: SpotCleanEnum.set,
-            message: {
+          } = validatedData;
+          if (useMqtt) {
+            sendStructuredMessage(SpotCleanEnum.set, {
               num,
               polygons: spots.map(spot => pointsToString([spot], origin)),
               suctions,
@@ -125,38 +75,35 @@ export const useSpotClean = devId => {
               cleanCounts,
               yMops,
               sweepMopModes
-            }
+            }, resolve, error => reject(handleMqttError(error, 'Failed to set spot clean')), SpotCleanEnum.query // 响应类型是 query，不是 set
+            );
+            return;
+          }
+
+          // 非 MQTT 模式：使用命令传输
+          const command = encodeSpotClean0x16({
+            version: commandVersion,
+            origin,
+            point: spots[0]
           });
-          ty.device.sendMqttMessage(params);
-          const {
-            taskId
-          } = params.message;
-          return normalResolve(SpotCleanEnum.query, taskId);
+          devices.common.model.actions.command_trans.set(command);
+          resolve({
+            success: true,
+            errCode: 0,
+            reqType: SpotCleanEnum.query,
+            version: commandVersion,
+            taskId: `${Date.now()}`,
+            polygons: spots.map(spot => pointsToString([spot], origin)),
+            suctions,
+            cisterns,
+            cleanCounts,
+            yMops,
+            sweepMopModes
+          });
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to set spot clean'));
         }
-
-        // 非 MQTT 模式：使用命令传输
-        const command = encodeSpotClean0x16({
-          version: commandVersion,
-          origin,
-          point: spots[0]
-        });
-        devices.common.model.actions.command_trans.set(command);
-        return Promise.resolve({
-          success: true,
-          errCode: 0,
-          reqType: SpotCleanEnum.query,
-          version: commandVersion,
-          taskId: `${Date.now()}`,
-          polygons: spots.map(spot => pointsToString([spot], origin)),
-          suctions: message.suctions,
-          cisterns: message.cisterns,
-          cleanCounts: message.cleanCounts,
-          yMops: message.yMops,
-          sweepMopModes: message.sweepMopModes
-        });
-      } catch (error) {
-        throw error instanceof Error ? error : new Error('Failed to set spot clean');
-      }
+      });
     }
   };
 };

package/lib/mqtt/useVirtualArea.d.ts

@@ -1,20 +1,9 @@
-import { BaseResponse, VirtualAreaEnum } from './type';
-import { Point, VirtualArea } from '@ray-js/robot-protocol';
-interface VirtualAreaResponse extends BaseResponse {
-    reqType: VirtualAreaEnum.query;
-    num: number;
-    modes: number[];
-    polygons: string[];
-    names: string[];
-    mapId: number;
-}
-type TSetVirtualArea = (message: {
-    data: VirtualArea[];
-    origin: Point;
-}) => Promise<VirtualAreaResponse>;
-type TRequestVirtualArea = () => Promise<VirtualAreaResponse>;
-export declare const useVirtualArea: (devId: string) => {
+import { type TRequestVirtualArea, type TSetVirtualArea } from './type/protocols';
+/**
+ * 自定义 Hook，用于虚拟区域（禁区）管理
+ * @returns 包含 requestVirtualArea 和 setVirtualArea 函数的对象
+ */
+export declare const useVirtualArea: () => {
     requestVirtualArea: TRequestVirtualArea;
     setVirtualArea: TSetVirtualArea;
 };
-export {};

package/lib/mqtt/useVirtualArea.js

@@ -2,27 +2,32 @@ import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.iterator.map.js";
 // 添加禁区
-import { useContext } from 'react';
-import { createSetCommonParams } from './createCommonOptions';
-import { normalResolve } from './promise';
-import { VirtualAreaEnum } from './type';
-import { SingletonContext } from './mqttProvider';
 import { encodeVirtualArea0x1a, requestVirtualArea0x1b } from '@ray-js/robot-protocol';
+import { useContext } from 'react';
 import { pointsToString } from '../utils';
-
-// 虚拟区域响应类型
-
+import { handleMqttError, useStructuredMessage } from './hooks/useStructuredMessage';
+import { SingletonContext } from './mqttProvider';
+import { VirtualAreaEnum } from './type';
+import { validator } from './type/fun';
 // 禁区
 
-export const useVirtualArea = devId => {
+/**
+ * 自定义 Hook，用于虚拟区域（禁区）管理
+ * @returns 包含 requestVirtualArea 和 setVirtualArea 函数的对象
+ */
+export const useVirtualArea = () => {
   const {
     useMqtt,
     commandVersion,
     devices
   } = useContext(SingletonContext);
+  const {
+    sendStructuredMessage
+  } = useStructuredMessage();
 
   /**
    * 请求虚拟区域数据
+   * @param data 可选参数（目前为空对象）
    * @returns Promise<VirtualAreaResponse> 响应结果
    */
 
@@ -36,125 +41,110 @@ export const useVirtualArea = devId => {
 
   return {
     requestVirtualArea: () => {
-      try {
-        if (useMqtt) {
-          const params = createSetCommonParams({
-            deviceId: devId,
-            reqType: VirtualAreaEnum.query
-          });
-          ty.device.sendMqttMessage(params);
-          const {
-            taskId
-          } = params.message;
-          return normalResolve(VirtualAreaEnum.query, taskId);
-        }
+      return new Promise((resolve, reject) => {
+        try {
+          if (useMqtt) {
+            sendStructuredMessage(VirtualAreaEnum.query, {}, resolve, error => reject(handleMqttError(error, 'Failed to request virtual area')));
+            return;
+          }
 
-        // 非 MQTT 模式：使用命令传输
-        devices.common.model.actions.command_trans.set(requestVirtualArea0x1b({
-          version: commandVersion
-        }));
+          // 非 MQTT 模式：使用命令传输
+          devices.common.model.actions.command_trans.set(requestVirtualArea0x1b({
+            version: commandVersion
+          }));
 
-        // 非 MQTT 模式下无法立即获取响应数据，返回默认响应
-        return Promise.resolve({
-          success: true,
-          errCode: 0,
-          reqType: VirtualAreaEnum.query,
-          version: commandVersion,
-          taskId: `${Date.now()}`,
-          num: 0,
-          modes: [],
-          polygons: [],
-          names: [],
-          mapId: 0
-        });
-      } catch (error) {
-        return Promise.reject(error instanceof Error ? error : new Error('Failed to request virtual area'));
-      }
-    },
-    setVirtualArea: _ref => {
-      let {
-        data,
-        origin
-      } = _ref;
-      // 参数验证
-      if (!Array.isArray(data)) {
-        throw new Error('data is required and must be a non-empty array');
-      }
-      if (!origin || typeof origin.x !== 'number' || typeof origin.y !== 'number') {
-        throw new Error('origin is required and must be a valid Point object with x and y properties');
-      }
-      try {
-        if (useMqtt) {
-          const names = [];
-          const modes = [];
-          const polygons = [];
-          data.forEach(_ref2 => {
-            let {
-              points,
-              name,
-              mode
-            } = _ref2;
-            names.push(name);
-            modes.push(mode);
-            polygons.push(pointsToString(points, origin));
+          // 非 MQTT 模式下无法立即获取响应数据，返回默认响应
+          resolve({
+            success: true,
+            errCode: 0,
+            reqType: VirtualAreaEnum.query,
+            version: commandVersion,
+            taskId: `${Date.now()}`,
+            num: 0,
+            modes: [],
+            polygons: [],
+            names: [],
+            mapId: 0
           });
-          const params = createSetCommonParams({
-            deviceId: devId,
-            reqType: VirtualAreaEnum.set,
-            message: {
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to request virtual area'));
+        }
+      });
+    },
+    setVirtualArea: message => {
+      return new Promise((resolve, reject) => {
+        try {
+          // 使用 TypeBox Schema 进行参数验证
+          const validatedData = validator.validate('set_virtual_area', message);
+          const {
+            data,
+            origin
+          } = validatedData;
+          if (useMqtt) {
+            const names = [];
+            const modes = [];
+            const polygons = [];
+            data.forEach(_ref => {
+              let {
+                points,
+                name,
+                mode
+              } = _ref;
+              names.push(name);
+              modes.push(mode);
+              polygons.push(pointsToString(points, origin));
+            });
+            sendStructuredMessage(VirtualAreaEnum.set, {
               polygons,
               num: data.length,
               modes: modes,
               names: names
-            }
+            }, resolve, error => reject(handleMqttError(error, 'Failed to set virtual area')), VirtualAreaEnum.query // 响应类型是 query，不是 set
+            );
+            return;
+          }
+
+          // 非 MQTT 模式：使用命令传输
+          const command = encodeVirtualArea0x1a({
+            version: commandVersion,
+            origin,
+            virtualAreas: data
           });
-          ty.device.sendMqttMessage(params);
-          const {
-            taskId
-          } = params.message;
-          return normalResolve(VirtualAreaEnum.query, taskId);
+          devices.common.model.actions.command_trans.set(command);
+          const names = data.map(_ref2 => {
+            let {
+              name
+            } = _ref2;
+            return name;
+          });
+          const modes = data.map(_ref3 => {
+            let {
+              mode
+            } = _ref3;
+            return mode;
+          });
+          const polygons = data.map(_ref4 => {
+            let {
+              points
+            } = _ref4;
+            return pointsToString(points, origin);
+          });
+          resolve({
+            success: true,
+            errCode: 0,
+            reqType: VirtualAreaEnum.query,
+            version: commandVersion,
+            taskId: `${Date.now()}`,
+            num: data.length,
+            modes,
+            polygons,
+            names,
+            mapId: 0
+          });
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to set virtual area'));
         }
-
-        // 非 MQTT 模式：使用命令传输
-        const command = encodeVirtualArea0x1a({
-          version: commandVersion,
-          origin,
-          virtualAreas: data
-        });
-        devices.common.model.actions.command_trans.set(command);
-        const names = data.map(_ref3 => {
-          let {
-            name
-          } = _ref3;
-          return name;
-        });
-        const modes = data.map(_ref4 => {
-          let {
-            mode
-          } = _ref4;
-          return mode;
-        });
-        const polygons = data.map(_ref5 => {
-          let {
-            points
-          } = _ref5;
-          return pointsToString(points, origin);
-        });
-        return Promise.resolve({
-          success: true,
-          errCode: 0,
-          reqType: VirtualAreaEnum.query,
-          version: commandVersion,
-          taskId: `${Date.now()}`,
-          num: data.length,
-          modes,
-          polygons,
-          names,
-          mapId: 0
-        });
-      } catch (error) {
-        throw error instanceof Error ? error : new Error('Failed to set virtual area');
-      }
+      });
     }
   };
 };

package/lib/mqtt/useVirtualWall.d.ts

@@ -1,25 +1,9 @@
-import { BaseResponse, VirtualWallEnum } from './type';
-import { Point } from '@ray-js/robot-protocol';
-interface VirtualWallResponse extends BaseResponse {
-    reqType: VirtualWallEnum.query;
-    modes: number[];
-    num: number;
-    mapId: number;
-    points: string[];
-}
-interface SetVirtualWallParams {
-    data: Point[][];
-    origin: Point;
-}
-type TRequestVirtualWall = () => Promise<VirtualWallResponse>;
-type TSetVirtualWall = (params: SetVirtualWallParams) => Promise<VirtualWallResponse>;
+import { type TRequestVirtualWall, type TSetVirtualWall } from './type/protocols';
 /**
  * 自定义 Hook，用于虚拟墙管理
- * @param devId 设备ID
  * @returns 包含 requestVirtualWall 和 setVirtualWall 函数的对象
  */
-export declare const useVirtualWall: (devId: string) => {
+export declare const useVirtualWall: () => {
     requestVirtualWall: TRequestVirtualWall;
     setVirtualWall: TSetVirtualWall;
 };
-export {};