@ray-js/robot-data-stream 0.0.13-beta-7 → 0.0.13-beta-8

package/lib/mqtt/useSelectRoomClean.js

@@ -8,20 +8,6 @@ import { normalResolve } from './promise';
 import { useContext } from 'react';
 import { SingletonContext } from './mqttProvider';
 import { encodeRoomClean0x14, requestRoomClean0x15 } from '@ray-js/robot-protocol';
-
-// 房间信息
-
-// 选区清扫响应类型
-
-// 设置选区清扫函数类型定义
-
-// 请求选区清扫函数类型定义
-
-/**
- * 自定义 Hook，用于选区清扫
- * @param devId 设备ID
- * @returns 包含 requestSelectRoomClean 和 setRoomClean 函数的对象
- */
 export const useSelectRoomClean = devId => {
   const {
     useMqtt,
@@ -29,148 +15,66 @@ export const useSelectRoomClean = devId => {
     devices
   } = useContext(SingletonContext);
 
-  /**
-   * 请求选区清扫信息
-   * @returns Promise<RoomCleanResponse> 响应结果
-   */
+  // 请求选区清扫信息
 
-  /**
-   * 设置选区清扫
-   * 选区清扫的清扫属性，当全局模式下使用全局的清扫属性，当自定义模式下，使用房间自定义的清扫属性
-   * @param rooms 房间信息数组
-   * @returns Promise<RoomCleanResponse> 响应结果
-   */
+  // 设置选区清扫
+  // 选区清扫的清扫属性，当全局模式下使用全局的清扫属性，当自定义模式下，使用房间自定义的清扫属性
 
   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);
-        }
-
-        // 非 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: []
+      if (useMqtt) {
+        const params = createSetCommonParams({
+          deviceId: devId,
+          reqType: RoomCleanSetEnum.query
         });
-      } catch (error) {
-        return Promise.reject(error instanceof Error ? error : new Error('Failed to request select room clean'));
+        ty.device.sendMqttMessage(params);
+        return normalResolve(RoomCleanSetEnum.query, params.message.taskId);
       }
+      return devices.common.model.actions.command_trans.set(requestRoomClean0x15({
+        version: commandVersion
+      }));
     },
     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`);
-        }
-      });
-      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: {
-              ids,
-              suctions,
-              cisterns,
-              cleanCounts,
-              yMops,
-              sweepMopModes,
-              num: rooms.length
-            }
-          });
-          ty.device.sendMqttMessage(params);
-          const {
-            taskId
-          } = params.message;
-          return normalResolve(RoomCleanSetEnum.query, taskId);
-        }
-
-        // 非 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;
+      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 yMops = rooms.map(room => {
-          var _room$yMop2;
-          return (_room$yMop2 = room.yMop) !== null && _room$yMop2 !== void 0 ? _room$yMop2 : -1;
+        const params = createSetCommonParams({
+          deviceId: devId,
+          reqType: RoomCleanSetEnum.set,
+          message: {
+            ids,
+            suctions,
+            cisterns,
+            cleanCounts,
+            yMops,
+            sweepMopModes,
+            num: rooms.length
+          }
         });
-        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');
+        ty.device.sendMqttMessage(params);
+        return normalResolve(RoomCleanSetEnum.query, params.message.taskId);
       }
+      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);
+      return Promise.resolve();
     }
   };
 };

package/lib/mqtt/useSpotClean.d.ts

@@ -1,13 +1,13 @@
-import { BaseResponse, RoomPreference } from './type';
+import { RoomPreference } from './type';
 import { Point } from '@ray-js/robot-protocol';
-type Response = BaseResponse & Partial<Pick<RoomPreference, 'suctions' | 'cisterns' | 'cleanCounts' | 'yMops' | 'sweepMopModes'>> & {
+type Response = 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>;
+}) => Promise<Response | void>;
 /**
  * 定点清扫
  * @returns

package/lib/mqtt/useSpotClean.js

@@ -39,80 +39,60 @@ export const useSpotClean = devId => {
         spots,
         origin
       } = message;
-      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 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: {
-              num,
-              polygons: spots.map(spot => pointsToString([spot], origin)),
-              suctions,
-              cisterns,
-              cleanCounts,
-              yMops,
-              sweepMopModes
-            }
-          });
-          ty.device.sendMqttMessage(params);
-          const {
-            taskId
-          } = params.message;
-          return normalResolve(SpotCleanEnum.query, taskId);
-        }
+      if (useMqtt) {
+        // if (!isArray(spots) || (isArray(spots) && spots.length === 0)) {
+        //   return Promise.reject(new Error('message is required'));
+        // }
 
-        // 非 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
+        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
+          }
         });
-      } catch (error) {
-        throw error instanceof Error ? error : new Error('Failed to set spot clean');
+        ty.device.sendMqttMessage(params);
+        return normalResolve(SpotCleanEnum.query, params.message.taskId);
       }
+      const command = encodeSpotClean0x16({
+        version: commandVersion,
+        origin,
+        point: spots[0]
+      });
+      devices.common.model.actions.command_trans.set(command);
+      return Promise.resolve();
     }
   };
 };

package/lib/mqtt/useVirtualArea.d.ts

@@ -1,18 +1,21 @@
-import { BaseResponse, VirtualAreaEnum } from './type';
 import { Point, VirtualArea } from '@ray-js/robot-protocol';
-interface VirtualAreaResponse extends BaseResponse {
-    reqType: VirtualAreaEnum.query;
+type Response = {
+    reqType: 'restrictedAreaQry';
+    version: string;
     num: number;
     modes: number[];
     polygons: string[];
     names: string[];
     mapId: number;
-}
+    success: boolean;
+    errCode: number;
+    taskId: string;
+};
 type TSetVirtualArea = (message: {
     data: VirtualArea[];
     origin: Point;
-}) => Promise<VirtualAreaResponse>;
-type TRequestVirtualArea = () => Promise<VirtualAreaResponse>;
+}) => Promise<Response> | Promise<void>;
+type TRequestVirtualArea = () => Promise<Response>;
 export declare const useVirtualArea: (devId: string) => {
     requestVirtualArea: TRequestVirtualArea;
     setVirtualArea: TSetVirtualArea;

package/lib/mqtt/useVirtualArea.js

@@ -1,6 +1,5 @@
 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';
@@ -9,9 +8,6 @@ import { VirtualAreaEnum } from './type';
 import { SingletonContext } from './mqttProvider';
 import { encodeVirtualArea0x1a, requestVirtualArea0x1b } from '@ray-js/robot-protocol';
 import { pointsToString } from '../utils';
-
-// 虚拟区域响应类型
-
 // 禁区
 
 export const useVirtualArea = devId => {
@@ -29,132 +25,66 @@ export const useVirtualArea = devId => {
   /**
    * 设置虚拟区域数据
    * @param message 包含虚拟区域设置参数的对象
-   * @param message.data 虚拟区域的数据数组
-   * @param message.origin 原点坐标
+   * @param message.polygons 多边形数组，每个元素为一个多边形的坐标字符串
+   * @param message.names 名称数组，每个元素为一个区域的名称
+   * @param message.modes 模式数组，每个元素为一个区域的模式，0:全禁，1:禁扫，2:禁拖
+   * @param message.num 虚拟区域的数量
    * @returns Promise<VirtualAreaResponse> 响应结果
    */
 
   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);
-        }
-
-        // 非 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
+      if (useMqtt) {
+        const params = createSetCommonParams({
+          deviceId: devId,
+          reqType: VirtualAreaEnum.query
         });
-      } catch (error) {
-        return Promise.reject(error instanceof Error ? error : new Error('Failed to request virtual area'));
+        ty.device.sendMqttMessage(params);
+        return normalResolve(VirtualAreaEnum.query, params.message.taskId);
       }
+      return devices.common.model.actions.command_trans.set(requestVirtualArea0x1b({
+        version: commandVersion
+      }));
     },
     setVirtualArea: _ref => {
       let {
         data,
         origin
       } = _ref;
-      // 参数验证
-      if (!Array.isArray(data) || data.length === 0) {
-        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));
-          });
-          const params = createSetCommonParams({
-            deviceId: devId,
-            reqType: VirtualAreaEnum.set,
-            message: {
-              polygons,
-              num: data.length,
-              modes: modes,
-              names: names
-            }
-          });
-          ty.device.sendMqttMessage(params);
-          const {
-            taskId
-          } = params.message;
-          return normalResolve(VirtualAreaEnum.query, taskId);
-        }
-
-        // 非 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 => {
+      if (useMqtt) {
+        const names = [];
+        const modes = [];
+        const polygons = [];
+        data.forEach(_ref2 => {
           let {
+            points,
+            name,
             mode
-          } = _ref4;
-          return mode;
-        });
-        const polygons = data.map(_ref5 => {
-          let {
-            points
-          } = _ref5;
-          return pointsToString(points, origin);
+          } = _ref2;
+          names.push(name);
+          modes.push(mode);
+          polygons.push(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
+        const params = createSetCommonParams({
+          deviceId: devId,
+          reqType: VirtualAreaEnum.set,
+          message: {
+            polygons,
+            num: data.length,
+            modes: modes,
+            names: names
+          }
         });
-      } catch (error) {
-        throw error instanceof Error ? error : new Error('Failed to set virtual area');
+        ty.device.sendMqttMessage(params);
+        return normalResolve(VirtualAreaEnum.query, params.message.taskId);
       }
+      const command = encodeVirtualArea0x1a({
+        version: commandVersion,
+        origin,
+        virtualAreas: data
+      });
+      devices.common.model.actions.command_trans.set(command);
+      return Promise.resolve();
     }
   };
 };

package/lib/mqtt/useVirtualWall.d.ts

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