@ray-js/robot-data-stream 0.0.16-beta.3 → 0.0.16-beta.5

package/lib/mqtt/type/protocols/base.d.ts

@@ -5,8 +5,8 @@ export interface Point {
 }
 export interface RoomPreferenceFields {
     suctions?: string[];
-    cisterns?: StringOrNumber[];
-    waterValues?: StringOrNumber[];
+    cisterns?: string[];
+    waterValues?: number[];
     cleanCounts?: number[];
     yMops?: number[];
     sweepMopModes?: string[];

package/lib/mqtt/type/protocols/roomPropertyProtocol.d.ts

@@ -1,9 +1,9 @@
-import type { BaseResponse, StringOrNumber } from './base';
+import type { BaseResponse } from './base';
 export interface SetRoomPropertyData {
     num?: number;
     ids: number[];
     suctions?: string[];
-    cisterns?: StringOrNumber[];
+    cisterns?: string[];
     cleanCounts?: number[];
     yMops?: number[];
     sweepMopModes?: string[];
@@ -12,11 +12,11 @@ export interface SetRoomPropertyData {
     nameLabels?: number[];
     orders?: number[];
     routePreferences?: string[];
-    waterValues?: StringOrNumber[];
+    waterValues?: number[];
 }
 export interface RoomPropertyResponse extends BaseResponse {
     suctions?: string[];
-    cisterns?: StringOrNumber[];
+    cisterns?: string[];
     cleanCounts?: number[];
     yMops?: number[];
     sweepMopModes?: string[];
@@ -28,7 +28,7 @@ export interface RoomPropertyResponse extends BaseResponse {
     nameLabels?: number[];
     orders?: number[];
     routePreferences?: string[];
-    waterValues?: StringOrNumber[];
+    waterValues?: number[];
 }
 export type TRequestRoomProperty = () => Promise<RoomPropertyResponse>;
 export type TSetRoomProperty = (data: SetRoomPropertyData) => Promise<RoomPropertyResponse>;

package/lib/mqtt/type/protocols/selectRoomCleanProtocol.d.ts

@@ -1,9 +1,9 @@
-import type { BaseResponse, StringOrNumber } from './base';
+import type { BaseResponse } from './base';
 export interface SelectRoomCleanItem {
     roomId: number;
     suction?: string;
-    cistern?: StringOrNumber;
-    waterValue?: StringOrNumber;
+    cistern?: string;
+    waterValue?: number;
     cleanTimes?: number;
     yMop?: number;
     sweepMopMode?: string;
@@ -13,8 +13,8 @@ export type SetSelectRoomCleanData = SelectRoomCleanItem[];
 export interface SelectRoomCleanResponse extends BaseResponse {
     ids: number[];
     suctions?: string[];
-    cisterns?: StringOrNumber[];
-    waterValues?: StringOrNumber[];
+    cisterns?: string[];
+    waterValues?: number[];
     cleanCounts?: number[];
     yMops?: number[];
     sweepMopModes?: string[];

package/lib/mqtt/type/protocols/spotCleanProtocol.d.ts

@@ -1,4 +1,4 @@
-import type { BaseResponse, Point, RoomPreferenceFields, StringOrNumber } from './base';
+import type { BaseResponse, Point, RoomPreferenceFields } from './base';
 export interface SetSpotCleanData extends RoomPreferenceFields {
     spots: Point[];
     origin?: Point;
@@ -6,8 +6,8 @@ export interface SetSpotCleanData extends RoomPreferenceFields {
 }
 export interface SpotCleanResponse extends BaseResponse {
     suctions?: string[];
-    cisterns?: StringOrNumber[];
-    waterValues?: StringOrNumber[];
+    cisterns?: string[];
+    waterValues?: number[];
     cleanCounts?: number[];
     yMops?: number[];
     sweepMopModes?: string[];

package/lib/mqtt/type/protocols/zoneCleanProtocol.d.ts

@@ -1,12 +1,12 @@
-import type { BaseResponse, Point, StringOrNumber } from './base';
+import type { BaseResponse, Point } from './base';
 export interface ZoneAdvancedConfig {
     id: number;
     localSave: number;
     cleanMode: number;
     order: number;
     cleanTimes: number;
-    suction: number;
-    cistern: number;
+    suction: string;
+    cistern: string;
 }
 export interface ZoneCleanItem {
     points: Point[];
@@ -17,8 +17,8 @@ export interface SetZoneCleanData {
     zones: ZoneCleanItem[];
     origin: Point;
     suctions?: string[];
-    cisterns?: StringOrNumber[];
-    waterValues?: StringOrNumber[];
+    cisterns?: string[];
+    waterValues?: number[];
     cleanCounts?: number[];
     yMops?: number[];
     sweepMopModes?: string[];
@@ -28,8 +28,8 @@ export interface ZoneCleanResponse extends BaseResponse {
     polygons: string[];
     names?: string[];
     suctions?: string[];
-    cisterns?: StringOrNumber[];
-    waterValues?: StringOrNumber[];
+    cisterns?: string[];
+    waterValues?: number[];
     cleanCounts?: number[];
     yMops?: number[];
     sweepMopModes?: string[];

package/lib/mqtt/useRoomProperty.js

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

package/lib/mqtt/useSchedule.js

@@ -6,7 +6,7 @@ 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';
@@ -53,11 +53,12 @@ export const useSchedule = () => {
       return new Promise((resolve, reject) => {
         try {
           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
             });
           });

package/lib/mqtt/useSelectRoomClean.js

@@ -9,7 +9,7 @@ import { useContext } from 'react';
 import { handleMqttError, useStructuredMessage } from './hooks/useStructuredMessage';
 import { SingletonContext } from './mqttProvider';
 import { RoomCleanSetEnum } from './type';
-import { normalizeWaterPreferencePayload } from './waterPreference';
+import { pickWaterFields } from '../utils';
 /**
  * 自定义 Hook，用于选区清扫
  * @returns 包含 requestSelectRoomClean 和 setRoomClean 函数的对象
@@ -92,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
@@ -127,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,9 +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 { normalizeWaterPreferencePayload } from './waterPreference';
 /**
  * 自定义 Hook，用于定点清扫
  * @returns 包含 requestSpotClean 和 setSpotClean 函数的对象
@@ -56,7 +55,7 @@ export const useSpotClean = () => {
             origin
           } = message;
           const num = spots.length;
-          const waterPayload = normalizeWaterPreferencePayload(message.cisterns, message.waterValues);
+          const waterPayload = pickWaterFields(num, message.cisterns, message.waterValues);
           const {
             suctions = new Array(num).fill(''),
             cleanCounts = new Array(num).fill(1),

package/lib/mqtt/useZoneClean.js

@@ -3,11 +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 { normalizeWaterPreferencePayload } from './waterPreference';
 /**
  * 自定义 Hook，用于划区清扫
  * @returns 包含 requestZoneClean 和 setZoneClean 函数的对象
@@ -74,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),

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
+ * （cisterns 缺省按 length 填充 'closed'）。
+ * 只要 waterValues 含有 undefined/null/NaN，就整体降级到 cisterns，避免发出 [null] 等坏协议。
+ */
+export declare const pickWaterFields: (length: number, cisterns?: string[], waterValues?: Array<number | null | undefined>) => {
+    waterValues: number[];
+} | {
+    cisterns: string[];
+};

package/lib/utils/index.js

@@ -1,7 +1,11 @@
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.every.js";
+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 +23,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 +101,37 @@ 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
+ * （cisterns 缺省按 length 填充 'closed'）。
+ * 只要 waterValues 含有 undefined/null/NaN，就整体降级到 cisterns，避免发出 [null] 等坏协议。
+ */
+export const pickWaterFields = (length, cisterns, waterValues) => {
+  if (waterValues !== null && waterValues !== void 0 && waterValues.length && waterValues.every(v => v != null && Number.isFinite(v))) {
+    return {
+      waterValues: waterValues
+    };
+  }
+  return {
+    cisterns: cisterns ? cisterns.map(v => v == null ? '' : v) : new Array(length).fill('')
+  };
+};

package/package.json

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

package/lib/mqtt/waterPreference.d.ts

@@ -1,20 +0,0 @@
-export type WaterPreferenceValue = string | number;
-/**
- * 将自定义水量 / 标准水量统一归一化为设备命令需要的数值。
- * 优先使用 waterValue，其次回退到 cistern。
- */
-export declare const resolveWaterLevel: (waterValue?: WaterPreferenceValue, cistern?: WaterPreferenceValue, fallback?: number) => number;
-export declare const hasPreferenceValue: (value?: WaterPreferenceValue | null) => boolean;
-/**
- * MQTT 水量相关字段是可选的。
- * 当数组里全是空字符串时，认为该字段未设置，避免把空 cisterns/waterValues 发给设备。
- */
-export declare const normalizeOptionalPreferenceArray: <T extends WaterPreferenceValue>(values?: T[] | undefined) => T[] | undefined;
-/**
- * 自定义水量优先于旧 cistern 水量。
- * 当某一项存在自定义水量时，同位置的 cistern 会被清空；最终空数组字段会被省略。
- */
-export declare const normalizeWaterPreferencePayload: (cisterns?: WaterPreferenceValue[], waterValues?: WaterPreferenceValue[]) => {
-    cisterns?: WaterPreferenceValue[] | undefined;
-    waterValues?: WaterPreferenceValue[] | undefined;
-};

package/lib/mqtt/waterPreference.js

@@ -1,70 +0,0 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "core-js/modules/esnext.iterator.constructor.js";
-import "core-js/modules/esnext.iterator.some.js";
-import { CISTERN_MAP } from '../constant';
-/**
- * 将自定义水量 / 标准水量统一归一化为设备命令需要的数值。
- * 优先使用 waterValue，其次回退到 cistern。
- */
-export const resolveWaterLevel = function (waterValue, cistern) {
-  var _ref, _resolveValue;
-  let fallback = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : CISTERN_MAP.closed;
-  const resolveValue = value => {
-    if (typeof value === 'number' && Number.isFinite(value)) {
-      return value;
-    }
-    if (typeof value !== 'string') {
-      return undefined;
-    }
-    if (value in CISTERN_MAP) {
-      return CISTERN_MAP[value];
-    }
-    const parsed = Number(value);
-    return Number.isFinite(parsed) ? parsed : undefined;
-  };
-  return (_ref = (_resolveValue = resolveValue(waterValue)) !== null && _resolveValue !== void 0 ? _resolveValue : resolveValue(cistern)) !== null && _ref !== void 0 ? _ref : fallback;
-};
-export const hasPreferenceValue = value => value !== '' && value !== null && value !== undefined;
-
-/**
- * MQTT 水量相关字段是可选的。
- * 当数组里全是空字符串时，认为该字段未设置，避免把空 cisterns/waterValues 发给设备。
- */
-export const normalizeOptionalPreferenceArray = values => {
-  if (!values) {
-    return undefined;
-  }
-  return values.some(hasPreferenceValue) ? values : undefined;
-};
-
-/**
- * 自定义水量优先于旧 cistern 水量。
- * 当某一项存在自定义水量时，同位置的 cistern 会被清空；最终空数组字段会被省略。
- */
-export const normalizeWaterPreferencePayload = (cisterns, waterValues) => {
-  var _cisterns$length, _waterValues$length;
-  const maxLength = Math.max((_cisterns$length = cisterns === null || cisterns === void 0 ? void 0 : cisterns.length) !== null && _cisterns$length !== void 0 ? _cisterns$length : 0, (_waterValues$length = waterValues === null || waterValues === void 0 ? void 0 : waterValues.length) !== null && _waterValues$length !== void 0 ? _waterValues$length : 0);
-  if (maxLength === 0) {
-    return {};
-  }
-  const normalizedCisterns = normalizeOptionalPreferenceArray(Array.from({
-    length: maxLength
-  }, (_, index) => {
-    var _cisterns$index;
-    if (hasPreferenceValue(waterValues === null || waterValues === void 0 ? void 0 : waterValues[index])) {
-      return '';
-    }
-    return (_cisterns$index = cisterns === null || cisterns === void 0 ? void 0 : cisterns[index]) !== null && _cisterns$index !== void 0 ? _cisterns$index : '';
-  }));
-  const normalizedWaterValues = normalizeOptionalPreferenceArray(Array.from({
-    length: maxLength
-  }, (_, index) => {
-    var _waterValues$index;
-    return (_waterValues$index = waterValues === null || waterValues === void 0 ? void 0 : waterValues[index]) !== null && _waterValues$index !== void 0 ? _waterValues$index : '';
-  }));
-  return _objectSpread(_objectSpread({}, normalizedCisterns ? {
-    cisterns: normalizedCisterns
-  } : {}), normalizedWaterValues ? {
-    waterValues: normalizedWaterValues
-  } : {});
-};