react-native-blob-util 0.16.3 → 0.17.0

package/ios/ReactNativeBlobUtilFS.h

@@ -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;

package/ios/{ReactNativeBlobUtilFS.m → ReactNativeBlobUtilFS.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,14 +58,14 @@ NSMutableDictionary *fileStreams = nil;
     return self;
 }
 
-- (id)initWithBridgeRef:(RCTBridge *)bridgeRef {
+- (id)initWithEventDispatcherRef:(RCTEventDispatcher *)eventDispatcherRef {
     self = [super init];
-    self.bridge = bridgeRef;
+    self.eventDispatcher = eventDispatcherRef;
     return self;
 }
 
 // static member getter
-+ (NSArray *) getFileStreams {
++ (NSDictionary *) getFileStreams {
 
     if(fileStreams == nil)
         fileStreams = [[NSMutableDictionary alloc] init];
@@ -160,11 +160,11 @@ NSMutableDictionary *fileStreams = nil;
          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,7 +508,8 @@ NSMutableDictionary *fileStreams = nil;
         __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)
             {
@@ -516,7 +517,7 @@ NSMutableDictionary *fileStreams = nil;
                 free(buffer);
                 return;
             }
-            fileContent = [NSData dataWithBytes:buffer length:asset.size];
+            fileContent = [NSData dataWithBytes:buffer length:size];
             free(buffer);
         }
         else
@@ -555,21 +556,25 @@ NSMutableDictionary *fileStreams = nil;
             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 @@ NSMutableDictionary *fileStreams = nil;
     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 @@ NSMutableDictionary *fileStreams = nil;
     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 @@ NSMutableDictionary *fileStreams = nil;
     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 @@ NSMutableDictionary *fileStreams = nil;
             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,7 +847,7 @@ NSMutableDictionary *fileStreams = nil;
                 }
                 else
                 {
-                    NSLog(@"read chunk %lu", 10240);
+                    NSLog(@"read chunk %d", 10240);
                     chunkSize = 10240;
                     chunk = [handle readDataOfLength:10240];
                 }
@@ -850,7 +855,7 @@ NSMutableDictionary *fileStreams = nil;
                     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 @@ NSMutableDictionary *fileStreams = nil;
             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;

package/ios/ReactNativeBlobUtilNetwork.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;

package/ios/{ReactNativeBlobUtilNetwork.m → ReactNativeBlobUtilNetwork.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 @@ static void initialize_tables() {
     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,13 +66,13 @@ static void initialize_tables() {
     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
@@ -81,12 +80,12 @@ static void initialize_tables() {
     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 @@ static void initialize_tables() {
         [self enableProgressReport:taskId config:downloadConfig];
         [self.rebindProgressDict removeObjectForKey:taskId];
     }
-    
+
     //reconfig uploadProgress
     ReactNativeBlobUtilProgress *uploadConfig = self.rebindUploadProgressDict[taskId];
     if (uploadConfig != nil) {
@@ -138,11 +137,11 @@ static void initialize_tables() {
 - (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 @@ static void initialize_tables() {
     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];

package/ios/{ReactNativeBlobUtilProgress.m → ReactNativeBlobUtilProgress.mm}

@@ -32,25 +32,25 @@
 
 -(BOOL)shouldReport:(NSNumber *)nextProgress
 {
-    BOOL * result = YES;
+    BOOL result = YES;
     float countF = [self.count floatValue];
     if(countF > 0 && [nextProgress floatValue] > 0)
     {
         result = (int)(floorf([nextProgress floatValue]*countF)) >= tick;
     }
-    
+
     NSTimeInterval timeStamp = [[NSDate date] timeIntervalSince1970];
     // NSTimeInterval is defined as double
     NSNumber *timeStampObj = [NSNumber numberWithDouble: timeStamp];
     float delta = [timeStampObj doubleValue] - lastTick;
-    BOOL * shouldReport = delta > [self.interval doubleValue] && self.enable && result;
+    BOOL shouldReport = delta > [self.interval doubleValue] && self.enable && result;
     if(shouldReport)
     {
         tick++;
         lastTick = [timeStampObj doubleValue];
     }
     return shouldReport;
-    
+
 }
 
 

package/ios/{ReactNativeBlobUtilReqBuilder.m → ReactNativeBlobUtilReqBuilder.mm}

@@ -53,7 +53,7 @@
         [[self class] buildFormBody:form boundary:boundary onComplete:^(NSData *formData, BOOL hasError) {
             if(hasError)
             {
-                onComplete(nil, nil);
+                onComplete(nil, 0);
             }
             else
             {
@@ -117,11 +117,11 @@
                     orgPath = [[NSURL URLWithString:orgPath] path];
                     if([orgPath hasPrefix:AL_PREFIX])
                     {
-                        
+
                         [ReactNativeBlobUtilFS readFile:orgPath encoding:nil transformFile:false onComplete:^(id content, NSString* code, NSString * err) {
                             if(err != nil)
                             {
-                                onComplete(nil, nil);
+                                onComplete(nil, 0);
                             }
                             else
                             {
@@ -131,7 +131,7 @@
                                 onComplete(request, [((NSData *)content) length]);
                             }
                         }];
-                        
+
                         return;
                     }
                     size = [[[NSFileManager defaultManager] attributesOfItemAtPath:orgPath error:nil] fileSize];

package/ios/ReactNativeBlobUtilRequest.h

@@ -15,8 +15,10 @@
 
 #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>
@@ -27,7 +29,7 @@
 @property (nonatomic) BOOL isServerPush;
 @property (nullable, nonatomic) NSMutableData * respData;
 @property (nullable, strong, nonatomic) RCTResponseSenderBlock callback;
-@property (nullable, nonatomic) RCTBridge * bridge;
+@property (nullable, nonatomic) RCTEventDispatcher * eventDispatcher;
 @property (nullable, nonatomic) NSDictionary * options;
 @property (nullable, nonatomic) NSError * error;
 @property (nullable, nonatomic) ReactNativeBlobUtilProgress *progressConfig;
@@ -36,7 +38,7 @@
 
 - (void) sendRequest:(NSDictionary  * _Nullable )options
        contentLength:(long)contentLength
-              bridge:(RCTBridge * _Nullable)bridgeRef
+              eventDispatcher:(RCTEventDispatcher * _Nullable)eventDispatcherRef
               taskId:(NSString * _Nullable)taskId
          withRequest:(NSURLRequest * _Nullable)req
   taskOperationQueue:(NSOperationQueue * _Nonnull)operationQueue

package/ios/{ReactNativeBlobUtilRequest.m → ReactNativeBlobUtilRequest.mm}

@@ -15,6 +15,12 @@
 
 #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,
@@ -47,7 +53,7 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
 @synthesize receivedBytes;
 @synthesize respData;
 @synthesize callback;
-@synthesize bridge;
+@synthesize eventDispatcher;
 @synthesize options;
 @synthesize error;
 
@@ -67,7 +73,7 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
 // send HTTP request
 - (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
   taskOperationQueue:(NSOperationQueue * _Nonnull)operationQueue
@@ -76,7 +82,7 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
     self.taskId = taskId;
     self.respData = [[NSMutableData alloc] initWithLength:0];
     self.callback = callback;
-    self.bridge = bridgeRef;
+    self.eventDispatcher = eventDispatcherRef;
     self.expectedBytes = 0;
     self.receivedBytes = 0;
     self.options = options;
@@ -207,7 +213,7 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
 
         if (self.isServerPush) {
             if (partBuffer) {
-                [self.bridge.eventDispatcher
+                [self.eventDispatcher
                  sendDeviceEventWithName:EVENT_SERVER_PUSH
                  body:@{
                         @"taskId": taskId,
@@ -263,8 +269,7 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
                 [cookieStore setCookies:cookies forURL:response.URL mainDocumentURL:nil];
             }
         }
-
-        [self.bridge.eventDispatcher
+        [self.eventDispatcher
          sendDeviceEventWithName: EVENT_STATE_CHANGE
          body:@{
                 @"taskId": taskId,
@@ -342,7 +347,7 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
     // If we need to process the data, we defer writing into the file until the we have all the data, at which point
     // we can perform the processing and then write into the file
     if (respFile && ![self ShouldTransformFile]) {
-        [writeStream write:[data bytes] maxLength:[data length]];
+        [writeStream write:(const uint8_t *)[data bytes] maxLength:[data length]];
     } else {
         [respData appendData:data];
     }
@@ -354,7 +359,7 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
     NSNumber * now =[NSNumber numberWithFloat:((float)receivedBytes/(float)expectedBytes)];
 
     if ([self.progressConfig shouldReport:now]) {
-        [self.bridge.eventDispatcher
+        [self.eventDispatcher
          sendDeviceEventWithName:EVENT_PROGRESS
          body:@{
                 @"taskId": taskId,
@@ -362,7 +367,7 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
                 @"total": [NSString stringWithFormat:@"%lld", (long long) expectedBytes],
                 @"chunk": chunkString
                 }
-         ];
+        ];
     }
 }
 
@@ -407,7 +412,7 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
             } else {
                 @try{
                     NSData* transformedData = [fileTransformer onWriteFile:respData];
-                    [writeStream write:[transformedData bytes] maxLength:[transformedData length]];
+                    [writeStream write:(const uint8_t *)[transformedData bytes] maxLength:[transformedData length]];
                 } @catch(NSException * ex)
                 {
                     errMsg = [NSString stringWithFormat:@"Exception on File Transformer: '%@' ", [ex description]];
@@ -468,7 +473,7 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
     NSNumber * now = [NSNumber numberWithFloat:((float)totalBytesWritten/(float)totalBytesExpectedToWrite)];
 
     if ([self.uploadProgressConfig shouldReport:now]) {
-        [self.bridge.eventDispatcher
+        [self.eventDispatcher
          sendDeviceEventWithName:EVENT_PROGRESS_UPLOAD
          body:@{
                 @"taskId": taskId,

package/ios.js

@@ -2,9 +2,8 @@
 // Use of this source code is governed by a MIT-style license that can be
 // found in the LICENSE file.
 
-import { NativeModules, Platform } from "react-native";
-
-const ReactNativeBlobUtil: ReactNativeBlobUtilNative = NativeModules.ReactNativeBlobUtil;
+import { Platform } from "react-native";
+import ReactNativeBlobUtil from "./codegenSpecs/NativeBlobUtils";
 
 /**
  * Displays an options menu using UIDocumentInteractionController.presentOptionsMenu

package/mediacollection.js

@@ -1,7 +1,5 @@
-import {NativeModules} from 'react-native';
 import type {ReactNativeBlobUtilNative, filedescriptor} from "types";
-
-const ReactNativeBlobUtil: ReactNativeBlobUtilNative = NativeModules.ReactNativeBlobUtil;
+import ReactNativeBlobUtil from "./codegenSpecs/NativeBlobUtils";
 
 function createMediafile(fd: filedescriptor, mediatype: string): Promise {
     if ((!'parentFolder' in fd)) fd['parentFolder'] = '';
@@ -35,4 +33,4 @@ export default {
     copyToInternal,
     getBlob,
     copyToMediaStore
-};
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-blob-util",
-    "version": "0.16.3",
+    "version": "0.17.0",
     "description": "A module provides upload, download, and files access API. Supports file stream read/write for process large files.",
     "main": "index.js",
     "scripts": {
@@ -8,7 +8,7 @@
     },
     "dependencies": {
         "base-64": "0.1.0",
-        "glob": "^7.1.6"
+        "glob": "^7.2.3"
     },
     "keywords": [
         "react-native",
@@ -46,5 +46,10 @@
     "peerDependencies": {
         "react": "*",
         "react-native": "*"
+    },
+    "codegenConfig": {
+        "name": "ReactNativeBlobUtilSpec",
+        "type": "modules",
+        "jsSrcsDir": "codegenSpecs"
     }
 }

package/react-native-blob-util.podspec

@@ -1,6 +1,8 @@
 require "json"
 package = JSON.parse(File.read('package.json'))
 
+folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+
 Pod::Spec.new do |s|
   s.name             = package['name']
   s.version          = package['version']
@@ -10,7 +12,25 @@ Pod::Spec.new do |s|
   s.homepage     = 'n/a'
   s.source       = { :git => "https://github.com/RonRadtke/react-native-blob-util" }
   s.author       = 'RonRadtke'
-  s.source_files = 'ios/**/*.{h,m}'
+  s.source_files = 'ios/**/*.{h,m,mm,swift}'
   s.platform     = :ios, "8.0"
+  s.framework    = 'AssetsLibrary'
+
   s.dependency 'React-Core'
+
+  if ENV["RCT_NEW_ARCH_ENABLED"] == "1"
+    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+    s.pod_target_xcconfig    = {
+      "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+      "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
+      "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+    }
+
+    s.dependency "React-Codegen"
+    s.dependency "React-RCTFabric"
+    s.dependency "RCT-Folly"
+    s.dependency "RCTRequired"
+    s.dependency "RCTTypeSafety"
+    s.dependency "ReactCommon/turbomodule/core"
+  end
 end

package/examples/ReactNativeBlobUtil/.buckconfig

@@ -1,6 +0,0 @@
-
-[android]
-  target = Google Inc.:Google APIs:23
-
-[maven_repositories]
-  central = https://repo1.maven.org/maven2

package/examples/ReactNativeBlobUtil/.eslintrc.js

@@ -1,4 +0,0 @@
-module.exports = {
-  root: true,
-  extends: '@react-native-community',
-};

package/examples/ReactNativeBlobUtil/.prettierrc.js

@@ -1,6 +0,0 @@
-module.exports = {
-  bracketSpacing: false,
-  jsxBracketSameLine: true,
-  singleQuote: true,
-  trailingComma: 'all',
-};