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

package/lib/mqtt/useZoneClean.js

@@ -1,7 +1,7 @@
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.for-each.js";
-import "core-js/modules/esnext.iterator.map.js";
 // 划区清扫
+
 import { isArray } from 'lodash-es';
 import { createSetCommonParams } from './createCommonOptions';
 import { normalResolve } from './promise';
@@ -10,19 +10,9 @@ import { useContext } from 'react';
 import { SingletonContext } from './mqttProvider';
 import { encodeZoneClean0x3a, requestZoneClean0x3b } from '@ray-js/robot-protocol';
 import { pointsToString } from '../utils';
-
-// 划区清扫响应类型
-
-// 设置划区清扫参数类型
-
-// 请求划区清扫函数类型定义
-
-// 设置划区清扫函数类型定义
-
 /**
- * 自定义 Hook，用于划区清扫
- * @param devId 设备ID
- * @returns 包含 requestZoneClean 和 setZoneClean 函数的对象
+ * 划区清扫
+ * @returns
  */
 export const useZoneClean = devId => {
   const {
@@ -31,158 +21,95 @@ export const useZoneClean = devId => {
     devices
   } = useContext(SingletonContext);
 
-  /**
-   * 请求划区清扫信息
-   * @returns Promise<ZoneCleanResponse> 响应结果
-   */
+  // 请求划区清扫信息
 
-  /**
-   * 设置划区清扫
-   * @param params 包含划区清扫设置参数的对象
-   * @param params.zones 区域数组
-   * @param params.origin 原点坐标
-   * @returns Promise<ZoneCleanResponse> 响应结果
-   */
+  // 设置划区清扫
 
   return {
     requestZoneClean: () => {
-      try {
-        if (useMqtt) {
-          const params = createSetCommonParams({
-            deviceId: devId,
-            reqType: ZoneCleanEnum.query
-          });
-          ty.device.sendMqttMessage(params);
-          const {
-            taskId
-          } = params.message;
-          return normalResolve(ZoneCleanEnum.query, taskId);
-        }
-
-        // 非 MQTT 模式：使用命令传输
-        devices.common.model.actions.command_trans.set(requestZoneClean0x3b({
-          version: commandVersion
-        }));
-
-        // 非 MQTT 模式下无法立即获取响应数据，返回默认响应
-        return Promise.resolve({
-          success: true,
-          errCode: 0,
-          reqType: ZoneCleanEnum.query,
-          version: commandVersion,
-          taskId: `${Date.now()}`,
-          polygons: [],
-          names: []
+      if (useMqtt) {
+        const params = createSetCommonParams({
+          deviceId: devId,
+          reqType: ZoneCleanEnum.query
         });
-      } catch (error) {
-        return Promise.reject(error instanceof Error ? error : new Error('Failed to request zone clean'));
+        ty.device.sendMqttMessage(params);
+        return normalResolve(ZoneCleanEnum.query, params.message.taskId);
       }
+      return devices.common.model.actions.command_trans.set(requestZoneClean0x3b({
+        version: commandVersion
+      }));
     },
-    setZoneClean: params => {
+    setZoneClean: message => {
       const {
         zones,
         origin
-      } = params;
-
-      // 参数验证
-      if (!isArray(zones) || zones.length === 0) {
-        throw new Error('zones is required and must be a non-empty array');
-      }
-      if (!origin || typeof origin.x !== 'number' || typeof origin.y !== 'number') {
-        throw new Error('origin is required and must be a valid Point object with x and y properties');
-      }
-      try {
-        if (useMqtt) {
-          const num = zones.length;
-          const {
-            suctions = new Array(num).fill(''),
-            cisterns = new Array(num).fill(''),
-            cleanCounts = new Array(num).fill(1),
-            yMops = new Array(num).fill(-1),
-            sweepMopModes = new Array(num).fill('only_sweep')
-          } = params;
-          if (suctions && !isArray(suctions)) {
-            throw new Error('suctions is illegal');
-          }
-          if (cisterns && !isArray(cisterns)) {
-            throw new Error('cisterns is illegal');
-          }
-          if (cleanCounts && !isArray(cleanCounts)) {
-            throw new Error('cleanCounts is illegal');
-          }
-          if (yMops && !isArray(yMops)) {
-            throw new Error('yMops is illegal');
-          }
-          if (sweepMopModes && !isArray(sweepMopModes)) {
-            throw new Error('sweepMopModes is illegal');
-          }
-          if (num !== suctions.length || num !== cisterns.length || num !== cleanCounts.length || num !== yMops.length || num !== sweepMopModes.length) {
-            throw new Error('The length of the parameters is inconsistent');
-          }
-          const polygons = [];
-          const names = [];
-          zones.forEach(_ref => {
-            let {
-              points,
-              name
-            } = _ref;
-            polygons.push(pointsToString(points, origin));
-            names.push(name || '');
-          });
-          const mqttParams = createSetCommonParams({
-            deviceId: devId,
-            reqType: ZoneCleanEnum.set,
-            message: {
-              num: zones.length,
-              switchGo: true,
-              polygons,
-              suctions,
-              cisterns,
-              cleanCounts,
-              yMops,
-              sweepMopModes,
-              names
-            }
-          });
-          ty.device.sendMqttMessage(mqttParams);
-          const {
-            taskId
-          } = mqttParams.message;
-          return normalResolve(ZoneCleanEnum.query, taskId);
+      } = message;
+      if (useMqtt) {
+        if (!isArray(zones) || isArray(zones) && zones.length === 0) {
+          return Promise.reject(new Error('message is required'));
         }
-
-        // 非 MQTT 模式：使用命令传输
-        const command = encodeZoneClean0x3a({
-          protocolVersion: 1,
-          version: commandVersion,
-          origin,
-          zones
-        });
-        devices.common.model.actions.command_trans.set(command);
-        const polygons = zones.map(_ref2 => {
-          let {
-            points
-          } = _ref2;
-          return pointsToString(points, origin);
-        });
-        const names = zones.map(_ref3 => {
+        const num = zones.length;
+        const {
+          suctions = new Array(num).fill(''),
+          cisterns = new Array(num).fill(''),
+          cleanCounts = new Array(num).fill(1),
+          yMops = new Array(num).fill(-1),
+          sweepMopModes = new Array(num).fill('only_sweep')
+        } = message;
+        if (suctions && !isArray(suctions)) {
+          return Promise.reject(new Error('suctions is illegal'));
+        }
+        if (cisterns && !isArray(cisterns)) {
+          return Promise.reject(new Error('cisterns is illegal'));
+        }
+        if (cleanCounts && !isArray(cleanCounts)) {
+          return Promise.reject(new Error('cleanCounts is illegal'));
+        }
+        if (yMops && !isArray(yMops)) {
+          return Promise.reject(new Error('yMops is illegal'));
+        }
+        if (sweepMopModes && !isArray(sweepMopModes)) {
+          return Promise.reject(new Error('sweepMopModes is illegal'));
+        }
+        if (num !== suctions.length || num !== cisterns.length || num !== cleanCounts.length || num !== yMops.length || num !== sweepMopModes.length) {
+          return Promise.reject(new Error('The length of the parameters is inconsistent'));
+        }
+        const polygons = [];
+        const names = [];
+        zones.forEach(_ref => {
           let {
+            points,
             name
-          } = _ref3;
-          return name || '';
+          } = _ref;
+          polygons.push(pointsToString(points, origin));
+          names.push(name || '');
         });
-        return Promise.resolve({
-          success: true,
-          errCode: 0,
-          reqType: ZoneCleanEnum.query,
-          version: commandVersion,
-          taskId: `${Date.now()}`,
-          polygons,
-          names
+        const params = createSetCommonParams({
+          deviceId: devId,
+          reqType: ZoneCleanEnum.set,
+          message: {
+            num: zones.length,
+            switchGo: true,
+            polygons,
+            suctions,
+            cisterns,
+            cleanCounts,
+            yMops,
+            sweepMopModes,
+            names
+          }
         });
-      } catch (error) {
-        throw error instanceof Error ? error : new Error('Failed to set zone clean');
+        ty.device.sendMqttMessage(params);
+        return normalResolve(ZoneCleanEnum.query, params.message.taskId);
       }
+      const command = encodeZoneClean0x3a({
+        protocolVersion: 1,
+        version: commandVersion,
+        origin,
+        zones
+      });
+      devices.common.model.actions.command_trans.set(command);
+      return Promise.resolve();
     }
   };
 };

package/lib/utils/index.d.ts

@@ -9,23 +9,12 @@ export declare const parseJSON: (str: any) => any;
 export declare const logger: (type: 'warn' | 'error' | 'info', params: {
     [key: string]: any;
     msg: string;
-}, onLogger?: ((type: 'warn' | 'error' | 'info', v: string) => void) | undefined) => void;
+}, onLogger: (type: 'warn' | 'error' | 'info', v: string) => void) => void;
 /**
- * 创建绑定了 onLogger 的 logger 函数
- * @param onLogger - 可选的日志回调函数
- * @returns 返回一个简化的 logger 函数
+ * 封装的 P2P 日志记录函数，根据 enableCustomLog 参数决定是否记录日志
+ * @param enableCustomLog 是否启用自定义日志
+ * @param devId 设备ID
+ * @param event 事件名称
+ * @param message 日志消息
  */
-export declare const createLogger: (onLogger?: ((type: 'warn' | 'error' | 'info', v: string) => void) | undefined) => {
-    info: (params: {
-        [key: string]: any;
-        msg: string;
-    }) => void;
-    warn: (params: {
-        [key: string]: any;
-        msg: string;
-    }) => void;
-    error: (params: {
-        [key: string]: any;
-        msg: string;
-    }) => void;
-};
+export declare const logP2PDataIfEnabled: (enableCustomLog: boolean, devId: string, event: string, message: string) => void;

package/lib/utils/index.js

@@ -1,6 +1,7 @@
 import mitt from 'mitt';
 import { floor, join, map } from 'lodash-es';
 import log4js from '@ray-js/log4js';
+import { logP2PData as originalLogP2PData } from '@ray-js/robot-custom-log';
 export const emitter = mitt();
 const pointToString = point => {
   return `${point.x},${point.y}`;
@@ -62,20 +63,17 @@ export const logger = (type, params, onLogger) => {
 };
 
 /**
- * 创建绑定了 onLogger 的 logger 函数
- * @param onLogger - 可选的日志回调函数
- * @returns 返回一个简化的 logger 函数
+ * 封装的 P2P 日志记录函数，根据 enableCustomLog 参数决定是否记录日志
+ * @param enableCustomLog 是否启用自定义日志
+ * @param devId 设备ID
+ * @param event 事件名称
+ * @param message 日志消息
  */
-export const createLogger = onLogger => {
-  return {
-    info: params => {
-      logger('info', params, onLogger);
-    },
-    warn: params => {
-      logger('warn', params, onLogger);
-    },
-    error: params => {
-      logger('error', params, onLogger);
-    }
-  };
+export const logP2PDataIfEnabled = (enableCustomLog, devId, event, message) => {
+  if (enableCustomLog) {
+    originalLogP2PData(devId, JSON.stringify({
+      event,
+      message
+    }));
+  }
 };

package/package.json

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

package/lib/ttt/index.d.ts

@@ -1,153 +0,0 @@
-/**
- * API 错误参数
- */
-export interface ApiErrorParams {
-    errorMsg?: string;
-    errorCode?: string | number;
-    innerError?: {
-        errorCode: string | number;
-        errorMsg: string;
-    };
-    [key: string]: any;
-}
-/**
- * 通用 API 响应类型
- * @template TSuccess 成功时的数据类型
- * @template TError 失败时的错误类型，默认为 ApiErrorParams
- */
-export interface ApiResponse<TSuccess = any, TError = ApiErrorParams> {
-    /** 操作是否成功 */
-    success: boolean;
-    /** 响应数据（成功时为 TSuccess，失败时为 TError） */
-    data?: TSuccess | TError;
-    /** 响应参数（P2P API 使用，成功时为 TSuccess，失败时为 TError） */
-    params?: TSuccess | TError;
-    /** 错误信息（失败时使用） */
-    error?: TError;
-}
-/**
- * 文件读取成功响应
- */
-export interface FileReadSuccess {
-    /** 文件内容（Base64 编码） */
-    data: string;
-}
-/**
- * 相册文件索引查询成功响应
- */
-export interface AlbumFileIndexSuccess {
-    /** 文件数量 */
-    count: number;
-    /** 文件索引列表 */
-    items: ty.p2p.ThingP2PAlbumFileIndex[];
-}
-type TOnLogger = (type: 'warn' | 'error' | 'info', data: string) => void;
-/**
- * 创建文件路径（目录）
- *
- * @param filePath - 文件路径
- * @returns Promise，成功时返回 true，失败时抛出错误
- */
-export declare const createFilePath: (filePath: string, onLogger: TOnLogger) => Promise<boolean>;
-/**
- * 检查目录是否存在
- *
- * @param filePath - 文件路径
- * @returns Promise，返回检查结果
- */
-export declare const checkIfDirIsExist: (filePath: string) => Promise<boolean>;
-/**
- * 读取文件内容（Base64 编码）
- *
- * @param filePath - 文件路径
- * @returns Promise，返回文件读取结果
- */
-export declare const readFile: (filePath: string, onLogger: TOnLogger) => Promise<ApiResponse<FileReadSuccess, ApiErrorParams>>;
-/**
- * 初始化 P2P SDK
- *
- * @returns Promise，返回初始化结果
- */
-export declare const initP2pSdk: (onLogger: TOnLogger) => Promise<ApiResponse<null, ApiErrorParams>>;
-/**
- * 连接设备
- *
- * @param devId - 设备ID
- * @returns Promise，返回连接结果
- */
-export declare const connectDevice: (devId: string, onLogger: TOnLogger) => Promise<ApiResponse<null, ApiErrorParams>>;
-/**
- * 断开设备连接
- *
- * @param devId - 设备ID
- * @returns Promise，返回断开连接结果
- */
-export declare const disconnectDevice: (devId: string, onLogger: TOnLogger) => Promise<ApiResponse<null, ApiErrorParams>>;
-/**
- * 下载流数据
- *
- * @param devId - 设备ID
- * @param albumName - 相册名称
- * @param files - 文件列表
- * @returns Promise，返回下载结果
- */
-export declare const downloadStream: (devId: string, albumName: string, files: string[], onLogger: TOnLogger) => Promise<ApiResponse<null, ApiErrorParams>>;
-/**
- * 追加下载流数据
- *
- * @param devId - 设备ID
- * @param albumName - 相册名称
- * @param files - 文件列表
- * @param onLogger - 日志回调函数
- * @returns Promise，返回追加下载结果
- */
-export declare const appendDownloadStream: (devId: string, albumName: string, files: string[], onLogger: TOnLogger) => Promise<ApiResponse<null, ApiErrorParams>>;
-/**
- * 下载文件
- *
- * @param devId - 设备ID
- * @param albumName - 相册名称
- * @param filePath - 文件保存路径
- * @param files - 文件列表
- * @returns Promise，返回下载结果
- */
-export declare const downloadFile: (devId: string, albumName: string, filePath: string, files: string[], onLogger: TOnLogger) => Promise<ApiResponse<null, ApiErrorParams>>;
-/**
- * 取消下载任务
- *
- * @param devId - 设备ID
- * @returns Promise，返回取消结果
- */
-export declare const cancelDownloadTask: (devId: string, onLogger: TOnLogger) => Promise<ApiResponse<null, ApiErrorParams>>;
-/**
- * 查询相册文件索引
- *
- * @param devId - 设备ID
- * @param albumName - 相册名称
- * @returns Promise，返回查询结果
- */
-export declare const queryAlbumFileIndexs: (devId: string, albumName: string, onLogger: TOnLogger) => Promise<ApiResponse<AlbumFileIndexSuccess, ApiErrorParams>>;
-/**
- * 反初始化 P2P SDK
- *
- * @returns Promise，返回反初始化结果
- */
-export declare const deInitP2pSdk: (onLogger: TOnLogger) => Promise<ApiResponse<null, ApiErrorParams>>;
-/**
- * TTT API 集合
- */
-export declare const apis: {
-    readonly createFilePath: (filePath: string, onLogger: TOnLogger) => Promise<boolean>;
-    readonly checkIfDirIsExist: (filePath: string) => Promise<boolean>;
-    readonly readFile: (filePath: string, onLogger: TOnLogger) => Promise<ApiResponse<FileReadSuccess, ApiErrorParams>>;
-    readonly initP2pSdk: (onLogger: TOnLogger) => Promise<ApiResponse<null, ApiErrorParams>>;
-    readonly connectDevice: (devId: string, onLogger: TOnLogger) => Promise<ApiResponse<null, ApiErrorParams>>;
-    readonly disconnectDevice: (devId: string, onLogger: TOnLogger) => Promise<ApiResponse<null, ApiErrorParams>>;
-    readonly downloadStream: (devId: string, albumName: string, files: string[], onLogger: TOnLogger) => Promise<ApiResponse<null, ApiErrorParams>>;
-    readonly appendDownloadStream: (devId: string, albumName: string, files: string[], onLogger: TOnLogger) => Promise<ApiResponse<null, ApiErrorParams>>;
-    readonly downloadFile: (devId: string, albumName: string, filePath: string, files: string[], onLogger: TOnLogger) => Promise<ApiResponse<null, ApiErrorParams>>;
-    readonly cancelDownloadTask: (devId: string, onLogger: TOnLogger) => Promise<ApiResponse<null, ApiErrorParams>>;
-    readonly queryAlbumFileIndexs: (devId: string, albumName: string, onLogger: TOnLogger) => Promise<ApiResponse<AlbumFileIndexSuccess, ApiErrorParams>>;
-    readonly deInitP2pSdk: (onLogger: TOnLogger) => Promise<ApiResponse<null, ApiErrorParams>>;
-};
-export {};