@ray-js/robot-data-stream 0.0.3 → 0.0.4

package/README.md

@@ -26,43 +26,36 @@ yarn start:tuya
 ## Usage
 
 ```tsx
-import React from 'react';
+
+import React, { useEffect } from 'react';
 import { View, Text } from '@ray-js/ray';
 import { useP2PDataStream, StreamDataNotificationCenter } from '@ray-js/robot-data-stream';
 import styles from './index.module.less';
 
 const DemoBlock = ({ devId }) => {
+  
   const onReceiveMapData = (data: string) => {
-    StreamDataNotificationCenter.emit('receiveMapData', data);
-  };
-
-  const onReceivePathData = (data: string) => {
-    StreamDataNotificationCenter.emit('receivePathData', data);
-  };
-
-  const onReceiveAIPicData = (data: string) => {
-    StreamDataNotificationCenter.emit('receiveAIPicData', data);
-  };
-
-  const onReceiveAIPicHDData = (data: string) => {
-    StreamDataNotificationCenter.emit('receiveAIPicHDData', data);
-  };
-
-  const { appendDownloadStreamDuringTask } = useP2PDataStream(
-    devId,
-    onReceiveMapData,
-    onReceivePathData,
-    onReceiveAIPicData,
-    onReceiveAIPicHDData
-  );
+    StreamDataNotificationCenter.emit('receiveMapData', data)
+  }
+
+  const onReceivePathData = (data:string) => {
+    StreamDataNotificationCenter.emit('receivePathData', data)
+  }
+
+
+  useEffect(() => {
+
+    useP2PDataStream(devId, onReceiveMapData, onReceivePathData);
+
+  }, []);
 
   return (
     <View className={styles.demoBlock}>
       <View className={styles.demoBlockTitle}>
         <Text className={styles.demoBlockTitleText}>{devId}</Text>
       </View>
-    </View>
-  );
+     </View>
+  )
 };
 
 export default function Home() {
@@ -72,5 +65,5 @@ export default function Home() {
     </View>
   );
 }
+```
 
-```

package/lib/api/index.d.ts

@@ -1,2 +1,2 @@
-import SweeperP2pInstance from './sweeperP2p';
+import SweeperP2pInstance from "./sweeperP2p";
 export { SweeperP2pInstance };

package/lib/api/index.js

@@ -1,2 +1,2 @@
-import SweeperP2pInstance from './sweeperP2p';
+import SweeperP2pInstance from "./sweeperP2p";
 export { SweeperP2pInstance };

package/lib/api/p2pApi.d.ts

@@ -39,17 +39,6 @@ export default class P2pApi {
     downloadStream: (files: {
         files: Array<string>;
     }, albumName: string, successCb?: () => void, failedCb?: () => void) => Promise<unknown> | undefined;
-    /**
-     * 在下载过程中加入下载文件，需要把之前下载中的文件名也一起带上
-     * @param files
-     * @param albumName
-     * @param successCb
-     * @param failedCb
-     * @returns
-     */
-    appendDownloadStream: (files: {
-        files: Array<string>;
-    }, albumName: string, successCb?: () => void, failedCb?: () => void) => Promise<boolean> | undefined;
     /**
      * 监听p2p传输数据流
      * @param callback

package/lib/api/p2pApi.js

@@ -164,43 +164,6 @@ export default class P2pApi {
     }
   };
 
-  /**
-   * 在下载过程中加入下载文件，需要把之前下载中的文件名也一起带上
-   * @param files
-   * @param albumName
-   * @param successCb
-   * @param failedCb
-   * @returns
-   */
-  appendDownloadStream = (files, albumName, successCb, failedCb) => {
-    try {
-      if (this.isConnected) {
-        return new Promise(resolve => {
-          p2p.appendDownloadStream({
-            deviceId: this.devId,
-            albumName: albumName,
-            jsonfiles: JSON.stringify(files),
-            success: () => {
-              log4js.info('p2p appendDownloadStream success');
-              typeof successCb === 'function' && successCb();
-              resolve(true);
-            },
-            fail: params => {
-              log4js.warn('p2p appendDownloadStream failed ==>', params);
-              setTimeout(() => {
-                typeof failedCb === 'function' && failedCb();
-              }, 500);
-              resolve(false);
-            },
-            complete: () => {}
-          });
-        });
-      }
-    } catch (e) {
-      log4js.warn('p2p appendDownloadStream occur an error ==>', e);
-    }
-  };
-
   /**
    * 监听p2p传输数据流
    * @param callback

package/lib/api/sweeperP2p.d.ts

@@ -24,18 +24,6 @@ declare const FILE_NAME_MAP: {
     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;
-    };
 };
 export declare class SweeperP2p extends P2pApi {
     file: {
@@ -45,22 +33,24 @@ export declare class SweeperP2p extends P2pApi {
     albumName: string;
     streamFilePath: string;
     dataFilePath: string;
+    mapBinData: string;
+    navPathBinData: string;
+    cleanPathBinData: string;
+    mapBinStream: string;
+    navPathBinStream: string;
+    cleanPathBinStream: string;
     downloadType: number;
     readingMap: boolean;
     readingClean: boolean;
-    readingAI: boolean;
-    readingHD: boolean;
+    readingNav: boolean;
     cacheDir: string;
     fileIndex: number;
     cacheData: any;
-    exitFiles: Array<string>;
     packetDataCacheMap: Map<keyof typeof FILE_NAME_MAP, Map<number, string>>;
     packetSerialNumberCacheMap: Map<keyof typeof FILE_NAME_MAP, number>;
     packetTotalMap: Map<keyof typeof FILE_NAME_MAP, number>;
     onReceiveMapData: (data: string) => void;
     onReceivePathData: (data: string) => void;
-    onReceiveAIPicData: (data: string) => void;
-    onReceiveAIPicHDData: (data: string) => void;
     offFileDownloadComplete: () => void;
     offP2pStreamPacketReceive: () => void;
     offDownLoadProgressUpdate: () => void;
@@ -116,15 +106,7 @@ export declare class SweeperP2p extends P2pApi {
      * @param downloadType
      * 0: 下载断开 1: 持续下载
      */
-    startObserverSweeperDataByP2P: (downloadType: number, devId: string, onReceiveMapData: (data: string) => void, onReceivePathData: (data: string) => void, onReceiveAIPicData?: ((data: string) => void) | undefined, onReceiveAIPicHDData?: ((data: string) => void) | undefined) => Promise<void>;
-    /**
-     * 在下载过程中继续添加下载文件
-     * @param files
-     * @param successCb
-     * @param failCb
-     * @returns
-     */
-    appendDownloadStreamDuringTask: (files: Array<string>, successCb?: () => void, failCb?: () => void) => Promise<boolean> | void;
+    startObserverSweeperDataByP2P: (downloadType: number, devId: string, onReceiveMapData: (data: string) => void, onReceivePathData: (data: string) => void) => Promise<void>;
     /**
      * 注册下载有关的监听
      */

package/lib/api/sweeperP2p.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-shadow */
 import P2pApi from './p2pApi';
 import Base64 from 'base64-js';
-import { padStart, join, map } from 'lodash-es';
+import { padStart } from 'lodash-es';
 import log4js from '@ray-js/log4js';
 /**
  * 基于P2p工具类的扫地机扩展实现
@@ -19,18 +19,6 @@ const FILE_NAME_MAP = {
   },
   'cleanPath.bin.stream': {
     type: 1
-  },
-  'ai.bin': {
-    type: 4
-  },
-  'ai.bin.stream': {
-    type: 4
-  },
-  'aiHD_XXXX_YYYY.bin': {
-    type: 5
-  },
-  'aiHD_XXXX_YYYY.bin.stream': {
-    type: 5
   }
 };
 
@@ -43,14 +31,20 @@ export class SweeperP2p extends P2pApi {
     this.downloadType = 1;
     this.fileIndex = -1; // -1 表示所有文件下载完成
     this.albumName = 'ipc_sweeper_robot';
+    this.mapBinData = 'map.bin';
+    this.navPathBinData = 'navPath.bin';
+    this.cleanPathBinData = 'cleanPath.bin';
+    this.mapBinStream = 'map.bin.stream';
+    this.navPathBinStream = 'navPath.bin.stream';
+    this.cleanPathBinStream = 'cleanPath.bin.stream';
     this.cacheDir = ty.env.USER_DATA_PATH;
     this.readingMap = false;
     this.readingClean = false;
+    this.readingNav = false;
     this.cacheData = {};
-    this.exitFiles = [];
-    this.packetTotalMap = new Map([['map.bin', -1], ['cleanPath.bin', -1], ['ai.bin', -1], ['aiHD_XXXX_YYYY.bin', -1], ['map.bin.stream', -1], ['cleanPath.bin.stream', -1], ['ai.bin.stream', -1], ['aiHD_XXXX_YYYY.bin.stream', -1]]);
-    this.packetSerialNumberCacheMap = new Map([['map.bin', -1], ['cleanPath.bin', -1], ['ai.bin', -1], ['aiHD_XXXX_YYYY.bin', -1], ['map.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()], ['cleanPath.bin', new Map()], ['ai.bin', new Map()], ['aiHD_XXXX_YYYY.bin', new Map()], ['map.bin.stream', new Map()], ['cleanPath.bin.stream', new Map()], ['ai.bin.stream', new Map()], ['aiHD_XXXX_YYYY.bin.stream', new Map()]]);
+    this.packetTotalMap = new Map([['map.bin', -1], ['cleanPath.bin', -1], ['map.bin.stream', -1], ['cleanPath.bin.stream', -1]]);
+    this.packetSerialNumberCacheMap = new Map([['map.bin', -1], ['cleanPath.bin', -1], ['map.bin.stream', -1], ['cleanPath.bin.stream', -1]]);
+    this.packetDataCacheMap = new Map([['map.bin', new Map()], ['cleanPath.bin', new Map()], ['map.bin.stream', new Map()], ['cleanPath.bin.stream', new Map()]]);
   }
   setStreamFilePath = () => {
     // this.streamFilePath = this.cacheDir + `/${this.albumName}/${devId}/stream`;
@@ -102,10 +96,10 @@ export class SweeperP2p extends P2pApi {
         dirPath: filePath,
         recursive: true
       });
-      log4js.info('mkdirSync success: filePath ==>', filePath);
+      console.log('mkdirSync success: filePath ==>', filePath);
       return true;
     } catch (e) {
-      log4js.error('mkdirSync error ==>', e);
+      console.log('mkdirSync error ==>', e);
       return false;
     }
   };
@@ -120,11 +114,11 @@ export class SweeperP2p extends P2pApi {
       ty.getFileSystemManager().access({
         path: filePath,
         success(params) {
-          log4js.info('file access success ==>', params);
+          console.info('file access success ==>', params);
           resolve(true);
         },
         fail(params) {
-          log4js.warn('file access fail ==>', params);
+          console.info('file access fail ==>', params);
           resolve(false);
         }
       });
@@ -156,11 +150,8 @@ export class SweeperP2p extends P2pApi {
     if (filename.indexOf('cleanPath') !== -1) {
       return 1;
     }
-    if (filename.indexOf('ai.') !== -1) {
-      return 4;
-    }
-    if (filename.indexOf('aiHD') !== -1) {
-      return 5;
+    if (filename.indexOf('navPath') !== -1) {
+      return 3;
     }
     return 2;
   };
@@ -194,7 +185,7 @@ export class SweeperP2p extends P2pApi {
    * @param downloadType
    * 0: 下载断开 1: 持续下载
    */
-  startObserverSweeperDataByP2P = async (downloadType, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData) => {
+  startObserverSweeperDataByP2P = async (downloadType, devId, onReceiveMapData, onReceivePathData) => {
     var _this$file$items;
     if (![0, 1].some(item => item === downloadType)) {
       log4js.warn('download type must be 0 or 1');
@@ -202,8 +193,6 @@ export class SweeperP2p extends P2pApi {
     }
     this.onReceiveMapData = onReceiveMapData;
     this.onReceivePathData = onReceivePathData;
-    this.onReceiveAIPicData = onReceiveAIPicData || (() => {});
-    this.onReceiveAIPicHDData = onReceiveAIPicHDData || (() => {});
     log4js.info('startObserverSweeperDataByP2P ==>');
     this.downloadType = downloadType;
     this.setDataFilePath(devId);
@@ -212,14 +201,12 @@ export class SweeperP2p extends P2pApi {
     this.removeP2pDownloadEvent();
     this.registerP2pDownloadEvent();
     if (!this.file) {
-      // @ts-ignore
+      //@ts-ignore
       this.file = await this.queryAlbumFileIndexs(this.albumName);
     }
     if (this.file && ((_this$file$items = this.file.items) === null || _this$file$items === void 0 ? void 0 : _this$file$items.length) > 0) {
       if (this.downloadType === 0) {
         const exitFiles = this.queryNeedFiles(this.file.items);
-        // 赋值
-        this.exitFiles = exitFiles;
         if (exitFiles.length > 0) {
           if (shouldDownloadStream) {
             // 开启p2p流传输
@@ -234,8 +221,6 @@ export class SweeperP2p extends P2pApi {
         }
       } else if (this.downloadType === 1) {
         const exitFiles = this.queryNeedFiles(this.file.items);
-        // 赋值
-        this.exitFiles = exitFiles;
         if (exitFiles.length > 0) {
           if (shouldDownloadStream) {
             // 开启p2p流传输
@@ -253,19 +238,6 @@ export class SweeperP2p extends P2pApi {
     }
   };
 
-  /**
-   * 在下载过程中继续添加下载文件
-   * @param files
-   * @param successCb
-   * @param failCb
-   * @returns
-   */
-  appendDownloadStreamDuringTask = (files, successCb, failCb) => {
-    return this.appendDownloadStream({
-      files: [...this.exitFiles, ...files]
-    }, this.albumName, successCb, failCb);
-  };
-
   /**
    * 注册下载有关的监听
    */
@@ -334,22 +306,12 @@ export class SweeperP2p extends P2pApi {
    */
   p2pStreamPacketReceiveCallback = data => {
     const {
+      fileName,
       packetData,
       fileSerialNumber,
       packetIndex,
       packetType
     } = data;
-    let {
-      fileName
-    } = data;
-
-    // 因为XXXX_YYYYY会被替换为坐标值，所以这里需要替换一下
-
-    if (/^aiHD.*\.bin$/.test(fileName)) {
-      fileName = 'aiHD_XXXX_YYYY.bin';
-    } else if (/^aiHD.*\.bin.stream$/.test(fileName)) {
-      fileName = 'aiHD_XXXX_YYYY.bin.stream';
-    }
     const cachePacketMap = this.packetDataCacheMap.get(fileName);
     const cacheSerialNumber = this.packetSerialNumberCacheMap.get(fileName);
 
@@ -389,12 +351,6 @@ export class SweeperP2p extends P2pApi {
           if (type === 1) {
             this.onReceivePathData(hexValue);
           }
-          if (type === 4) {
-            this.onReceiveAIPicData(hexValue);
-          }
-          if (type === 5) {
-            this.onReceiveAIPicHDData(hexValue);
-          }
           this.cacheData[type] = hexValue;
         }
       }
@@ -432,7 +388,7 @@ export class SweeperP2p extends P2pApi {
         success: params => {
           this.resetReading(fileName);
           const bytes = Base64.toByteArray(params.data);
-          const hexValue = join(map(bytes, d => padStart(d.toString(16), 2, '0')), '');
+          const hexValue = _(bytes).map(d => padStart(d.toString(16), 2, '0')).value().join('');
           const type = this.getFileType(fileName);
           if (this.cacheData[type] !== hexValue) {
             if (hexValue.length === 0) {
@@ -445,12 +401,6 @@ export class SweeperP2p extends P2pApi {
             if (type === 1) {
               this.onReceivePathData(hexValue);
             }
-            if (type === 4) {
-              this.onReceiveAIPicData(hexValue);
-            }
-            if (type === 5) {
-              this.onReceiveAIPicHDData(hexValue);
-            }
             this.cacheData[type] = hexValue;
           }
         },
@@ -475,14 +425,9 @@ export class SweeperP2p extends P2pApi {
       this.readingClean = true;
       return true;
     }
-    if (fileName.indexOf('ai.') !== -1) {
-      if (this.readingAI === true) return false;
-      this.readingAI = true;
-      return true;
-    }
-    if (fileName.indexOf('aiHD') !== -1) {
-      if (this.readingHD === true) return false;
-      this.readingHD = true;
+    if (fileName.indexOf('navPath') !== -1) {
+      if (this.readingNav === true) return false;
+      this.readingNav = true;
       return true;
     }
     return true;
@@ -492,10 +437,8 @@ export class SweeperP2p extends P2pApi {
       this.readingMap = false;
     } else if (fileName.indexOf('cleanPath') !== -1) {
       this.readingClean = false;
-    } else if (fileName.indexOf('ai.') !== -1) {
-      this.readingAI = false;
-    } else if (fileName.indexOf('aiHD') !== -1) {
-      this.readingHD = false;
+    } else if (fileName.indexOf('navPath') !== -1) {
+      this.readingNav = false;
     }
   };
 

package/lib/index.d.ts

@@ -1,5 +1,5 @@
-declare const useP2PDataStream: (devId: string, onReceiveMapData: (data: string) => void, onReceivePathData: (data: string) => void, onReceiveAIPicData?: ((data: string) => void) | undefined, onReceiveAIPicHDData?: ((data: string) => void) | undefined) => {
-    appendDownloadStreamDuringTask: (files: Array<string>, successCb?: () => void, failedCb?: () => void) => Promise<boolean> | void;
-};
+declare const useP2PDataStream: (devId: string, onReceiveMapData: (data: string) => void, onReceivePathData: (data: string) => void, opt?: {
+    logTag?: string | undefined;
+} | undefined) => void;
 declare const StreamDataNotificationCenter: import("mitt").Emitter<Record<import("mitt").EventType, unknown>>;
 export { useP2PDataStream, StreamDataNotificationCenter };

package/lib/index.js

@@ -1,14 +1,20 @@
+/* eslint-disable consistent-return */
 import { useEffect, useRef } from 'react';
 import mitt from 'mitt';
 import { SweeperP2pInstance } from './api';
 import log4js from '@ray-js/log4js';
-import sweeperP2pInstance from './api/sweeperP2p';
-const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData) => {
+const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
+  const {
+    logTag
+  } = opt || {};
   const isInit = useRef(null);
   const offSessionStatusChange = useRef(null);
   const isAppOnBackground = useRef(false);
   const timer = useRef(null);
   useEffect(() => {
+    if (logTag) {
+      log4js.setTag(logTag);
+    }
     if (devId.startsWith('vdevo')) {
       log4js.warn('virtual device cannot use p2p');
       return;
@@ -31,11 +37,11 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, onReceiveA
     if (isInit.current) {
       SweeperP2pInstance.isConnecting = true;
       SweeperP2pInstance.connectDevice(() => {
-        SweeperP2pInstance.startObserverSweeperDataByP2P(1, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData);
+        SweeperP2pInstance.startObserverSweeperDataByP2P(1, devId, onReceiveMapData, onReceivePathData);
         offSessionStatusChange.current = SweeperP2pInstance.onSessionStatusChange(SweeperP2pInstance.sessionStatusCallback);
       }, () => {
         SweeperP2pInstance.reconnectP2p(() => {
-          SweeperP2pInstance.startObserverSweeperDataByP2P(1, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData);
+          SweeperP2pInstance.startObserverSweeperDataByP2P(1, devId, onReceiveMapData, onReceivePathData);
           // 这里失败重连需要注册断开重连的事件
           offSessionStatusChange.current = SweeperP2pInstance.onSessionStatusChange(SweeperP2pInstance.sessionStatusCallback);
         });
@@ -90,9 +96,6 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, onReceiveA
       }
     });
   };
-  return {
-    appendDownloadStreamDuringTask: sweeperP2pInstance.appendDownloadStreamDuringTask
-  };
 };
 const StreamDataNotificationCenter = mitt();
 export { useP2PDataStream, StreamDataNotificationCenter };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/robot-data-stream",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "扫地机P2P数据流标准化组件",
   "main": "lib/index",
   "files": [
@@ -31,10 +31,10 @@
     "release-it": "standard-version"
   },
   "peerDependencies": {
-    "@ray-js/ray": "^1.5.0"
+    "@ray-js/ray": "^1.5.0",
+    "@ray-js/log4js": "^0.0.4"
   },
   "dependencies": {
-    "@ray-js/log4js": "^0.0.3",
     "clsx": "^1.2.1",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.1",
@@ -44,6 +44,7 @@
     "@commitlint/cli": "^7.2.1",
     "@commitlint/config-conventional": "^9.0.1",
     "@ray-js/cli": "^1.5.20",
+    "@ray-js/log4js": "^0.0.4",
     "@ray-js/ray": "^1.5.0",
     "core-js": "^3.19.1",
     "eslint-config-tuya-panel": "^0.4.2",
@@ -52,9 +53,6 @@
     "patch-package": "^8.0.0",
     "standard-version": "9.3.2"
   },
-  "resolutions": {
-    "@ray-js/builder-mp": "1.4.15"
-  },
   "husky": {
     "hooks": {
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS --config commitlint.config.js",