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

package/lib/mqtt/useSelectRoomClean.js

@@ -2,118 +2,95 @@ 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 { createSetCommonParams } from './createCommonOptions';
-import { RoomCleanSetEnum } from './type';
-import { normalResolve } from './promise';
+import { encodeRoomClean0x14, requestRoomClean0x15 } from '@ray-js/robot-protocol';
 import { useContext } from 'react';
+import { handleMqttError, useStructuredMessage } from './hooks/useStructuredMessage';
 import { SingletonContext } from './mqttProvider';
-import { encodeRoomClean0x14, requestRoomClean0x15 } from '@ray-js/robot-protocol';
-
-// 房间信息
-
-// 选区清扫响应类型
-
-// 设置选区清扫函数类型定义
-
-// 请求选区清扫函数类型定义
-
+import { RoomCleanSetEnum } from './type';
+import { validator } from './type/fun';
 /**
  * 自定义 Hook，用于选区清扫
- * @param devId 设备ID
  * @returns 包含 requestSelectRoomClean 和 setRoomClean 函数的对象
  */
-export const useSelectRoomClean = devId => {
+export const useSelectRoomClean = () => {
   const {
     useMqtt,
     commandVersion,
     devices
   } = useContext(SingletonContext);
+  const {
+    sendStructuredMessage
+  } = useStructuredMessage();
 
   /**
    * 请求选区清扫信息
-   * @returns Promise<RoomCleanResponse> 响应结果
+   * @param data 可选参数（目前为空对象）
+   * @returns Promise<SelectRoomCleanResponse> 响应结果
    */
 
   /**
    * 设置选区清扫
    * 选区清扫的清扫属性，当全局模式下使用全局的清扫属性，当自定义模式下，使用房间自定义的清扫属性
-   * @param rooms 房间信息数组
-   * @returns Promise<RoomCleanResponse> 响应结果
+   * @param data 包含房间信息数组的对象
+   * @returns Promise<SelectRoomCleanResponse> 响应结果
    */
 
   return {
     requestSelectRoomClean: () => {
-      try {
-        if (useMqtt) {
-          const params = createSetCommonParams({
-            deviceId: devId,
-            reqType: RoomCleanSetEnum.query
-          });
-          ty.device.sendMqttMessage(params);
-          const {
-            taskId
-          } = params.message;
-          return normalResolve(RoomCleanSetEnum.query, taskId);
-        }
+      return new Promise((resolve, reject) => {
+        try {
+          if (useMqtt) {
+            sendStructuredMessage(RoomCleanSetEnum.query, {}, resolve, error => reject(handleMqttError(error, 'Failed to request select room clean')));
+            return;
+          }
 
-        // 非 MQTT 模式：使用命令传输
-        devices.common.model.actions.command_trans.set(requestRoomClean0x15({
-          version: commandVersion
-        }));
+          // 非 MQTT 模式：使用命令传输
+          devices.common.model.actions.command_trans.set(requestRoomClean0x15({
+            version: commandVersion
+          }));
 
-        // 非 MQTT 模式下无法立即获取响应数据，返回默认响应
-        return Promise.resolve({
-          success: true,
-          errCode: 0,
-          reqType: RoomCleanSetEnum.query,
-          version: commandVersion,
-          taskId: `${Date.now()}`,
-          ids: [],
-          suctions: [],
-          cisterns: [],
-          cleanCounts: [],
-          yMops: [],
-          sweepMopModes: []
-        });
-      } catch (error) {
-        return Promise.reject(error instanceof Error ? error : new Error('Failed to request select room clean'));
-      }
-    },
-    setRoomClean: rooms => {
-      // 参数验证
-      if (!Array.isArray(rooms) || rooms.length === 0) {
-        throw new Error('rooms is required and must be a non-empty array');
-      }
-      rooms.forEach((room, index) => {
-        if (typeof room.roomId !== 'number') {
-          throw new Error(`rooms[${index}].roomId is required and must be a number`);
-        }
-        if (!room.cistern || typeof room.cistern !== 'string') {
-          throw new Error(`rooms[${index}].cistern is required and must be a string`);
+          // 非 MQTT 模式下无法立即获取响应数据，返回默认响应
+          resolve({
+            success: true,
+            errCode: 0,
+            reqType: RoomCleanSetEnum.query,
+            version: commandVersion,
+            taskId: `${Date.now()}`,
+            ids: [],
+            suctions: [],
+            cisterns: [],
+            cleanCounts: [],
+            yMops: [],
+            sweepMopModes: []
+          });
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to request select room clean'));
         }
       });
-      try {
-        var _rooms$0$cleanTimes, _rooms$;
-        if (useMqtt) {
-          const ids = [];
-          const suctions = [];
-          const cisterns = [];
-          const cleanCounts = [];
-          const yMops = [];
-          const sweepMopModes = [];
-          rooms.forEach(room => {
-            var _room$suction, _room$cleanTimes, _room$yMop, _room$sweepMopMode;
-            ids.push(room.roomId);
-            suctions.push((_room$suction = room.suction) !== null && _room$suction !== void 0 ? _room$suction : '');
-            cisterns.push(room.cistern);
-            cleanCounts.push((_room$cleanTimes = room.cleanTimes) !== null && _room$cleanTimes !== void 0 ? _room$cleanTimes : 1);
-            yMops.push((_room$yMop = room.yMop) !== null && _room$yMop !== void 0 ? _room$yMop : -1);
-            sweepMopModes.push((_room$sweepMopMode = room.sweepMopMode) !== null && _room$sweepMopMode !== void 0 ? _room$sweepMopMode : 'only_sweep');
-          });
-          const params = createSetCommonParams({
-            deviceId: devId,
-            reqType: RoomCleanSetEnum.set,
-            message: {
+    },
+    setRoomClean: data => {
+      return new Promise((resolve, reject) => {
+        try {
+          var _rooms$0$cleanTimes, _rooms$;
+          // 使用 TypeBox Schema 进行参数验证
+          const rooms = validator.validate('set_select_room_clean', data);
+          if (useMqtt) {
+            const ids = [];
+            const suctions = [];
+            const cisterns = [];
+            const cleanCounts = [];
+            const yMops = [];
+            const sweepMopModes = [];
+            rooms.forEach(room => {
+              var _room$suction, _room$cleanTimes, _room$yMop, _room$sweepMopMode;
+              ids.push(room.roomId);
+              suctions.push((_room$suction = room.suction) !== null && _room$suction !== void 0 ? _room$suction : '');
+              cisterns.push(room.cistern);
+              cleanCounts.push((_room$cleanTimes = room.cleanTimes) !== null && _room$cleanTimes !== void 0 ? _room$cleanTimes : 1);
+              yMops.push((_room$yMop = room.yMop) !== null && _room$yMop !== void 0 ? _room$yMop : -1);
+              sweepMopModes.push((_room$sweepMopMode = room.sweepMopMode) !== null && _room$sweepMopMode !== void 0 ? _room$sweepMopMode : 'only_sweep');
+            });
+            sendStructuredMessage(RoomCleanSetEnum.set, {
               ids,
               suctions,
               cisterns,
@@ -121,56 +98,53 @@ export const useSelectRoomClean = devId => {
               yMops,
               sweepMopModes,
               num: rooms.length
-            }
+            }, resolve, error => reject(handleMqttError(error, 'Failed to set room clean')), RoomCleanSetEnum.query // 响应类型是 query，不是 set
+            );
+            return;
+          }
+
+          // 非 MQTT 模式：使用命令传输
+          const command = encodeRoomClean0x14({
+            version: commandVersion,
+            roomIds: rooms.map(room => room.roomId),
+            cleanTimes: (_rooms$0$cleanTimes = (_rooms$ = rooms[0]) === null || _rooms$ === void 0 ? void 0 : _rooms$.cleanTimes) !== null && _rooms$0$cleanTimes !== void 0 ? _rooms$0$cleanTimes : 1
+          });
+          devices.common.model.actions.command_trans.set(command);
+          const ids = rooms.map(room => room.roomId);
+          const suctions = rooms.map(room => {
+            var _room$suction2;
+            return (_room$suction2 = room.suction) !== null && _room$suction2 !== void 0 ? _room$suction2 : '';
           });
-          ty.device.sendMqttMessage(params);
-          const {
-            taskId
-          } = params.message;
-          return normalResolve(RoomCleanSetEnum.query, taskId);
+          const cisterns = rooms.map(room => room.cistern);
+          const cleanCounts = rooms.map(room => {
+            var _room$cleanTimes2;
+            return (_room$cleanTimes2 = room.cleanTimes) !== null && _room$cleanTimes2 !== void 0 ? _room$cleanTimes2 : 1;
+          });
+          const yMops = rooms.map(room => {
+            var _room$yMop2;
+            return (_room$yMop2 = room.yMop) !== null && _room$yMop2 !== void 0 ? _room$yMop2 : -1;
+          });
+          const sweepMopModes = rooms.map(room => {
+            var _room$sweepMopMode2;
+            return (_room$sweepMopMode2 = room.sweepMopMode) !== null && _room$sweepMopMode2 !== void 0 ? _room$sweepMopMode2 : 'only_sweep';
+          });
+          resolve({
+            success: true,
+            errCode: 0,
+            reqType: RoomCleanSetEnum.query,
+            version: commandVersion,
+            taskId: `${Date.now()}`,
+            ids,
+            suctions,
+            cisterns,
+            cleanCounts,
+            yMops,
+            sweepMopModes
+          });
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to set room clean'));
         }
-
-        // 非 MQTT 模式：使用命令传输
-        const command = encodeRoomClean0x14({
-          version: commandVersion,
-          roomIds: rooms.map(room => room.roomId),
-          cleanTimes: (_rooms$0$cleanTimes = (_rooms$ = rooms[0]) === null || _rooms$ === void 0 ? void 0 : _rooms$.cleanTimes) !== null && _rooms$0$cleanTimes !== void 0 ? _rooms$0$cleanTimes : 1
-        });
-        devices.common.model.actions.command_trans.set(command);
-        const ids = rooms.map(room => room.roomId);
-        const suctions = rooms.map(room => {
-          var _room$suction2;
-          return (_room$suction2 = room.suction) !== null && _room$suction2 !== void 0 ? _room$suction2 : '';
-        });
-        const cisterns = rooms.map(room => room.cistern);
-        const cleanCounts = rooms.map(room => {
-          var _room$cleanTimes2;
-          return (_room$cleanTimes2 = room.cleanTimes) !== null && _room$cleanTimes2 !== void 0 ? _room$cleanTimes2 : 1;
-        });
-        const yMops = rooms.map(room => {
-          var _room$yMop2;
-          return (_room$yMop2 = room.yMop) !== null && _room$yMop2 !== void 0 ? _room$yMop2 : -1;
-        });
-        const sweepMopModes = rooms.map(room => {
-          var _room$sweepMopMode2;
-          return (_room$sweepMopMode2 = room.sweepMopMode) !== null && _room$sweepMopMode2 !== void 0 ? _room$sweepMopMode2 : 'only_sweep';
-        });
-        return Promise.resolve({
-          success: true,
-          errCode: 0,
-          reqType: RoomCleanSetEnum.query,
-          version: commandVersion,
-          taskId: `${Date.now()}`,
-          ids,
-          suctions,
-          cisterns,
-          cleanCounts,
-          yMops,
-          sweepMopModes
-        });
-      } catch (error) {
-        throw error instanceof Error ? error : new Error('Failed to set room clean');
-      }
+      });
     }
   };
 };

package/lib/mqtt/useSpotClean.d.ts

@@ -1,19 +1,9 @@
-import { BaseResponse, RoomPreference } from './type';
-import { Point } from '@ray-js/robot-protocol';
-type Response = BaseResponse & Partial<Pick<RoomPreference, 'suctions' | 'cisterns' | 'cleanCounts' | 'yMops' | 'sweepMopModes'>> & {
-    polygons: string[];
-    names?: string[];
-};
-type TSetSpotClean = (message: Partial<Pick<RoomPreference, 'suctions' | 'cisterns' | 'cleanCounts' | 'yMops' | 'sweepMopModes'>> & {
-    spots: Point[];
-    origin?: Point;
-}) => Promise<Response>;
+import { type TRequestSpotClean, type TSetSpotClean } from './type/protocols';
 /**
- * 定点清扫
- * @returns
+ * 自定义 Hook，用于定点清扫
+ * @returns 包含 requestSpotClean 和 setSpotClean 函数的对象
  */
-export declare const useSpotClean: (devId: string) => {
-    requestSpotClean: () => Promise<Response>;
+export declare const useSpotClean: () => {
+    requestSpotClean: TRequestSpotClean;
     setSpotClean: TSetSpotClean;
 };
-export {};

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 {};