react-native-blob-util 0.23.1 → 0.24.2

package/.eslintrc.json

@@ -0,0 +1,96 @@
+{
+    "root": true,
+    "extends": [
+        "@react-native"
+        //"plugin:import/recommended"
+    ],
+    "rules": {
+        "prettier/prettier": 0,
+        "eqeqeq": 2,
+        "comma-dangle": 0,
+        "curly": 0,
+        "no-console": 1,
+        "no-debugger": 1,
+        "no-extra-semi": 2,
+        "no-extra-parens": 1,
+        "no-extra-boolean-cast": 1,
+        "no-cond-assign": 2,
+        "no-irregular-whitespace": 2,
+        "no-undef": 0,
+        "no-unused-vars": 0,
+        "semi": 2,
+        "semi-spacing": 2,
+        "valid-jsdoc": 0,
+        "radix": 0,
+        "no-extend-native": 0,
+        "react/display-name": 2,
+        "react/forbid-prop-types": 1,
+        "react/jsx-boolean-value": 1,
+        "react/jsx-closing-bracket-location": 1,
+        "react/jsx-curly-spacing": 1,
+        "react/jsx-indent-props": 0,
+        "react/jsx-max-props-per-line": 0,
+        "react/jsx-no-duplicate-props": 1,
+        "react/jsx-no-literals": 0,
+        "react/jsx-no-undef": 1,
+        "react/jsx-sort-props": 0,
+        "react/jsx-uses-react": 1,
+        "react/jsx-uses-vars": 1,
+        "react/jsx-wrap-multilines": 0,
+        "react/no-danger": 1,
+        "react/no-did-mount-set-state": 1,
+        "react/no-did-update-set-state": 1,
+        "react/no-direct-mutation-state": 1,
+        "react/no-multi-comp": 1,
+        "react/no-set-state": 0,
+        "react/no-unknown-property": 1,
+        "react/prop-types": 0,
+        "react/react-in-jsx-scope": 0,
+        "react/self-closing-comp": 1,
+        "react/sort-comp": 1,
+        "import/no-unresolved": 0,
+        "import/no-default-export": 1,
+        "import/order": [
+            1,
+            {
+                "groups": [
+                    "external",
+                    "internal",
+                    "index",
+                    "sibling",
+                    "parent",
+                    "builtin",
+                    "object",
+                    "type"
+                ],
+                "alphabetize": {
+                    "order": "asc",
+                    /* sort in ascending order. Options: ['ignore', 'asc', 'desc'] */
+                    "caseInsensitive": true
+                    /* ignore case. Options: [true, false] */
+                }
+            }
+        ],
+        "quotes": [
+            "warn",
+            "single",
+            {
+                "allowTemplateLiterals": true
+            }
+        ]
+    },
+    "overrides": [
+        {
+            "files": [
+                "*.ts",
+                "*.tsx"
+            ],
+            "rules": {
+                "no-dupe-class-members": "off"
+            }
+        }
+    ],
+    "plugins": [
+        "import"
+    ]
+}

package/android/build.gradle

@@ -88,7 +88,7 @@ android {
 
 dependencies {
     implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
-    implementation 'org.apache.commons:commons-lang3:3.0'
+    implementation 'org.apache.commons:commons-lang3:20:0'
 }
 
 afterEvaluate { project ->

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

@@ -12,8 +12,9 @@ import android.net.NetworkCapabilities;
 import android.net.NetworkInfo;
 import android.net.Uri;
 import android.net.LinkProperties;
-import android.net.LinkAddress;
-import java.net.Inet4Address;  
+import android.net.RouteInfo;
+import java.net.Inet4Address;
+import java.net.InetAddress;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
@@ -44,6 +45,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
+import java.net.UnknownHostException;
 import java.net.Proxy;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
@@ -391,10 +393,22 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
 
             // wifi only, need ACCESS_NETWORK_STATE permission
             // and API level >= 21
-            boolean targetHostIpAvailable = (this.options.targetHostIp != null && !this.options.targetHostIp.isEmpty());
+            final String targetHostIp = this.options.targetHostIp;
+            boolean targetHostIpAvailable = (targetHostIp != null && !targetHostIp.isEmpty());
+            
             if (this.options.wifiOnly) {
                 boolean found = false;
 
+                // convert targetHostIp from String into InetAddress
+                InetAddress targetHostAddr = null;
+                if (targetHostIpAvailable) {
+                    try {
+                        targetHostAddr = InetAddress.getByName(targetHostIp);
+                    } catch (UnknownHostException e) {
+                        targetHostAddr = null; // skip
+                    }
+                }
+
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                     ConnectivityManager connectivityManager = (ConnectivityManager) ReactNativeBlobUtilImpl.RCTContext.getSystemService(ReactNativeBlobUtilImpl.RCTContext.CONNECTIVITY_SERVICE);
                     Network[] networks = connectivityManager.getAllNetworks();
@@ -408,9 +422,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
 
                         // if targetHostIpAvailable does not match, fallback to any wifi
                         if (targetHostIpAvailable) {
-                            String targetHostIp = this.options.targetHostIp;
-
-                            if (networkMatchesTargetIp(connectivityManager, network, targetHostIp)) {
+                            if (networkMatchesTargetIp(connectivityManager, network, targetHostIp, targetHostAddr)) {
                                 clientBuilder.proxy(Proxy.NO_PROXY);
                                 clientBuilder.socketFactory(network.getSocketFactory());
                                 found = true;
@@ -1048,28 +1060,33 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
     /**
      * Check if a network matches the target host IP address
      */
-    private boolean networkMatchesTargetIp(ConnectivityManager cm, Network network, String targetHostIp) {
+    private boolean networkMatchesTargetIp(ConnectivityManager cm, Network network, String targetHostIp, InetAddress targetHostAddr) {
         LinkProperties lp = cm.getLinkProperties(network);
         if (lp == null) return false;
         
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            // For Android R and above, use DHCP server address
+            // For Android 11 and above, use DHCP server address
             Inet4Address dhcpServer = lp.getDhcpServerAddress();
             if (dhcpServer != null && dhcpServer.getHostAddress().equals(targetHostIp)) {
                 return true;
             }
         }
-        
-        // Always fall back to linkAddresses check
-        List<LinkAddress> linkAddresses = lp.getLinkAddresses();
-        if (linkAddresses != null && !linkAddresses.isEmpty()) {
-            for (LinkAddress la : linkAddresses) {
-                if (la.getAddress().getHostAddress().equals(targetHostIp)) {
-                    return true;
+
+        // For older versions or Android 11+ if DHCP does not match, check routing table
+        if (targetHostAddr != null) {
+            List<RouteInfo> routes = lp.getRoutes();
+            if (routes != null) {
+                for (RouteInfo route : routes) {
+                    if (route.isDefaultRoute()) {
+                        continue;
+                    }
+                    if (route.matches(targetHostAddr)) {
+                        return true;
+                    }
                 }
             }
         }
-        
+
         return false;
     }
 }

package/ios/ReactNativeBlobUtil/ReactNativeBlobUtil.mm

@@ -728,7 +728,7 @@ RCT_EXPORT_METHOD(hash:(NSString *)path
 }
 
 #pragma mark - fs.readStream
-RCT_EXPORT_METHOD(readStream:(NSString *)path encoding:(NSString *)encoding bufferSize:(int)bufferSize tick:(int)tick streamId:(NSString *)streamId)
+RCT_EXPORT_METHOD(readStream:(NSString *)path encoding:(NSString *)encoding bufferSize:(double)bufferSize tick:(double)tick streamId:(NSString *)streamId)
 {
     if(bufferSize == 0) {
         if([[encoding lowercaseString] isEqualToString:@"base64"])

package/ios/ReactNativeBlobUtilFS.h

@@ -83,7 +83,7 @@
      rejecter:(RCTPromiseRejectBlock)reject;
 //+ (void) writeFileFromFile:(NSString *)src toFile:(NSString *)dest append:(BOOL)append;
 + (void) writeAssetToPath:(PHAsset * )asset dest:(NSString *)dest;
-+ (void) readStream:(NSString *)uri encoding:(NSString * )encoding bufferSize:(int)bufferSize tick:(int)tick streamId:(NSString *)streamId baseModule:(ReactNativeBlobUtil *)baseModule;
++ (void) readStream:(NSString *)uri encoding:(NSString * )encoding bufferSize:(double)bufferSize tick:(double)tick streamId:(NSString *)streamId baseModule:(ReactNativeBlobUtil *)baseModule;
 + (void) df:(RCTResponseSenderBlock)callback;
 
 // constructor

package/ios/ReactNativeBlobUtilFS.mm

@@ -149,8 +149,8 @@ NSMutableDictionary *fileStreams = nil;
 
 + (void) readStream:(NSString *)uri
            encoding:(NSString * )encoding
-         bufferSize:(int)bufferSize
-               tick:(int)tick
+         bufferSize:(double)bufferSize
+               tick:(double)tick
            streamId:(NSString *)streamId
           baseModule:(ReactNativeBlobUtil*)baseModule
 {

package/package.json

@@ -1,68 +1,70 @@
 {
-  "name": "react-native-blob-util",
-  "version": "0.23.1",
-  "description": "A module provides upload, download, and files access API. Supports file stream read/write for process large files.",
-  "main": "index",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "dependencies": {
-    "base-64": "0.1.0",
-    "glob": "^10.3.10"
-  },
-  "keywords": [
-    "react-native",
-    "fetch",
-    "blob",
-    "fs",
-    "upload",
-    "file",
-    "download",
-    "filestream",
-    "image header"
-  ],
-  "repository": {
-    "url": "https://github.com/RonRadtke/react-native-blob-util"
-  },
-  "author": {
-    "name": "RonRadtke",
-    "username": "RonRadtke"
-  },
-  "license": "MIT",
-  "contributors": [
-    "Traviskn <>",
-    "Ben <benhsieh@catchplay.com>",
-    "wkh237 <xeiyan@gmail.com>"
-  ],
-  "devDependencies": {
-    "@react-native-community/eslint-config": "^3.0.0",
-    "@typescript-eslint/parser": "^3.4.0",
-    "eslint": ">7.0.0",
-    "eslint-config-defaults": "^9.0.0",
-    "eslint-plugin-react": "^7.24.0",
-    "react": "19.0.0",
-    "react-native": "0.78.2",
-    "react-native-windows": "0.78.2"
-  },
-  "peerDependencies": {
-    "react": "*",
-    "react-native": "*"
-  },
-  "codegenConfig": {
-    "name": "ReactNativeBlobUtilSpec",
-    "type": "modules",
-    "jsSrcsDir": "codegenSpecs",
-    "windows": {
-      "namespace": "ReactNativeBlobUtilCodegen",
-      "outputDirectory": "windows/ReactNativeBlobUtil/codegen",
-      "separateDataTypes": true
+    "name" : "react-native-blob-util",
+    "version" : "0.24.2",
+    "description" : "A module provides upload, download, and files access API. Supports file stream read/write for process large files.",
+    "main" : "index",
+    "scripts" : {
+        "test" : "echo \"Error: no test specified\" && exit 1"
+    },
+    "dependencies" : {
+        "base-64" : "0.1.0",
+        "glob" : "13.0.0"
+    },
+    "keywords" : [
+        "react-native",
+        "fetch",
+        "blob",
+        "fs",
+        "upload",
+        "file",
+        "download",
+        "filestream",
+        "image header"
+    ],
+    "repository" : {
+        "url" : "https://github.com/RonRadtke/react-native-blob-util"
+    },
+    "author" : {
+        "name" : "RonRadtke",
+        "username" : "RonRadtke"
+    },
+    "license" : "MIT",
+    "contributors" : [
+        "Traviskn <>",
+        "Ben <benhsieh@catchplay.com>",
+        "wkh237 <xeiyan@gmail.com>"
+    ],
+    "devDependencies" : {
+        "@typescript-eslint/eslint-plugin": "^8.46.4",
+        "@typescript-eslint/parser": "^8.46.4",
+        "eslint": "^8.57.1",
+        "eslint-plugin-ft-flow" : "^3.0.11",
+        "eslint-plugin-import" : "^2.32.0",
+        "eslint-plugin-react" : "^7.37.5",
+        "eslint-plugin-react-native" : "^5.0.0",
+        "react" : "19.0.0",
+        "react-native" : "0.78.2",
+        "react-native-windows" : "0.78.2"
+    },
+    "peerDependencies" : {
+        "react" : "*",
+        "react-native" : "*"
+    },
+    "codegenConfig" : {
+        "name" : "ReactNativeBlobUtilSpec",
+        "type" : "modules",
+        "jsSrcsDir" : "codegenSpecs",
+        "windows" : {
+            "namespace" : "ReactNativeBlobUtilCodegen",
+            "outputDirectory" : "windows/ReactNativeBlobUtil/codegen",
+            "separateDataTypes" : true
+        }
+    },
+    "react-native-windows" : {
+        "init-windows" : {
+            "name" : "ReactNativeBlobUtil",
+            "namespace" : "ReactNativeBlobUtil",
+            "template" : "cpp-lib"
+        }
     }
-  },
-  "react-native-windows": {
-    "init-windows": {
-      "name": "ReactNativeBlobUtil",
-      "namespace": "ReactNativeBlobUtil",
-      "template": "cpp-lib"
-    }
-  }
 }

package/.eslintrc.js

@@ -1,56 +0,0 @@
-module.exports = {
-    root: true,
-    extends: '@react-native-community',
-    rules: {
-        'prettier/prettier': 0,
-        "eqeqeq": 2,
-        "comma-dangle": 0,
-        curly: 0,
-        "no-console": 1,
-        "no-debugger": 1,
-        "no-extra-semi": 2,
-        "no-extra-parens": 1,
-        "no-extra-boolean-cast": 1,
-        "no-cond-assign": 2,
-        "no-irregular-whitespace": 2,
-        "no-undef": 0,
-        "no-unused-vars": 0,
-        "semi": 2,
-        "semi-spacing": 2,
-        "valid-jsdoc": [
-            1,
-            {
-                "requireReturn": false,
-                "requireParamDescription": false,
-                "requireReturnDescription": false
-            }
-        ],
-        "radix": 0,
-
-        "react/display-name": 2,
-        "react/forbid-prop-types": 1,
-        "react/jsx-boolean-value": 1,
-        "react/jsx-closing-bracket-location": 1,
-        "react/jsx-curly-spacing": 1,
-        "react/jsx-indent-props": 0,
-        "react/jsx-max-props-per-line": 0,
-        "react/jsx-no-duplicate-props": 1,
-        "react/jsx-no-literals": 0,
-        "react/jsx-no-undef": 1,
-        "react/jsx-sort-props": 0,
-        "react/jsx-uses-react": 1,
-        "react/jsx-uses-vars": 1,
-        "react/jsx-wrap-multilines": 1,
-        "react/no-danger": 1,
-        "react/no-did-mount-set-state": 1,
-        "react/no-did-update-set-state": 1,
-        "react/no-direct-mutation-state": 1,
-        "react/no-multi-comp": 1,
-        "react/no-set-state": 0,
-        "react/no-unknown-property": 1,
-        "react/prop-types": 0,
-        "react/react-in-jsx-scope": 0,
-        "react/self-closing-comp": 1,
-        "react/sort-comp": 1,
-    },
-};