@ray-js/robot-data-stream 0.0.16-beta.2 → 0.0.16-beta.4

package/lib/mqtt/useHistoryMap.js

@@ -4,7 +4,6 @@ import { DeleteMapEnum, SaveCurrentMapEnum, UseMapEnum } from './type';
 import { SingletonContext } from './mqttProvider';
 import { encodeDeleteMap0x2c, encodeSaveMap0x2a, encodeUseMap0x2e } from '@ray-js/robot-protocol';
 import { useStructuredMessage, handleMqttError } from './hooks/useStructuredMessage';
-import { validator } from './type/fun';
 /**
  * 自定义 Hook，用于管理历史地图
  * @returns 包含删除历史地图、更改当前地图和保存地图的函数
@@ -45,16 +44,10 @@ export const useHistoryMap = () => {
       return new Promise((resolve, reject) => {
         (async () => {
           try {
-            // 使用 TypeBox Schema 进行参数验证
-            const validatedData = validator.validate('delete_history_map', {
-              mapId
-            });
-
-            // 先删除地图文件
-            await deleteMultipleMapFile(validatedData.mapId, devId);
+            await deleteMultipleMapFile(mapId, devId);
             if (useMqtt) {
               sendStructuredMessage(DeleteMapEnum.set, {
-                mapId: validatedData.mapId
+                mapId
               }, resolve, error => reject(handleMqttError(error, 'Failed to delete history map')), DeleteMapEnum.rst // 响应类型是 rst，不是 set
               );
               return;
@@ -62,7 +55,7 @@ export const useHistoryMap = () => {
 
             // 非 MQTT 模式：使用命令传输
             const command = encodeDeleteMap0x2c({
-              id: validatedData.mapId
+              id: mapId
             });
             devices.common.model.actions.command_trans.set(command);
             resolve({
@@ -82,25 +75,21 @@ export const useHistoryMap = () => {
       return new Promise((resolve, reject) => {
         (async () => {
           try {
-            // 构建符合 Schema 的数据
             const mapData = {
               mapId,
               url,
               urlLen: url.length
             };
-
-            // 使用 TypeBox Schema 进行参数验证
-            const validatedData = validator.validate('change_current_map', mapData);
             if (useMqtt) {
-              sendStructuredMessage(UseMapEnum.set, validatedData, resolve, error => reject(handleMqttError(error, 'Failed to change current map')), UseMapEnum.query // 响应类型是 query，不是 set
+              sendStructuredMessage(UseMapEnum.set, mapData, resolve, error => reject(handleMqttError(error, 'Failed to change current map')), UseMapEnum.query // 响应类型是 query，不是 set
               );
               return;
             }
 
             // 非 MQTT 模式：使用命令传输
             const command = encodeUseMap0x2e({
-              mapId: validatedData.mapId,
-              url: validatedData.url
+              mapId: mapData.mapId,
+              url: mapData.url
             });
             devices.common.model.actions.command_trans.set(command);
             resolve({
@@ -109,7 +98,7 @@ export const useHistoryMap = () => {
               reqType: UseMapEnum.query,
               version: commandVersion,
               taskId: `${Date.now()}`,
-              mapId: validatedData.mapId
+              mapId: mapData.mapId
             });
           } catch (error) {
             reject(handleMqttError(error, 'Failed to change current map'));
@@ -123,10 +112,8 @@ export const useHistoryMap = () => {
       };
       return new Promise((resolve, reject) => {
         try {
-          // 使用 TypeBox Schema 进行参数验证
-          const validatedData = validator.validate('save_map', data);
           if (useMqtt) {
-            sendStructuredMessage(SaveCurrentMapEnum.set, validatedData, resolve, error => reject(handleMqttError(error, 'Failed to save current map')), SaveCurrentMapEnum.query // 响应类型是 query，不是 set
+            sendStructuredMessage(SaveCurrentMapEnum.set, data, resolve, error => reject(handleMqttError(error, 'Failed to save current map')), SaveCurrentMapEnum.query // 响应类型是 query，不是 set
             );
             return;
           }

package/lib/mqtt/usePartDivision.js

@@ -5,7 +5,6 @@ import { pointsToString } from '../utils';
 import { handleMqttError, useStructuredMessage } from './hooks/useStructuredMessage';
 import { SingletonContext } from './mqttProvider';
 import { PartDivisionEnum } from './type';
-import { validator } from './type/fun';
 /**
  * 自定义 Hook，用于房间分隔
  * @returns 包含 setPartDivision 函数的对象
@@ -32,32 +31,19 @@ export const usePartDivision = () => {
     setPartDivision: (points, roomId, origin) => {
       return new Promise((resolve, reject) => {
         try {
-          // 使用验证器验证三个独立参数
-          const validatedData = validator.validateSetPartDivision(points, roomId, origin);
-          const {
-            points: validatedPoints,
-            roomId: validatedRoomId,
-            origin: validatedOrigin
-          } = validatedData;
           if (useMqtt) {
-            // 将点数组转换为字符串格式
-            const pointStr = pointsToString(validatedPoints, validatedOrigin);
+            const pointStr = pointsToString(points, origin);
             sendStructuredMessage(PartDivisionEnum.set, {
               lines: [pointStr],
-              // 分隔线数组
-              ids: [validatedRoomId] // 房间ID数组
-            }, resolve, error => reject(handleMqttError(error, 'Failed to set part division')), PartDivisionEnum.query // 响应类型是 query，不是 set
-            );
+              ids: [roomId]
+            }, resolve, error => reject(handleMqttError(error, 'Failed to set part division')), PartDivisionEnum.query);
             return;
           }
-
-          // 非 MQTT 模式：使用命令传输
-          // 将 roomId 转换为数字（如果它是字符串）
-          const roomIdNumber = typeof validatedRoomId === 'string' ? Number(validatedRoomId) : validatedRoomId;
+          const roomIdNumber = typeof roomId === 'string' ? Number(roomId) : roomId;
           const command = encodePartitionDivision0x1c({
             version: commandVersion,
-            origin: validatedOrigin,
-            points: validatedPoints,
+            origin,
+            points,
             roomId: roomIdNumber
           });
           devices.common.model.actions.command_trans.set(command);

package/lib/mqtt/usePartMerge.js

@@ -4,7 +4,6 @@ import { PartMergeEnum } from './type';
 import { SingletonContext } from './mqttProvider';
 import { encodePartitionMerge0x1e } from '@ray-js/robot-protocol';
 import { useStructuredMessage, handleMqttError } from './hooks/useStructuredMessage';
-import { validator } from './type/fun';
 /**
  * 自定义 Hook，用于分区合并
  * @returns 包含 setPartMerge 函数的对象
@@ -28,8 +27,7 @@ export const usePartMerge = () => {
     setPartMerge: data => {
       return new Promise((resolve, reject) => {
         try {
-          // 使用 TypeBox Schema 进行参数验证
-          const ids = validator.validate('set_part_merge', data);
+          const ids = data;
           if (useMqtt) {
             sendStructuredMessage(PartMergeEnum.set, {
               ids

package/lib/mqtt/usePassword.js

@@ -3,7 +3,6 @@ import { PasswordEnum } from './type';
 import { useContext } from 'react';
 import { SingletonContext } from './mqttProvider';
 import { useStructuredMessage, handleMqttError } from './hooks/useStructuredMessage';
-import { validator } from './type/fun';
 /**
  * 自定义 Hook，用于密码管理
  * @returns 包含 requestPassword、setPassword 和 checkPassword 函数的对象
@@ -65,10 +64,7 @@ export const usePassword = () => {
             oldPassword: params.oldPassword ? md5(params.oldPassword).toString() : undefined,
             taskId: (_params$taskId = params.taskId) !== null && _params$taskId !== void 0 ? _params$taskId : String(Date.now())
           };
-
-          // 使用 TypeBox Schema 进行参数验证
-          const validatedData = validator.validate('set_password', passwordData);
-          sendStructuredMessage(PasswordEnum.set, validatedData, resolve, error => reject(handleMqttError(error, 'Failed to set password')), PasswordEnum.rst // 响应类型是 rst，不是 set
+          sendStructuredMessage(PasswordEnum.set, passwordData, resolve, error => reject(handleMqttError(error, 'Failed to set password')), PasswordEnum.rst // 响应类型是 rst，不是 set
           );
         } catch (error) {
           reject(handleMqttError(error, 'Failed to set password'));
@@ -90,10 +86,7 @@ export const usePassword = () => {
             password: md5(params.password).toString(),
             taskId: (_params$taskId2 = params.taskId) !== null && _params$taskId2 !== void 0 ? _params$taskId2 : String(Date.now())
           };
-
-          // 使用 TypeBox Schema 进行参数验证
-          const validatedData = validator.validate('check_password', passwordData);
-          sendStructuredMessage(PasswordEnum.check, validatedData, resolve, error => reject(handleMqttError(error, 'Failed to check password')), PasswordEnum.checkRst // 响应类型是 checkRst，不是 check
+          sendStructuredMessage(PasswordEnum.check, passwordData, resolve, error => reject(handleMqttError(error, 'Failed to check password')), PasswordEnum.checkRst // 响应类型是 checkRst，不是 check
           );
         } catch (error) {
           reject(handleMqttError(error, 'Failed to check password'));

package/lib/mqtt/useQuiteHours.js

@@ -4,7 +4,6 @@ import { useContext } from 'react';
 import { handleMqttError, useStructuredMessage } from './hooks/useStructuredMessage';
 import { SingletonContext } from './mqttProvider';
 import { QuietHoursEnum } from './type';
-import { validator } from './type/fun';
 /**
  * 自定义 Hook，用于勿扰模式
  * @returns 包含 setQuiteHours 和 requestQuiteHours 函数的对象
@@ -34,14 +33,12 @@ export const useQuiteHours = () => {
     setQuiteHours: params => {
       return new Promise((resolve, reject) => {
         try {
-          // 使用 TypeBox Schema 进行参数验证
-          const validatedData = validator.validate('set_quiet_hours', params);
           const {
             startTime,
             endTime,
             active,
             day
-          } = validatedData;
+          } = params;
           const {
             hour: h0,
             minute: m0

package/lib/mqtt/useRoomProperty.js

@@ -3,8 +3,7 @@ import { useContext } from 'react';
 import { handleMqttError, useStructuredMessage } from './hooks/useStructuredMessage';
 import { SingletonContext } from './mqttProvider';
 import { RoomPropertyEnum } from './type';
-import { validator } from './type/fun';
-import { normalizeWaterPreferencePayload } from './waterPreference';
+import { pickWaterFields } from '../utils';
 /**
  * 自定义 Hook，用于房间属性管理
  * @param devId 设备ID（可选，如果不提供则从 MqttProvider Context 获取）
@@ -71,11 +70,8 @@ export const useRoomProperty = () => {
             orders: data.orders
           }, data.routePreferences && {
             routePreferences: data.routePreferences
-          }), normalizeWaterPreferencePayload(data.cisterns, data.waterValues));
-
-          // 使用 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
+          }), pickWaterFields(len, data.cisterns, data.waterValues));
+          sendStructuredMessage(RoomPropertyEnum.set, sendData, 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.js

@@ -6,11 +6,10 @@ import "core-js/modules/esnext.iterator.map.js";
 import { encodeDeviceTimer0x30 } from '@ray-js/robot-protocol';
 import { useContext } from 'react';
 import { CLEAN_MODE_MAP, SUCTION_MAP, ROUTE_PREFERENCE_MAP } from '../constant';
-import { normalizeWaterPreferencePayload, resolveWaterLevel } from './waterPreference';
+import { pickWaterFields, resolveWaterLevel } from '../utils';
 import { handleMqttError, useStructuredMessage } from './hooks/useStructuredMessage';
 import { SingletonContext } from './mqttProvider';
 import { ScheduleEnum } from './type';
-import { validator } from './type/fun';
 /**
  * 自定义 Hook，用于定时任务
  * @param devId 设备ID（可选，如果不提供则从 MqttProvider Context 获取）
@@ -44,9 +43,7 @@ export const useSchedule = () => {
       };
       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')));
+          sendStructuredMessage(ScheduleEnum.query, message, resolve, error => reject(handleMqttError(error, 'Failed to request schedule')));
         } catch (error) {
           reject(handleMqttError(error, 'Failed to request schedule'));
         }
@@ -55,19 +52,18 @@ export const useSchedule = () => {
     setSchedule: message => {
       return new Promise((resolve, reject) => {
         try {
-          // 使用 TypeBox Schema 进行参数验证
-          const validatedData = validator.validate('set_schedule', message);
-          const list = validatedData.list.map(item => {
+          const list = message.list.map(item => {
+            var _item$ids$length, _item$ids;
             const {
                 routePreferences
               } = item,
               rest = _objectWithoutProperties(item, _excluded);
-            return _objectSpread(_objectSpread(_objectSpread({}, rest), normalizeWaterPreferencePayload(item.cisterns, item.waterValues)), routePreferences && {
+            return _objectSpread(_objectSpread(_objectSpread({}, rest), pickWaterFields((_item$ids$length = (_item$ids = item.ids) === null || _item$ids === void 0 ? void 0 : _item$ids.length) !== null && _item$ids$length !== void 0 ? _item$ids$length : 0, item.cisterns, item.waterValues)), routePreferences && {
               routePreferences
             });
           });
           if (useMqtt) {
-            sendStructuredMessage(ScheduleEnum.set, _objectSpread(_objectSpread({}, validatedData), {}, {
+            sendStructuredMessage(ScheduleEnum.set, _objectSpread(_objectSpread({}, message), {}, {
               list
             }), resolve, error => reject(handleMqttError(error, 'Failed to set schedule')), ScheduleEnum.query // 响应类型是 query，不是 set
             );
@@ -77,7 +73,7 @@ export const useSchedule = () => {
           // 非 MQTT 模式：使用命令传输
           const command = encodeDeviceTimer0x30({
             version: commandVersion,
-            number: validatedData.num,
+            number: message.num,
             list: list.map(_ref => {
               let {
                 active,
@@ -116,7 +112,7 @@ export const useSchedule = () => {
             version: commandVersion,
             taskId: `${Date.now()}`,
             list,
-            num: validatedData.num
+            num: message.num
           });
         } catch (error) {
           reject(handleMqttError(error, 'Failed to set schedule'));

package/lib/mqtt/useSelectRoomClean.js

@@ -9,8 +9,7 @@ import { useContext } from 'react';
 import { handleMqttError, useStructuredMessage } from './hooks/useStructuredMessage';
 import { SingletonContext } from './mqttProvider';
 import { RoomCleanSetEnum } from './type';
-import { validator } from './type/fun';
-import { normalizeWaterPreferencePayload } from './waterPreference';
+import { pickWaterFields } from '../utils';
 /**
  * 自定义 Hook，用于选区清扫
  * @returns 包含 requestSelectRoomClean 和 setRoomClean 函数的对象
@@ -77,8 +76,7 @@ export const useSelectRoomClean = () => {
       return new Promise((resolve, reject) => {
         try {
           var _rooms$0$cleanTimes, _rooms$;
-          // 使用 TypeBox Schema 进行参数验证
-          const rooms = validator.validate('set_select_room_clean', data);
+          const rooms = data;
           if (useMqtt) {
             const ids = [];
             const suctions = [];
@@ -94,13 +92,10 @@ export const useSelectRoomClean = () => {
               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 waterPayload = normalizeWaterPreferencePayload(rooms.map(room => {
+            const waterPayload = pickWaterFields(rooms.length, rooms.map(room => {
               var _room$cistern;
               return (_room$cistern = room.cistern) !== null && _room$cistern !== void 0 ? _room$cistern : '';
-            }), rooms.map(room => {
-              var _room$waterValue;
-              return (_room$waterValue = room.waterValue) !== null && _room$waterValue !== void 0 ? _room$waterValue : '';
-            }));
+            }), rooms.map(room => room.waterValue));
             sendStructuredMessage(RoomCleanSetEnum.set, _objectSpread(_objectSpread(_objectSpread({
               ids,
               suctions
@@ -129,13 +124,10 @@ export const useSelectRoomClean = () => {
             var _room$suction2;
             return (_room$suction2 = room.suction) !== null && _room$suction2 !== void 0 ? _room$suction2 : '';
           });
-          const waterPayload = normalizeWaterPreferencePayload(rooms.map(room => {
+          const waterPayload = pickWaterFields(rooms.length, rooms.map(room => {
             var _room$cistern2;
             return (_room$cistern2 = room.cistern) !== null && _room$cistern2 !== void 0 ? _room$cistern2 : '';
-          }), rooms.map(room => {
-            var _room$waterValue2;
-            return (_room$waterValue2 = room.waterValue) !== null && _room$waterValue2 !== void 0 ? _room$waterValue2 : '';
-          }));
+          }), rooms.map(room => room.waterValue));
           const cleanCounts = rooms.map(room => {
             var _room$cleanTimes2;
             return (_room$cleanTimes2 = room.cleanTimes) !== null && _room$cleanTimes2 !== void 0 ? _room$cleanTimes2 : 1;

package/lib/mqtt/useSpotClean.js

@@ -6,10 +6,8 @@ import { useContext } from 'react';
 import { SpotCleanEnum } from './type';
 import { SingletonContext } from './mqttProvider';
 import { encodeSpotClean0x16 } from '@ray-js/robot-protocol';
-import { pointsToString } from '../utils';
+import { pointsToString, pickWaterFields } from '../utils';
 import { useStructuredMessage, handleMqttError } from './hooks/useStructuredMessage';
-import { validator } from './type/fun';
-import { normalizeWaterPreferencePayload } from './waterPreference';
 /**
  * 自定义 Hook，用于定点清扫
  * @returns 包含 requestSpotClean 和 setSpotClean 函数的对象
@@ -52,16 +50,12 @@ export const useSpotClean = () => {
     setSpotClean: message => {
       return new Promise((resolve, reject) => {
         try {
-          // 使用 TypeBox Schema 进行参数验证（包含自定义验证逻辑）
-          const validatedData = validator.validate('set_spot_clean', message);
           const {
             spots,
             origin
-          } = validatedData;
+          } = message;
           const num = spots.length;
-          const waterPayload = normalizeWaterPreferencePayload(validatedData.cisterns, validatedData.waterValues);
-
-          // 为可选字段设置默认值
+          const waterPayload = pickWaterFields(num, message.cisterns, message.waterValues);
           const {
             suctions = new Array(num).fill(''),
             cleanCounts = new Array(num).fill(1),
@@ -69,7 +63,7 @@ export const useSpotClean = () => {
             sweepMopModes = new Array(num).fill('only_sweep'),
             routePreferences,
             names
-          } = validatedData;
+          } = message;
           if (useMqtt) {
             sendStructuredMessage(SpotCleanEnum.set, _objectSpread(_objectSpread(_objectSpread({
               num,

package/lib/mqtt/useVirtualArea.js

@@ -8,7 +8,6 @@ import { pointsToString } from '../utils';
 import { handleMqttError, useStructuredMessage } from './hooks/useStructuredMessage';
 import { SingletonContext } from './mqttProvider';
 import { VirtualAreaEnum } from './type';
-import { validator } from './type/fun';
 // 禁区
 
 /**
@@ -74,12 +73,10 @@ export const useVirtualArea = () => {
     setVirtualArea: message => {
       return new Promise((resolve, reject) => {
         try {
-          // 使用 TypeBox Schema 进行参数验证
-          const validatedData = validator.validate('set_virtual_area', message);
           const {
             data,
             origin
-          } = validatedData;
+          } = message;
           if (useMqtt) {
             const names = [];
             const modes = [];

package/lib/mqtt/useVirtualWall.js

@@ -6,7 +6,6 @@ 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，用于虚拟墙管理
  * @returns 包含 requestVirtualWall 和 setVirtualWall 函数的对象
@@ -69,12 +68,10 @@ export const useVirtualWall = () => {
     setVirtualWall: params => {
       return new Promise((resolve, reject) => {
         try {
-          // 使用 TypeBox Schema 进行参数验证
-          const validatedData = validator.validate('set_virtual_wall', params);
           const {
             data,
             origin
-          } = validatedData;
+          } = params;
           if (useMqtt) {
             sendStructuredMessage(VirtualWallEnum.set, {
               points: data.map(points => pointsToString(points, origin)),

package/lib/mqtt/useVoice.js

@@ -5,7 +5,6 @@ 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，用于语音语言设置
  * @returns 包含 requestAllVoices, requestVoiceInUse 和 setVoice 函数的对象
@@ -68,18 +67,16 @@ export const useVoice = () => {
     setVoice: message => {
       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
+            const sendData = _objectSpread(_objectSpread({}, message), {}, {
+              urlLen: message.url.length
             });
             sendStructuredMessage(VoiceLanguageEnum.set, sendData, resolve, error => reject(handleMqttError(error, 'Failed to set voice')), VoiceLanguageEnum.query);
             return;
           }
 
           // 非 MQTT 模式：使用命令传输
-          const command = encodeVoice0x34(validatedData);
+          const command = encodeVoice0x34(message);
           devices.common.model.actions.voice_data.set(command);
           resolve({
             success: true,
@@ -87,7 +84,7 @@ export const useVoice = () => {
             reqType: VoiceLanguageEnum.query,
             version: commandVersion,
             taskId: `${Date.now()}`,
-            id: validatedData.id,
+            id: message.id,
             schedule: 0,
             status: 0
           });

package/lib/mqtt/useWifiMap.js

@@ -1,6 +1,5 @@
 import { WifiMapEnum } from './type';
 import { useStructuredMessage, handleMqttError } from './hooks/useStructuredMessage';
-import { validator } from './type/fun';
 /**
  * 自定义 Hook，用于 WiFi 地图管理
  * @returns 包含 requestWifiMap 和 setWifiMap 函数的对象
@@ -42,10 +41,7 @@ export const useWifiMap = () => {
             taskId: data.taskId || String(Date.now()),
             switch: (_data$switch = data.switch) !== null && _data$switch !== void 0 ? _data$switch : true
           };
-
-          // 使用 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
+          sendStructuredMessage(WifiMapEnum.set, wifiMapData, 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.js

@@ -3,12 +3,10 @@ import "core-js/modules/esnext.iterator.map.js";
 // 划区清扫
 import { encodeZoneClean0x3a, requestZoneClean0x3b } from '@ray-js/robot-protocol';
 import { useContext } from 'react';
-import { pointsToString } from '../utils';
+import { pointsToString, pickWaterFields } from '../utils';
 import { handleMqttError, useStructuredMessage } from './hooks/useStructuredMessage';
 import { SingletonContext } from './mqttProvider';
 import { ZoneCleanEnum } from './type';
-import { validator } from './type/fun';
-import { normalizeWaterPreferencePayload } from './waterPreference';
 /**
  * 自定义 Hook，用于划区清扫
  * @returns 包含 requestZoneClean 和 setZoneClean 函数的对象
@@ -75,7 +73,7 @@ export const useZoneClean = () => {
 
           // 将业务参数转换为协议数据格式
           const num = zones.length;
-          const waterPayload = normalizeWaterPreferencePayload(params.cisterns, params.waterValues);
+          const waterPayload = pickWaterFields(num, params.cisterns, params.waterValues);
           const {
             suctions = new Array(num).fill(''),
             cleanCounts = new Array(num).fill(1),
@@ -105,9 +103,6 @@ export const useZoneClean = () => {
           }, routePreferences && {
             routePreferences
           });
-
-          // 使用 TypeBox Schema 进行参数验证
-          const validatedData = validator.validate('set_zone_clean', zoneCleanData);
           const polygons = zones.map(_ref2 => {
             let {
               points
@@ -121,13 +116,13 @@ export const useZoneClean = () => {
             return name || '';
           });
           const commonFields = _objectSpread(_objectSpread({
-            suctions: validatedData.suctions
+            suctions: zoneCleanData.suctions
           }, waterPayload), {}, {
-            cleanCounts: validatedData.cleanCounts,
-            yMops: validatedData.yMops,
-            sweepMopModes: validatedData.sweepMopModes
-          }, validatedData.routePreferences && {
-            routePreferences: validatedData.routePreferences
+            cleanCounts: zoneCleanData.cleanCounts,
+            yMops: zoneCleanData.yMops,
+            sweepMopModes: zoneCleanData.sweepMopModes
+          }, zoneCleanData.routePreferences && {
+            routePreferences: zoneCleanData.routePreferences
           });
           if (useMqtt) {
             sendStructuredMessage(ZoneCleanEnum.set, _objectSpread(_objectSpread({
@@ -144,8 +139,8 @@ export const useZoneClean = () => {
           const command = encodeZoneClean0x3a({
             protocolVersion: 1,
             version: commandVersion,
-            origin: validatedData.origin,
-            zones: validatedData.zones.map(zone => ({
+            origin: zoneCleanData.origin,
+            zones: zoneCleanData.zones.map(zone => ({
               points: zone.points,
               name: zone.name,
               advanced: zone.advanced

package/lib/utils/index.d.ts

@@ -38,3 +38,18 @@ export declare const createLogger: (onLogger?: ((type: 'warn' | 'error' | 'info'
  */
 export declare const logP2PDataIfEnabled: (enableCustomLog: boolean, devId: string, event: string, message: string) => void;
 export declare const getBitValue: (num: number, idx: number) => number;
+/**
+ * 将自定义水量 / 标准水量统一归一化为设备命令需要的数值。
+ * 优先使用 waterValue，其次回退到 cistern。
+ */
+export declare const resolveWaterLevel: (waterValue?: number, cistern?: string, fallback?: number) => number;
+/**
+ * 水量字段：有自定义水量(waterValues)时只带 waterValues，否则带 cisterns（缺省按 length 填充 'closed'）。
+ */
+export declare const pickWaterFields: (length: number, cisterns?: string[], waterValues?: number[]) => {
+    waterValues: number[];
+    cisterns?: undefined;
+} | {
+    cisterns: any[];
+    waterValues?: undefined;
+};

package/lib/utils/index.js

@@ -1,7 +1,9 @@
+import "core-js/modules/esnext.iterator.map.js";
 import mitt from 'mitt';
 import { floor, join, map } from 'lodash-es';
 import log4js from '@ray-js/log4js';
 import { logP2PData as originalLogP2PData } from '@ray-js/robot-custom-log';
+import { CISTERN_MAP } from '../constant';
 export const emitter = mitt();
 const pointToString = point => {
   return `${point.x},${point.y}`;
@@ -19,6 +21,7 @@ export const pointsToString = (points, origin) => {
     });
     return join(map(newPoints, pointToString), ',');
   } catch (e) {
+    // eslint-disable-next-line no-console
     console.error('pointsToString error', e);
     throw new Error('pointsToString error');
   }
@@ -96,4 +99,35 @@ export const logP2PDataIfEnabled = (enableCustomLog, devId, event, message) => {
     }));
   }
 };
-export const getBitValue = (num, idx) => (num & 1 << idx) >> idx;
+
+// eslint-disable-next-line no-bitwise
+export const getBitValue = (num, idx) => (num & 1 << idx) >> idx;
+
+/**
+ * 将自定义水量 / 标准水量统一归一化为设备命令需要的数值。
+ * 优先使用 waterValue，其次回退到 cistern。
+ */
+export const resolveWaterLevel = function (waterValue, cistern) {
+  let fallback = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : CISTERN_MAP.closed;
+  if (waterValue != null && Number.isFinite(waterValue)) {
+    return waterValue;
+  }
+  if (cistern && cistern in CISTERN_MAP) {
+    return CISTERN_MAP[cistern];
+  }
+  return fallback;
+};
+
+/**
+ * 水量字段：有自定义水量(waterValues)时只带 waterValues，否则带 cisterns（缺省按 length 填充 'closed'）。
+ */
+export const pickWaterFields = (length, cisterns, waterValues) => {
+  if (waterValues !== null && waterValues !== void 0 && waterValues.length) {
+    return {
+      waterValues
+    };
+  }
+  return {
+    cisterns: cisterns ? cisterns.map(v => v == null ? 'closed' : v) : new Array(length).fill('closed')
+  };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/robot-data-stream",
-  "version": "0.0.16-beta.2",
+  "version": "0.0.16-beta.4",
   "description": "扫地机P2P数据流标准化组件",
   "main": "lib/index",
   "files": [