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

package/lib/mqtt/useResetMap.js

@@ -1,60 +1,53 @@
 // 重置地图
 import { useContext } from 'react';
-import { createSetCommonParams } from './createCommonOptions';
-import { normalResolve } from './promise';
 import { ResetCurrMapEnum } from './type';
 import { SingletonContext } from './mqttProvider';
 import { encodeResetMap0x42 } from '@ray-js/robot-protocol';
-
-// 重置地图响应类型
-
-// 设置重置地图函数类型定义
-
+import { useStructuredMessage, handleMqttError } from './hooks/useStructuredMessage';
 /**
  * 自定义 Hook，用于重置地图
- * @param devId 设备ID
  * @returns 包含 setResetMap 函数的对象
  */
-export const useResetMap = devId => {
+export const useResetMap = () => {
   const {
     useMqtt,
     devices,
     commandVersion
   } = useContext(SingletonContext);
+  const {
+    sendStructuredMessage
+  } = useStructuredMessage();
   /**
    * 重置地图
+   * @param data 可选参数（目前为空对象）
    * @returns Promise<ResetMapResponse> 响应结果
    */
 
   return {
     setResetMap: () => {
-      try {
-        if (useMqtt) {
-          const params = createSetCommonParams({
-            deviceId: devId,
-            reqType: ResetCurrMapEnum.set
+      return new Promise((resolve, reject) => {
+        try {
+          if (useMqtt) {
+            sendStructuredMessage(ResetCurrMapEnum.set, {}, resolve, error => reject(handleMqttError(error, 'Failed to reset map')), ResetCurrMapEnum.query // 响应类型是 query，不是 set
+            );
+            return;
+          }
+
+          // 非 MQTT 模式：使用命令传输
+          devices.common.model.actions.command_trans.set(encodeResetMap0x42({
+            version: commandVersion
+          }));
+          resolve({
+            success: true,
+            errCode: 0,
+            reqType: ResetCurrMapEnum.query,
+            version: commandVersion,
+            taskId: `${Date.now()}`
           });
-          ty.device.sendMqttMessage(params);
-          const {
-            taskId
-          } = params.message;
-          return normalResolve(ResetCurrMapEnum.query, taskId);
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to reset map'));
         }
-
-        // 非 MQTT 模式：使用命令传输
-        devices.common.model.actions.command_trans.set(encodeResetMap0x42({
-          version: commandVersion
-        }));
-        return Promise.resolve({
-          success: true,
-          errCode: 0,
-          reqType: ResetCurrMapEnum.query,
-          version: commandVersion,
-          taskId: `${Date.now()}`
-        });
-      } catch (error) {
-        throw error instanceof Error ? error : new Error('Failed to reset map');
-      }
+      });
     }
   };
 };

package/lib/mqtt/useRoomProperty.d.ts

@@ -1,11 +1,10 @@
-import { BaseResponse, RoomPreference } from './type';
-type Response = BaseResponse & RoomPreference & {
-    num: number;
-    mapId: number;
-};
-type TSetRoomProperty = (message: Pick<Response, 'num' | 'suctions' | 'cisterns' | 'floorTypes' | 'names' | 'orders' | 'yMops' | 'sweepMopModes' | 'cleanCounts' | 'ids'>) => Promise<RoomPreference>;
-export declare const useRoomProperty: (devId: string) => {
-    requestRoomProperty: () => Promise<Response>;
+import { type TRequestRoomProperty, type TSetRoomProperty } from './type/protocols/roomPropertyProtocol';
+/**
+ * 自定义 Hook，用于房间属性管理
+ * @param devId 设备ID（可选，如果不提供则从 MqttProvider Context 获取）
+ * @returns 包含 requestRoomProperty 和 setRoomProperty 函数的对象
+ */
+export declare const useRoomProperty: () => {
+    requestRoomProperty: TRequestRoomProperty;
     setRoomProperty: TSetRoomProperty;
 };
-export {};

package/lib/mqtt/useRoomProperty.js

@@ -1,80 +1,82 @@
-import { isArray } from 'lodash-es';
-import { createSetCommonParams } from './createCommonOptions';
-import { normalResolve } from './promise';
-import { RoomPropertyEnum } from './type';
 import { useContext } from 'react';
+import { handleMqttError, useStructuredMessage } from './hooks/useStructuredMessage';
 import { SingletonContext } from './mqttProvider';
-export const useRoomProperty = devId => {
+import { RoomPropertyEnum } from './type';
+import { validator } from './type/fun';
+/**
+ * 自定义 Hook，用于房间属性管理
+ * @param devId 设备ID（可选，如果不提供则从 MqttProvider Context 获取）
+ * @returns 包含 requestRoomProperty 和 setRoomProperty 函数的对象
+ */
+export const useRoomProperty = () => {
   const {
     useMqtt
   } = useContext(SingletonContext);
+  const {
+    sendStructuredMessage
+  } = useStructuredMessage();
 
-  // 请求房间属性
+  /**
+   * 请求房间属性
+   * @param data 可选参数（目前为空对象）
+   * @returns Promise<RoomPropertyResponse> 响应结果
+   */
 
-  // 设置房间属性
+  /**
+   * 设置房间属性
+   * @param data 包含房间属性设置参数的对象
+   * @returns Promise<RoomPropertyResponse> 响应结果
+   */
 
   return {
     requestRoomProperty: () => {
-      if (!useMqtt) return Promise.reject(new Error('useMqtt is not used'));
-      const params = createSetCommonParams({
-        deviceId: devId,
-        reqType: RoomPropertyEnum.query
+      return new Promise((resolve, reject) => {
+        try {
+          if (!useMqtt) {
+            reject(new Error('useMqtt is not used'));
+            return;
+          }
+          sendStructuredMessage(RoomPropertyEnum.query, {}, resolve, error => reject(handleMqttError(error, 'Failed to request room property')));
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to request room property'));
+        }
       });
-      ty.device.sendMqttMessage(params);
-      return normalResolve(RoomPropertyEnum.query, params.message.taskId);
     },
-    setRoomProperty: message => {
-      // 参数验证
-      const {
-        ids
-      } = message;
-      if (!isArray(ids) || isArray(ids) && ids.length === 0) {
-        throw new Error('ids is required and must be a non-empty array');
-      }
-      const len = ids.length;
-      const {
-        suctions = new Array(len).fill('closed'),
-        cisterns = new Array(len).fill('closed'),
-        cleanCounts = new Array(len).fill(1),
-        yMops = new Array(len).fill(-1),
-        sweepMopModes = new Array(len).fill('only_sweep'),
-        names = new Array(len).fill('')
-      } = 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 (names && !isArray(names)) {
-        throw new Error('names is illegal');
-      }
-      if (len !== suctions.length || len !== cisterns.length || len !== cleanCounts.length || len !== yMops.length || len !== sweepMopModes.length || len !== names.length) {
-        throw new Error('The length of the parameters is inconsistent');
-      }
-      try {
-        const params = createSetCommonParams({
-          deviceId: devId,
-          reqType: RoomPropertyEnum.set,
-          message
-        });
-        ty.device.sendMqttMessage(params);
-        const {
-          taskId
-        } = params.message;
-        return normalResolve(RoomPropertyEnum.query, taskId);
-      } catch (error) {
-        throw error instanceof Error ? error : new Error('Failed to set room property');
-      }
+    setRoomProperty: data => {
+      return new Promise((resolve, reject) => {
+        try {
+          var _data$num, _data$suctions, _data$cisterns, _data$cleanCounts, _data$yMops, _data$sweepMopModes, _data$names;
+          if (!useMqtt) {
+            reject(new Error('useMqtt is not used'));
+            return;
+          }
+
+          // 构建发送数据，为可选字段设置默认值
+          const {
+            ids
+          } = data;
+          const len = ids.length;
+          const sendData = {
+            num: (_data$num = data.num) !== null && _data$num !== void 0 ? _data$num : len,
+            ids,
+            suctions: (_data$suctions = data.suctions) !== null && _data$suctions !== void 0 ? _data$suctions : new Array(len).fill('closed'),
+            cisterns: (_data$cisterns = data.cisterns) !== null && _data$cisterns !== void 0 ? _data$cisterns : new Array(len).fill('closed'),
+            cleanCounts: (_data$cleanCounts = data.cleanCounts) !== null && _data$cleanCounts !== void 0 ? _data$cleanCounts : new Array(len).fill(1),
+            yMops: (_data$yMops = data.yMops) !== null && _data$yMops !== void 0 ? _data$yMops : new Array(len).fill(-1),
+            sweepMopModes: (_data$sweepMopModes = data.sweepMopModes) !== null && _data$sweepMopModes !== void 0 ? _data$sweepMopModes : new Array(len).fill('only_sweep'),
+            names: (_data$names = data.names) !== null && _data$names !== void 0 ? _data$names : new Array(len).fill(''),
+            floorTypes: data.floorTypes,
+            orders: data.orders
+          };
+
+          // 使用 TypeBox Schema 进行参数验证（包含自定义验证逻辑）
+          const validatedData = validator.validate('set_room_property', sendData);
+          sendStructuredMessage(RoomPropertyEnum.set, validatedData, resolve, error => reject(handleMqttError(error, 'Failed to set room property')), RoomPropertyEnum.query // 响应类型是 query，不是 set
+          );
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to set room property'));
+        }
+      });
     }
   };
 };

package/lib/mqtt/useSchedule.d.ts

@@ -1,30 +1,10 @@
-import { ScheduleEnum, RoomPreference, BaseResponse } from './type';
-type ScheduleItem = Pick<RoomPreference, 'suctions' | 'cisterns' | 'cleanCounts' | 'yMops' | 'sweepMopModes' | 'ids'> & {
-    active: number;
-    cycle: number[];
-    time: number[];
-};
-interface Schedule {
-    list: Array<ScheduleItem>;
-    num: number;
-    version?: string;
-}
-interface ScheduleResponse extends BaseResponse {
-    reqType: ScheduleEnum.query;
-    list: Array<ScheduleItem>;
-    num: number;
-}
-type TRequestSchedule = (message?: {
-    version?: string;
-}) => Promise<ScheduleResponse>;
-type TSetSchedule = (message: Schedule) => Promise<ScheduleResponse>;
+import { type TRequestSchedule, type TSetSchedule } from './type/protocols';
 /**
  * 自定义 Hook，用于定时任务
- * @param devId 设备ID
+ * @param devId 设备ID（可选，如果不提供则从 MqttProvider Context 获取）
  * @returns 包含 requestSchedule 和 setSchedule 函数的对象
  */
-export declare const useSchedule: (devId: string) => {
+export declare const useSchedule: () => {
     requestSchedule: TRequestSchedule;
     setSchedule: TSetSchedule;
 };
-export {};

package/lib/mqtt/useSchedule.js

@@ -1,34 +1,26 @@
 import "core-js/modules/esnext.iterator.map.js";
 // 定时
-import { useContext } from 'react';
-import { createSetCommonParams } from './createCommonOptions';
-import { normalResolve } from './promise';
-import { ScheduleEnum } from './type';
-import { SingletonContext } from './mqttProvider';
 import { encodeDeviceTimer0x30 } from '@ray-js/robot-protocol';
+import { useContext } from 'react';
 import { CISTERN_MAP, CLEAN_MODE_MAP, SUCTION_MAP } from '../constant';
-
-// 定时任务项
-
-// 定时任务数据
-
-// 定时任务响应类型
-
-// 请求定时数据函数类型定义
-
-// 设置定时数据函数类型定义
-
+import { handleMqttError, useStructuredMessage } from './hooks/useStructuredMessage';
+import { SingletonContext } from './mqttProvider';
+import { ScheduleEnum } from './type';
+import { validator } from './type/fun';
 /**
  * 自定义 Hook，用于定时任务
- * @param devId 设备ID
+ * @param devId 设备ID（可选，如果不提供则从 MqttProvider Context 获取）
  * @returns 包含 requestSchedule 和 setSchedule 函数的对象
  */
-export const useSchedule = devId => {
+export const useSchedule = () => {
   const {
     useMqtt,
     devices,
     commandVersion
   } = useContext(SingletonContext);
+  const {
+    sendStructuredMessage
+  } = useStructuredMessage();
   /**
    * 请求定时数据
    * @param message 可选参数，包含版本号
@@ -46,93 +38,72 @@ export const useSchedule = devId => {
       let message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
         version: '1.0.0'
       };
-      if (!useMqtt) {
-        return Promise.reject(new Error('useMqtt is not used'));
-      }
-      try {
-        const params = createSetCommonParams({
-          deviceId: devId,
-          reqType: ScheduleEnum.query,
-          message
-        });
-        ty.device.sendMqttMessage(params);
-        const {
-          taskId
-        } = params.message;
-        return normalResolve(ScheduleEnum.query, taskId);
-      } catch (error) {
-        return Promise.reject(error instanceof Error ? error : new Error('Failed to request schedule'));
-      }
+      return new Promise((resolve, reject) => {
+        try {
+          // 使用 TypeBox Schema 进行参数验证
+          const validatedParams = validator.validate('request_schedule', message);
+          sendStructuredMessage(ScheduleEnum.query, validatedParams, resolve, error => reject(handleMqttError(error, 'Failed to request schedule')));
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to request schedule'));
+        }
+      });
     },
     setSchedule: message => {
-      // 参数验证
-      if (!message || typeof message.num !== 'number') {
-        throw new Error('message.num is required and must be a number');
-      }
-      if (!Array.isArray(message.list)) {
-        throw new Error('message.list is required and must be an array');
-      }
-      if (message.num !== message.list.length) {
-        throw new Error('message.num must equal message.list.length');
-      }
-      try {
-        if (useMqtt) {
-          const params = createSetCommonParams({
-            deviceId: devId,
-            reqType: ScheduleEnum.set,
-            message
+      return new Promise((resolve, reject) => {
+        try {
+          // 使用 TypeBox Schema 进行参数验证
+          const validatedData = validator.validate('set_schedule', message);
+          if (useMqtt) {
+            sendStructuredMessage(ScheduleEnum.set, validatedData, resolve, error => reject(handleMqttError(error, 'Failed to set schedule')), ScheduleEnum.query // 响应类型是 query，不是 set
+            );
+            return;
+          }
+
+          // 非 MQTT 模式：使用命令传输
+          const command = encodeDeviceTimer0x30({
+            version: commandVersion,
+            number: validatedData.num,
+            list: validatedData.list.map(_ref => {
+              let {
+                active,
+                suctions,
+                sweepMopModes,
+                ids,
+                cleanCounts,
+                cycle,
+                cisterns,
+                time
+              } = _ref;
+              return {
+                effectiveness: active,
+                cleanMode: CLEAN_MODE_MAP[(sweepMopModes === null || sweepMopModes === void 0 ? void 0 : sweepMopModes[0]) || ''],
+                fanLevel: SUCTION_MAP[(suctions === null || suctions === void 0 ? void 0 : suctions[0]) || ''],
+                waterLevel: CISTERN_MAP[(cisterns === null || cisterns === void 0 ? void 0 : cisterns[0]) || ''],
+                time: {
+                  hour: time[0],
+                  minute: time[1]
+                },
+                week: cycle,
+                sweepCount: (cleanCounts === null || cleanCounts === void 0 ? void 0 : cleanCounts[0]) || 1,
+                roomIds: ids || [],
+                roomNum: (ids === null || ids === void 0 ? void 0 : ids.length) || 0
+              };
+            })
           });
-          ty.device.sendMqttMessage(params);
-          const {
-            taskId
-          } = params.message;
-          return normalResolve(ScheduleEnum.query, taskId);
+          devices.common.model.actions.device_timer.set(command);
+          resolve({
+            success: true,
+            errCode: 0,
+            reqType: ScheduleEnum.query,
+            version: commandVersion,
+            taskId: `${Date.now()}`,
+            list: validatedData.list,
+            num: validatedData.num
+          });
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to set schedule'));
         }
-
-        // 非 MQTT 模式：使用命令传输
-        const command = encodeDeviceTimer0x30({
-          version: commandVersion,
-          number: message.num,
-          list: message.list.map(_ref => {
-            let {
-              active,
-              suctions,
-              sweepMopModes,
-              ids,
-              cleanCounts,
-              cycle,
-              cisterns,
-              time
-            } = _ref;
-            return {
-              effectiveness: active,
-              cleanMode: CLEAN_MODE_MAP[sweepMopModes[0]],
-              fanLevel: SUCTION_MAP[suctions[0]],
-              waterLevel: CISTERN_MAP[cisterns[0]],
-              time: {
-                hour: time[0],
-                minute: time[1]
-              },
-              week: cycle,
-              sweepCount: cleanCounts[0],
-              roomIds: ids,
-              roomNum: ids.length
-            };
-          })
-        });
-        devices.common.model.actions.device_timer.set(command);
-        return Promise.resolve({
-          success: true,
-          errCode: 0,
-          reqType: ScheduleEnum.query,
-          version: commandVersion,
-          taskId: `${Date.now()}`,
-          list: message.list,
-          num: message.num
-        });
-      } catch (error) {
-        throw error instanceof Error ? error : new Error('Failed to set schedule');
-      }
+      });
     }
   };
 };

package/lib/mqtt/useSelectRoomClean.d.ts

@@ -1,30 +1,9 @@
-import { BaseResponse, RoomCleanSetEnum } from './type';
-interface RoomInfo {
-    roomId: number;
-    suction?: string;
-    cistern: string;
-    cleanTimes?: number;
-    yMop?: number;
-    sweepMopMode?: string;
-}
-interface RoomCleanResponse extends BaseResponse {
-    reqType: RoomCleanSetEnum.query;
-    ids: number[];
-    suctions?: string[];
-    cisterns?: string[];
-    cleanCounts?: number[];
-    yMops?: number[];
-    sweepMopModes?: string[];
-}
-type TSetRoomClean = (rooms: RoomInfo[]) => Promise<RoomCleanResponse>;
-type TRequestSelectRoomClean = () => Promise<RoomCleanResponse>;
+import { type TRequestSelectRoomClean, type TSetSelectRoomClean } from './type/protocols';
 /**
  * 自定义 Hook，用于选区清扫
- * @param devId 设备ID
  * @returns 包含 requestSelectRoomClean 和 setRoomClean 函数的对象
  */
-export declare const useSelectRoomClean: (devId: string) => {
+export declare const useSelectRoomClean: () => {
     requestSelectRoomClean: TRequestSelectRoomClean;
-    setRoomClean: TSetRoomClean;
+    setRoomClean: TSetSelectRoomClean;
 };
-export {};