react-native-blob-util 0.17.3 → 0.18.2

package/ios/ReactNativeBlobUtilFS.mm

@@ -17,10 +17,8 @@
 
 #if __has_include(<React/RCTAssert.h>)
 #import <React/RCTBridge.h>
-#import <React/RCTEventDispatcher.h>
 #else
 #import "RCTBridge.h"
-#import "RCTEventDispatcher.h"
 #endif
 
 
@@ -58,12 +56,6 @@ NSMutableDictionary *fileStreams = nil;
     return self;
 }
 
-- (id)initWithEventDispatcherRef:(RCTEventDispatcher *)eventDispatcherRef {
-    self = [super init];
-    self.eventDispatcher = eventDispatcherRef;
-    return self;
-}
-
 // static member getter
 + (NSDictionary *) getFileStreams {
 
@@ -160,11 +152,10 @@ NSMutableDictionary *fileStreams = nil;
          bufferSize:(int)bufferSize
                tick:(int)tick
            streamId:(NSString *)streamId
-          eventDispatcherRef:(RCTEventDispatcher *)eventDispatcherRef
+          baseModule:(ReactNativeBlobUtil*)baseModule
 {
     [[self class] getPathFromUri:uri completionHandler:^(NSString *path, ALAssetRepresentation *asset) {
 
-        __block RCTEventDispatcher * event = eventDispatcherRef;
         __block int read = 0;
         __block int backoff = tick *1000;
         __block int chunkSize = bufferSize;
@@ -178,8 +169,8 @@ NSMutableDictionary *fileStreams = nil;
                 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 };
-                    [event sendDeviceEventWithName:streamId body:payload];
+                    NSDictionary * payload = @{ @"streamId":streamId, @"event": FS_EVENT_ERROR, @"code": @"ENOENT", @"detail": message };
+                    [baseModule emitEventDict:EVENT_FILESYSTEM body:payload];
                     free(buffer);
                     return ;
                 }
@@ -187,7 +178,7 @@ NSMutableDictionary *fileStreams = nil;
                 [stream open];
                 while((read = [stream read:buffer maxLength:bufferSize]) > 0)
                 {
-                    [[self class] emitDataChunks:[NSData dataWithBytes:buffer length:read] encoding:encoding streamId:streamId event:event];
+                    [[self class] emitDataChunks:[NSData dataWithBytes:buffer length:read] encoding:encoding streamId:streamId baseModule:baseModule];
                     if(tick > 0)
                     {
                         usleep(backoff);
@@ -202,7 +193,7 @@ NSMutableDictionary *fileStreams = nil;
                 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 class] emitDataChunks:[NSData dataWithBytes:buffer length:read] encoding:encoding streamId:streamId baseModule:baseModule];
                     if(tick > 0)
                     {
                         usleep(backoff);
@@ -211,8 +202,8 @@ NSMutableDictionary *fileStreams = nil;
             }
             else
             {
-                NSDictionary * payload = @{ @"event": FS_EVENT_ERROR, @"code": @"EINVAL", @"detail": @"Unable to resolve URI" };
-                [event sendDeviceEventWithName: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)
@@ -221,13 +212,13 @@ NSMutableDictionary *fileStreams = nil;
         }
         @catch (NSError * err)
         {
-            NSDictionary * payload = @{ @"event": FS_EVENT_ERROR, @"code": @"EUNSPECIFIED", @"detail": [err description] };
-            [event sendDeviceEventWithName: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": @"" };
-            [event sendDeviceEventWithName:streamId body:payload];
+            NSDictionary * payload = @{ @"streamId":streamId, @"event": FS_EVENT_END, @"detail": @"" };
+            [baseModule emitEventDict:EVENT_FILESYSTEM body:payload];
         }
 
     }];
@@ -236,7 +227,7 @@ NSMutableDictionary *fileStreams = nil;
 }
 
 // send read stream chunks via native event emitter
-+ (void) emitDataChunks:(NSData *)data encoding:(NSString *) encoding streamId:(NSString *)streamId event:(RCTEventDispatcher *)event
++ (void) emitDataChunks:(NSData *)data encoding:(NSString *) encoding streamId:(NSString *)streamId baseModule:(ReactNativeBlobUtil *)baseModule
 {
     @try
     {
@@ -244,15 +235,16 @@ NSMutableDictionary *fileStreams = nil;
         if([[encoding lowercaseString] isEqualToString:@"utf8"])
         {
             NSDictionary * payload = @{
+                @"streamId":streamId,
                                        @"event": FS_EVENT_DATA,
                                        @"detail" : [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]
                                        };
-            [event sendDeviceEventWithName: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] };
-            [event sendDeviceEventWithName: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"])
         {
@@ -269,23 +261,25 @@ NSMutableDictionary *fileStreams = nil;
                 }
             }
 
-            NSDictionary * payload = @{ @"event": FS_EVENT_DATA,  @"detail" : asciiArray };
-            [event sendDeviceEventWithName: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]];
-        [event
-         sendDeviceEventWithName:streamId
+        [baseModule
+         emitEventDict:EVENT_FILESYSTEM
          body:@{
+            @"streamId":streamId,
                 @"event" : MSG_EVENT_ERROR,
                 @"detail" : message
                 }];
-        [event
-         sendDeviceEventWithName:MSG_EVENT
+        [baseModule
+         emitEventDict:MSG_EVENT
          body:@{
+            @"streamId":streamId,
                 @"event" : MSG_EVENT_WARN,
                 @"detail" : message
                 }];

package/ios/ReactNativeBlobUtilNetwork.h

@@ -30,12 +30,11 @@
 
 + (ReactNativeBlobUtilNetwork* _Nullable)sharedInstance;
 + (NSMutableDictionary  * _Nullable ) normalizeHeaders:(NSDictionary * _Nullable)headers;
-+ (void) emitExpiredTasks:(RCTEventDispatcher *) eventDispatcher;
 
 - (nullable id) init;
 - (void) sendRequest:(NSDictionary  * _Nullable )options
        contentLength:(long)contentLength
-              eventDispatcher:(RCTEventDispatcher * _Nullable)eventDispatcherRef
+              baseModule:(ReactNativeBlobUtil * _Nullable)baseModule
               taskId:(NSString * _Nullable)taskId
          withRequest:(NSURLRequest * _Nullable)req
             callback:(_Nullable RCTResponseSenderBlock) callback;

package/ios/ReactNativeBlobUtilNetwork.mm

@@ -16,12 +16,10 @@
 #if __has_include(<React/RCTAssert.h>)
 #import <React/RCTRootView.h>
 #import <React/RCTLog.h>
-#import <React/RCTEventDispatcher.h>
 #import <React/RCTBridge.h>
 #else
 #import "RCTRootView.h"
 #import "RCTLog.h"
-#import "RCTEventDispatcher.h"
 #import "RCTBridge.h"
 #endif
 
@@ -72,7 +70,7 @@ static void initialize_tables() {
 
 - (void) sendRequest:(__weak NSDictionary  * _Nullable )options
        contentLength:(long) contentLength
-              eventDispatcher:(RCTEventDispatcher * _Nullable)eventDispatcherRef
+              baseModule:(ReactNativeBlobUtil * _Nullable)baseModule
               taskId:(NSString * _Nullable)taskId
          withRequest:(__weak NSURLRequest * _Nullable)req
             callback:(_Nullable RCTResponseSenderBlock) callback
@@ -80,7 +78,7 @@ static void initialize_tables() {
     ReactNativeBlobUtilRequest *request = [[ReactNativeBlobUtilRequest alloc] init];
     [request sendRequest:options
            contentLength:contentLength
-                  eventDispatcher:eventDispatcherRef
+              baseModule:baseModule
                   taskId:taskId
              withRequest:req
       taskOperationQueue:self.taskQueue
@@ -158,24 +156,4 @@ static void initialize_tables() {
     return mheaders;
 }
 
-// #115 Invoke fetch.expire event on those expired requests so that the expired event can be handled
-+ (void) emitExpiredTasks:(RCTEventDispatcher *)eventDispatcher
-{
-    @synchronized ([ReactNativeBlobUtilNetwork class]){
-        NSEnumerator * emu =  [expirationTable keyEnumerator];
-        NSString * key;
-
-        while ((key = [emu nextObject]))
-        {
-            id args = @{ @"taskId": key };
-            [eventDispatcher sendDeviceEventWithName:EVENT_EXPIRE body:args];
-
-        }
-
-        // clear expired task entries
-        [expirationTable removeAllObjects];
-        expirationTable = [[NSMapTable alloc] init];
-    }
-}
-
 @end

package/ios/ReactNativeBlobUtilRequest.h

@@ -12,13 +12,12 @@
 #import <Foundation/Foundation.h>
 
 #import "ReactNativeBlobUtilProgress.h"
+#import "ReactNativeBlobUtil.h"
 
 #if __has_include(<React/RCTAssert.h>)
 #import <React/RCTBridgeModule.h>
-#import <React/RCTEventDispatcher.h>
 #else
 #import "RCTBridgeModule.h"
-#import "RCTEventDispatcher.h"
 #endif
 
 @interface ReactNativeBlobUtilRequest : NSObject <NSURLSessionDelegate, NSURLSessionTaskDelegate, NSURLSessionDataDelegate>
@@ -29,7 +28,7 @@
 @property (nonatomic) BOOL isServerPush;
 @property (nullable, nonatomic) NSMutableData * respData;
 @property (nullable, strong, nonatomic) RCTResponseSenderBlock callback;
-@property (nullable, nonatomic) RCTEventDispatcher * eventDispatcher;
+@property (nullable, strong, nonatomic) ReactNativeBlobUtil * baseModule;
 @property (nullable, nonatomic) NSDictionary * options;
 @property (nullable, nonatomic) NSError * error;
 @property (nullable, nonatomic) ReactNativeBlobUtilProgress *progressConfig;
@@ -38,7 +37,7 @@
 
 - (void) sendRequest:(NSDictionary  * _Nullable )options
        contentLength:(long)contentLength
-              eventDispatcher:(RCTEventDispatcher * _Nullable)eventDispatcherRef
+              baseModule:(ReactNativeBlobUtil * _Nullable)baseModule
               taskId:(NSString * _Nullable)taskId
          withRequest:(NSURLRequest * _Nullable)req
   taskOperationQueue:(NSOperationQueue * _Nonnull)operationQueue

package/ios/ReactNativeBlobUtilRequest.mm

@@ -15,12 +15,6 @@
 
 #import <CommonCrypto/CommonDigest.h>
 
-#if __has_include(<React/RCTAssert.h>)
-#import <React/RCTEventDispatcherProtocol.h>
-#else
-#import "RCTEventDispatcherProtocol.h"
-#endif
-
 
 typedef NS_ENUM(NSUInteger, ResponseFormat) {
     UTF8,
@@ -53,7 +47,7 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
 @synthesize receivedBytes;
 @synthesize respData;
 @synthesize callback;
-@synthesize eventDispatcher;
+@synthesize baseModule;
 @synthesize options;
 @synthesize error;
 
@@ -73,7 +67,7 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
 // send HTTP request
 - (void) sendRequest:(__weak NSDictionary  * _Nullable )options
        contentLength:(long) contentLength
-              eventDispatcher:(RCTEventDispatcher * _Nullable)eventDispatcherRef
+              baseModule:(__strong ReactNativeBlobUtil * _Nullable)baseModule
               taskId:(NSString * _Nullable)taskId
          withRequest:(__weak NSURLRequest * _Nullable)req
   taskOperationQueue:(NSOperationQueue * _Nonnull)operationQueue
@@ -82,7 +76,7 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
     self.taskId = taskId;
     self.respData = [[NSMutableData alloc] initWithLength:0];
     self.callback = callback;
-    self.eventDispatcher = eventDispatcherRef;
+    self.baseModule = baseModule;
     self.expectedBytes = 0;
     self.receivedBytes = 0;
     self.options = options;
@@ -213,8 +207,8 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
 
         if (self.isServerPush) {
             if (partBuffer) {
-                [self.eventDispatcher
-                 sendDeviceEventWithName:EVENT_SERVER_PUSH
+                [self.baseModule
+                 emitEventDict:EVENT_SERVER_PUSH
                  body:@{
                         @"taskId": taskId,
                         @"chunk": [partBuffer base64EncodedStringWithOptions:0],
@@ -269,8 +263,7 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
                 [cookieStore setCookies:cookies forURL:response.URL mainDocumentURL:nil];
             }
         }
-        [self.eventDispatcher
-         sendDeviceEventWithName: EVENT_STATE_CHANGE
+        [self.baseModule emitEventDict : EVENT_STATE_CHANGE
          body:@{
                 @"taskId": taskId,
                 @"state": @"2",
@@ -359,8 +352,7 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
     NSNumber * now =[NSNumber numberWithFloat:((float)receivedBytes/(float)expectedBytes)];
 
     if ([self.progressConfig shouldReport:now]) {
-        [self.eventDispatcher
-         sendDeviceEventWithName:EVENT_PROGRESS
+        [self.baseModule emitEventDict :EVENT_PROGRESS
          body:@{
                 @"taskId": taskId,
                 @"written": [NSString stringWithFormat:@"%lld", (long long) receivedBytes],
@@ -473,8 +465,7 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
     NSNumber * now = [NSNumber numberWithFloat:((float)totalBytesWritten/(float)totalBytesExpectedToWrite)];
 
     if ([self.uploadProgressConfig shouldReport:now]) {
-        [self.eventDispatcher
-         sendDeviceEventWithName:EVENT_PROGRESS_UPLOAD
+        [self.baseModule emitEventDict:EVENT_PROGRESS_UPLOAD
          body:@{
                 @"taskId": taskId,
                 @"written": [NSString stringWithFormat:@"%ld", (long) totalBytesWritten],

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-blob-util",
-    "version": "0.17.3",
+    "version": "0.18.2",
     "description": "A module provides upload, download, and files access API. Supports file stream read/write for process large files.",
     "main": "index",
     "scripts": {
@@ -35,13 +35,13 @@
         "wkh237 <xeiyan@gmail.com>"
     ],
     "devDependencies": {
-        "react": "16.13.1",
-        "react-native": "^0.68.2",
+        "react": "18.0.0",
+            "react-native": "0.69.7",
         "@typescript-eslint/parser": "^3.4.0",
         "@react-native-community/eslint-config": "^3.0.0",
         "eslint-config-defaults": "^9.0.0",
         "eslint-plugin-react": "^7.24.0",
-        "eslint": "^6.8.0"
+        "eslint": ">7.0.0"
     },
     "peerDependencies": {
         "react": "*",