filesystem rework

Ron Radtke · Ron Radtke · commit 552d2a704db9 · 2023-05-16T22:05:32.000+02:00
diff --git a/class/ReactNativeBlobUtilReadStream.js b/class/ReactNativeBlobUtilReadStream.js
@@ -2,14 +2,11 @@
 // Use of this source code is governed by a MIT-style license that can be
 // found in the LICENSE file.
 
-import {
-  DeviceEventEmitter,
-  NativeAppEventEmitter,
-} from 'react-native';
+import {NativeEventEmitter} from 'react-native';
 import UUID from '../utils/uuid';
 
 import ReactNativeBlobUtil from "../codegenSpecs/NativeBlobUtils";
-const emitter = DeviceEventEmitter;
+const emitter =  new NativeEventEmitter(ReactNativeBlobUtil);
 
 export default class ReactNativeBlobUtilReadStream {
 
@@ -33,7 +30,9 @@ export default class ReactNativeBlobUtilReadStream {
     this.streamId = 'RNFBRS'+ UUID();
 
     // register for file stream event
-    let subscription = emitter.addListener(this.streamId, (e) => {
+    let subscription = emitter.addListener('ReactNativeBlobUtilFilesystem', (e) => {
+      e = JSON.parse(e);
+      if(e.streamId !== this.streamId) return; // wrong stream
       let {event, code, detail} = e;
       if(this._onData && event === 'data') {
         this._onData(detail);
diff --git a/ios/ReactNativeBlobUtilConst.h b/ios/ReactNativeBlobUtilConst.h
@@ -22,6 +22,7 @@ extern NSString *const EVENT_PROGRESS;
 extern NSString *const EVENT_SERVER_PUSH;
 extern NSString *const EVENT_PROGRESS_UPLOAD;
 extern NSString *const EVENT_STATE_CHANGE;
+extern NSString *const EVENT_FILESYSTEM;
 
 extern NSString *const FILE_PREFIX;
 extern NSString *const ASSET_PREFIX;
diff --git a/ios/ReactNativeBlobUtilConst.mm b/ios/ReactNativeBlobUtilConst.mm
@@ -27,6 +27,7 @@
 NSString *const EVENT_PROGRESS = @"ReactNativeBlobUtilProgress";
 NSString *const EVENT_PROGRESS_UPLOAD = @"ReactNativeBlobUtilProgress-upload";
 NSString *const EVENT_EXPIRE = @"ReactNativeBlobUtilExpire";
+NSString *const EVENT_FILESYSTEM = @"ReactNativeBlobUtilFilesystem";
 
 NSString *const MSG_EVENT = @"ReactNativeBlobUtilMessage";
 NSString *const MSG_EVENT_LOG = @"log";
diff --git a/ios/ReactNativeBlobUtilFS.mm b/ios/ReactNativeBlobUtilFS.mm
@@ -169,8 +169,8 @@ + (void) readStream:(NSString *)uri
                 if([[NSFileManager defaultManager] fileExistsAtPath:path] == NO)
                 {
                     NSString * message = [NSString stringWithFormat:@"File does not exist at path %@", path];
-                    NSDictionary * payload = @{ @"event": FS_EVENT_ERROR, @"code": @"ENOENT", @"detail": message };
-                    [baseModule emitEventDict:streamId body:payload];
+                    NSDictionary * payload = @{ @"streamId":streamId, @"event": FS_EVENT_ERROR, @"code": @"ENOENT", @"detail": message };
+                    [baseModule emitEventDict:EVENT_FILESYSTEM body:payload];
                     free(buffer);
                     return ;
                 }
@@ -202,8 +202,8 @@ + (void) readStream:(NSString *)uri
             }
             else
             {
-                NSDictionary * payload = @{ @"event": FS_EVENT_ERROR, @"code": @"EINVAL", @"detail": @"Unable to resolve URI" };
-                [baseModule emitEventDict:streamId body:payload];
+                NSDictionary * payload = @{ @"streamId":streamId, @"event": FS_EVENT_ERROR, @"code": @"EINVAL", @"detail": @"Unable to resolve URI" };
+                [baseModule emitEventDict:EVENT_FILESYSTEM body:payload];
             }
             // release buffer
             if(buffer != nil)
@@ -212,13 +212,13 @@ + (void) readStream:(NSString *)uri
         }
         @catch (NSError * err)
         {
-            NSDictionary * payload = @{ @"event": FS_EVENT_ERROR, @"code": @"EUNSPECIFIED", @"detail": [err description] };
-            [baseModule emitEventDict:streamId body:payload];
+            NSDictionary * payload = @{ @"streamId":streamId, @"event": FS_EVENT_ERROR, @"code": @"EUNSPECIFIED", @"detail": [err description] };
+            [baseModule emitEventDict:EVENT_FILESYSTEM body:payload];
         }
         @finally
         {
-            NSDictionary * payload = @{ @"event": FS_EVENT_END, @"detail": @"" };
-            [baseModule emitEventDict:streamId body:payload];
+            NSDictionary * payload = @{ @"streamId":streamId, @"event": FS_EVENT_END, @"detail": @"" };
+            [baseModule emitEventDict:EVENT_FILESYSTEM body:payload];
         }
 
     }];
@@ -235,15 +235,16 @@ + (void) emitDataChunks:(NSData *)data encoding:(NSString *) encoding streamId:(
         if([[encoding lowercaseString] isEqualToString:@"utf8"])
         {
             NSDictionary * payload = @{
+                @"streamId":streamId,
                                        @"event": FS_EVENT_DATA,
                                        @"detail" : [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]
                                        };
-            [baseModule emitEventDict:streamId body:payload];
+            [baseModule emitEventDict:EVENT_FILESYSTEM body:payload];
         }
         else if ([[encoding lowercaseString] isEqualToString:@"base64"])
         {
-            NSDictionary * payload = @{ @"event": FS_EVENT_DATA,  @"detail" : [data base64EncodedStringWithOptions:0] };
-            [baseModule emitEventDict:streamId body:payload];
+            NSDictionary * payload = @{ @"streamId":streamId, @"event": FS_EVENT_DATA,  @"detail" : [data base64EncodedStringWithOptions:0] };
+            [baseModule emitEventDict:EVENT_FILESYSTEM body:payload];
         }
         else if([[encoding lowercaseString] isEqualToString:@"ascii"])
         {
@@ -260,23 +261,25 @@ + (void) emitDataChunks:(NSData *)data encoding:(NSString *) encoding streamId:(
                 }
             }
 
-            NSDictionary * payload = @{ @"event": FS_EVENT_DATA,  @"detail" : asciiArray };
-            [baseModule emitEventDict:streamId body:payload];
+            NSDictionary * payload = @{ @"streamId":streamId, @"event": FS_EVENT_DATA,  @"detail" : asciiArray };
+            [baseModule emitEventDict:EVENT_FILESYSTEM body:payload];
         }
 
     }
     @catch (NSException * ex)
     {
         NSString * message = [NSString stringWithFormat:@"Failed to convert data to '%@' encoded string, this might due to the source data is not able to convert using this encoding. source = %@", encoding, [ex description]];
         [baseModule
-         emitEventDict:streamId
+         emitEventDict:EVENT_FILESYSTEM
          body:@{
+            @"streamId":streamId,
                 @"event" : MSG_EVENT_ERROR,
                 @"detail" : message
                 }];
         [baseModule
          emitEventDict:MSG_EVENT
          body:@{
+            @"streamId":streamId,
                 @"event" : MSG_EVENT_WARN,
                 @"detail" : message
                 }];

Original file line number	Diff line number	Diff line change
`@@ -169,8 +169,8 @@ + (void) readStream:(NSString *)uri`
`169`	`169`	`if([[NSFileManager defaultManager] fileExistsAtPath:path] == NO)`
`170`	`170`	`{`
`171`	`171`	`NSString * message = [NSString stringWithFormat:@"File does not exist at path %@", path];`
`172`		`- NSDictionary * payload = @{ @"event": FS_EVENT_ERROR, @"code": @"ENOENT", @"detail": message };`
`173`		`- [baseModule emitEventDict:streamId body:payload];`
	`172`	`+ NSDictionary * payload = @{ @"streamId":streamId, @"event": FS_EVENT_ERROR, @"code": @"ENOENT", @"detail": message };`
	`173`	`+ [baseModule emitEventDict:EVENT_FILESYSTEM body:payload];`
`174`	`174`	`free(buffer);`
`175`	`175`	`return ;`
`176`	`176`	`}`
`@@ -202,8 +202,8 @@ + (void) readStream:(NSString *)uri`
`202`	`202`	`}`
`203`	`203`	`else`
`204`	`204`	`{`
`205`		`- NSDictionary * payload = @{ @"event": FS_EVENT_ERROR, @"code": @"EINVAL", @"detail": @"Unable to resolve URI" };`
`206`		`- [baseModule emitEventDict:streamId body:payload];`
	`205`	`+ NSDictionary * payload = @{ @"streamId":streamId, @"event": FS_EVENT_ERROR, @"code": @"EINVAL", @"detail": @"Unable to resolve URI" };`
	`206`	`+ [baseModule emitEventDict:EVENT_FILESYSTEM body:payload];`
`207`	`207`	`}`
`208`	`208`	`// release buffer`
`209`	`209`	`if(buffer != nil)`
`@@ -212,13 +212,13 @@ + (void) readStream:(NSString *)uri`
`212`	`212`	`}`
`213`	`213`	`@catch (NSError * err)`
`214`	`214`	`{`
`215`		`- NSDictionary * payload = @{ @"event": FS_EVENT_ERROR, @"code": @"EUNSPECIFIED", @"detail": [err description] };`
`216`		`- [baseModule emitEventDict:streamId body:payload];`
	`215`	`+ NSDictionary * payload = @{ @"streamId":streamId, @"event": FS_EVENT_ERROR, @"code": @"EUNSPECIFIED", @"detail": [err description] };`
	`216`	`+ [baseModule emitEventDict:EVENT_FILESYSTEM body:payload];`
`217`	`217`	`}`
`218`	`218`	`@finally`
`219`	`219`	`{`
`220`		`- NSDictionary * payload = @{ @"event": FS_EVENT_END, @"detail": @"" };`
`221`		`- [baseModule emitEventDict:streamId body:payload];`
	`220`	`+ NSDictionary * payload = @{ @"streamId":streamId, @"event": FS_EVENT_END, @"detail": @"" };`
	`221`	`+ [baseModule emitEventDict:EVENT_FILESYSTEM body:payload];`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`}];`
`@@ -235,15 +235,16 @@ + (void) emitDataChunks:(NSData )data encoding:(NSString ) encoding streamId:(`
`235`	`235`	`if([[encoding lowercaseString] isEqualToString:@"utf8"])`
`236`	`236`	`{`
`237`	`237`	`NSDictionary * payload = @{`
	`238`	`+ @"streamId":streamId,`
`238`	`239`	`@"event": FS_EVENT_DATA,`
`239`	`240`	`@"detail" : [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]`
`240`	`241`	`};`
`241`		`- [baseModule emitEventDict:streamId body:payload];`
	`242`	`+ [baseModule emitEventDict:EVENT_FILESYSTEM body:payload];`
`242`	`243`	`}`
`243`	`244`	`else if ([[encoding lowercaseString] isEqualToString:@"base64"])`
`244`	`245`	`{`
`245`		`- NSDictionary * payload = @{ @"event": FS_EVENT_DATA, @"detail" : [data base64EncodedStringWithOptions:0] };`
`246`		`- [baseModule emitEventDict:streamId body:payload];`
	`246`	`+ NSDictionary * payload = @{ @"streamId":streamId, @"event": FS_EVENT_DATA, @"detail" : [data base64EncodedStringWithOptions:0] };`
	`247`	`+ [baseModule emitEventDict:EVENT_FILESYSTEM body:payload];`
`247`	`248`	`}`
`248`	`249`	`else if([[encoding lowercaseString] isEqualToString:@"ascii"])`
`249`	`250`	`{`
`@@ -260,23 +261,25 @@ + (void) emitDataChunks:(NSData )data encoding:(NSString ) encoding streamId:(`
`260`	`261`	`}`
`261`	`262`	`}`
`262`	`263`
`263`		`- NSDictionary * payload = @{ @"event": FS_EVENT_DATA, @"detail" : asciiArray };`
`264`		`- [baseModule emitEventDict:streamId body:payload];`
	`264`	`+ NSDictionary * payload = @{ @"streamId":streamId, @"event": FS_EVENT_DATA, @"detail" : asciiArray };`
	`265`	`+ [baseModule emitEventDict:EVENT_FILESYSTEM body:payload];`
`265`	`266`	`}`
`266`	`267`
`267`	`268`	`}`
`268`	`269`	`@catch (NSException * ex)`
`269`	`270`	`{`
`270`	`271`	`NSString * message = [NSString stringWithFormat:@"Failed to convert data to '%@' encoded string, this might due to the source data is not able to convert using this encoding. source = %@", encoding, [ex description]];`
`271`	`272`	`[baseModule`
`272`		`- emitEventDict:streamId`
	`273`	`+ emitEventDict:EVENT_FILESYSTEM`
`273`	`274`	`body:@{`
	`275`	`+ @"streamId":streamId,`
`274`	`276`	`@"event" : MSG_EVENT_ERROR,`
`275`	`277`	`@"detail" : message`
`276`	`278`	`}];`
`277`	`279`	`[baseModule`
`278`	`280`	`emitEventDict:MSG_EVENT`
`279`	`281`	`body:@{`
	`282`	`+ @"streamId":streamId,`
`280`	`283`	`@"event" : MSG_EVENT_WARN,`
`281`	`284`	`@"detail" : message`
`282`	`285`	`}];`