@ray-js/robot-data-stream 0.0.15-beta.1 → 0.0.15-beta.10

package/lib/api/sweeperP2p.js

@@ -72,7 +72,7 @@ export class SweeperP2p extends P2pApi {
     this.packetTotalMap = new Map([['map.bin', -1], ['map_structured.bin', -1], ['cleanPath.bin', -1], ['ai.bin', -1], ['aiHD_XXXX_YYYY.bin', -1], ['map.bin.stream', -1], ['map_structured.bin.stream', -1], ['cleanPath.bin.stream', -1], ['ai.bin.stream', -1], ['aiHD_XXXX_YYYY.bin.stream', -1]]);
     this.packetSerialNumberCacheMap = new Map([['map.bin', -1], ['map_structured.bin', -1], ['cleanPath.bin', -1], ['ai.bin', -1], ['aiHD_XXXX_YYYY.bin', -1], ['map.bin.stream', -1], ['map_structured.bin.stream', -1], ['cleanPath.bin.stream', -1], ['ai.bin.stream', -1], ['aiHD_XXXX_YYYY.bin.stream', -1]]);
     this.fileLengthCacheMap = new Map([['map.bin', -1], ['map_structured.bin', -1], ['cleanPath.bin', -1], ['ai.bin', -1], ['aiHD_XXXX_YYYY.bin', -1], ['map.bin.stream', -1], ['map_structured.bin.stream', -1], ['cleanPath.bin.stream', -1], ['ai.bin.stream', -1], ['aiHD_XXXX_YYYY.bin.stream', -1]]);
-    this.packetDataCacheMap = new Map([['map.bin', new Map()], ['map_structured.bin', new Map()], ['cleanPath.bin', new Map()], ['ai.bin', new Map()], ['aiHD_XXXX_YYYY.bin', new Map()], ['map.bin.stream', new Map()], ['map_structured.bin.stream', new Map()], ['cleanPath.bin.stream', new Map()], ['ai.bin.stream', new Map()], ['aiHD_XXXX_YYYY.bin.stream', new Map()]]);
+    this.packetDataCacheMap = new Map([['map.bin', new Map()], ['map_structured.bin', new Map()], ['cleanPath.bin', new Map()], ['ai.bin', new Map()], ['aiHD_XXXX_YYYY.bin', new Map()], ['map.bin.stream', new Map()], ['map_structured.bin.stream', new Map()], ['cleanPath.bin.stream', new Map()], ['wifi_map.bin', new Map()], ['wifi_map.bin.stream', new Map()], ['ai.bin.stream', new Map()], ['aiHD_XXXX_YYYY.bin.stream', new Map()]]);
   }
   setStreamFilePath = () => {
     // this.streamFilePath = this.cacheDir + `/${this.albumName}/${devId}/stream`;

package/lib/mqtt/hooks/useStructuredMessage.d.ts

@@ -3,12 +3,15 @@
  * 提供统一的 sendMqttMessage 方法，自动从 Context 获取 devId 和配置
  */
 export declare const useStructuredMessage: () => {
-    sendStructuredMessage: <T extends z.infer<any>>(reqType: string, message: Record<string, any> | undefined, resolve: (value: T) => void, reject: (reason?: any) => void, responseType?: string) => void;
+    sendStructuredMessage: <T extends {
+        success: boolean;
+        errCode: number;
+        reqType: string;
+        version: string;
+        taskId: string;
+    }>(reqType: string, message: Record<string, any> | undefined, resolve: (value: T) => void, reject: (reason?: any) => void, responseType?: string) => void;
 };
 /**
  * 错误处理工具函数
- * @param error 错误对象
- * @param defaultMessage 默认错误消息
- * @returns Error 对象
  */
 export declare const handleMqttError: (error: unknown, defaultMessage: string) => Error;

package/lib/mqtt/hooks/useStructuredMessage.js

@@ -1,11 +1,29 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { getDeviceOnlineType, onDeviceOnlineStatusUpdate } from '@ray-js/ray';
+import { getDeviceOnlineType, offDeviceOnlineStatusUpdate, onDeviceOnlineStatusUpdate } from '@ray-js/ray';
 import { isFunction } from 'lodash-es';
 import { useCallback, useEffect, useRef } from 'react';
 import { getBitValue, logger } from '../../utils';
 import { createSetCommonParams } from '../createCommonOptions';
 import { useMqtt } from '../mqttProvider';
 import { normalResolve } from '../promise';
+// 常量定义
+const COMMUNICATION_CHANNELS = {
+  MQTT: 'mqtt',
+  LAN: 'lan'
+};
+const DEVICE_ONLINE_BITS = {
+  WIFI: 0,
+  LOCAL: 1
+};
+const LOG_LEVEL = {
+  INFO: 'info',
+  ERROR: 'error'
+};
+
+// 类型定义
+
+// 通信方法接口
+
 /**
  * 统一的 MQTT 消息发送 Hook
  * 提供统一的 sendMqttMessage 方法，自动从 Context 获取 devId 和配置
@@ -15,103 +33,160 @@ export const useStructuredMessage = () => {
   const {
     devId
   } = context.devices.common.getDevInfo();
-  const isLocalOnLineRef = useRef(false);
-  const isWifiOnLineRef = useRef(true);
-  const _onDeviceOnlineStatusChange = useCallback(_ref => {
+  const isLocalOnlineRef = useRef(false);
+  const isWifiOnlineRef = useRef(true);
+
+  // 设备在线状态处理器
+  const handleDeviceOnlineStatusChange = useCallback(_ref => {
     let {
       onlineType
     } = _ref;
-    // bit 0: WiFi在线
-    const wifiOnline = !!getBitValue(onlineType, 0);
-    // bit 1: 局域网在线
-    const localOnline = !!getBitValue(onlineType, 1);
-    logger('info', {
-      msg: `onDeviceOnlineStatusChange00000: onlineType ==>${onlineType}===>wifiOnline:${wifiOnline}===>localOnline:${localOnline}`
-    });
-    isLocalOnLineRef.current = localOnline;
-    isWifiOnLineRef.current = wifiOnline;
+    const wifiOnline = Boolean(getBitValue(onlineType, DEVICE_ONLINE_BITS.WIFI));
+    const localOnline = Boolean(getBitValue(onlineType, DEVICE_ONLINE_BITS.LOCAL));
+    isLocalOnlineRef.current = localOnline;
+    isWifiOnlineRef.current = wifiOnline;
   }, []);
+
+  // 订阅设备在线状态更新
   useEffect(() => {
     if (!devId) return;
-    getDeviceOnlineType({
+    (() => {
+      getDeviceOnlineType({
+        deviceId: devId,
+        success: handleDeviceOnlineStatusChange
+      });
+    })();
+    onDeviceOnlineStatusUpdate(handleDeviceOnlineStatusChange);
+    return offDeviceOnlineStatusUpdate(handleDeviceOnlineStatusChange);
+  }, [devId, handleDeviceOnlineStatusChange]);
+
+  // MQTT 通信方法
+  const mqttCommunication = {
+    isAvailable: () => {
+      var _ty;
+      return isWifiOnlineRef.current && ((_ty = ty) === null || _ty === void 0 ? void 0 : _ty.device) && isFunction(ty.device.sendMqttMessage);
+    },
+    send: (params, successCallback, failCallback) => {
+      const messageParams = _objectSpread(_objectSpread({}, params), {}, {
+        success: successCallback,
+        fail: failCallback
+      });
+      ty.device.sendMqttMessage(messageParams);
+    }
+  };
+
+  // LAN 通信方法
+  const lanCommunication = {
+    isAvailable: () => {
+      var _ty2;
+      return isLocalOnlineRef.current && ((_ty2 = ty) === null || _ty2 === void 0 ? void 0 : _ty2.device) && isFunction(ty.device.publishLanMessage);
+    },
+    send: (params, successCallback, failCallback) => {
+      const messageParams = _objectSpread(_objectSpread({}, params), {}, {
+        success: successCallback,
+        fail: failCallback
+      });
+      ty.device.publishLanMessage(messageParams);
+    }
+  };
+
+  // 创建消息参数
+  const createMessageParams = (reqType, message, useLocal) => {
+    return createSetCommonParams({
       deviceId: devId,
-      success: _onDeviceOnlineStatusChange
+      reqType,
+      message,
+      isLocalOnLine: useLocal
+    });
+  };
+
+  // 记录通信日志
+  const logCommunication = (level, reqType, message, params) => {
+    const baseMessage = `${reqType} ${message}`;
+    const fullMessage = params ? `${baseMessage}: ${JSON.stringify(params)}` : baseMessage;
+    logger(level, {
+      msg: fullMessage
     });
-    onDeviceOnlineStatusUpdate(_onDeviceOnlineStatusChange);
-  }, [_onDeviceOnlineStatusChange, devId]);
+  };
+
+  // 通信策略选择器
+  const selectCommunicationMethod = preferredChannel => {
+    const isPreferredMqtt = preferredChannel === COMMUNICATION_CHANNELS.MQTT;
+    const primaryMethod = isPreferredMqtt ? mqttCommunication : lanCommunication;
+    const fallbackMethod = isPreferredMqtt ? lanCommunication : mqttCommunication;
+    const useLocal = isPreferredMqtt ? false : true;
+    if (primaryMethod.isAvailable()) {
+      return {
+        method: primaryMethod,
+        useLocal
+      };
+    }
+    if (fallbackMethod.isAvailable()) {
+      return {
+        method: fallbackMethod,
+        useLocal: !useLocal
+      };
+    }
+    return null;
+  };
+
+  // 处理通信失败
+  const handleCommunicationError = (preferredChannel, reject) => {
+    const errorMessage = preferredChannel === COMMUNICATION_CHANNELS.MQTT ? `操作需要 MQTT 模式，请在 MqttProvider 中启用 useMqtt` : `没有可用的通信方式。局域网在线: ${isLocalOnlineRef.current}, WiFi在线: ${isWifiOnlineRef.current}`;
+    reject(new Error(errorMessage));
+  };
 
   /**
-   * 发送 MQTT 消息
-   * @param reqType 请求类型
-   * @param message 消息体（可选）
-   * @param responseType 响应类型（可选，如果不提供则使用 reqType）
-   * @param resolve Promise 的 resolve 回调
-   * @param reject Promise 的 reject 回调
+   * 发送结构化消息
    */
   const sendStructuredMessage = useCallback((reqType, message, resolve, reject, responseType) => {
+    // 参数验证
     if (!devId) {
-      reject(new Error('devId is required'));
+      reject(new Error('设备ID (devId) 为必填项'));
       return;
     }
-    // 检查是否使用 MQTT 模式
     if (!context.useMqtt) {
-      reject(new Error(`Operation ${reqType} requires MQTT mode. Please enable useMqtt in MqttProvider.`));
+      reject(new Error(`操作 ${reqType} 需要 MQTT 模式。请在 MqttProvider 中启用 useMqtt。`));
       return;
     }
     try {
-      var _ty, _ty2;
-      const params = createSetCommonParams({
-        deviceId: devId,
-        reqType,
-        message,
-        isLocalOnLine: isLocalOnLineRef.current
-      });
-
-      // 优先使用局域网通信（LAN）
-      if (isLocalOnLineRef.current && (_ty = ty) !== null && _ty !== void 0 && _ty.device && isFunction(ty.device.publishLanMessage)) {
-        // @ts-ignore - publishLanMessage 可能不存在于类型定义中
-        ty.device.publishLanMessage(_objectSpread(_objectSpread({}, params), {}, {
-          success: () => {
-            logger('info', {
-              msg: `${reqType} LAN message publish success: ${JSON.stringify(params)}`
-            });
-            // 局域网通信成功回调
-          },
-          fail: e => {
-            logger('error', {
-              msg: `${reqType} LAN message publish failed: ${JSON.stringify(e)}`
-            });
-          }
-        }));
-      }
-      // 如果局域网不可用，使用 WiFi MQTT 通信
-      else if (isWifiOnLineRef.current && (_ty2 = ty) !== null && _ty2 !== void 0 && _ty2.device && isFunction(ty.device.sendMqttMessage)) {
-        ty.device.sendMqttMessage(_objectSpread(_objectSpread({}, params), {}, {
-          success: () => {
-            // WiFi MQTT 通信成功回调
-            logger('info', {
-              msg: `${reqType} WiFi MQTT message send success: ${JSON.stringify(params)}`
-            });
-          },
-          fail: e => {
-            logger('error', {
-              msg: `${reqType} MQTT message send failed: ${JSON.stringify(e)}`
-            });
-          }
-        }));
-      }
-      // 如果两种通信方式都不可用，抛出错误
-      else {
-        reject(new Error(`No available communication method. LAN online: ${isLocalOnLineRef.current}, WiFi online: ${isWifiOnLineRef.current}`));
+      const {
+        preferredChannel
+      } = context;
+      const selectedMethod = selectCommunicationMethod(preferredChannel);
+      if (!selectedMethod) {
+        handleCommunicationError(preferredChannel, reject);
         return;
       }
-      // 如果指定了响应类型，使用响应类型；否则使用请求类型
+      const {
+        method,
+        useLocal
+      } = selectedMethod;
+      const messageParams = createMessageParams(reqType, message, useLocal);
+
+      // 成功回调
+
+      // 失败回调
+
+      // 发送消息
+      method.send(messageParams, () => {
+        const channelName = useLocal ? '局域网' : 'WiFi MQTT';
+        const fallbackSuffix = method === mqttCommunication && preferredChannel === COMMUNICATION_CHANNELS.LAN ? ' (备用)' : '';
+        logCommunication(LOG_LEVEL.INFO, reqType, `${channelName} 消息发送成功${fallbackSuffix}`, messageParams);
+      }, error => {
+        logCommunication(LOG_LEVEL.ERROR, reqType, '消息发送失败', _objectSpread(_objectSpread({}, messageParams), {}, {
+          error: JSON.stringify(error)
+        }));
+      });
+
+      // 处理响应
 
       normalResolve(responseType || reqType, resolve, reject);
     } catch (error) {
+      logCommunication(LOG_LEVEL.ERROR, reqType, `发送消息时发生异常: ${error}`);
       reject(error);
     }
-  }, [devId, context.useMqtt]);
+  }, [devId, context.useMqtt, context.preferredChannel]);
   return {
     sendStructuredMessage
   };
@@ -119,13 +194,13 @@ export const useStructuredMessage = () => {
 
 /**
  * 错误处理工具函数
- * @param error 错误对象
- * @param defaultMessage 默认错误消息
- * @returns Error 对象
  */
 export const handleMqttError = (error, defaultMessage) => {
   if (error instanceof Error) {
     return error;
   }
+  if (typeof error === 'string') {
+    return new Error(error);
+  }
   return new Error(defaultMessage);
 };

package/lib/mqtt/mqttProvider.d.ts

@@ -1,8 +1,10 @@
 import React from 'react';
 import { MqttError } from './promise';
+export type CommunicationChannel = 'mqtt' | 'lan';
 export interface MqttContextValue {
     useMqtt: boolean;
     commandVersion: '0' | '1';
+    preferredChannel: CommunicationChannel;
     devices: {
         common: {
             getDevInfo: () => {
@@ -26,6 +28,13 @@ export interface MqttProviderProps {
     useMqtt: boolean;
     commandVersion: '0' | '1';
     devices: MqttContextValue['devices'];
+    /**
+     * 优先选择的通信通道
+     * - 'mqtt': 优先使用 MQTT 通道（WiFi MQTT）
+     * - 'lan': 优先使用局域网通道（LAN）
+     * @default 'mqtt'
+     */
+    preferredChannel?: CommunicationChannel;
     onMqttReady?: () => void;
     /**
      * 可选的错误处理回调
@@ -45,7 +54,7 @@ export interface MqttProviderProps {
     onError?: MqttErrorHandler;
 }
 export declare function useMqtt(): MqttContextValue;
-export declare function MqttProvider({ children, useMqtt, commandVersion, devices, onError, onMqttReady, }: MqttProviderProps): React.JSX.Element;
+export declare function MqttProvider({ children, useMqtt, commandVersion, devices, preferredChannel, onError, onMqttReady, }: MqttProviderProps): React.JSX.Element;
 export declare namespace MqttProvider {
     var defaultProps: {
         onMqttReady: undefined;

package/lib/mqtt/mqttProvider.js

@@ -7,6 +7,8 @@ import { setUnhandledRejectionHandler } from './promise';
 import { ProtocolEnum } from './type';
 import log4js from '@ray-js/log4js';
 
+// 通信通道类型
+
 // Context 类型定义
 
 // 创建一个Context
@@ -32,6 +34,7 @@ export function MqttProvider(_ref) {
     useMqtt,
     commandVersion,
     devices,
+    preferredChannel = 'mqtt',
     onError,
     onMqttReady
   } = _ref;
@@ -42,10 +45,9 @@ export function MqttProvider(_ref) {
   const instance = useMemo(() => ({
     useMqtt,
     commandVersion,
+    preferredChannel,
     devices
-    // isLocalOnLine,
-    // isWifiOnLine,
-  }), [useMqtt, commandVersion, devices]);
+  }), [useMqtt, commandVersion, preferredChannel, devices]);
 
   // 使用 ref 存储设备 ID 和初始化状态，避免重复初始化
   const devIdRef = useRef(null);