react-native-blob-util 0.15.0 → 0.16.0

package/README.md

@@ -908,6 +908,30 @@ ReactNativeBlobUtil.fetch('POST', 'http://example.com/upload', {'Transfer-Encodi
 ### Self-Signed SSL Server
 
 By default, react-native-blob-util does NOT allow connection to unknown certification provider since it's dangerous. To connect a server with self-signed certification, you need to add `trusty` to `config` explicitly. This function is available for version >= `0.5.3`
+In addition since ``0.16.0`` you'll have to define your own trust manager for android.
+````java
+public class MainApplication extends Application implements ReactApplication {
+    ...
+    @Override
+    public void onCreate() {
+       ...
+        ReactNativeBlobUtilUtils.sharedTrustManager = final X509TrustManager x509TrustManager = new X509TrustManager() {
+                @Override
+                public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
+                }
+
+                @Override
+                public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
+                }
+
+                @Override
+                public java.security.cert.X509Certificate[] getAcceptedIssuers() {
+                    return new java.security.cert.X509Certificate[]{};
+                }
+        };
+        ...
+    }
+````
 
 ```js
 ReactNativeBlobUtil.config({

package/android/src/main/AndroidManifest.xml

@@ -1,9 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.ReactNativeBlobUtil">
 
-    <!-- Required to access Google Play Licensing -->
-    <uses-permission android:name="com.android.vending.CHECK_LICENSE" />
-
     <!-- Required to download files from Google Play -->
     <uses-permission android:name="android.permission.INTERNET" />
 

package/android/src/main/java/com/ReactNativeBlobUtil/ReactNativeBlobUtilBody.java

@@ -26,7 +26,6 @@ import okio.BufferedSink;
 
 class ReactNativeBlobUtilBody extends RequestBody {
 
-    private InputStream requestStream;
     private long contentLength = 0;
     private ReadableArray form;
     private String mTaskId;
@@ -71,12 +70,10 @@ class ReactNativeBlobUtilBody extends RequestBody {
         try {
             switch (requestType) {
                 case SingleFile:
-                    requestStream = getRequestStream();
-                    contentLength = requestStream.available();
+                    contentLength = getRequestStream().available();
                     break;
                 case AsIs:
                     contentLength = this.rawBody.getBytes().length;
-                    requestStream = new ByteArrayInputStream(this.rawBody.getBytes());
                     break;
                 case Others:
                     break;
@@ -98,7 +95,6 @@ class ReactNativeBlobUtilBody extends RequestBody {
         this.form = body;
         try {
             bodyCache = createMultipartBodyCache();
-            requestStream = new FileInputStream(bodyCache);
             contentLength = bodyCache.length();
         } catch (Exception ex) {
             ex.printStackTrace();
@@ -107,6 +103,34 @@ class ReactNativeBlobUtilBody extends RequestBody {
         return this;
     }
 
+    // This organizes the input stream initialization logic into a method. This allows:
+    // 1) Initialization to be deferred until it's needed (when we are ready to pipe it into the BufferedSink)
+    // 2) The stream to be initialized and used as many times as necessary. When okhttp runs into
+    //    a connection error, it will retry the request which will require a new stream to write into
+    //    the sink once again.
+    InputStream getInputStreamForRequestBody() {
+        try {
+            if (this.form != null) {
+                return new FileInputStream(bodyCache);
+            } else {
+                switch (requestType) {
+                    case SingleFile:
+                        return getRequestStream();
+                    case AsIs:
+                        return new ByteArrayInputStream(this.rawBody.getBytes());
+                    case Others:
+                        ReactNativeBlobUtilUtils.emitWarningEvent("ReactNativeBlobUtil could not create input stream for request type others");
+                        break;
+                }
+            }
+        } catch (Exception ex){
+            ex.printStackTrace();
+            ReactNativeBlobUtilUtils.emitWarningEvent("ReactNativeBlobUtil failed to create input stream for request:" + ex.getLocalizedMessage());
+        }
+
+        return null;
+    }
+
     @Override
     public long contentLength() {
         return chunkedEncoding ? -1 : contentLength;
@@ -120,7 +144,7 @@ class ReactNativeBlobUtilBody extends RequestBody {
     @Override
     public void writeTo(@NonNull BufferedSink sink) {
         try {
-            pipeStreamToSink(requestStream, sink);
+            pipeStreamToSink(getInputStreamForRequestBody(), sink);
         } catch (Exception ex) {
             ReactNativeBlobUtilUtils.emitWarningEvent(ex.getLocalizedMessage());
             ex.printStackTrace();

package/android/src/main/java/com/ReactNativeBlobUtil/ReactNativeBlobUtilReq.java

@@ -12,6 +12,9 @@ import android.net.NetworkCapabilities;
 import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.util.Base64;
 import android.webkit.CookieManager;
 
@@ -48,6 +51,9 @@ import java.util.HashMap;
 
 import java.util.List;
 import java.util.Locale;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.SSLContext;
@@ -161,6 +167,59 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
         }
     }
 
+    private final int QUERY = 1314;
+    private ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(1);
+    private Future<?> future;
+    private Handler mHandler = new Handler(new Handler.Callback() {
+        public boolean handleMessage(Message msg) {
+            switch (msg.what) {
+
+                case QUERY:
+
+                    Bundle data = msg.getData();
+                    long id = data.getLong("downloadManagerId");
+                    if (id == downloadManagerId) {
+
+                        Context appCtx = ReactNativeBlobUtil.RCTContext.getApplicationContext();
+
+                        DownloadManager downloadManager = (DownloadManager) appCtx.getSystemService(Context.DOWNLOAD_SERVICE);
+
+                        DownloadManager.Query query = new DownloadManager.Query();
+
+                        Cursor cursor = downloadManager.query(query);
+
+                        if (cursor != null && cursor.moveToFirst()) {
+
+                            long written = cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR));
+
+                            long total = cursor.getLong(cursor.getColumnIndex(
+                                    DownloadManager.COLUMN_TOTAL_SIZE_BYTES));
+                            cursor.close();
+
+                            ReactNativeBlobUtilProgressConfig reportConfig = getReportProgress(taskId);
+                            float progress = (total != -1) ? written / total : 0;
+
+                            if (reportConfig != null && reportConfig.shouldReport(progress /* progress */)) {
+                                WritableMap args = Arguments.createMap();
+                                args.putString("taskId", String.valueOf(taskId));
+                                args.putString("written", String.valueOf(written));
+                                args.putString("total", String.valueOf(total));
+                                args.putString("chunk", "");
+                                ReactNativeBlobUtil.RCTContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                                        .emit(ReactNativeBlobUtilConst.EVENT_PROGRESS, args);
+
+                            }
+
+                            if (total == written) {
+                                future.cancel(true);
+                            }
+                        }
+                    }
+            }
+            return true;
+        }
+    });
+
     @Override
     public void run() {
 
@@ -212,6 +271,17 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                 downloadManagerId = dm.enqueue(req);
                 androidDownloadManagerTaskTable.put(taskId, Long.valueOf(downloadManagerId));
                 appCtx.registerReceiver(this, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
+                future = scheduledExecutorService.scheduleAtFixedRate(new Runnable() {
+                    @Override
+                    public void run() {
+                        Message msg = mHandler.obtainMessage();
+                        Bundle data = new Bundle();
+                        data.putLong("downloadManagerId", downloadManagerId);
+                        msg.setData(data);
+                        msg.what = QUERY;
+                        mHandler.sendMessage(msg);
+                    }
+                }, 0, 100, TimeUnit.MILLISECONDS);
                 return;
             }
 

package/android/src/main/java/com/ReactNativeBlobUtil/ReactNativeBlobUtilUtils.java

@@ -10,7 +10,6 @@ import com.facebook.react.modules.core.DeviceEventManagerModule;
 
 import java.nio.charset.Charset;
 import java.security.MessageDigest;
-import java.security.cert.CertificateException;
 import java.util.Locale;
 
 import javax.net.ssl.HostnameVerifier;
@@ -22,9 +21,10 @@ import javax.net.ssl.X509TrustManager;
 
 import okhttp3.OkHttpClient;
 
-
 public class ReactNativeBlobUtilUtils {
 
+    public static X509TrustManager sharedTrustManager;
+
     public static String getMD5(String input) {
         String result = null;
 
@@ -61,22 +61,10 @@ public class ReactNativeBlobUtilUtils {
 
     public static OkHttpClient.Builder getUnsafeOkHttpClient(OkHttpClient client) {
         try {
-            // Create a trust manager that does not validate certificate chains
-            final X509TrustManager x509TrustManager = new X509TrustManager() {
-                @Override
-                public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
-                }
 
-                @Override
-                public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
-                }
+            if (sharedTrustManager == null) throw new IllegalStateException("Use of own trust manager but none defined");
 
-                @Override
-                public java.security.cert.X509Certificate[] getAcceptedIssuers() {
-                    return new java.security.cert.X509Certificate[]{};
-                }
-            };
-            final TrustManager[] trustAllCerts = new TrustManager[]{x509TrustManager};
+            final TrustManager[] trustAllCerts = new TrustManager[]{sharedTrustManager};
 
             // Install the all-trusting trust manager
             final SSLContext sslContext = SSLContext.getInstance("SSL");
@@ -85,7 +73,7 @@ public class ReactNativeBlobUtilUtils {
             final SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
 
             OkHttpClient.Builder builder = client.newBuilder();
-            builder.sslSocketFactory(sslSocketFactory, x509TrustManager);
+            builder.sslSocketFactory(sslSocketFactory, sharedTrustManager);
             builder.hostnameVerifier(new HostnameVerifier() {
                 @Override
                 public boolean verify(String hostname, SSLSession session) {

package/index.d.ts

@@ -490,7 +490,7 @@ export interface ReactNativeBlobUtilWriteStream {
 
     write(data: string): Promise<void>;
 
-    close(): void;
+    close(): Promise<void>;
 }
 
 export interface ReactNativeBlobUtilReadStream {

package/ios/ReactNativeBlobUtil.xcodeproj/project.pbxproj

@@ -48,7 +48,6 @@
 		A19B48241D98102400E6868A /* ReactNativeBlobUtilProgress.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReactNativeBlobUtilProgress.m; sourceTree = "<group>"; };
 		A1AAE2971D300E3E0051D11C /* ReactNativeBlobUtilReqBuilder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ReactNativeBlobUtilReqBuilder.h; sourceTree = "<group>"; };
 		A1AAE2981D300E4D0051D11C /* ReactNativeBlobUtilReqBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReactNativeBlobUtilReqBuilder.m; sourceTree = "<group>"; };
-		A1F950181D7E9134002A95A6 /* IOS7Polyfill.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IOS7Polyfill.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -76,7 +75,6 @@
 				9FD8D3C126F1709A00009F35 /* ReactNativeBlobUtilFileTransformer.h */,
 				A19B48241D98102400E6868A /* ReactNativeBlobUtilProgress.m */,
 				A19B48231D98100800E6868A /* ReactNativeBlobUtilProgress.h */,
-				A1F950181D7E9134002A95A6 /* IOS7Polyfill.h */,
 				A1AAE2981D300E4D0051D11C /* ReactNativeBlobUtilReqBuilder.m */,
 				A1AAE2971D300E3E0051D11C /* ReactNativeBlobUtilReqBuilder.h */,
 				A158F42E1D0539CE006FFD38 /* ReactNativeBlobUtilNetwork.h */,

package/ios/ReactNativeBlobUtilFS.m

@@ -11,7 +11,6 @@
 #import "ReactNativeBlobUtilFS.h"
 #import "ReactNativeBlobUtilConst.h"
 #import "ReactNativeBlobUtilFileTransformer.h"
-#import "IOS7Polyfill.h"
 @import AssetsLibrary;
 
 #import <CommonCrypto/CommonDigest.h>
@@ -381,7 +380,7 @@ NSMutableDictionary *fileStreams = nil;
 
         NSFileHandle *fileHandle = [NSFileHandle fileHandleForWritingAtPath:path];
         NSData * content = nil;
-        if([encoding RNFBContainsString:@"base64"]) {
+        if([encoding containsString:@"base64"]) {
             content = [[NSData alloc] initWithBase64EncodedString:data options:0];
         }
         else if([encoding isEqualToString:@"uri"]) {

package/ios/ReactNativeBlobUtilReqBuilder.m

@@ -11,7 +11,6 @@
 #import "ReactNativeBlobUtilNetwork.h"
 #import "ReactNativeBlobUtilConst.h"
 #import "ReactNativeBlobUtilFS.h"
-#import "IOS7Polyfill.h"
 
 #if __has_include(<React/RCTAssert.h>)
 #import <React/RCTLog.h>
@@ -151,7 +150,7 @@
 
                     __block NSString * cType = [[self class]getHeaderIgnoreCases:@"content-type" fromHeaders:mheaders];
                     // when content-type is application/octet* decode body string using BASE64 decoder
-                    if([[cType lowercaseString] hasPrefix:@"application/octet"] || [[cType lowercaseString] RNFBContainsString:@";base64"])
+                    if([[cType lowercaseString] hasPrefix:@"application/octet"] || [[cType lowercaseString] containsString:@";base64"])
                     {
                         __block NSString * ncType = [[cType stringByReplacingOccurrencesOfString:@";base64" withString:@""]stringByReplacingOccurrencesOfString:@";BASE64" withString:@""];
                         if([mheaders valueForKey:@"content-type"] != nil)

package/ios/ReactNativeBlobUtilRequest.m

@@ -13,7 +13,6 @@
 #import "ReactNativeBlobUtilFileTransformer.h"
 #import "ReactNativeBlobUtilReqBuilder.h"
 
-#import "IOS7Polyfill.h"
 #import <CommonCrypto/CommonDigest.h>
 
 
@@ -222,20 +221,20 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
 
             return;
         } else {
-            self.isServerPush = [[respCType lowercaseString] RNFBContainsString:@"multipart/x-mixed-replace;"];
+            self.isServerPush = [[respCType lowercaseString] containsString:@"multipart/x-mixed-replace;"];
         }
 
         if(respCType)
         {
             NSArray * extraBlobCTypes = [options objectForKey:CONFIG_EXTRA_BLOB_CTYPE];
 
-            if ([respCType RNFBContainsString:@"text/"]) {
+            if ([respCType containsString:@"text/"]) {
                 respType = @"text";
-            } else if ([respCType RNFBContainsString:@"application/json"]) {
+            } else if ([respCType containsString:@"application/json"]) {
                 respType = @"json";
             } else if(extraBlobCTypes) { // If extra blob content type is not empty, check if response type matches
                 for (NSString * substr in extraBlobCTypes) {
-                    if ([respCType RNFBContainsString:[substr lowercaseString]]) {
+                    if ([respCType containsString:[substr lowercaseString]]) {
                         respType = @"blob";
                         respFile = YES;
                         destPath = [ReactNativeBlobUtilFS getTempPath:taskId withExtension:nil];
@@ -293,7 +292,7 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
 
             // if not set overwrite in options, defaults to TRUE
             BOOL overwrite = [options valueForKey:@"overwrite"] == nil ? YES : [[options valueForKey:@"overwrite"] boolValue];
-            BOOL appendToExistingFile = [destPath RNFBContainsString:@"?append=true"];
+            BOOL appendToExistingFile = [destPath containsString:@"?append=true"];
 
             appendToExistingFile = !overwrite;
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-blob-util",
-    "version": "0.15.0",
+    "version": "0.16.0",
     "description": "A module provides upload, download, and files access API. Supports file stream read/write for process large files.",
     "main": "index.js",
     "scripts": {

package/ios/IOS7Polyfill.h

@@ -1,27 +0,0 @@
-//
-//  IOS7Polyfill.h
-//  ReactNativeBlobUtil
-//
-//  Created by Ben Hsieh on 2016/9/6.
-//  Copyright © 2016年 wkh237.github.io. All rights reserved.
-//
-
-#ifndef IOS7Polyfill_h
-#define IOS7Polyfill_h
-
-@interface NSString (Contains)
-
-- (BOOL)RNFBContainsString:(NSString*)other;
-
-@end
-
-@implementation NSString (Contains)
-
-- (BOOL)RNFBContainsString:(NSString*)other {
-    NSRange range = [self rangeOfString:other];
-    return range.length != 0;
-}
-
-
-@end
-#endif /* IOS7Polyfill_h */