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

package/lib/mqtt/useVirtualWall.js

@@ -1,6 +1,5 @@
 import "core-js/modules/esnext.iterator.map.js";
 // 虚拟墙数据
-
 import { useContext } from 'react';
 import { createSetCommonParams } from './createCommonOptions';
 import { normalResolve } from './promise';
@@ -8,6 +7,20 @@ import { VirtualWallEnum } from './type';
 import { SingletonContext } from './mqttProvider';
 import { encodeVirtualWall0x12, requestVirtualWall0x13 } from '@ray-js/robot-protocol';
 import { pointsToString } from '../utils';
+
+// 虚拟墙响应类型
+
+// 设置虚拟墙参数类型
+
+// 请求虚拟墙函数类型定义
+
+// 设置虚拟墙函数类型定义
+
+/**
+ * 自定义 Hook，用于虚拟墙管理
+ * @param devId 设备ID
+ * @returns 包含 requestVirtualWall 和 setVirtualWall 函数的对象
+ */
 export const useVirtualWall = devId => {
   const {
     useMqtt,
@@ -15,56 +28,106 @@ export const useVirtualWall = devId => {
     devices
   } = useContext(SingletonContext);
 
-  // 请求虚拟墙数据
+  /**
+   * 请求虚拟墙数据
+   * @returns Promise<VirtualWallResponse> 响应结果
+   */
 
   /**
    * 设置虚拟墙数据
-   * @param message 包含虚拟墙设置参数的对象
-   * @param message.points 虚拟墙的点数组
-   * @param message.num 虚拟墙的数量（可选）
-   * @param message.mode 虚拟墙的模式数组（可选）
-   * @returns Promise<Response> 响应结果
+   * @param params 包含虚拟墙设置参数的对象
+   * @param params.data 虚拟墙的点数组
+   * @param params.origin 原点坐标
+   * @returns Promise<VirtualWallResponse> 响应结果
    */
 
   return {
     requestVirtualWall: () => {
-      if (useMqtt) {
-        const params = createSetCommonParams({
-          deviceId: devId,
-          reqType: VirtualWallEnum.query
+      try {
+        if (useMqtt) {
+          const params = createSetCommonParams({
+            deviceId: devId,
+            reqType: VirtualWallEnum.query
+          });
+          ty.device.sendMqttMessage(params);
+          const {
+            taskId
+          } = params.message;
+          return normalResolve(VirtualWallEnum.query, taskId);
+        }
+
+        // 非 MQTT 模式：使用命令传输
+        devices.common.model.actions.command_trans.set(requestVirtualWall0x13({
+          version: commandVersion
+        }));
+
+        // 非 MQTT 模式下无法立即获取响应数据，返回默认响应
+        return Promise.resolve({
+          success: true,
+          errCode: 0,
+          reqType: VirtualWallEnum.query,
+          version: commandVersion,
+          taskId: `${Date.now()}`,
+          num: 0,
+          modes: [],
+          points: [],
+          mapId: 0
         });
-        ty.device.sendMqttMessage(params);
-        return normalResolve(VirtualWallEnum.query, params.message.taskId);
+      } catch (error) {
+        return Promise.reject(error instanceof Error ? error : new Error('Failed to request virtual wall'));
       }
-      return devices.common.model.actions.command_trans.set(requestVirtualWall0x13({
-        version: commandVersion
-      }));
     },
     setVirtualWall: _ref => {
       let {
         data,
         origin
       } = _ref;
-      if (useMqtt) {
-        const params = createSetCommonParams({
-          deviceId: devId,
-          reqType: VirtualWallEnum.set,
-          message: {
-            points: data.map(points => pointsToString(points, origin)),
-            num: data.length,
-            mode: new Array(data.length).fill('0')
-          }
+      // 参数验证
+      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 params = createSetCommonParams({
+            deviceId: devId,
+            reqType: VirtualWallEnum.set,
+            message: {
+              points: data.map(points => pointsToString(points, origin)),
+              num: data.length,
+              mode: new Array(data.length).fill('0')
+            }
+          });
+          ty.device.sendMqttMessage(params);
+          const {
+            taskId
+          } = params.message;
+          return normalResolve(VirtualWallEnum.query, taskId);
+        }
+
+        // 非 MQTT 模式：使用命令传输
+        const command = encodeVirtualWall0x12({
+          version: commandVersion,
+          origin,
+          walls: data
+        });
+        devices.common.model.actions.command_trans.set(command);
+        return Promise.resolve({
+          success: true,
+          errCode: 0,
+          reqType: VirtualWallEnum.query,
+          version: commandVersion,
+          taskId: `${Date.now()}`,
+          num: data.length,
+          modes: new Array(data.length).fill(0),
+          points: data.map(points => pointsToString(points, origin)),
+          mapId: 0
         });
-        ty.device.sendMqttMessage(params);
-        return normalResolve(VirtualWallEnum.query, params.message.taskId);
+      } catch (error) {
+        throw error instanceof Error ? error : new Error('Failed to set virtual wall');
       }
-      const command = encodeVirtualWall0x12({
-        version: commandVersion,
-        origin,
-        walls: data
-      });
-      devices.common.model.actions.command_trans.set(command);
-      return Promise.resolve();
     }
   };
 };

package/lib/mqtt/useVoice.d.ts

@@ -1,12 +1,9 @@
-interface VoiceLanguageResponse {
-    reqType: string;
-    version: string;
+import { BaseResponse, VoiceLanguageEnum } from './type';
+interface VoiceLanguageResponse extends BaseResponse {
+    reqType: VoiceLanguageEnum.query;
     id: number;
     schedule: number;
     status: number;
-    success: boolean;
-    errCode: number;
-    taskId: string;
 }
 type TSetVoice = (message: {
     id: number;

package/lib/mqtt/useVoice.js

@@ -7,6 +7,8 @@ import { useContext } from 'react';
 import { SingletonContext } from './mqttProvider';
 import { encodeVoice0x34 } from '@ray-js/robot-protocol';
 
+// 语音语言响应类型
+
 // 设置语音语言函数类型定义
 
 // 请求当前使用的机器语音
@@ -19,62 +21,100 @@ import { encodeVoice0x34 } from '@ray-js/robot-protocol';
 export const useVoice = devId => {
   const {
     useMqtt,
-    devices
+    devices,
+    commandVersion
   } = useContext(SingletonContext);
   /**
    * 请求所有语音语言
-   * @returns Promise<any> 响应结果
+   * @returns Promise<ty.GetVoiceListResponse> 响应结果
    */
 
   /**
    * 请求当前使用的语音语言
-   * @returns Promise<any> 响应结果
+   * @returns Promise<VoiceLanguageResponse> 响应结果
    */
 
   /**
    * 设置语音语言
    * @param message 包含语音语言设置参数的对象
-   * @returns Promise<Response> 响应结果
+   * @returns Promise<VoiceLanguageResponse> 响应结果
    */
 
   return {
     requestAllVoices: async () => {
-      const res = await getVoiceList({
-        devId: devId,
-        offset: 0,
-        limit: 100
-      });
-      return res;
+      try {
+        const res = await getVoiceList({
+          devId: devId,
+          offset: 0,
+          limit: 100
+        });
+        return res;
+      } catch (error) {
+        throw error instanceof Error ? error : new Error('Failed to request all voices');
+      }
     },
     requestVoiceInUse: () => {
-      const params = createSetCommonParams({
-        deviceId: devId,
-        reqType: VoiceLanguageEnum.query
-      });
-      const {
-        taskId
-      } = params.message;
-      ty.device.sendMqttMessage(params);
-      return normalResolve(VoiceLanguageEnum.query, taskId);
-    },
-    setVoice: message => {
-      if (useMqtt) {
-        const sendData = _objectSpread(_objectSpread({}, message), {}, {
-          urlLen: message.url.length
-        });
+      if (!useMqtt) {
+        return Promise.reject(new Error('useMqtt is not used'));
+      }
+      try {
         const params = createSetCommonParams({
           deviceId: devId,
-          reqType: VoiceLanguageEnum.set,
-          message: sendData
+          reqType: VoiceLanguageEnum.query
         });
+        const {
+          taskId
+        } = params.message;
         ty.device.sendMqttMessage(params);
-        return normalResolve(VoiceLanguageEnum.query, params.message.taskId);
+        return normalResolve(VoiceLanguageEnum.query, taskId);
+      } catch (error) {
+        return Promise.reject(error instanceof Error ? error : new Error('Failed to request voice in use'));
+      }
+    },
+    setVoice: message => {
+      // 参数验证
+      if (!message || typeof message.id !== 'number') {
+        throw new Error('message.id is required and must be a number');
+      }
+      if (!message.url || typeof message.url !== 'string') {
+        throw new Error('message.url is required and must be a string');
+      }
+      if (!message.md5 || typeof message.md5 !== 'string') {
+        throw new Error('message.md5 is required and must be a string');
+      }
+      try {
+        if (useMqtt) {
+          const sendData = _objectSpread(_objectSpread({}, message), {}, {
+            urlLen: message.url.length
+          });
+          const params = createSetCommonParams({
+            deviceId: devId,
+            reqType: VoiceLanguageEnum.set,
+            message: sendData
+          });
+          ty.device.sendMqttMessage(params);
+          const {
+            taskId
+          } = params.message;
+          return normalResolve(VoiceLanguageEnum.query, taskId);
+        }
+
+        // 非 MQTT 模式：使用命令传输
+        const command = encodeVoice0x34(message);
+        devices.common.model.actions.voice_data.set(command);
+        return Promise.resolve({
+          success: true,
+          errCode: 0,
+          reqType: VoiceLanguageEnum.query,
+          version: commandVersion,
+          taskId: `${Date.now()}`,
+          id: message.id,
+          schedule: 0,
+          status: 0
+        });
+      } catch (error) {
+        throw error instanceof Error ? error : new Error('Failed to set voice');
       }
-      const command = encodeVoice0x34(message);
-      devices.common.model.actions.voice_data.set(command);
-      return Promise.resolve({
-        success: true
-      });
     }
   };
 };

package/lib/mqtt/useWifiMap.js

@@ -8,30 +8,46 @@ export const useWifiMap = devId => {
     useMqtt
   } = useContext(SingletonContext);
 
-  // 请求密码状态
+  // 请求 WiFi 地图状态
 
-  // 设置密码
+  // 设置 WiFi 地图
 
   return {
     requestWifiMap: () => {
-      if (!useMqtt) return Promise.reject(new Error('useMqtt is not used'));
-      const params = createSetCommonParams({
-        deviceId: devId,
-        reqType: WifiMapEnum.query
-      });
-      ty.device.sendMqttMessage(params);
-      return normalResolve(WifiMapEnum.query, params.message.taskId);
+      if (!useMqtt) {
+        return Promise.reject(new Error('useMqtt is not used'));
+      }
+      try {
+        const params = createSetCommonParams({
+          deviceId: devId,
+          reqType: WifiMapEnum.query
+        });
+        ty.device.sendMqttMessage(params);
+        const {
+          taskId
+        } = params.message;
+        return normalResolve(WifiMapEnum.query, taskId);
+      } catch (error) {
+        return Promise.reject(error instanceof Error ? error : new Error('Failed to request WiFi map'));
+      }
     },
     setWifiMap: () => {
-      const params = createSetCommonParams({
-        deviceId: devId,
-        reqType: WifiMapEnum.set,
-        message: {
-          taskId: String(Date.now())
-        }
-      });
-      ty.device.sendMqttMessage(params);
-      return normalResolve(WifiMapEnum.rst, params.message.taskId);
+      try {
+        const params = createSetCommonParams({
+          deviceId: devId,
+          reqType: WifiMapEnum.set,
+          message: {
+            taskId: String(Date.now())
+          }
+        });
+        ty.device.sendMqttMessage(params);
+        const {
+          taskId
+        } = params.message;
+        return normalResolve(WifiMapEnum.rst, taskId);
+      } catch (error) {
+        throw error instanceof Error ? error : new Error('Failed to set WiFi map');
+      }
     }
   };
 };

package/lib/mqtt/useZoneClean.d.ts

@@ -1,28 +1,28 @@
-import { RoomPreference } from './type';
+import { BaseResponse, ZoneCleanEnum, RoomPreference } from './type';
 import { Point, Zone } from '@ray-js/robot-protocol';
-type Response = {
-    reqType: string;
-    version: string;
-    success: boolean;
-    errCode: number;
-    taskId: string;
+interface ZoneCleanResponse extends BaseResponse {
+    reqType: ZoneCleanEnum.query;
     polygons: string[];
+    names?: string[];
     suctions?: string[];
     cisterns?: string[];
     cleanCounts?: number[];
     yMops?: number[];
     sweepMopModes?: string[];
-};
-type TSetZoneClean = (message: Partial<Pick<RoomPreference, 'suctions' | 'cisterns' | 'cleanCounts' | 'yMops' | 'sweepMopModes'>> & {
+}
+interface SetZoneCleanParams extends Partial<Pick<RoomPreference, 'suctions' | 'cisterns' | 'cleanCounts' | 'yMops' | 'sweepMopModes'>> {
     zones: Zone[];
     origin: Point;
-}) => Promise<Response | void>;
+}
+type TRequestZoneClean = () => Promise<ZoneCleanResponse>;
+type TSetZoneClean = (params: SetZoneCleanParams) => Promise<ZoneCleanResponse>;
 /**
- * 划区清扫
- * @returns
+ * 自定义 Hook，用于划区清扫
+ * @param devId 设备ID
+ * @returns 包含 requestZoneClean 和 setZoneClean 函数的对象
  */
 export declare const useZoneClean: (devId: string) => {
-    requestZoneClean: () => Promise<Response>;
+    requestZoneClean: TRequestZoneClean;
     setZoneClean: TSetZoneClean;
 };
 export {};