fs.readStream redesign

Author: wkh237

src/class/RNFetchBlobReadStream.js

@@ -8,6 +8,7 @@ import {
   DeviceEventEmitter,
   NativeAppEventEmitter,
 } from 'react-native'
+import UUID from '../utils/uuid'
 
 const RNFetchBlob = NativeModules.RNFetchBlob
 const emitter = DeviceEventEmitter
@@ -29,10 +30,10 @@ export default class RNFetchBlobReadStream {
     this._onData = () => {}
     this._onEnd = () => {}
     this._onError = () => {}
+    this.streamId = 'RNFBRS'+ UUID()
 
     // register for file stream event
-    let subscription = emitter.addListener(`RNFetchBlobStream+${this.path}`, (e) => {
-
+    let subscription = emitter.addListener(this.streamId, (e) => {
       let {event, detail} = e
       if(this._onData && event === 'data')
         this._onData(detail)
@@ -56,18 +57,18 @@ export default class RNFetchBlobReadStream {
 
   open() {
     if(!this.closed)
-      RNFetchBlob.readStream(this.path, this.encoding, this.bufferSize || 0)
+      RNFetchBlob.readStream(this.path, this.encoding, this.bufferSize || 0, this.streamId)
     else
       throw new Error('Stream closed')
   }
 
   onData(fn) {
-    if(this.encoding.toLowerCase() === 'ascii')
-      this._onData = (data) => {
-        fn(data)
-      }
-    else
-      this._onData = fn
+    // if(this.encoding.toLowerCase() === 'ascii')
+    //   this._onData = (data) => {
+    //     fn(data)
+    //   }
+    // else
+    this._onData = fn
   }
 
   onError(fn) {

src/ios/RNFetchBlob/RNFetchBlob.h

@@ -17,6 +17,7 @@
 
 @property (nonatomic) NSString * filePathPrefix;
 
++ (RCTBridge *)getRCTBridge;
 
 @end
 

src/ios/RNFetchBlob/RNFetchBlob.m

@@ -14,6 +14,8 @@
 #import "RNFetchBlobReqBuilder.h"
 
 
+RCTBridge * bridgeRef;
+
 ////////////////////////////////////////
 //
 //  Exported native methods
@@ -31,6 +33,11 @@ - (dispatch_queue_t) methodQueue {
     return dispatch_queue_create("RNFetchBlob.queue", DISPATCH_QUEUE_SERIAL);
 }
 
++ (RCTBridge *)getRCTBridge
+{
+    return bridgeRef;
+}
+
 RCT_EXPORT_MODULE();
 
 - (id) init {
@@ -41,6 +48,7 @@ - (id) init {
     if(![[NSFileManager defaultManager] fileExistsAtPath: [RNFetchBlobFS getTempPath] isDirectory:&isDir]) {
         [[NSFileManager defaultManager] createDirectoryAtPath:[RNFetchBlobFS getTempPath] withIntermediateDirectories:YES attributes:nil error:NULL];
     }
+    bridgeRef = _bridge;
     return self;
 }
 
@@ -366,18 +374,20 @@ - (NSDictionary *)constantsToExport
 })
 
 #pragma mark - fs.readStream
-RCT_EXPORT_METHOD(readStream:(NSString *)path withEncoding:(NSString *)encoding bufferSize:(int)bufferSize) {
+RCT_EXPORT_METHOD(readStream:(NSString *)path withEncoding:(NSString *)encoding bufferSize:(int)bufferSize streamId:(NSString *)streamId
+{
 
-    RNFetchBlobFS *fileStream = [[RNFetchBlobFS alloc] initWithBridgeRef:self.bridge];
+//    RNFetchBlobFS *fileStream = [[RNFetchBlobFS alloc] initWithBridgeRef:self.bridge];
     if(bufferSize == nil) {
         if([[encoding lowercaseString] isEqualToString:@"base64"])
             bufferSize = 4095;
         else
             bufferSize = 4096;
     }
-    // read asset stream
-    [fileStream readWithPath:path useEncoding:encoding bufferSize:bufferSize];
-}
+    
+//    [fileStream readWithPath:path useEncoding:encoding bufferSize:bufferSize];
+    [RNFetchBlobFS readStream:path encoding:encoding bufferSize:bufferSize streamId:streamId bridgeRef:_bridge];
+})
 
 #pragma mark - fs.getEnvionmentDirs
 RCT_EXPORT_METHOD(getEnvironmentDirs:(RCTResponseSenderBlock) callback) {

src/ios/RNFetchBlobFS.h

@@ -55,7 +55,7 @@
 + (void) writeFile:(NSString *)path encoding:(NSString *)encoding data:(NSString *)data append:(BOOL)append resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject;
 + (void) readFile:(NSString *)path encoding:(NSString *)encoding resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject onComplete:(void (^)(NSData * content))onComplete;
 + (void) readAssetFile:(NSData *)assetUrl completionBlock:(void(^)(NSData * content))completionBlock failBlock:(void(^)(NSError * err))failBlock;
-+ (void)slice:(NSString *)path
++ (void) slice:(NSString *)path
          dest:(NSString *)dest
         start:(nonnull NSNumber *)start
           end:(nonnull NSNumber *)end
@@ -64,6 +64,7 @@
      rejecter:(RCTPromiseRejectBlock)reject;
 //+ (void) writeFileFromFile:(NSString *)src toFile:(NSString *)dest append:(BOOL)append;
 + (void) writeAssetToPath:(ALAssetRepresentation * )rep dest:(NSString *)dest;
++ (void) readStream:(NSString *)uri encoding:(NSString * )encoding bufferSize:(int)bufferSize streamId:(NSString *)streamId bridgeRef:(RCTBridge *)bridgeRef;
 
 // constructor
 - (id) init;
@@ -73,12 +74,10 @@
 // file stream
 - (void) openWithDestination;
 - (NSString *)openWithPath:(NSString *)destPath encode:(nullable NSString *)encode appendData:(BOOL)append;
-- (void) startAssetReadStream:(NSData *)assetUrl;
 
 // file stream write data
 - (void)write:(NSData *) chunk;
 - (void)writeEncodeChunk:(NSString *) chunk;
-- (void)readWithPath:(NSString *)path useEncoding:(NSString *)encoding bufferSize:(int) bufferSize;
 
 - (void) closeInStream;
 - (void) closeOutStream;