@ray-js/robot-data-stream 0.0.17-beta.7 → 0.0.17-beta.9

package/lib/mqtt/cruise.d.ts

@@ -0,0 +1,2 @@
+import type { SetCruiseData } from './type/protocols/cruiseProtocol';
+export declare const createCruisePayload: (message: SetCruiseData) => SetCruiseData;

package/lib/mqtt/cruise.js

@@ -0,0 +1,9 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+export const createCruisePayload = message => {
+  if (message.polygons && message.num === undefined) {
+    return _objectSpread(_objectSpread({}, message), {}, {
+      num: message.polygons.length
+    });
+  }
+  return message;
+};

package/lib/mqtt/index.d.ts

@@ -21,5 +21,6 @@ import { useDeviceModel } from './useDeviceModel';
 import { useFurnitureModel } from './useFurnitureModel';
 import { usePurifierSchedule } from './usePurifierSchedule';
 import { useCruise } from './useCruise';
+import { useSpotPolygons } from './useSpotPolygons';
 import { useMcsRoomInfo } from './useMcsRoomInfo';
-export { useCarpet, useCarpetClean, useVoice, MqttProvider, useDeviceModel, useFurnitureModel, useDevInfo, usePartMerge, usePartDivision, usePassword, useWifiMap, useQuiteHours, useVirtualArea, useSpotClean, useZoneClean, useSelectRoomClean, useVirtualWall, useSchedule, useHistoryMap, useRoomProperty, useResetMap, usePurifierSchedule, useCruise, useMcsRoomInfo, };
+export { useCarpet, useCarpetClean, useVoice, MqttProvider, useDeviceModel, useFurnitureModel, useDevInfo, usePartMerge, usePartDivision, usePassword, useWifiMap, useQuiteHours, useVirtualArea, useSpotClean, useZoneClean, useSelectRoomClean, useVirtualWall, useSchedule, useHistoryMap, useRoomProperty, useResetMap, usePurifierSchedule, useCruise, useSpotPolygons, useMcsRoomInfo, };

package/lib/mqtt/index.js

@@ -21,5 +21,6 @@ import { useDeviceModel } from './useDeviceModel';
 import { useFurnitureModel } from './useFurnitureModel';
 import { usePurifierSchedule } from './usePurifierSchedule';
 import { useCruise } from './useCruise';
+import { useSpotPolygons } from './useSpotPolygons';
 import { useMcsRoomInfo } from './useMcsRoomInfo';
-export { useCarpet, useCarpetClean, useVoice, MqttProvider, useDeviceModel, useFurnitureModel, useDevInfo, usePartMerge, usePartDivision, usePassword, useWifiMap, useQuiteHours, useVirtualArea, useSpotClean, useZoneClean, useSelectRoomClean, useVirtualWall, useSchedule, useHistoryMap, useRoomProperty, useResetMap, usePurifierSchedule, useCruise, useMcsRoomInfo };
+export { useCarpet, useCarpetClean, useVoice, MqttProvider, useDeviceModel, useFurnitureModel, useDevInfo, usePartMerge, usePartDivision, usePassword, useWifiMap, useQuiteHours, useVirtualArea, useSpotClean, useZoneClean, useSelectRoomClean, useVirtualWall, useSchedule, useHistoryMap, useRoomProperty, useResetMap, usePurifierSchedule, useCruise, useSpotPolygons, useMcsRoomInfo };

package/lib/mqtt/spotPolygons.d.ts

@@ -0,0 +1,7 @@
+import type { SetSpotPolygonsData } from './type/protocols/spotPolygonsProtocol';
+export declare const createSpotPolygonsPayload: ({ polygons, spotNames, version, }: SetSpotPolygonsData) => {
+    version?: string | undefined;
+    num: number;
+    polygons: string[];
+    spotNames: string[];
+};

package/lib/mqtt/spotPolygons.js

@@ -0,0 +1,18 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+export const createSpotPolygonsPayload = _ref => {
+  let {
+    polygons,
+    spotNames,
+    version
+  } = _ref;
+  if (polygons.length !== spotNames.length) {
+    throw new Error('polygons and spotNames must have the same length');
+  }
+  return _objectSpread({
+    num: polygons.length,
+    polygons,
+    spotNames
+  }, version && {
+    version
+  });
+};

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

@@ -12,19 +12,26 @@ export interface SetCruiseData {
     cruiseType?: CruiseType;
     /** spot 定点巡航时的净化点坐标列表，格式 "x, y"；不传表示全部净化点 */
     polygons?: string[];
+    /** spot 定点巡航时的净化点数量，= polygons.length；不传时由设备侧根据 polygons 长度推断 */
+    num?: number;
     version?: string;
 }
 export interface RequestCruiseData {
     version?: string;
 }
 export interface CruiseResponse extends BaseResponse {
-    /** 巡航状态 */
-    status: CruiseStatus;
-    mapId: number;
+    /** Wiki 协议中的当前巡航指令/状态字段 */
+    cmd?: CruiseCmd;
+    /** 兼容旧设备的巡航状态 */
+    status?: CruiseStatus;
+    /** 当前地图 ID，设备可不返回 */
+    mapId?: number;
     /** 巡航类型；idle 时可不携带 */
     cruiseType?: CruiseType;
     /** spot 定点巡航时的净化点坐标列表，格式 "x, y" */
     polygons?: string[];
+    /** spot 定点巡航时的净化点数量 */
+    num?: number;
     /** 当前正在净化的坐标 "x, y" */
     currentPolygon?: string;
 }

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

@@ -20,4 +20,5 @@ export * from './devInfoProtocol';
 export * from './roomPropertyProtocol';
 export * from './purifierScheduleProtocol';
 export * from './cruiseProtocol';
+export * from './spotPolygonsProtocol';
 export * from './mcsRoomInfoProtocol';

package/lib/mqtt/type/protocols/index.js

@@ -20,4 +20,5 @@ export * from './devInfoProtocol';
 export * from './roomPropertyProtocol';
 export * from './purifierScheduleProtocol';
 export * from './cruiseProtocol';
+export * from './spotPolygonsProtocol';
 export * from './mcsRoomInfoProtocol';

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

@@ -0,0 +1,21 @@
+import type { BaseResponse } from './base';
+export interface SetSpotPolygonsData {
+    /** 定点位置坐标，格式为 "x,y" */
+    polygons: string[];
+    /** 定点位置名称，与 polygons 一一对应 */
+    spotNames: string[];
+    version?: string;
+}
+export interface RequestSpotPolygonsData {
+    version?: string;
+}
+export interface SpotPolygonsResponse extends BaseResponse {
+    /** 定点位置数量 */
+    num: number;
+    /** 定点位置坐标，格式为 "x,y" */
+    polygons: string[];
+    /** 定点位置名称，与 polygons 一一对应 */
+    spotNames: string[];
+}
+export type TRequestSpotPolygons = (message?: RequestSpotPolygonsData) => Promise<SpotPolygonsResponse>;
+export type TSetSpotPolygons = (message: SetSpotPolygonsData) => Promise<SpotPolygonsResponse>;

package/lib/mqtt/type/protocols/spotPolygonsProtocol.js

@@ -0,0 +1 @@
+export {};

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

@@ -100,6 +100,10 @@ export declare enum CruiseEnum {
     query = "purifierCruiseQry",
     set = "purifierCruiseSet"
 }
+export declare enum SpotPolygonsEnum {
+    query = "spotPolygonsQry",
+    set = "spotPolygonsSet"
+}
 export declare enum McsRoomInfoEnum {
     query = "McsRoomInfoQry"
 }

package/lib/mqtt/type/requestType.js

@@ -153,6 +153,13 @@ export let CruiseEnum = /*#__PURE__*/function (CruiseEnum) {
   return CruiseEnum;
 }({});
 
+// 定点位置
+export let SpotPolygonsEnum = /*#__PURE__*/function (SpotPolygonsEnum) {
+  SpotPolygonsEnum["query"] = "spotPolygonsQry";
+  SpotPolygonsEnum["set"] = "spotPolygonsSet";
+  return SpotPolygonsEnum;
+}({});
+
 // 设备当前所在房间（MCS 房间信息；RVC SDK Alexa 语音方案协议，通常仅在任务中查询）
 export let McsRoomInfoEnum = /*#__PURE__*/function (McsRoomInfoEnum) {
   McsRoomInfoEnum["query"] = "McsRoomInfoQry";

package/lib/mqtt/useCruise.js

@@ -2,6 +2,7 @@
 import { useContext } from 'react';
 import { handleMqttError, useStructuredMessage } from './hooks/useStructuredMessage';
 import { SingletonContext } from './mqttProvider';
+import { createCruisePayload } from './cruise';
 import { CruiseEnum } from './type';
 /**
  * 自定义 Hook，用于移动设备巡航状态查询与控制（如移动空气净化器、移动垃圾桶）
@@ -55,7 +56,7 @@ export const useCruise = () => {
             reject(new Error('cruiseType is required when cmd is "start"'));
             return;
           }
-          sendStructuredMessage(CruiseEnum.set, message, resolve, error => reject(handleMqttError(error, 'Failed to set cruise')), CruiseEnum.query // 响应类型是 query，不是 set
+          sendStructuredMessage(CruiseEnum.set, createCruisePayload(message), resolve, error => reject(handleMqttError(error, 'Failed to set cruise')), CruiseEnum.query // 响应类型是 query，不是 set
           );
         } catch (error) {
           reject(handleMqttError(error, 'Failed to set cruise'));

package/lib/mqtt/useSpotPolygons.d.ts

@@ -0,0 +1,9 @@
+import { type TRequestSpotPolygons, type TSetSpotPolygons } from './type/protocols/spotPolygonsProtocol';
+/**
+ * 自定义 Hook，用于定点位置查询与设置
+ * @returns 包含 requestSpotPolygons 和 setSpotPolygons 函数的对象
+ */
+export declare const useSpotPolygons: () => {
+    requestSpotPolygons: TRequestSpotPolygons;
+    setSpotPolygons: TSetSpotPolygons;
+};

package/lib/mqtt/useSpotPolygons.js

@@ -0,0 +1,48 @@
+import { useContext } from 'react';
+import { handleMqttError, useStructuredMessage } from './hooks/useStructuredMessage';
+import { SingletonContext } from './mqttProvider';
+import { createSpotPolygonsPayload } from './spotPolygons';
+import { SpotPolygonsEnum } from './type';
+/**
+ * 自定义 Hook，用于定点位置查询与设置
+ * @returns 包含 requestSpotPolygons 和 setSpotPolygons 函数的对象
+ */
+export const useSpotPolygons = () => {
+  const {
+    useMqtt
+  } = useContext(SingletonContext);
+  const {
+    sendStructuredMessage
+  } = useStructuredMessage();
+  return {
+    requestSpotPolygons: function () {
+      let message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
+        version: '1.0.0'
+      };
+      return new Promise((resolve, reject) => {
+        try {
+          if (!useMqtt) {
+            reject(new Error('useMqtt is not used'));
+            return;
+          }
+          sendStructuredMessage(SpotPolygonsEnum.query, message, resolve, error => reject(handleMqttError(error, 'Failed to request spot polygons')));
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to request spot polygons'));
+        }
+      });
+    },
+    setSpotPolygons: message => {
+      return new Promise((resolve, reject) => {
+        try {
+          if (!useMqtt) {
+            reject(new Error('useMqtt is not used'));
+            return;
+          }
+          sendStructuredMessage(SpotPolygonsEnum.set, createSpotPolygonsPayload(message), resolve, error => reject(handleMqttError(error, 'Failed to set spot polygons')), SpotPolygonsEnum.query);
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to set spot polygons'));
+        }
+      });
+    }
+  };
+};

package/package.json

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