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

package/lib/mqtt/useVirtualWall.js

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

package/lib/mqtt/useVoice.d.ts

@@ -1,24 +1,10 @@
-import { BaseResponse, VoiceLanguageEnum } from './type';
-interface VoiceLanguageResponse extends BaseResponse {
-    reqType: VoiceLanguageEnum.query;
-    id: number;
-    schedule: number;
-    status: number;
-}
-type TSetVoice = (message: {
-    id: number;
-    url: string;
-    md5: string;
-}) => Promise<VoiceLanguageResponse>;
-type TRequestVoiceInUse = () => Promise<VoiceLanguageResponse>;
+import { type TSetVoice, type TRequestVoiceInUse } from './type/protocols';
 /**
  * 自定义 Hook，用于语音语言设置
- * @param devId 设备ID
  * @returns 包含 requestAllVoices, requestVoiceInUse 和 setVoice 函数的对象
  */
-export declare const useVoice: (devId: string) => {
+export declare const useVoice: () => {
     requestAllVoices: () => Promise<ty.GetVoiceListResponse>;
     requestVoiceInUse: TRequestVoiceInUse;
     setVoice: TSetVoice;
 };
-export {};

package/lib/mqtt/useVoice.js

@@ -1,29 +1,27 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { getVoiceList } from '@ray-js/ray';
-import { createSetCommonParams } from './createCommonOptions';
-import { normalResolve } from './promise';
 import { VoiceLanguageEnum } from './type';
 import { useContext } from 'react';
 import { SingletonContext } from './mqttProvider';
 import { encodeVoice0x34 } from '@ray-js/robot-protocol';
-
-// 语音语言响应类型
-
-// 设置语音语言函数类型定义
-
-// 请求当前使用的机器语音
-
+import { useStructuredMessage, handleMqttError } from './hooks/useStructuredMessage';
+import { validator } from './type/fun';
 /**
  * 自定义 Hook，用于语音语言设置
- * @param devId 设备ID
  * @returns 包含 requestAllVoices, requestVoiceInUse 和 setVoice 函数的对象
  */
-export const useVoice = devId => {
+export const useVoice = () => {
   const {
     useMqtt,
     devices,
     commandVersion
   } = useContext(SingletonContext);
+  const {
+    sendStructuredMessage
+  } = useStructuredMessage();
+  const {
+    devId
+  } = devices.common.getDevInfo();
   /**
    * 请求所有语音语言
    * @returns Promise<ty.GetVoiceListResponse> 响应结果
@@ -31,6 +29,7 @@ export const useVoice = devId => {
 
   /**
    * 请求当前使用的语音语言
+   * @param data 可选参数（目前为空对象）
    * @returns Promise<VoiceLanguageResponse> 响应结果
    */
 
@@ -54,67 +53,48 @@ export const useVoice = devId => {
       }
     },
     requestVoiceInUse: () => {
-      if (!useMqtt) {
-        return Promise.reject(new Error('useMqtt is not used'));
-      }
-      try {
-        const params = createSetCommonParams({
-          deviceId: devId,
-          reqType: VoiceLanguageEnum.query
-        });
-        const {
-          taskId
-        } = params.message;
-        ty.device.sendMqttMessage(params);
-        return normalResolve(VoiceLanguageEnum.query, taskId);
-      } catch (error) {
-        return Promise.reject(error instanceof Error ? error : new Error('Failed to request voice in use'));
-      }
+      return new Promise((resolve, reject) => {
+        try {
+          if (!useMqtt) {
+            reject(new Error('useMqtt is not used'));
+            return;
+          }
+          sendStructuredMessage(VoiceLanguageEnum.query, {}, resolve, error => reject(handleMqttError(error, 'Failed to request voice in use')));
+        } catch (error) {
+          reject(handleMqttError(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
+      return new Promise((resolve, reject) => {
+        try {
+          // 使用 TypeBox Schema 进行参数验证
+          const validatedData = validator.validate('set_voice', message);
+          if (useMqtt) {
+            const sendData = _objectSpread(_objectSpread({}, validatedData), {}, {
+              urlLen: validatedData.url.length
+            });
+            sendStructuredMessage(VoiceLanguageEnum.set, sendData, resolve, error => reject(handleMqttError(error, 'Failed to set voice')), VoiceLanguageEnum.query);
+            return;
+          }
+
+          // 非 MQTT 模式：使用命令传输
+          const command = encodeVoice0x34(validatedData);
+          devices.common.model.actions.voice_data.set(command);
+          resolve({
+            success: true,
+            errCode: 0,
+            reqType: VoiceLanguageEnum.query,
+            version: commandVersion,
+            taskId: `${Date.now()}`,
+            id: validatedData.id,
+            schedule: 0,
+            status: 0
           });
-          ty.device.sendMqttMessage(params);
-          const {
-            taskId
-          } = params.message;
-          return normalResolve(VoiceLanguageEnum.query, taskId);
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to set voice'));
         }
-
-        // 非 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');
-      }
+      });
     }
   };
 };

package/lib/mqtt/useWifiMap.d.ts

@@ -1,8 +1,9 @@
-import { PromiseWithRejection } from './promise';
-type TRequestWifiMap = () => PromiseWithRejection | Promise<void>;
-type TSetWifiMap = () => PromiseWithRejection;
-export declare const useWifiMap: (devId: string) => {
+import { type TRequestWifiMap, type TSetWifiMap } from './type/protocols';
+/**
+ * 自定义 Hook，用于 WiFi 地图管理
+ * @returns 包含 requestWifiMap 和 setWifiMap 函数的对象
+ */
+export declare const useWifiMap: () => {
     requestWifiMap: TRequestWifiMap;
     setWifiMap: TSetWifiMap;
 };
-export {};

package/lib/mqtt/useWifiMap.js

@@ -1,53 +1,54 @@
-import { createSetCommonParams } from './createCommonOptions';
-import { normalResolve } from './promise';
 import { WifiMapEnum } from './type';
-import { useContext } from 'react';
-import { SingletonContext } from './mqttProvider';
-export const useWifiMap = devId => {
+import { useStructuredMessage, handleMqttError } from './hooks/useStructuredMessage';
+import { validator } from './type/fun';
+/**
+ * 自定义 Hook，用于 WiFi 地图管理
+ * @returns 包含 requestWifiMap 和 setWifiMap 函数的对象
+ */
+export const useWifiMap = () => {
   const {
-    useMqtt
-  } = useContext(SingletonContext);
+    sendStructuredMessage
+  } = useStructuredMessage();
 
-  // 请求 WiFi 地图状态
+  /**
+   * 请求 WiFi 地图状态
+   * @param data 可选参数（目前为空对象）
+   * @returns Promise<WifiMapResponse> 响应结果
+   */
 
-  // 设置 WiFi 地图
+  /**
+   * 设置 WiFi 地图
+   * @param data 包含 taskId 的参数对象（taskId 可选，不提供时自动生成）
+   * @returns Promise<WifiMapResponse> 响应结果
+   */
 
   return {
     requestWifiMap: () => {
-      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'));
-      }
+      return new Promise((resolve, reject) => {
+        try {
+          sendStructuredMessage(WifiMapEnum.query, {}, resolve, error => reject(handleMqttError(error, 'Failed to request WiFi map')));
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to request WiFi map'));
+        }
+      });
     },
-    setWifiMap: () => {
-      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');
-      }
+    setWifiMap: function () {
+      let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      return new Promise((resolve, reject) => {
+        try {
+          // 如果没有提供 taskId，自动生成
+          const wifiMapData = {
+            taskId: data.taskId || String(Date.now())
+          };
+
+          // 使用 TypeBox Schema 进行参数验证
+          const validatedData = validator.validate('set_wifi_map', wifiMapData);
+          sendStructuredMessage(WifiMapEnum.set, validatedData, resolve, error => reject(handleMqttError(error, 'Failed to set WiFi map')), WifiMapEnum.rst // 响应类型是 rst，不是 set
+          );
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to set WiFi map'));
+        }
+      });
     }
   };
 };

package/lib/mqtt/useZoneClean.d.ts

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