fs.readStream redesign

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 @@
     return dispatch_queue_create("RNFetchBlob.queue", DISPATCH_QUEUE_SERIAL);
 }
 
++ (RCTBridge *)getRCTBridge
+{
+    return bridgeRef;
+}
+
 RCT_EXPORT_MODULE();
 
 - (id) init {
@@ -41,6 +48,7 @@ RCT_EXPORT_MODULE();
     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 @@ RCT_EXPORT_METHOD(readFile:(NSString *)path encoding:(NSString *)encoding resolv
 })
 
 #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;

src/ios/RNFetchBlobFS.m

@@ -9,6 +9,7 @@
 
 #import <Foundation/Foundation.h>
 #import "RCTBridge.h"
+#import "RNFetchBlob.h"
 #import "RCTEventDispatcher.h"
 #import "RNFetchBlobFS.h"
 #import "RNFetchBlobConst.h"
@@ -98,93 +99,99 @@ NSMutableDictionary *fileStreams = nil;
     return tempPath;
 }
 
-#pragma mark - read asset stream
+#pragma margk - readStream 
 
-- (void) startAssetReadStream:(NSString *)assetUrl
++ (void) readStream:(NSString *)uri
+           encoding:(NSString * )encoding
+         bufferSize:(int)bufferSize
+           streamId:(NSString *)streamId
+          bridgeRef:(RCTBridge *)bridgeRef
 {
-    ALAssetsLibraryAssetForURLResultBlock resultblock = ^(ALAsset *myasset)
-    {
-        dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0);
-        dispatch_async(queue, ^ {
-            NSString * streamEventCode = [NSString stringWithFormat:@"RNFetchBlobStream+%@", self.path];
-            ALAssetRepresentation *rep = [myasset defaultRepresentation];
-            Byte *buffer = (Byte*)malloc(self.bufferSize);
-            NSUInteger cursor = [rep getBytes:buffer fromOffset:0 length:self.bufferSize error:nil];
-            while(cursor > 0)
+    [[self class] getPathFromUri:uri completionHandler:^(NSString *path, ALAssetRepresentation *asset) {
+    
+        RCTEventDispatcher * event = bridgeRef.eventDispatcher;
+        @try
+        {
+            int read = 0;
+            int chunkSize = bufferSize;
+            uint8_t * buffer[bufferSize];
+            
+            if(path != nil)
             {
-                cursor += [rep getBytes:buffer fromOffset:cursor length:self.bufferSize error:nil];
-                NSData * chunkData = [NSData dataWithBytes:buffer length:self.bufferSize];
-                NSString * encodedChunk = @"";
-                // emit data
-                if( [[self.encoding lowercaseString] isEqualToString:@"utf8"] ) {
-                    encodedChunk = [encodedChunk initWithData:chunkData encoding:NSUTF8StringEncoding];
-                }
-                // when encoding is ASCII, send byte array data
-                else if ( [[self.encoding lowercaseString] isEqualToString:@"ascii"] ) {
-                    // RCTBridge only emits string data, so we have to create JSON byte array string
-                    NSMutableArray * asciiArray = [NSMutableArray array];
-                    unsigned char *bytePtr;
-                    if (chunkData.length > 0)
-                    {
-                        bytePtr = (unsigned char *)[chunkData bytes];
-                        NSInteger byteLen = chunkData.length/sizeof(uint8_t);
-                        for (int i = 0; i < byteLen; i++)
-                        {
-                            [asciiArray addObject:[NSNumber numberWithChar:bytePtr[i]]];
-                        }
-                    }
-                    
-                    [self.bridge.eventDispatcher
-                     sendDeviceEventWithName:streamEventCode
-                     body: @{
-                             @"event": FS_EVENT_DATA,
-                             @"detail": asciiArray
-                             }
-                     ];
-                    return;
-                }
-                // convert byte array to base64 data chunks
-                else if ( [[self.encoding lowercaseString] isEqualToString:@"base64"] ) {
-                    encodedChunk = [chunkData base64EncodedStringWithOptions:0];
+                NSInputStream * stream = [[NSInputStream alloc] initWithFileAtPath:path];
+                [stream open];
+                while((read = [stream read:buffer maxLength:bufferSize]) > 0)
+                {
+                    [[self class] emitDataChunks:[NSData dataWithBytes:buffer length:read] encoding:encoding streamId:streamId event:event];
                 }
-                // unknown encoding, send error event
-                else {
-                    [self.bridge.eventDispatcher
-                     sendDeviceEventWithName:streamEventCode
-                     body:@{
-                            @"event": FS_EVENT_ERROR,
-                            @"detail": @"unrecognized encoding"
-                            }
-                     ];
-                    return;
+                [stream close];
+            }
+            else if (asset != nil)
+            {
+                int cursor = 0;
+                NSError * err;
+                while((read = [asset getBytes:buffer fromOffset:cursor length:bufferSize error:&err]) > 0)
+                {
+                    cursor += read;
+                    [[self class] emitDataChunks:[NSData dataWithBytes:buffer length:read] encoding:encoding streamId:streamId event:event];
                 }
-                
-                [self.bridge.eventDispatcher
-                 sendDeviceEventWithName:streamEventCode
-                 body:@{
-                        @"event": FS_EVENT_DATA,
-                        @"detail": encodedChunk
-                        }
-                 ];
             }
-            free(buffer);
-        });
+            else
+            {
+                NSDictionary * payload = @{ @"event": FS_EVENT_ERROR, @"detail": @"RNFetchBlob.readStream unable to resolve URI" };
+                [event sendDeviceEventWithName:streamId body:payload];
+            }
+        }
+        @catch (NSError * err)
+        {
+            
+            NSDictionary * payload = @{ @"event": FS_EVENT_ERROR, @"detail": [NSString stringWithFormat:@"RNFetchBlob.readStream error %@", [err description]] };
+            [event sendDeviceEventWithName:streamId body:payload];
+        }
+        @finally
+        {
+            NSDictionary * payload = @{ @"event": FS_EVENT_END, @"detail": @"" };
+            [event sendDeviceEventWithName:streamId body:payload];
+        }
         
-    };
+    }];
     
-    ALAssetsLibraryAccessFailureBlock failureblock  = ^(NSError *error)
+}
+
+// send read stream chunks via native event emitter
++ (void) emitDataChunks:(NSData *)data encoding:(NSString *) encoding streamId:(NSString *)streamId event:(RCTEventDispatcher *)event
+{
+    NSString * encodedChunk = @"";
+    if([[encoding lowercaseString] isEqualToString:@"utf8"])
     {
-        
-    };
-    
-    if(assetUrl && [assetUrl length])
+        NSDictionary * payload = @{ @"event": FS_EVENT_DATA,  @"detail" : [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding] };
+        [event sendDeviceEventWithName:streamId body:payload];
+    }
+    else if ([[encoding lowercaseString] isEqualToString:@"base64"])
     {
-        NSURL *asseturl = [NSURL URLWithString:assetUrl];
-        ALAssetsLibrary* assetslibrary = [[ALAssetsLibrary alloc] init];
-        [assetslibrary assetForURL:asseturl
-                       resultBlock:resultblock
-                      failureBlock:failureblock];
+        NSDictionary * payload = @{ @"event": FS_EVENT_DATA,  @"detail" : [data base64EncodedStringWithOptions:0] };
+        [event sendDeviceEventWithName:streamId body:payload];
     }
+    else if([[encoding lowercaseString] isEqualToString:@"ascii"])
+    {
+        // RCTBridge only emits string data, so we have to create JSON byte array string
+        NSMutableArray * asciiArray = [NSMutableArray array];
+        unsigned char *bytePtr;
+        if (data.length > 0)
+        {
+            bytePtr = (unsigned char *)[data bytes];
+            NSInteger byteLen = data.length/sizeof(uint8_t);
+            for (int i = 0; i < byteLen; i++)
+            {
+                [asciiArray addObject:[NSNumber numberWithChar:bytePtr[i]]];
+            }
+        }
+
+        NSDictionary * payload = @{ @"event": FS_EVENT_DATA,  @"detail" : asciiArray };
+        [event sendDeviceEventWithName:streamId body:payload];
+    }
+    
+    
 }
 
 # pragma write file from file
@@ -544,35 +551,6 @@ NSMutableDictionary *fileStreams = nil;
     
 }
 
-- (void)readWithPath:(NSString *)path useEncoding:(NSString *)encoding bufferSize:(int) bufferSize {
-    
-    self.inStream = [[NSInputStream alloc] initWithFileAtPath:path];
-    self.inStream.delegate = self;
-    self.encoding = encoding;
-    self.path = path;
-    self.bufferSize = bufferSize;
-    
-    if([path hasPrefix:AL_PREFIX])
-    {
-        [self startAssetReadStream:path];
-        return;
-    }
-    
-    // normalize file path
-    path = [[self class] getPathOfAsset:path];
-    
-    // NSStream needs a runloop so let's create a run loop for it
-    dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0);
-    // start NSStream is a runloop
-    dispatch_async(queue, ^ {
-        [inStream scheduleInRunLoop:[NSRunLoop currentRunLoop]
-                            forMode:NSDefaultRunLoopMode];
-        [inStream open];
-        [[NSRunLoop currentRunLoop] run];
-        
-    });
-}
-
 // Slice a file into another file, generally for support Blob implementation.
 + (void)slice:(NSString *)path
          dest:(NSString *)dest
@@ -690,118 +668,6 @@ NSMutableDictionary *fileStreams = nil;
     
 }
 
-#pragma mark RNFetchBlobFS read stream delegate
-
-- (void)stream:(NSStream *)stream handleEvent:(NSStreamEvent)eventCode {
-    
-    NSString * streamEventCode = [NSString stringWithFormat:@"RNFetchBlobStream+%@", self.path];
-    
-    switch(eventCode) {
-            
-            // write stream event
-        case NSStreamEventHasSpaceAvailable:
-        {
-            
-            
-        }
-            
-            // read stream incoming chunk
-        case NSStreamEventHasBytesAvailable:
-        {
-            NSMutableData * chunkData = [[NSMutableData alloc] init];
-            NSInteger chunkSize = 4096;
-            if([[self.encoding lowercaseString] isEqualToString:@"base64"])
-                chunkSize = 4095;
-            if(self.bufferSize > 0)
-                chunkSize = self.bufferSize;
-            uint8_t buf[chunkSize];
-            unsigned int len = 0;
-            len = [(NSInputStream *)stream read:buf maxLength:chunkSize];
-            // still have data in stream
-            if(len) {
-                [chunkData appendBytes:buf length:len];
-                // dispatch data event
-                NSString * encodedChunk = [NSString alloc];
-                if( [[self.encoding lowercaseString] isEqualToString:@"utf8"] ) {
-                    encodedChunk = [encodedChunk initWithData:chunkData encoding:NSUTF8StringEncoding];
-                }
-                // when encoding is ASCII, send byte array data
-                else if ( [[self.encoding lowercaseString] isEqualToString:@"ascii"] ) {
-                    // RCTBridge only emits string data, so we have to create JSON byte array string
-                    NSMutableArray * asciiArray = [NSMutableArray array];
-                    unsigned char *bytePtr;
-                    if (chunkData.length > 0)
-                    {
-                        bytePtr = (unsigned char *)[chunkData bytes];
-                        NSInteger byteLen = chunkData.length/sizeof(uint8_t);
-                        for (int i = 0; i < byteLen; i++)
-                        {
-                            [asciiArray addObject:[NSNumber numberWithChar:bytePtr[i]]];
-                        }
-                    }
-                    
-                    [self.bridge.eventDispatcher
-                     sendDeviceEventWithName:streamEventCode
-                     body: @{
-                             @"event": FS_EVENT_DATA,
-                             @"detail": asciiArray
-                             }
-                     ];
-                    return;
-                }
-                // convert byte array to base64 data chunks
-                else if ( [[self.encoding lowercaseString] isEqualToString:@"base64"] ) {
-                    encodedChunk = [chunkData base64EncodedStringWithOptions:0];
-                }
-                // unknown encoding, send error event
-                else {
-                    [self.bridge.eventDispatcher
-                     sendDeviceEventWithName:streamEventCode
-                     body:@{
-                            @"event": FS_EVENT_ERROR,
-                            @"detail": @"unrecognized encoding"
-                            }
-                     ];
-                    return;
-                }
-                
-                [self.bridge.eventDispatcher
-                 sendDeviceEventWithName:streamEventCode
-                 body:@{
-                        @"event": FS_EVENT_DATA,
-                        @"detail": encodedChunk
-                        }
-                 ];
-            }
-            // end of stream
-            else {
-                [self.bridge.eventDispatcher
-                 sendDeviceEventWithName:streamEventCode
-                 body:@{
-                        @"event": FS_EVENT_END,
-                        @"detail": @""
-                        }
-                 ];
-            }
-            break;
-        }
-            
-            // stream error
-        case NSStreamEventErrorOccurred:
-        {
-            [self.bridge.eventDispatcher
-             sendDeviceEventWithName:streamEventCode
-             body:@{
-                    @"event": FS_EVENT_ERROR,
-                    @"detail": @"RNFetchBlob error when read file with stream, file may not exists"
-                    }
-             ];
-            break;
-        }
-            
-    }
-    
-}
 
 # pragma mark - get absolute path of resource