@ray-js/robot-data-stream 0.0.16 → 0.0.17-beta.1

package/lib/mqtt/index.d.ts

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

package/lib/mqtt/index.js

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

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

@@ -0,0 +1,34 @@
+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';
+export interface SetCruiseData {
+    /** start 开始 / pause 暂停 / resume 继续 / stop 结束 */
+    cmd: CruiseCmd;
+    /** 巡航类型，cmd 为 start 时必填 */
+    cruiseType?: CruiseType;
+    /** select_room 时的房间 ID 列表；不传表示全部工作点 */
+    ids?: number[];
+    version?: string;
+}
+export interface RequestCruiseData {
+    version?: string;
+}
+export interface CruiseResponse extends BaseResponse {
+    /** 巡航状态 */
+    status: CruiseStatus;
+    mapId: number;
+    /** 巡航类型；idle 时可不携带 */
+    cruiseType?: CruiseType;
+    /** select_room 时本次巡航的房间 ID 列表 */
+    ids?: number[];
+    /** 当前正在工作的房间 ID */
+    currentId?: number;
+    /** 当前工作点坐标 "x, y" */
+    polygon?: string;
+}
+export type TRequestCruise = (message?: RequestCruiseData) => Promise<CruiseResponse>;
+export type TSetCruise = (message: SetCruiseData) => Promise<CruiseResponse>;

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

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

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

@@ -18,3 +18,5 @@ export * from './deviceModelProtocol';
 export * from './carpetCleanProtocol';
 export * from './devInfoProtocol';
 export * from './roomPropertyProtocol';
+export * from './purifierScheduleProtocol';
+export * from './cruiseProtocol';

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

@@ -17,4 +17,6 @@ export * from './furnitureModelProtocol';
 export * from './deviceModelProtocol';
 export * from './carpetCleanProtocol';
 export * from './devInfoProtocol';
-export * from './roomPropertyProtocol';
+export * from './roomPropertyProtocol';
+export * from './purifierScheduleProtocol';
+export * from './cruiseProtocol';

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

@@ -0,0 +1,42 @@
+import type { BaseResponse } from './base';
+/** 工作类型：select_room 选房净化 / whole_house 整屋净化 */
+export type PurifierWorkType = 'select_room' | 'whole_house';
+/** 风速 */
+export type PurifierFanMode = 'auto' | 'low' | 'mid' | 'high';
+export interface PurifierScheduleItem {
+    /** 是否启用：1 启用 / 0 禁用 */
+    active: number;
+    /** 周重复，长度 7（周一~周日），1 生效；全 0 表示仅执行一次 */
+    cycle: number[];
+    /** 执行时间 [时, 分]，24 小时制 */
+    time: number[];
+    /** 房间 ID 列表；workTypes 为 whole_house 时为空数组 */
+    ids: number[];
+    /** 工作类型，与 ids 对齐；整屋时单元素 whole_house */
+    workTypes: PurifierWorkType[];
+    /** 风速，与 ids 对齐（整屋时单元素） */
+    fanModes: PurifierFanMode[];
+    /** 净化顺序，与 ids 对齐 */
+    orders?: number[];
+    /** 房间名称，与 ids 对齐 */
+    names?: string[];
+    /** 净化点坐标 "x, y"，与 ids 对齐 */
+    polygons?: string[];
+}
+export interface SetPurifierScheduleData {
+    /** 定时任务数量，= list.length */
+    num: number;
+    /** 定时任务列表（覆盖式全量下发） */
+    list: PurifierScheduleItem[];
+    version?: string;
+}
+export interface RequestPurifierScheduleData {
+    version?: string;
+}
+export interface PurifierScheduleResponse extends BaseResponse {
+    mapId: number;
+    num: number;
+    list: PurifierScheduleItem[];
+}
+export type TRequestPurifierSchedule = (message?: RequestPurifierScheduleData) => Promise<PurifierScheduleResponse>;
+export type TSetPurifierSchedule = (message: SetPurifierScheduleData) => Promise<PurifierScheduleResponse>;

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

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

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

@@ -13,6 +13,8 @@ export interface SetRoomPropertyData {
     orders?: number[];
     routePreferences?: string[];
     waterValues?: number[];
+    /** 净化点坐标 "x, y"，与 ids 一一对应；空字符串表示该房间未设置净化点 */
+    polygons?: string[];
 }
 export interface RoomPropertyResponse extends BaseResponse {
     suctions?: string[];
@@ -29,6 +31,8 @@ export interface RoomPropertyResponse extends BaseResponse {
     orders?: number[];
     routePreferences?: string[];
     waterValues?: number[];
+    /** 净化点坐标 "x, y"，与 ids 一一对应；空字符串表示该房间未设置净化点 */
+    polygons?: string[];
 }
 export type TRequestRoomProperty = () => Promise<RoomPropertyResponse>;
 export type TSetRoomProperty = (data: SetRoomPropertyData) => Promise<RoomPropertyResponse>;

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

@@ -92,3 +92,11 @@ export declare enum CarpetCleanEnum {
     query = "carpetCleanQry",
     set = "carpetCleanSet"
 }
+export declare enum PurifierScheduleEnum {
+    query = "purifierScheduleQry",
+    set = "purifierScheduleSet"
+}
+export declare enum CruiseEnum {
+    query = "cruiseQry",
+    set = "cruiseSet"
+}

package/lib/mqtt/type/requestType.js

@@ -137,4 +137,18 @@ export let CarpetCleanEnum = /*#__PURE__*/function (CarpetCleanEnum) {
   CarpetCleanEnum["query"] = "carpetCleanQry";
   CarpetCleanEnum["set"] = "carpetCleanSet";
   return CarpetCleanEnum;
+}({});
+
+// 净化定时（移动空气净化器）
+export let PurifierScheduleEnum = /*#__PURE__*/function (PurifierScheduleEnum) {
+  PurifierScheduleEnum["query"] = "purifierScheduleQry";
+  PurifierScheduleEnum["set"] = "purifierScheduleSet";
+  return PurifierScheduleEnum;
+}({});
+
+// 巡航（通用：移动空气净化器、移动垃圾桶等移动设备）
+export let CruiseEnum = /*#__PURE__*/function (CruiseEnum) {
+  CruiseEnum["query"] = "cruiseQry";
+  CruiseEnum["set"] = "cruiseSet";
+  return CruiseEnum;
 }({});

package/lib/mqtt/useCruise.d.ts

@@ -0,0 +1,9 @@
+import { type TRequestCruise, type TSetCruise } from './type/protocols/cruiseProtocol';
+/**
+ * 自定义 Hook，用于移动设备巡航状态查询与控制（如移动空气净化器、移动垃圾桶）
+ * @returns 包含 requestCruise 和 setCruise 函数的对象
+ */
+export declare const useCruise: () => {
+    requestCruise: TRequestCruise;
+    setCruise: TSetCruise;
+};

package/lib/mqtt/useCruise.js

@@ -0,0 +1,66 @@
+// 巡航（通用：移动空气净化器、移动垃圾桶等移动设备）
+import { useContext } from 'react';
+import { handleMqttError, useStructuredMessage } from './hooks/useStructuredMessage';
+import { SingletonContext } from './mqttProvider';
+import { CruiseEnum } from './type';
+/**
+ * 自定义 Hook，用于移动设备巡航状态查询与控制（如移动空气净化器、移动垃圾桶）
+ * @returns 包含 requestCruise 和 setCruise 函数的对象
+ */
+export const useCruise = () => {
+  const {
+    useMqtt
+  } = useContext(SingletonContext);
+  const {
+    sendStructuredMessage
+  } = useStructuredMessage();
+
+  /**
+   * 查询巡航状态（status）与巡航类型（cruiseType）
+   * @param message 可选参数，包含版本号
+   * @returns Promise<CruiseResponse> 响应结果
+   */
+
+  /**
+   * 巡航控制：cmd 为 start / pause / resume / stop；start 时需携带 cruiseType
+   * @param message 巡航控制数据
+   * @returns Promise<CruiseResponse> 响应结果
+   */
+
+  return {
+    requestCruise: 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(CruiseEnum.query, message, resolve, error => reject(handleMqttError(error, 'Failed to request cruise')));
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to request cruise'));
+        }
+      });
+    },
+    setCruise: message => {
+      return new Promise((resolve, reject) => {
+        try {
+          if (!useMqtt) {
+            reject(new Error('useMqtt is not used'));
+            return;
+          }
+          if (message.cmd === 'start' && !message.cruiseType) {
+            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
+          );
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to set cruise'));
+        }
+      });
+    }
+  };
+};

package/lib/mqtt/usePurifierSchedule.d.ts

@@ -0,0 +1,9 @@
+import { type TRequestPurifierSchedule, type TSetPurifierSchedule } from './type/protocols/purifierScheduleProtocol';
+/**
+ * 自定义 Hook，用于净化定时任务管理（移动空气净化器）
+ * @returns 包含 requestPurifierSchedule 和 setPurifierSchedule 函数的对象
+ */
+export declare const usePurifierSchedule: () => {
+    requestPurifierSchedule: TRequestPurifierSchedule;
+    setPurifierSchedule: TSetPurifierSchedule;
+};

package/lib/mqtt/usePurifierSchedule.js

@@ -0,0 +1,66 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+// 净化定时（移动空气净化器）
+import { useContext } from 'react';
+import { handleMqttError, useStructuredMessage } from './hooks/useStructuredMessage';
+import { SingletonContext } from './mqttProvider';
+import { PurifierScheduleEnum } from './type';
+/**
+ * 自定义 Hook，用于净化定时任务管理（移动空气净化器）
+ * @returns 包含 requestPurifierSchedule 和 setPurifierSchedule 函数的对象
+ */
+export const usePurifierSchedule = () => {
+  const {
+    useMqtt
+  } = useContext(SingletonContext);
+  const {
+    sendStructuredMessage
+  } = useStructuredMessage();
+
+  /**
+   * 请求净化定时数据
+   * @param message 可选参数，包含版本号
+   * @returns Promise<PurifierScheduleResponse> 响应结果
+   */
+
+  /**
+   * 设置净化定时数据（覆盖式全量下发）
+   * @param message 定时任务数据
+   * @returns Promise<PurifierScheduleResponse> 响应结果
+   */
+
+  return {
+    requestPurifierSchedule: 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(PurifierScheduleEnum.query, message, resolve, error => reject(handleMqttError(error, 'Failed to request purifier schedule')));
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to request purifier schedule'));
+        }
+      });
+    },
+    setPurifierSchedule: message => {
+      return new Promise((resolve, reject) => {
+        try {
+          var _message$num;
+          if (!useMqtt) {
+            reject(new Error('useMqtt is not used'));
+            return;
+          }
+          sendStructuredMessage(PurifierScheduleEnum.set, _objectSpread(_objectSpread({}, message), {}, {
+            num: (_message$num = message.num) !== null && _message$num !== void 0 ? _message$num : message.list.length
+          }), resolve, error => reject(handleMqttError(error, 'Failed to set purifier schedule')), PurifierScheduleEnum.query // 响应类型是 query，不是 set
+          );
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to set purifier schedule'));
+        }
+      });
+    }
+  };
+};

package/lib/mqtt/useRoomProperty.js

@@ -57,7 +57,7 @@ export const useRoomProperty = () => {
             ids
           } = data;
           const len = ids.length;
-          const sendData = _objectSpread(_objectSpread({
+          const sendData = _objectSpread(_objectSpread(_objectSpread({
             num: (_data$num = data.num) !== null && _data$num !== void 0 ? _data$num : len,
             ids,
             suctions: (_data$suctions = data.suctions) !== null && _data$suctions !== void 0 ? _data$suctions : new Array(len).fill('closed'),
@@ -70,6 +70,8 @@ export const useRoomProperty = () => {
             orders: data.orders
           }, data.routePreferences && {
             routePreferences: data.routePreferences
+          }), data.polygons && {
+            polygons: data.polygons
           }), pickWaterFields(len, data.cisterns, data.waterValues));
           sendStructuredMessage(RoomPropertyEnum.set, sendData, resolve, error => reject(handleMqttError(error, 'Failed to set room property')), RoomPropertyEnum.query // 响应类型是 query，不是 set
           );

package/package.json

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