@ray-js/robot-data-stream 0.0.13-beta-11 → 0.0.13-beta-12

package/lib/mqtt/type/requestType.d.ts

@@ -85,7 +85,8 @@ export declare enum CarpetEnum {
     add = "addCarpet",
     update = "updateCarpet",
     delete = "removeCarpet",
-    query = "carpetQry"
+    query = "carpetQry",
+    set = "carpetSet"
 }
 export declare enum CarpetCleanEnum {
     query = "carpetCleanQry",

package/lib/mqtt/type/requestType.js

@@ -128,6 +128,7 @@ export let CarpetEnum = /*#__PURE__*/function (CarpetEnum) {
   CarpetEnum["update"] = "updateCarpet";
   CarpetEnum["delete"] = "removeCarpet";
   CarpetEnum["query"] = "carpetQry";
+  CarpetEnum["set"] = "carpetSet";
   return CarpetEnum;
 }({});
 

package/lib/mqtt/useCarpet.d.ts

@@ -1,8 +1,16 @@
 import { BaseResponse } from './type';
 import { CarpetEnum } from './type/requestType';
-interface AddCarpetInput {
-    shape: ('rectangle' | 'round')[];
-    polygons: string[];
+import { Point } from '@ray-js/robot-protocol';
+interface CarpetCommonFields {
+    autoBoost?: number[];
+    fineCleaning?: number[];
+    sideBrushRotating?: number[];
+}
+type CarpetShape = 'rectangle' | 'round';
+type CarpetShapeWithCustom = 'rectangle' | 'round' | 'custom';
+interface AddCarpetInput extends CarpetCommonFields {
+    shape: CarpetShape[];
+    polygons: Array<Point[]>;
     num: number;
     type: number[];
     cleanMode: number[];
@@ -12,11 +20,12 @@ interface AddCarpetResponse extends BaseResponse {
     id: number;
 }
 type TAddCarpet = (carpetInfo: AddCarpetInput) => Promise<AddCarpetResponse>;
-interface UpdateCarpetInfo {
+interface UpdateCarpetInfo extends CarpetCommonFields {
     ids: number[];
-    shape?: ('rectangle' | 'round')[];
+    shape?: CarpetShape[];
     type?: number[];
     cleanMode?: number[];
+    polygons?: Array<Point[]>;
 }
 type TUpdateCarpet = (carpetInfo: UpdateCarpetInfo) => Promise<BaseResponse>;
 type TDeleteCarpet = (carpetIds: number[]) => Promise<BaseResponse>;
@@ -25,15 +34,40 @@ interface CarpetQueryResponse extends BaseResponse {
     num: number;
     polygons: string[];
     cleanMode: number[];
+    autoBoost?: number[];
+    fineCleaning?: number[];
+    sideBrushRotating?: number[];
     shape: string[];
     type: number[];
     ids: number[];
 }
 type TQueryCarpet = () => Promise<CarpetQueryResponse>;
+export interface SetCarpetInput extends CarpetCommonFields {
+    num: number;
+    polygons: Array<Point[]>;
+    cleanMode: number[];
+    shape: CarpetShapeWithCustom[];
+    ids: number[];
+    type?: number[];
+}
+interface SetCarpetResponse extends BaseResponse {
+    reqType: CarpetEnum.set;
+    num: number;
+    polygons: string[];
+    cleanMode: number[];
+    autoBoost?: number[];
+    fineCleaning?: number[];
+    sideBrushRotating?: number[];
+    shape: string[];
+    ids: number[];
+    type?: number[];
+}
+type TSetCarpet = (carpetInfo: SetCarpetInput) => Promise<SetCarpetResponse>;
 export declare const useCarpet: (devId: string) => {
     addCarpet: TAddCarpet;
     updateCarpet: TUpdateCarpet;
     deleteCarpet: TDeleteCarpet;
     queryCarpet: TQueryCarpet;
+    setCarpet: TSetCarpet;
 };
 export {};

package/lib/mqtt/useCarpet.js

@@ -1,17 +1,50 @@
 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 { pointsToString } from 'src/utils';
 import { createSetCommonParams } from './createCommonOptions';
 import { normalResolve } from './promise';
 import { CarpetEnum } from './type/requestType';
 
+// 公共的地毯属性类型
+
+// 形状类型定义
+
 // 添加地毯的输入参数（批量添加）
 
 // 添加地毯响应类型
 
 // 更新地毯的输入参数
 
+// 更新地毯发送数据的类型（polygons 已转换为字符串）
+
 // 查询地毯响应类型
 
+// 设置地毯的输入参数
+
+// 设置地毯响应类型
+
+// 验证形状数组的辅助函数
+const validateShape = function (shape, allowedShapes) {
+  let fieldName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'shape';
+  if (!shape.every(s => allowedShapes.includes(s))) {
+    throw new Error(`${fieldName} must contain only ${allowedShapes.map(s => `"${s}"`).join(', ')}`);
+  }
+};
+
+// 发送 MQTT 消息并返回 Promise 的辅助函数
+const sendMqttMessage = (devId, reqType, message) => {
+  const params = createSetCommonParams({
+    deviceId: devId,
+    reqType,
+    message
+  });
+  ty.device.sendMqttMessage(params);
+  const {
+    taskId
+  } = params.message;
+  return normalResolve(reqType, taskId);
+};
 export const useCarpet = devId => {
   /**
    * 添加地毯（批量添加）
@@ -36,63 +69,61 @@ export const useCarpet = devId => {
    * @returns Promise<CarpetQueryResponse> 响应结果，包含地毯数量、轮廓点集合、清洁属性和形状等信息
    */
 
+  /**
+   * 设置地毯（一次性设置所有地毯）
+   * @param carpetInfo 地毯信息，包含数量、轮廓点集合、清洁属性、形状和ID等
+   * @returns Promise<SetCarpetResponse> 响应结果，包含设置后的地毯信息
+   */
+
   return {
     addCarpet: carpetInfo => {
       // 参数验证
       if (!carpetInfo) {
         throw new Error('carpetInfo is required');
       }
-      if (!Array.isArray(carpetInfo.shape)) {
+      if (!Array.isArray(carpetInfo.shape) || carpetInfo.shape.length === 0) {
         throw new Error('carpetInfo.shape is required and must be a non-empty array');
       }
-      if (!carpetInfo.shape.every(s => ['rectangle', 'round'].includes(s))) {
-        throw new Error('carpetInfo.shape must contain only "rectangle" or "round"');
-      }
-      if (!Array.isArray(carpetInfo.polygons)) {
+      validateShape(carpetInfo.shape, ['rectangle', 'round'], 'carpetInfo.shape');
+      if (!Array.isArray(carpetInfo.polygons) || carpetInfo.polygons.length === 0) {
         throw new Error('carpetInfo.polygons is required and must be a non-empty array');
       }
-      if (typeof carpetInfo.num !== 'number') {
+      if (typeof carpetInfo.num !== 'number' || carpetInfo.num <= 0) {
         throw new Error('carpetInfo.num is required and must be a positive number');
       }
-      if (!Array.isArray(carpetInfo.type)) {
+      if (!Array.isArray(carpetInfo.type) || carpetInfo.type.length === 0) {
         throw new Error('carpetInfo.type is required and must be a non-empty array');
       }
-      if (!Array.isArray(carpetInfo.cleanMode)) {
+      if (!Array.isArray(carpetInfo.cleanMode) || carpetInfo.cleanMode.length === 0) {
         throw new Error('carpetInfo.cleanMode is required and must be a non-empty array');
       }
       try {
         const sendData = {
           shape: carpetInfo.shape,
-          polygons: carpetInfo.polygons,
+          polygons: carpetInfo.polygons.map(i => pointsToString(i)),
           num: carpetInfo.num,
           type: carpetInfo.type,
-          cleanMode: carpetInfo.cleanMode
+          cleanMode: carpetInfo.cleanMode,
+          autoBoost: carpetInfo.autoBoost,
+          fineCleaning: carpetInfo.fineCleaning,
+          sideBrushRotating: carpetInfo.sideBrushRotating
         };
-        const params = createSetCommonParams({
-          deviceId: devId,
-          reqType: CarpetEnum.add,
-          message: {
-            carpetInfo: sendData
-          }
+        return sendMqttMessage(devId, CarpetEnum.add, {
+          carpetInfo: sendData
         });
-        ty.device.sendMqttMessage(params);
-        const {
-          taskId
-        } = params.message;
-        return normalResolve(CarpetEnum.add, taskId);
       } catch (error) {
         throw error instanceof Error ? error : new Error('Failed to add carpet');
       }
     },
     updateCarpet: carpetInfo => {
       // 参数验证：只验证 id，其他字段可选
-      if (!carpetInfo || !Array.isArray(carpetInfo.ids)) {
-        throw new Error('carpetInfo.ids is required and must be a array');
+      if (!carpetInfo || !Array.isArray(carpetInfo.ids) || carpetInfo.ids.length === 0) {
+        throw new Error('carpetInfo.ids is required and must be a non-empty array');
       }
 
       // 验证 shape 字段（如果提供）
-      if (carpetInfo.shape !== undefined && !carpetInfo.shape.every(s => ['rectangle', 'round'].includes(s))) {
-        throw new Error('carpetInfo.shape must be "rectangle" or "round"');
+      if (carpetInfo.shape !== undefined) {
+        validateShape(carpetInfo.shape, ['rectangle', 'round'], 'carpetInfo.shape');
       }
       try {
         // 构建发送数据，只包含传入的字段
@@ -110,60 +141,85 @@ export const useCarpet = devId => {
         if (carpetInfo.cleanMode !== undefined) {
           sendData.cleanMode = carpetInfo.cleanMode;
         }
-        const params = createSetCommonParams({
-          deviceId: devId,
-          reqType: CarpetEnum.update,
-          message: {
-            carpetInfo: sendData
-          }
+        if (carpetInfo.autoBoost !== undefined) {
+          sendData.autoBoost = carpetInfo.autoBoost;
+        }
+        if (carpetInfo.fineCleaning !== undefined) {
+          sendData.fineCleaning = carpetInfo.fineCleaning;
+        }
+        if (carpetInfo.sideBrushRotating !== undefined) {
+          sendData.sideBrushRotating = carpetInfo.sideBrushRotating;
+        }
+        // 特殊处理 polygons（需要转换）
+        if (carpetInfo.polygons !== undefined) {
+          sendData.polygons = carpetInfo.polygons.map(i => pointsToString(i));
+        }
+        return sendMqttMessage(devId, CarpetEnum.update, {
+          carpetInfo: sendData
         });
-        ty.device.sendMqttMessage(params);
-        const {
-          taskId
-        } = params.message;
-        return normalResolve(CarpetEnum.update, taskId);
       } catch (error) {
         throw error instanceof Error ? error : new Error('Failed to update carpet');
       }
     },
     deleteCarpet: carpetIds => {
       // 参数验证
-      if (!carpetIds || !Array.isArray(carpetIds)) {
-        throw new Error('carpetId is required and must be a number');
+      if (!Array.isArray(carpetIds) || carpetIds.length === 0) {
+        throw new Error('carpetIds is required and must be a non-empty array');
       }
       try {
-        const params = createSetCommonParams({
-          deviceId: devId,
-          reqType: CarpetEnum.delete,
-          message: {
-            carpetInfo: {
-              ids: carpetIds
-            }
+        return sendMqttMessage(devId, CarpetEnum.delete, {
+          carpetInfo: {
+            ids: carpetIds
           }
         });
-        ty.device.sendMqttMessage(params);
-        const {
-          taskId
-        } = params.message;
-        return normalResolve(CarpetEnum.delete, taskId);
       } catch (error) {
         throw error instanceof Error ? error : new Error('Failed to delete carpet');
       }
     },
     queryCarpet: () => {
       try {
-        const params = createSetCommonParams({
-          deviceId: devId,
-          reqType: CarpetEnum.query
-        });
-        ty.device.sendMqttMessage(params);
-        const {
-          taskId
-        } = params.message;
-        return normalResolve(CarpetEnum.query, taskId);
+        return sendMqttMessage(devId, CarpetEnum.query, {});
       } catch (error) {
         throw error instanceof Error ? error : new Error('Failed to query carpet');
       }
+    },
+    setCarpet: carpetInfo => {
+      // 参数验证
+      if (!carpetInfo) {
+        throw new Error('carpetInfo is required');
+      }
+      if (typeof carpetInfo.num !== 'number' || carpetInfo.num <= 0) {
+        throw new Error('carpetInfo.num is required and must be a positive number');
+      }
+      if (!Array.isArray(carpetInfo.polygons) || carpetInfo.polygons.length === 0) {
+        throw new Error('carpetInfo.polygons is required and must be a non-empty array');
+      }
+      if (!Array.isArray(carpetInfo.cleanMode) || carpetInfo.cleanMode.length === 0) {
+        throw new Error('carpetInfo.cleanMode is required and must be a non-empty array');
+      }
+      if (!Array.isArray(carpetInfo.shape) || carpetInfo.shape.length === 0) {
+        throw new Error('carpetInfo.shape is required and must be a non-empty array');
+      }
+      validateShape(carpetInfo.shape, ['rectangle', 'round', 'custom'], 'carpetInfo.shape');
+      if (!Array.isArray(carpetInfo.ids) || carpetInfo.ids.length === 0) {
+        throw new Error('carpetInfo.ids is required and must be a non-empty array');
+      }
+      try {
+        const sendData = {
+          num: carpetInfo.num,
+          polygons: carpetInfo.polygons.map(i => pointsToString(i)),
+          cleanMode: carpetInfo.cleanMode,
+          autoBoost: carpetInfo.autoBoost,
+          fineCleaning: carpetInfo.fineCleaning,
+          sideBrushRotating: carpetInfo.sideBrushRotating,
+          shape: carpetInfo.shape,
+          ids: carpetInfo.ids,
+          type: carpetInfo.type
+        };
+        return sendMqttMessage(devId, CarpetEnum.set, sendData);
+      } catch (error) {
+        throw error instanceof Error ? error : new Error('Failed to set carpet');
+      }
     }
   };
 };

package/lib/utils/index.d.ts

@@ -3,7 +3,7 @@ export type Point = {
     y: number;
 };
 export declare const emitter: import("mitt").Emitter<Record<import("mitt").EventType, unknown>>;
-export declare const pointsToString: (points: Point[], origin: Point) => string;
+export declare const pointsToString: (points: Point[], origin?: Point) => string;
 export declare const isJSONString: (str: any) => boolean;
 export declare const parseJSON: (str: any) => any;
 export declare const logger: (type: 'warn' | 'error' | 'info', params: {

package/lib/utils/index.js

@@ -9,8 +9,8 @@ const pointToString = point => {
 export const pointsToString = (points, origin) => {
   let newPoints = [];
   try {
-    const ox = origin.x;
-    const oy = origin.y;
+    const ox = (origin === null || origin === void 0 ? void 0 : origin.x) || 0;
+    const oy = (origin === null || origin === void 0 ? void 0 : origin.y) || 0;
     newPoints = map(points, i => {
       return {
         x: floor(i.x - ox, 0),

package/package.json

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