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

package/lib/api/index.d.ts

@@ -1,2 +1,12 @@
-import SweeperP2pInstance from './sweeperP2p';
-export { SweeperP2pInstance };
+type TOnLogger = (type: 'warn' | 'error' | 'info', data: string) => void;
+export declare const useP2PDataStream: (devId: string, onReceiveMapData: (data: string) => void, onReceivePathData: (data: string) => void, opt?: {
+    logTag?: string | undefined;
+    onReceiveAIPicData?: ((data: string) => void) | undefined;
+    onReceiveAIPicHDData?: ((data: string) => void) | undefined;
+    onReceiveWifiMapData?: ((data: string) => void) | undefined;
+    onLogger?: TOnLogger | undefined;
+    onDefineStructuredMode?: ((isStructured: boolean) => void) | undefined;
+} | undefined) => {
+    appendDownloadStreamDuringTask: (files: Array<string>, successCb?: () => void, failedCb?: () => void) => Promise<boolean> | void;
+};
+export {};

package/lib/api/index.js

@@ -1,2 +1,173 @@
 import SweeperP2pInstance from './sweeperP2p';
-export { SweeperP2pInstance };
+import log4js from '@ray-js/log4js';
+import { getSystemInfoSync, usePageEvent } from '@ray-js/ray';
+import { useCallback, useEffect, useMemo, useRef } from 'react';
+import { trace } from '../trace';
+import { createLogger } from '../utils';
+export const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
+  const traceId = `${devId}_${Date.now()}`;
+  global.robotPanelTraceId = traceId;
+  const {
+    logTag,
+    onReceiveAIPicData,
+    onReceiveAIPicHDData,
+    onReceiveWifiMapData,
+    onLogger,
+    onDefineStructuredMode
+  } = opt || {};
+  const isInit = useRef(false);
+  const offSessionStatusChange = useRef(null);
+  const isAppOnBackground = useRef(false);
+  const timer = useRef(null);
+  const isIDE = getSystemInfoSync().brand === 'devtools';
+
+  // 创建 logger 实例，避免重复创建
+  const log = useMemo(() => createLogger(onLogger), [onLogger]);
+
+  /**
+   * 启动数据观察
+   */
+  const startObserver = useCallback(() => {
+    SweeperP2pInstance.startObserverSweeperDataByP2P(1, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData, onReceiveWifiMapData, onDefineStructuredMode);
+    offSessionStatusChange.current = SweeperP2pInstance.onSessionStatusChange(SweeperP2pInstance.sessionStatusCallback);
+  }, [devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData, onReceiveWifiMapData, onDefineStructuredMode]);
+
+  /**
+   * p2p连接
+   */
+  const connectP2p = useCallback(async () => {
+    log.info({
+      msg: 'hooks has been started connectP2p'
+    });
+    // 开始进行连接时作为整个p2p连接的开始，将trace的开始时间戳记录下来
+    trace.initTimeStamps = Date.now();
+    SweeperP2pInstance.connectDevice(() => {
+      trace.pointFn({
+        devId,
+        eventName: 'connectDeviceSuccess'
+      });
+      isInit.current = true;
+      startObserver();
+    }, () => {
+      trace.pointFn({
+        devId,
+        eventName: 'connectDeviceFail'
+      });
+      SweeperP2pInstance.reconnectP2p(() => {
+        isInit.current = true;
+        trace.pointFn({
+          devId,
+          eventName: 'reconnectP2p'
+        });
+        startObserver();
+      }, '');
+    });
+  }, [log, devId, startObserver]);
+
+  /**
+   * p2p断开
+   */
+  const unmount = useCallback(() => {
+    log.info({
+      msg: 'hooks has been started unmount'
+    });
+    isInit.current = false;
+    SweeperP2pInstance.stopObserverSweeperDataByP2P();
+    if (offSessionStatusChange.current) {
+      offSessionStatusChange.current();
+      offSessionStatusChange.current = null;
+    }
+  }, [log]);
+  const handleAppHide = useCallback(() => {
+    log.info({
+      msg: 'hooks onAppHide'
+    });
+    isAppOnBackground.current = true;
+    if (isInit.current) {
+      timer.current = setTimeout(() => {
+        log.info({
+          msg: `background timer has been exe,isAppOnBackground: ${isAppOnBackground.current}`
+        });
+        if (isAppOnBackground.current) {
+          unmount();
+        }
+        clearTimeout(timer.current);
+        timer.current = null;
+      }, 10 * 1000);
+    }
+  }, [log, unmount]);
+  const handleAppShow = useCallback(() => {
+    log.info({
+      msg: 'hooks onAppShow'
+    });
+    log.info({
+      msg: `clear timer ${timer.current}`
+    });
+    isAppOnBackground.current = false;
+    timer.current && clearTimeout(timer.current);
+    setTimeout(() => {
+      var _ty$p2p$isP2PActiveSy, _ty$p2p, _ty$p2p$isP2PActiveSy2, _ty$p2p2;
+      log.info({
+        msg: `hooks onAppShow and after 500ms : ${isInit.current} isP2PActiveSync: ${(_ty$p2p$isP2PActiveSy = (_ty$p2p = ty.p2p).isP2PActiveSync) === null || _ty$p2p$isP2PActiveSy === void 0 ? void 0 : _ty$p2p$isP2PActiveSy.call(_ty$p2p, {
+          deviceId: devId
+        })}`
+      });
+      if ((!isInit.current || !((_ty$p2p$isP2PActiveSy2 = (_ty$p2p2 = ty.p2p).isP2PActiveSync) !== null && _ty$p2p$isP2PActiveSy2 !== void 0 && _ty$p2p$isP2PActiveSy2.call(_ty$p2p2, {
+        deviceId: devId
+      }))) && !SweeperP2pInstance.isConnecting) {
+        connectP2p();
+      }
+    }, 500);
+  }, [log, devId, connectP2p]);
+  useEffect(() => {
+    if (logTag) {
+      log4js.setTag(logTag);
+    }
+    if (traceId) {
+      trace.traceId = traceId;
+    }
+    if (isIDE) {
+      log.warn({
+        msg: `You are using the IDE environment. To perform P2P and map debugging, please ensure the 'Robot Vacuum Debugger' plugin is installed.`
+      });
+      SweeperP2pInstance.onReceiveMapData = onReceiveMapData;
+      SweeperP2pInstance.onReceivePathData = onReceivePathData;
+      SweeperP2pInstance.onDefineStructuredMode = onDefineStructuredMode;
+      SweeperP2pInstance.registerP2pDownloadEvent();
+      SweeperP2pInstance.onLogger = onLogger;
+      return () => {
+        SweeperP2pInstance.removeP2pDownloadEvent();
+      };
+    }
+    if (devId.startsWith('vdevo')) {
+      log.warn({
+        msg: 'virtual device cannot use p2p'
+      });
+      return;
+    }
+    SweeperP2pInstance.onLogger = onLogger;
+    SweeperP2pInstance.initP2pSdk(devId).then(() => {
+      connectP2p();
+      trace.pointFn({
+        devId,
+        eventName: 'initP2pSdk'
+      });
+    }).catch(() => {
+      trace.pointFn({
+        devId,
+        eventName: 'initP2pSdkFail'
+      });
+    });
+    ty.onAppHide(handleAppHide);
+    ty.onAppShow(handleAppShow);
+  }, [devId, logTag, traceId, isIDE, log, onLogger, connectP2p, handleAppHide, handleAppShow]);
+  usePageEvent('onUnload', () => {
+    unmount();
+    ty.offAppHide(handleAppHide);
+    ty.offAppShow(handleAppShow);
+    SweeperP2pInstance.deInitP2PSDK();
+  });
+  return {
+    appendDownloadStreamDuringTask: SweeperP2pInstance.appendDownloadStreamDuringTask
+  };
+};

package/lib/api/p2pApi.d.ts

@@ -1,3 +1,4 @@
+import { ApiResponse, ApiErrorParams, AlbumFileIndexSuccess } from '../ttt';
 /**
  * P2P 工具类
  */
@@ -10,6 +11,24 @@ export default class P2pApi {
     devId: string;
     traceId: string;
     constructor();
+    /**
+     * 便捷的日志记录方法
+     * 使用 getter 确保每次访问时都使用最新的 onLogger
+     */
+    protected get log(): {
+        info: (params: {
+            [key: string]: any;
+            msg: string;
+        }) => void;
+        warn: (params: {
+            [key: string]: any;
+            msg: string;
+        }) => void;
+        error: (params: {
+            [key: string]: any;
+            msg: string;
+        }) => void;
+    };
     /**
      * 设备断开之后的重连
      */
@@ -19,7 +38,7 @@ export default class P2pApi {
      * @param id 用户Id
      * @returns
      */
-    initP2pSdk: (devId: string) => Promise<boolean>;
+    initP2pSdk: (devId: string) => Promise<ApiResponse<null, ApiErrorParams>>;
     /**
      * 连接设备
      * @returns
@@ -29,7 +48,7 @@ export default class P2pApi {
      * 断开P2P设备连接
      * @returns
      */
-    disconnectDevice: () => Promise<boolean>;
+    disconnectDevice: () => Promise<ApiResponse<null, ApiErrorParams>>;
     /**
      * 开始P2p流传输
      * @param files
@@ -41,7 +60,7 @@ export default class P2pApi {
      */
     downloadStream: (files: {
         files: Array<string>;
-    }, albumName: string, successCb?: () => void, failedCb?: () => void) => Promise<unknown> | undefined;
+    }, albumName: string, successCb?: () => void, failedCb?: () => void) => Promise<boolean>;
     /**
      * 在下载过程中加入下载文件，需要把之前下载中的文件名也一起带上
      * @param files
@@ -52,7 +71,7 @@ export default class P2pApi {
      */
     appendDownloadStream: (files: {
         files: Array<string>;
-    }, albumName: string, successCb?: () => void, failedCb?: () => void) => Promise<boolean> | undefined;
+    }, albumName: string, successCb?: () => void, failedCb?: () => void) => Promise<boolean>;
     /**
      * 监听p2p传输数据流
      * @param callback
@@ -65,7 +84,7 @@ export default class P2pApi {
      */
     downloadFile: (files: {
         files: Array<string>;
-    }, albumName: string, filePath: string, successCb?: () => void, failedCb?: () => void) => Promise<unknown> | null;
+    }, albumName: string, filePath: string, successCb?: () => void, failedCb?: () => void) => Promise<boolean | null>;
     /**
      * 注册下载监听事件
      * @param callback
@@ -93,16 +112,16 @@ export default class P2pApi {
      * 取消进行下载
      * @returns
      */
-    cancelDownloadTask: () => Promise<unknown>;
+    cancelDownloadTask: () => Promise<ApiResponse<null, ApiErrorParams>>;
     /**
      * 查询设备相册文件列表
      * @param albumName
      * @returns
      */
-    queryAlbumFileIndexs: (albumName: string) => Promise<unknown>;
+    queryAlbumFileIndexs: (albumName: string) => Promise<ApiResponse<AlbumFileIndexSuccess, ApiErrorParams>>;
     /**
      * P2p SDK 销毁
      * @returns
      */
-    deInitP2PSDK: () => Promise<boolean>;
+    deInitP2PSDK: () => Promise<ApiResponse<null, ApiErrorParams>>;
 }