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

package/lib/mqtt/index.d.ts

@@ -21,4 +21,5 @@ import { useDeviceModel } from './useDeviceModel';
 import { useFurnitureModel } from './useFurnitureModel';
 import { usePurifierSchedule } from './usePurifierSchedule';
 import { useCruise } from './useCruise';
-export { useCarpet, useCarpetClean, useVoice, MqttProvider, useDeviceModel, useFurnitureModel, useDevInfo, usePartMerge, usePartDivision, usePassword, useWifiMap, useQuiteHours, useVirtualArea, useSpotClean, useZoneClean, useSelectRoomClean, useVirtualWall, useSchedule, useHistoryMap, useRoomProperty, useResetMap, usePurifierSchedule, useCruise, };
+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, };

package/lib/mqtt/index.js

@@ -21,4 +21,5 @@ import { useDeviceModel } from './useDeviceModel';
 import { useFurnitureModel } from './useFurnitureModel';
 import { usePurifierSchedule } from './usePurifierSchedule';
 import { useCruise } from './useCruise';
-export { useCarpet, useCarpetClean, useVoice, MqttProvider, useDeviceModel, useFurnitureModel, useDevInfo, usePartMerge, usePartDivision, usePassword, useWifiMap, useQuiteHours, useVirtualArea, useSpotClean, useZoneClean, useSelectRoomClean, useVirtualWall, useSchedule, useHistoryMap, useRoomProperty, useResetMap, usePurifierSchedule, useCruise };
+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 };

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

@@ -3,15 +3,15 @@ import type { BaseResponse } from './base';
 export type CruiseCmd = 'start' | 'pause' | 'resume' | 'stop';
 /** 巡航状态：idle 未巡航 / cruising 巡航中 / paused 已暂停 */
 export type CruiseStatus = 'idle' | 'cruising' | 'paused';
-/** 巡航类型：whole_house 全屋巡航 / select_room 定点巡航（按房间工作点） */
-export type CruiseType = 'whole_house' | 'select_room';
+/** 巡航类型：whole_house 全屋巡航 / spot 定点巡航（按净化点坐标） */
+export type CruiseType = 'whole_house' | 'spot';
 export interface SetCruiseData {
     /** start 开始 / pause 暂停 / resume 继续 / stop 结束 */
     cmd: CruiseCmd;
     /** 巡航类型，cmd 为 start 时必填 */
     cruiseType?: CruiseType;
-    /** select_room 时的房间 ID 列表；不传表示全部工作点 */
-    ids?: number[];
+    /** spot 定点巡航时的净化点坐标列表，格式 "x, y"；不传表示全部净化点 */
+    polygons?: string[];
     version?: string;
 }
 export interface RequestCruiseData {
@@ -23,12 +23,10 @@ export interface CruiseResponse extends BaseResponse {
     mapId: number;
     /** 巡航类型；idle 时可不携带 */
     cruiseType?: CruiseType;
-    /** select_room 时本次巡航的房间 ID 列表 */
-    ids?: number[];
-    /** 当前正在工作的房间 ID */
-    currentId?: number;
-    /** 当前工作点坐标 "x, y" */
-    polygon?: string;
+    /** spot 定点巡航时的净化点坐标列表，格式 "x, y" */
+    polygons?: string[];
+    /** 当前正在净化的坐标 "x, y" */
+    currentPolygon?: string;
 }
 export type TRequestCruise = (message?: RequestCruiseData) => Promise<CruiseResponse>;
 export type TSetCruise = (message: SetCruiseData) => Promise<CruiseResponse>;

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

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

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

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

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

@@ -0,0 +1,18 @@
+import type { BaseResponse } from './base';
+export interface RequestMcsRoomInfoData {
+    /** 协议版本；默认 '1.0.0' */
+    version?: string;
+}
+/**
+ * McsRoomInfoQry 应答（RVC SDK Alexa 语音方案协议）。
+ * 注意：房间字段为 snake_case（与设备端 MCS_ROOM_INFO_S 结构体对应）。
+ */
+export interface McsRoomInfoResponse extends BaseResponse {
+    /** 当前地图 ID */
+    mapId: number;
+    /** 设备当前所在房间 ID（与 roomPropertyQry 的 ids 对应） */
+    curr_room_id: number;
+    /** 设备当前所在房间名称 */
+    curr_room_name: string;
+}
+export type TRequestMcsRoomInfo = (message?: RequestMcsRoomInfoData) => Promise<McsRoomInfoResponse>;

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

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

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

@@ -1,6 +1,12 @@
 import type { BaseResponse } from './base';
-/** 工作类型：select_room 选房净化 / whole_house 整屋净化 */
-export type PurifierWorkType = 'select_room' | 'whole_house';
+/**
+ * 工作类型：
+ * - select_room 选房净化（携带 ids）
+ * - whole_house 整屋净化
+ * - spot 定点净化
+ * - current_location 原地净化
+ */
+export type PurifierWorkType = 'select_room' | 'whole_house' | 'spot' | 'current_location';
 /** 风速档位，透传字符串，不限制具体取值（不同设备支持的档位不同） */
 export type PurifierFanMode = string;
 export interface PurifierScheduleItem {
@@ -10,9 +16,9 @@ export interface PurifierScheduleItem {
     cycle: number[];
     /** 执行时间 [时, 分]，24 小时制 */
     time: number[];
-    /** 房间 ID 列表；workTypes 为 whole_house 时为空数组 */
+    /** 房间 ID 列表；workTypes 为 whole_house / spot / current_location 时为空数组 */
     ids: number[];
-    /** 工作类型，与 ids 对齐；整屋时单元素 whole_house */
+    /** 工作类型，与 ids 对齐；非 select_room 时为单元素 */
     workTypes: PurifierWorkType[];
     /** 风速，与 ids 对齐（整屋时单元素） */
     fanModes: PurifierFanMode[];

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

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

package/lib/mqtt/type/requestType.js

@@ -151,4 +151,10 @@ export let CruiseEnum = /*#__PURE__*/function (CruiseEnum) {
   CruiseEnum["query"] = "purifierCruiseQry";
   CruiseEnum["set"] = "purifierCruiseSet";
   return CruiseEnum;
+}({});
+
+// 设备当前所在房间（MCS 房间信息；RVC SDK Alexa 语音方案协议，通常仅在任务中查询）
+export let McsRoomInfoEnum = /*#__PURE__*/function (McsRoomInfoEnum) {
+  McsRoomInfoEnum["query"] = "McsRoomInfoQry";
+  return McsRoomInfoEnum;
 }({});

package/lib/mqtt/useMcsRoomInfo.d.ts

@@ -0,0 +1,9 @@
+import { type TRequestMcsRoomInfo } from './type/protocols/mcsRoomInfoProtocol';
+/**
+ * 自定义 Hook，用于查询设备当前所在房间（mapId / currNameId / currName）。
+ * 面板通常仅在设备处于任务中时查询，用于展示「当前位置」。
+ * @returns 包含 requestMcsRoomInfo 函数的对象
+ */
+export declare const useMcsRoomInfo: () => {
+    requestMcsRoomInfo: TRequestMcsRoomInfo;
+};

package/lib/mqtt/useMcsRoomInfo.js

@@ -0,0 +1,43 @@
+// 设备当前所在房间（MCS 房间信息）
+import { useContext } from 'react';
+import { handleMqttError, useStructuredMessage } from './hooks/useStructuredMessage';
+import { SingletonContext } from './mqttProvider';
+import { McsRoomInfoEnum } from './type';
+/**
+ * 自定义 Hook，用于查询设备当前所在房间（mapId / currNameId / currName）。
+ * 面板通常仅在设备处于任务中时查询，用于展示「当前位置」。
+ * @returns 包含 requestMcsRoomInfo 函数的对象
+ */
+export const useMcsRoomInfo = () => {
+  const {
+    useMqtt
+  } = useContext(SingletonContext);
+  const {
+    sendStructuredMessage
+  } = useStructuredMessage();
+
+  /**
+   * 查询设备当前所在房间
+   * @param message 可选参数，包含版本号
+   * @returns Promise<McsRoomInfoResponse> 响应结果
+   */
+
+  return {
+    requestMcsRoomInfo: 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(McsRoomInfoEnum.query, message, resolve, error => reject(handleMqttError(error, 'Failed to request mcs room info')));
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to request mcs room info'));
+        }
+      });
+    }
+  };
+};

package/package.json

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