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

package/lib/constant.d.ts

@@ -1,3 +1,55 @@
 export declare const SUCTION_MAP: Record<string, number>;
 export declare const CISTERN_MAP: Record<string, number>;
 export declare const CLEAN_MODE_MAP: Record<string, number>;
+export declare enum FileNameEnum {
+    map = "map.bin",
+    mapStructured = "map_structured.bin",
+    cleanPath = "cleanPath.bin",
+    mapStream = "map.bin.stream",
+    mapStructuredStream = "map_structured.bin.stream",
+    cleanPathStream = "cleanPath.bin.stream",
+    ai = "ai.bin",
+    aiStream = "ai.bin.stream",
+    aiHD = "aiHD_XXXX_YYYY.bin",
+    aiHDStream = "aiHD_XXXX_YYYY.bin.stream",
+    wifiMap = "wifi_map.bin",
+    wifiMapStream = "wifi_map.bin.stream"
+}
+export declare const FILE_NAME_MAP: {
+    readonly "map.bin": {
+        readonly type: 0;
+    };
+    readonly "map_structured.bin": {
+        readonly type: 6;
+    };
+    readonly "cleanPath.bin": {
+        readonly type: 1;
+    };
+    readonly "map.bin.stream": {
+        readonly type: 0;
+    };
+    readonly "map_structured.bin.stream": {
+        readonly type: 6;
+    };
+    readonly "cleanPath.bin.stream": {
+        readonly type: 1;
+    };
+    readonly "ai.bin": {
+        readonly type: 4;
+    };
+    readonly "ai.bin.stream": {
+        readonly type: 4;
+    };
+    readonly "aiHD_XXXX_YYYY.bin": {
+        readonly type: 5;
+    };
+    readonly "aiHD_XXXX_YYYY.bin.stream": {
+        readonly type: 5;
+    };
+    readonly "wifi_map.bin": {
+        readonly type: 7;
+    };
+    readonly "wifi_map.bin.stream": {
+        readonly type: 7;
+    };
+};

package/lib/constant.js

@@ -1,3 +1,4 @@
+import "core-js/modules/esnext.iterator.map.js";
 // 吸力
 export const SUCTION_MAP = {
   closed: 0,
@@ -26,4 +27,57 @@ export const CLEAN_MODE_MAP = {
   // 先扫后拖
   clean_before_mop: 3,
   sweep_after_mop: 3
+};
+export let FileNameEnum = /*#__PURE__*/function (FileNameEnum) {
+  FileNameEnum["map"] = "map.bin";
+  FileNameEnum["mapStructured"] = "map_structured.bin";
+  FileNameEnum["cleanPath"] = "cleanPath.bin";
+  FileNameEnum["mapStream"] = "map.bin.stream";
+  FileNameEnum["mapStructuredStream"] = "map_structured.bin.stream";
+  FileNameEnum["cleanPathStream"] = "cleanPath.bin.stream";
+  FileNameEnum["ai"] = "ai.bin";
+  FileNameEnum["aiStream"] = "ai.bin.stream";
+  FileNameEnum["aiHD"] = "aiHD_XXXX_YYYY.bin";
+  FileNameEnum["aiHDStream"] = "aiHD_XXXX_YYYY.bin.stream";
+  FileNameEnum["wifiMap"] = "wifi_map.bin";
+  FileNameEnum["wifiMapStream"] = "wifi_map.bin.stream";
+  return FileNameEnum;
+}({});
+export const FILE_NAME_MAP = {
+  [FileNameEnum.map]: {
+    type: 0
+  },
+  [FileNameEnum.mapStructured]: {
+    type: 6
+  },
+  [FileNameEnum.cleanPath]: {
+    type: 1
+  },
+  [FileNameEnum.mapStream]: {
+    type: 0
+  },
+  [FileNameEnum.mapStructuredStream]: {
+    type: 6
+  },
+  [FileNameEnum.cleanPathStream]: {
+    type: 1
+  },
+  [FileNameEnum.ai]: {
+    type: 4
+  },
+  [FileNameEnum.aiStream]: {
+    type: 4
+  },
+  [FileNameEnum.aiHD]: {
+    type: 5
+  },
+  [FileNameEnum.aiHDStream]: {
+    type: 5
+  },
+  [FileNameEnum.wifiMap]: {
+    type: 7
+  },
+  [FileNameEnum.wifiMapStream]: {
+    type: 7
+  }
 };

package/lib/mqtt/createCommonOptions.d.ts

@@ -1,24 +1,65 @@
-interface Message {
-    [key: string]: string | number | string[] | number[] | any;
+import { ProtocolEnum } from './type';
+/**
+ * MQTT 消息体类型
+ */
+export interface MqttMessage {
+    reqType: string;
+    version: string;
+    taskId: string;
+    [key: string]: string | number | string[] | number[] | boolean | null | undefined | Record<string, any>;
 }
-interface Options {
+/**
+ * MQTT 选项类型
+ */
+export interface MqttOptions {
     [key: string]: string;
 }
-export declare enum ProtocolEnum {
-    appToRobot = 64,
-    robotToApp = 65
-}
-interface Params {
+/**
+ * 创建通用参数的输入参数
+ */
+export interface CreateSetCommonParamsInput {
+    /** 设备ID */
     deviceId: string;
+    /** 请求类型 */
     reqType: string;
-    message?: Message;
+    /** 消息体（可选） */
+    message?: Partial<MqttMessage>;
+    /** 版本号（可选，默认为 1.0.0） */
     version?: string;
-    options?: Options;
+    /** 选项（可选） */
+    options?: MqttOptions;
 }
-export declare const createSetCommonParams: ({ deviceId, reqType, message, version, options, }: Params) => {
+/**
+ * 创建通用参数的返回类型
+ */
+export interface CreateSetCommonParamsOutput {
+    /** 设备ID */
     deviceId: string;
-    message: Message;
-    options: Options;
+    /** 消息体 */
+    message: MqttMessage;
+    /** 选项 */
+    options: MqttOptions;
+    /** 协议号 */
     protocol: ProtocolEnum;
-};
-export {};
+}
+/**
+ * 创建 MQTT 通用参数
+ *
+ * @param params - 参数对象
+ * @param params.deviceId - 设备ID
+ * @param params.reqType - 请求类型
+ * @param params.message - 消息体（可选）
+ * @param params.version - 版本号（可选，默认为 1.0.0）
+ * @param params.options - 选项（可选）
+ * @returns MQTT 通用参数对象
+ *
+ * @example
+ * ```ts
+ * const params = createSetCommonParams({
+ *   deviceId: 'device123',
+ *   reqType: 'devInfoQry',
+ *   message: { customField: 'value' }
+ * });
+ * ```
+ */
+export declare const createSetCommonParams: ({ deviceId, reqType, message, version, options, }: CreateSetCommonParamsInput) => CreateSetCommonParamsOutput;

package/lib/mqtt/createCommonOptions.js

@@ -1,17 +1,53 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-const defaultVersion = '1.0.0';
-// mqtt协议号
-export let ProtocolEnum = /*#__PURE__*/function (ProtocolEnum) {
-  ProtocolEnum[ProtocolEnum["appToRobot"] = 64] = "appToRobot";
-  ProtocolEnum[ProtocolEnum["robotToApp"] = 65] = "robotToApp";
-  return ProtocolEnum;
-}({});
+import { ProtocolEnum } from './type';
+
+/**
+ * MQTT 消息默认版本号
+ */
+const DEFAULT_VERSION = '1.0.0';
+
+/**
+ * MQTT 消息体类型
+ */
+
+/**
+ * MQTT 选项类型
+ */
+
+/**
+ * 创建通用参数的输入参数
+ */
+
+/**
+ * 创建通用参数的返回类型
+ */
+
+/**
+ * 创建 MQTT 通用参数
+ *
+ * @param params - 参数对象
+ * @param params.deviceId - 设备ID
+ * @param params.reqType - 请求类型
+ * @param params.message - 消息体（可选）
+ * @param params.version - 版本号（可选，默认为 1.0.0）
+ * @param params.options - 选项（可选）
+ * @returns MQTT 通用参数对象
+ *
+ * @example
+ * ```ts
+ * const params = createSetCommonParams({
+ *   deviceId: 'device123',
+ *   reqType: 'devInfoQry',
+ *   message: { customField: 'value' }
+ * });
+ * ```
+ */
 export const createSetCommonParams = _ref => {
   let {
     deviceId,
     reqType,
     message = {},
-    version = defaultVersion,
+    version = DEFAULT_VERSION,
     options = {}
   } = _ref;
   const taskId = Date.now();

package/lib/mqtt/index.d.ts

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

package/lib/mqtt/index.js

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

package/lib/mqtt/mqttProvider.d.ts

@@ -1,21 +1,29 @@
 import React from 'react';
-export declare const SingletonContext: React.Context<{
+export interface MqttContextValue {
     useMqtt: boolean;
     commandVersion: '0' | '1';
     devices: {
-        common: any;
+        common: {
+            getDevInfo: () => {
+                devId: string;
+            };
+            model: {
+                props?: any;
+                actions: {
+                    [dpCode: string]: {
+                        set: (command: string) => void;
+                    };
+                };
+            };
+        };
     };
-}>;
-export declare function useMqtt(): {
+}
+export declare const SingletonContext: React.Context<MqttContextValue | null>;
+export interface MqttProviderProps {
+    children: React.ReactNode;
     useMqtt: boolean;
-    commandVersion: "0" | "1";
-    devices: {
-        common: any;
-    };
-};
-export declare function MqttProvider({ children, useMqtt, commandVersion, devices }: {
-    children: any;
-    useMqtt: any;
-    commandVersion: any;
-    devices: any;
-}): React.JSX.Element;
+    commandVersion: '0' | '1';
+    devices: MqttContextValue['devices'];
+}
+export declare function useMqtt(): MqttContextValue;
+export declare function MqttProvider({ children, useMqtt, commandVersion, devices }: MqttProviderProps): React.JSX.Element;

package/lib/mqtt/mqttProvider.js

@@ -1,11 +1,18 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { get, isNil } from 'lodash-es';
-import React, { createContext, useCallback, useContext, useRef, useState } from 'react';
+import React, { createContext, useCallback, useContext, useEffect, useMemo, useRef } from 'react';
 import { emitter } from '../utils';
+import { ProtocolEnum } from './type';
+
+// Context 类型定义
 
 // 创建一个Context
 export const SingletonContext = /*#__PURE__*/createContext(null);
 
+// MqttProvider Props 类型定义
+
+// MQTT 消息数据类型
+
 // 创建一个自定义Hook来使用这个Context
 export function useMqtt() {
   const context = useContext(SingletonContext);
@@ -21,50 +28,80 @@ export function MqttProvider(_ref) {
     commandVersion,
     devices
   } = _ref;
-  const [instance, setInstance] = useState(null);
+  // 使用 useMemo 创建实例，确保只在依赖项变化时重新创建
+  const instance = useMemo(() => ({
+    useMqtt,
+    commandVersion,
+    devices
+  }), [useMqtt, commandVersion, devices]);
+
+  // 使用 ref 存储设备 ID 和初始化状态，避免重复初始化
+  const devIdRef = useRef(null);
+  const isInitializedRef = useRef(false);
+
+  // MQTT 消息处理回调
   const onMqttMessageReceived = useCallback(data => {
+    var _messageData$errCode;
     const {
       messageData
     } = data || {};
     const reqType = get(messageData, 'reqType', '');
     if (!reqType) return;
-    if (reqType) {
-      console.log('mqtt message received:', reqType, messageData);
-      emitter.emit(reqType, isNil(messageData === null || messageData === void 0 ? void 0 : messageData.success) ? _objectSpread(_objectSpread({}, messageData), {}, {
-        success: true
-      }) : messageData);
-    }
+
+    // 确保消息数据包含 success 和 errCode 字段
+    // errCode: 0 表示成功，非 0 表示失败
+    // success: true 表示成功，false 表示失败
+    const errCode = (_messageData$errCode = messageData === null || messageData === void 0 ? void 0 : messageData.errCode) !== null && _messageData$errCode !== void 0 ? _messageData$errCode : (messageData === null || messageData === void 0 ? void 0 : messageData.success) === false ? -1 : 0;
+    const success = isNil(messageData === null || messageData === void 0 ? void 0 : messageData.success) ? errCode === 0 : messageData.success;
+    const responseData = _objectSpread(_objectSpread({}, messageData), {}, {
+      success,
+      errCode
+    });
+    emitter.emit(reqType, responseData);
   }, []);
 
-  // 使用ref确保实例只被创建一次
-  const instanceRef = useRef(null);
-  if (instanceRef.current === null) {
-    const {
-      devId
-    } = devices.common.getDevInfo();
+  // 初始化 MQTT 监听器（只执行一次）
+  useEffect(() => {
+    // 防止重复初始化
+    if (isInitializedRef.current) return;
+
+    // 获取设备 ID
+    try {
+      const devInfo = devices.common.getDevInfo();
+      devIdRef.current = devInfo.devId;
+    } catch (error) {
+      console.error('Failed to get device info:', error);
+      return;
+    }
+    const devId = devIdRef.current;
+    if (!devId) {
+      console.error('Device ID is not available');
+      return;
+    }
+
+    // 注册 MQTT 协议监听器
     ty.device.registerMQTTProtocolListener({
-      protocol: 65,
+      protocol: ProtocolEnum.robotToApp,
       success: () => {
         console.log('注册mqtt成功');
+      },
+      fail: error => {
+        console.error('注册mqtt失败:', error);
       }
     });
+
+    // 注册 MQTT 消息接收监听器
     ty.device.onMqttMessageReceived(data => {
       if (data.deviceId === devId) {
         onMqttMessageReceived(data);
       }
     });
-    instanceRef.current = {
-      // 是否走mqtt64/65通道
-      useMqtt,
-      // 指令协议版本(1byte or 4bytes)
-      commandVersion,
-      // sdm
-      devices
-    };
-    setInstance(instanceRef.current);
-  }
 
-  // 将单例状态和行为作为value传递给消费组件
+    // 标记为已初始化
+    isInitializedRef.current = true;
+  }, [devices, onMqttMessageReceived]);
+
+  // 将实例作为 value 传递给消费组件
   return /*#__PURE__*/React.createElement(SingletonContext.Provider, {
     value: instance
   }, children);

package/lib/mqtt/promise.js

@@ -13,7 +13,7 @@ class MyError extends Error {
   }
 }
 
-// 2. 定义 Message 类型
+// 2. 定义 Message 类型（兼容 MQTT 响应格式）
 
 // 3. 定义 PromiseWithRejection 类型
 
@@ -28,15 +28,20 @@ export function normalResolve(reqType, taskId) {
       }));
     }, 10 * 1000);
     const handle = message => {
+      var _message$errCode;
+      // 通过 taskId 匹配响应
       if (`${message.taskId}` !== `${taskId}`) {
         return;
       }
       clearTimeout(timer);
-      if (message.errCode === 0) {
+
+      // 优先使用 errCode，如果没有则使用 success 字段判断
+      const errCode = (_message$errCode = message.errCode) !== null && _message$errCode !== void 0 ? _message$errCode : message.success === false ? -1 : 0;
+      if (errCode === 0) {
         resolve(message);
       } else {
         reject(new MyError('Request failed', {
-          errCode: message.errCode,
+          errCode,
           reqType
         }));
       }

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

@@ -6,6 +6,15 @@ export interface BaseResponse {
     version: string;
     taskId: string;
 }
+/**
+ * MQTT 协议号枚举
+ */
+export declare enum ProtocolEnum {
+    /** 面板下发 */
+    appToRobot = 64,
+    /** 设备上报 */
+    robotToApp = 65
+}
 export declare enum PasswordEnum {
     query = "passwordQry",
     set = "passwordSet",

package/lib/mqtt/type/index.js

@@ -1,6 +1,14 @@
 export * from './requestType';
 // 设备接口响应的统一标准结构
 
+/**
+ * MQTT 协议号枚举
+ */
+export let ProtocolEnum = /*#__PURE__*/function (ProtocolEnum) {
+  ProtocolEnum[ProtocolEnum["appToRobot"] = 64] = "appToRobot";
+  ProtocolEnum[ProtocolEnum["robotToApp"] = 65] = "robotToApp";
+  return ProtocolEnum;
+}({});
 export let PasswordEnum = /*#__PURE__*/function (PasswordEnum) {
   PasswordEnum["query"] = "passwordQry";
   PasswordEnum["set"] = "passwordSet";

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

@@ -70,3 +70,24 @@ export declare enum UseMapEnum {
     query = "useMapRst",
     set = "useMapSet"
 }
+export declare enum DevInfoEnum {
+    query = "devInfoQry"
+}
+export declare enum FurnitureModelEnum {
+    query = "modelQry",
+    set = "setFurnitureModel"
+}
+export declare enum DeviceModelEnum {
+    query = "deviceModelQry",
+    set = "setDeviceModel"
+}
+export declare enum CarpetEnum {
+    add = "addCarpet",
+    update = "updateCarpet",
+    delete = "removeCarpet",
+    query = "carpetQry"
+}
+export declare enum CarpetCleanEnum {
+    query = "carpetCleanQry",
+    set = "carpetCleanSet"
+}

package/lib/mqtt/type/requestType.js

@@ -104,4 +104,36 @@ export let UseMapEnum = /*#__PURE__*/function (UseMapEnum) {
   UseMapEnum["query"] = "useMapRst";
   UseMapEnum["set"] = "useMapSet";
   return UseMapEnum;
+}({});
+export let DevInfoEnum = /*#__PURE__*/function (DevInfoEnum) {
+  DevInfoEnum["query"] = "devInfoQry";
+  return DevInfoEnum;
+}({});
+
+// 家具模型枚举
+export let FurnitureModelEnum = /*#__PURE__*/function (FurnitureModelEnum) {
+  FurnitureModelEnum["query"] = "modelQry";
+  FurnitureModelEnum["set"] = "setFurnitureModel";
+  return FurnitureModelEnum;
+}({});
+
+// 设备模型枚举
+export let DeviceModelEnum = /*#__PURE__*/function (DeviceModelEnum) {
+  DeviceModelEnum["query"] = "deviceModelQry";
+  DeviceModelEnum["set"] = "setDeviceModel";
+  return DeviceModelEnum;
+}({});
+export let CarpetEnum = /*#__PURE__*/function (CarpetEnum) {
+  CarpetEnum["add"] = "addCarpet";
+  CarpetEnum["update"] = "updateCarpet";
+  CarpetEnum["delete"] = "removeCarpet";
+  CarpetEnum["query"] = "carpetQry";
+  return CarpetEnum;
+}({});
+
+// 地毯清洁模式
+export let CarpetCleanEnum = /*#__PURE__*/function (CarpetCleanEnum) {
+  CarpetCleanEnum["query"] = "carpetCleanQry";
+  CarpetCleanEnum["set"] = "carpetCleanSet";
+  return CarpetCleanEnum;
 }({});

package/lib/mqtt/useCarpet.d.ts

@@ -0,0 +1,39 @@
+import { BaseResponse } from './type';
+import { CarpetEnum } from './type/requestType';
+interface AddCarpetInput {
+    shape: ('rectangle' | 'round')[];
+    polygons: string[];
+    num: number;
+    type: number[];
+    cleanMode: number[];
+}
+interface AddCarpetResponse extends BaseResponse {
+    reqType: CarpetEnum.add;
+    id: number;
+}
+type TAddCarpet = (carpetInfo: AddCarpetInput) => Promise<AddCarpetResponse>;
+interface UpdateCarpetInfo {
+    ids: number[];
+    shape?: ('rectangle' | 'round')[];
+    type?: number[];
+    cleanMode?: number[];
+}
+type TUpdateCarpet = (carpetInfo: UpdateCarpetInfo) => Promise<BaseResponse>;
+type TDeleteCarpet = (carpetIds: number[]) => Promise<BaseResponse>;
+interface CarpetQueryResponse extends BaseResponse {
+    reqType: CarpetEnum.query;
+    num: number;
+    polygons: string[];
+    cleanMode: number[];
+    shape: string[];
+    type: number[];
+    ids: number[];
+}
+type TQueryCarpet = () => Promise<CarpetQueryResponse>;
+export declare const useCarpet: (devId: string) => {
+    addCarpet: TAddCarpet;
+    updateCarpet: TUpdateCarpet;
+    deleteCarpet: TDeleteCarpet;
+    queryCarpet: TQueryCarpet;
+};
+export {};