feat: update iOS implementation

Author: Riccardo Cipolleschi

codegenSpecs/NativeBlobUtils.js

@@ -4,15 +4,15 @@ import { TurboModuleRegistry } from 'react-native';
 
 export interface Spec extends TurboModule {
     +getConstants: () => {|
-        'CacheDir': string,
-        'DocumentDir': string,
-        'DownloadDir': string,
-        'LibraryDir': string,
-        'MainBundleDir': string,
-        'MovieDir': string,
-        'MusicDir': string,
-        'PictureDir': string,
-        'ApplicationSupportDir': string,
+        CacheDir: string,
+        DocumentDir: string,
+        DownloadDir: string,
+        LibraryDir: string,
+        MainBundleDir: string,
+        MovieDir: string,
+        MusicDir: string,
+        PictureDir: string,
+        ApplicationSupportDir: string,
     |};
 
     +fetchBlobForm: (options: Object, taskId: string, method: string, url: string, headers: Object, form: Array<any>, callback: (value: Array<any>) => void) => void;

ios/ReactNativeBlobUtil/ReactNativeBlobUtil.m renamed to ios/ReactNativeBlobUtil/ReactNativeBlobUtil.mm

@@ -18,13 +18,13 @@
 #import "RCTBridgeModule.h"
 #endif
 
-@import AssetsLibrary;
+#import <AssetsLibrary/AssetsLibrary.h>
 
 @interface ReactNativeBlobUtilFS : NSObject <NSStreamDelegate>  {
     NSOutputStream * outStream;
     NSInputStream * inStream;
     RCTResponseSenderBlock callback;
-    RCTBridge * bridge;
+    RCTEventDispatcher * eventDispatcher;
     Boolean isOpen;
     NSString * encoding;
     int bufferSize;
@@ -37,7 +37,7 @@
 @property (nonatomic) NSOutputStream * _Nullable outStream;
 @property (nonatomic) NSInputStream * _Nullable inStream;
 @property (strong, nonatomic) RCTResponseSenderBlock callback;
-@property (nonatomic) RCTBridge * bridge;
+@property (nonatomic) RCTEventDispatcher * eventDispatcher;
 @property (nonatomic) NSString * encoding;
 @property (nonatomic) NSString * taskId;
 @property (nonatomic) NSString * path;
@@ -85,13 +85,13 @@
      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 tick:(int)tick streamId:(NSString *)streamId bridgeRef:(RCTBridge *)bridgeRef;
++ (void) readStream:(NSString *)uri encoding:(NSString * )encoding bufferSize:(int)bufferSize tick:(int)tick streamId:(NSString *)streamId eventDispatcherRef:(RCTEventDispatcher *)eventDispatcherRef;
 + (void) df:(RCTResponseSenderBlock)callback;
 
 // constructor
 - (id) init;
 - (id)initWithCallback:(RCTResponseSenderBlock)callback;
-- (id)initWithBridgeRef:(RCTBridge *)bridgeRef;
+- (id)initWithEventDispatcherRef:(RCTEventDispatcher *)eventDispatcherRef;
 
 // file stream
 - (void) openWithDestination;

ios/ReactNativeBlobUtilConst.m renamed to ios/ReactNativeBlobUtilConst.mm

@@ -11,7 +11,7 @@
 #import "ReactNativeBlobUtilFS.h"
 #import "ReactNativeBlobUtilConst.h"
 #import "ReactNativeBlobUtilFileTransformer.h"
-@import AssetsLibrary;
+#import <AssetsLibrary/AssetsLibrary.h>
 
 #import <CommonCrypto/CommonDigest.h>
 
@@ -58,9 +58,9 @@ - (id)initWithCallback:(RCTResponseSenderBlock)callback {
     return self;
 }
 
-- (id)initWithBridgeRef:(RCTBridge *)bridgeRef {
+- (id)initWithEventDispatcherRef:(RCTEventDispatcher *)eventDispatcherRef {
     self = [super init];
-    self.bridge = bridgeRef;
+    self.eventDispatcher = eventDispatcherRef;
     return self;
 }
 
@@ -69,7 +69,7 @@ + (NSArray *) getFileStreams {
 
     if(fileStreams == nil)
         fileStreams = [[NSMutableDictionary alloc] init];
-    return fileStreams;
+    return fileStreams.allValues;
 }
 
 +(void) setFileStream:(ReactNativeBlobUtilFS *) instance withId:(NSString *) uuid {
@@ -160,11 +160,11 @@ + (void) readStream:(NSString *)uri
          bufferSize:(int)bufferSize
                tick:(int)tick
            streamId:(NSString *)streamId
-          bridgeRef:(RCTBridge *)bridgeRef
+          eventDispatcherRef:(RCTEventDispatcher *)eventDispatcherRef
 {
     [[self class] getPathFromUri:uri completionHandler:^(NSString *path, ALAssetRepresentation *asset) {
 
-        __block RCTEventDispatcher * event = bridgeRef.eventDispatcher;
+        __block RCTEventDispatcher * event = eventDispatcherRef;
         __block int read = 0;
         __block int backoff = tick *1000;
         __block int chunkSize = bufferSize;
@@ -508,15 +508,16 @@ + (void) readFile:(NSString *)path
         __block Byte * buffer;
         if(asset != nil)
         {
-            buffer = malloc(asset.size);
+            int size = asset.size;
+            buffer = (Byte *)malloc(size);
             [asset getBytes:buffer fromOffset:0 length:asset.size error:&err];
             if(err != nil)
             {
                 onComplete(nil, @"EUNSPECIFIED", [err description]);
                 free(buffer);
                 return;
             }
-            fileContent = [NSData dataWithBytes:buffer length:asset.size];
+            fileContent = [NSData dataWithBytes:buffer length:size];
             free(buffer);
         }
         else
@@ -555,21 +556,25 @@ + (void) readFile:(NSString *)path
             if([[encoding lowercaseString] isEqualToString:@"utf8"])
             {
                 NSString * utf8 = [[NSString alloc] initWithData:fileContent encoding:NSUTF8StringEncoding];
-                if(utf8 == nil)
-                    onComplete([[NSString alloc] initWithData:fileContent encoding:NSISOLatin1StringEncoding], nil, nil);
-                else
-                    onComplete(utf8, nil, nil);
+                if(utf8 == nil) {
+                    NSString * latin1 = [[NSString alloc] initWithData:fileContent encoding:NSISOLatin1StringEncoding];
+                    NSData * latin1Data = [latin1 dataUsingEncoding:NSISOLatin1StringEncoding];
+                    onComplete(latin1Data, nil, nil);
+                } else {
+                    onComplete(fileContent, nil, nil);
+                }
             }
             else if ([[encoding lowercaseString] isEqualToString:@"base64"]) {
-                onComplete([fileContent base64EncodedStringWithOptions:0], nil, nil);
+                NSString * base64String = [fileContent base64EncodedStringWithOptions:0];
+                onComplete([[NSData alloc] initWithBase64EncodedString:base64String options:0], nil, nil);
             }
             else if ([[encoding lowercaseString] isEqualToString:@"ascii"]) {
                 NSMutableArray * resultArray = [NSMutableArray array];
-                char * bytes = [fileContent bytes];
+                char * bytes = (char *)[fileContent bytes];
                 for(int i=0;i<[fileContent length];i++) {
                     [resultArray addObject:[NSNumber numberWithChar:bytes[i]]];
                 }
-                onComplete(resultArray, nil, nil);
+                onComplete((NSData *)resultArray, nil, nil);
             }
         }
         else
@@ -690,11 +695,11 @@ + (NSDictionary *) stat:(NSString *) path error:(NSError **) error {
     if([fm fileExistsAtPath:path isDirectory:&isDir] == NO) {
         return nil;
     }
-    NSDictionary * info = [fm attributesOfItemAtPath:path error:&error];
-    NSString * size = [NSString stringWithFormat:@"%d", [info fileSize]];
+    NSDictionary * info = [fm attributesOfItemAtPath:path error:error];
+    NSString * size = [NSString stringWithFormat:@"%llu", [info fileSize]];
     NSString * filename = [path lastPathComponent];
     NSDate * lastModified;
-    [[NSURL fileURLWithPath:path] getResourceValue:&lastModified forKey:NSURLContentModificationDateKey error:&error];
+    [[NSURL fileURLWithPath:path] getResourceValue:&lastModified forKey:NSURLContentModificationDateKey error:error];
     return @{
              @"size" : size,
              @"filename" : filename,
@@ -759,7 +764,7 @@ - (void)writeEncodeChunk:(NSString *) chunk {
     NSUInteger left = [decodedData length];
     NSUInteger nwr = 0;
     do {
-        nwr = [self.outStream write:[decodedData bytes] maxLength:left];
+        nwr = [self.outStream write:(const uint8_t *)[decodedData bytes] maxLength:left];
         if (-1 == nwr) break;
         left -= nwr;
     } while (left > 0);
@@ -773,7 +778,7 @@ - (void)write:(NSData *) chunk {
     NSUInteger left = [chunk length];
     NSUInteger nwr = 0;
     do {
-        nwr = [self.outStream write:[chunk bytes] maxLength:left];
+        nwr = [self.outStream write:(const uint8_t *)[chunk bytes] maxLength:left];
         if (-1 == nwr) break;
         left -= nwr;
     } while (left > 0);
@@ -826,7 +831,7 @@ + (void)slice:(NSString *)path
             long max = MIN(size, [end longValue]);
 
             if(![fm fileExistsAtPath:dest]) {
-                if(![fm createFileAtPath:dest contents:@"" attributes:nil]) {
+                if(![fm createFileAtPath:dest contents:[NSData new] attributes:nil]) {
                     return reject(@"ENOENT", [NSString stringWithFormat:@"File '%@' does not exist and could not be created", path], nil);
                 }
             }
@@ -842,15 +847,15 @@ + (void)slice:(NSString *)path
                 }
                 else
                 {
-                    NSLog(@"read chunk %lu", 10240);
+                    NSLog(@"read chunk %d", 10240);
                     chunkSize = 10240;
                     chunk = [handle readDataOfLength:10240];
                 }
                 if([chunk length] <= 0)
                     break;
                 long remain = expected - read;
 
-                [os write:[chunk bytes] maxLength:chunkSize];
+                [os write:(const uint8_t *)[chunk bytes] maxLength:chunkSize];
                 read += [chunk length];
             }
             [handle closeFile];
@@ -868,19 +873,20 @@ + (void)slice:(NSString *)path
             long max = MIN(size, [end longValue]);
 
             while(read < expected) {
-                uint8_t * chunk[10240];
+                uint8_t chunk[10240];
+                uint8_t * pointerToChunk = &chunk[0];
                 long chunkSize = 0;
                 if([start longValue] + read + 10240 > max)
                 {
                     NSLog(@"read chunk %lu", max - read - [start longValue]);
                     chunkSize = max - read - [start longValue];
-                    chunkRead = [asset getBytes:chunk fromOffset:[start longValue] + read length:chunkSize error:nil];
+                    chunkRead = [asset getBytes:pointerToChunk fromOffset:[start longValue] + read length:chunkSize error:nil];
                 }
                 else
                 {
                     NSLog(@"read chunk %lu", 10240);
                     chunkSize = 10240;
-                    chunkRead = [asset getBytes:chunk fromOffset:[start longValue] + read length:chunkSize error:nil];
+                    chunkRead = [asset getBytes:pointerToChunk fromOffset:[start longValue] + read length:chunkSize error:nil];
                 }
                 if( chunkRead <= 0)
                     break;

ios/ReactNativeBlobUtilFS.h

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

ios/ReactNativeBlobUtilFS.m renamed to ios/ReactNativeBlobUtilFS.mm

@@ -10,7 +10,6 @@
 #import <Foundation/Foundation.h>
 #import "ReactNativeBlobUtilNetwork.h"
 
-#import "ReactNativeBlobUtil.h"
 #import "ReactNativeBlobUtilConst.h"
 #import "ReactNativeBlobUtilProgress.h"
 
@@ -49,14 +48,14 @@ - (id)init {
     self = [super init];
     if (self) {
         self.requestsTable = [NSMapTable mapTableWithKeyOptions:NSMapTableStrongMemory valueOptions:NSMapTableWeakMemory];
-        
+
         self.taskQueue = [[NSOperationQueue alloc] init];
         self.taskQueue.qualityOfService = NSQualityOfServiceUtility;
         self.taskQueue.maxConcurrentOperationCount = 10;
         self.rebindProgressDict = [NSMutableDictionary dictionary];
         self.rebindUploadProgressDict = [NSMutableDictionary dictionary];
     }
-    
+
     return self;
 }
 
@@ -67,26 +66,26 @@ + (ReactNativeBlobUtilNetwork* _Nullable)sharedInstance {
     dispatch_once(&onceToken, ^{
         _sharedInstance = [[self alloc] init];
     });
-    
+
     return _sharedInstance;
 }
 
 - (void) sendRequest:(__weak NSDictionary  * _Nullable )options
        contentLength:(long) contentLength
-              bridge:(RCTBridge * _Nullable)bridgeRef
+              eventDispatcher:(RCTEventDispatcher * _Nullable)eventDispatcherRef
               taskId:(NSString * _Nullable)taskId
          withRequest:(__weak NSURLRequest * _Nullable)req
             callback:(_Nullable RCTResponseSenderBlock) callback
 {
     ReactNativeBlobUtilRequest *request = [[ReactNativeBlobUtilRequest alloc] init];
     [request sendRequest:options
            contentLength:contentLength
-                  bridge:bridgeRef
+                  eventDispatcher:eventDispatcherRef
                   taskId:taskId
              withRequest:req
       taskOperationQueue:self.taskQueue
                 callback:callback];
-    
+
     @synchronized([ReactNativeBlobUtilNetwork class]) {
         [self.requestsTable setObject:request forKey:taskId];
         [self checkProgressConfigForTask:taskId];
@@ -100,7 +99,7 @@ - (void) checkProgressConfigForTask:(NSString *)taskId {
         [self enableProgressReport:taskId config:downloadConfig];
         [self.rebindProgressDict removeObjectForKey:taskId];
     }
-    
+
     //reconfig uploadProgress
     ReactNativeBlobUtilProgress *uploadConfig = self.rebindUploadProgressDict[taskId];
     if (uploadConfig != nil) {
@@ -138,11 +137,11 @@ - (void) enableUploadProgress:(NSString *) taskId config:(ReactNativeBlobUtilPro
 - (void) cancelRequest:(NSString *)taskId
 {
     NSURLSessionDataTask * task;
-    
+
     @synchronized ([ReactNativeBlobUtilNetwork class]) {
         task = [self.requestsTable objectForKey:taskId].task;
     }
-    
+
     if (task && task.state == NSURLSessionTaskStateRunning) {
         [task cancel];
     }
@@ -155,25 +154,24 @@ + (NSMutableDictionary *) normalizeHeaders:(NSDictionary *)headers
     for (NSString * key in headers) {
         [mheaders setValue:[headers valueForKey:key] forKey:[key lowercaseString]];
     }
-    
+
     return mheaders;
 }
 
 // #115 Invoke fetch.expire event on those expired requests so that the expired event can be handled
-+ (void) emitExpiredTasks
++ (void) emitExpiredTasks:(RCTEventDispatcher *)eventDispatcher
 {
     @synchronized ([ReactNativeBlobUtilNetwork class]){
         NSEnumerator * emu =  [expirationTable keyEnumerator];
         NSString * key;
-        
+
         while ((key = [emu nextObject]))
         {
-            RCTBridge * bridge = [ReactNativeBlobUtil getRCTBridge];
             id args = @{ @"taskId": key };
-            [bridge.eventDispatcher sendDeviceEventWithName:EVENT_EXPIRE body:args];
-            
+            [eventDispatcher sendDeviceEventWithName:EVENT_EXPIRE body:args];
+
         }
-        
+
         // clear expired task entries
         [expirationTable removeAllObjects];
         expirationTable = [[NSMapTable alloc] init];