@react-native-hero/network 0.0.4 → 0.0.8

package/android/build/kotlin/compileDebugKotlin/caches-jvm/lookups/counters.tab

@@ -0,0 +1,2 @@
+3
+1

package/android/build/outputs/logs/manifest-merger-debug-report.txt

@@ -0,0 +1,33 @@
+-- Merging decision tree log ---
+manifest
+ADDED from /Users/musicode/workspace/fe-team/finstao-app/node_modules/@react-native-hero/network/android/src/main/AndroidManifest.xml:1:1-7:12
+INJECTED from /Users/musicode/workspace/fe-team/finstao-app/node_modules/@react-native-hero/network/android/src/main/AndroidManifest.xml:1:1-7:12
+INJECTED from /Users/musicode/workspace/fe-team/finstao-app/node_modules/@react-native-hero/network/android/src/main/AndroidManifest.xml:1:1-7:12
+	package
+		ADDED from /Users/musicode/workspace/fe-team/finstao-app/node_modules/@react-native-hero/network/android/src/main/AndroidManifest.xml:2:11-55
+		INJECTED from /Users/musicode/workspace/fe-team/finstao-app/node_modules/@react-native-hero/network/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/musicode/workspace/fe-team/finstao-app/node_modules/@react-native-hero/network/android/src/main/AndroidManifest.xml
+	xmlns:android
+		ADDED from /Users/musicode/workspace/fe-team/finstao-app/node_modules/@react-native-hero/network/android/src/main/AndroidManifest.xml:1:11-69
+uses-permission#android.permission.INTERNET
+ADDED from /Users/musicode/workspace/fe-team/finstao-app/node_modules/@react-native-hero/network/android/src/main/AndroidManifest.xml:4:5-67
+	android:name
+		ADDED from /Users/musicode/workspace/fe-team/finstao-app/node_modules/@react-native-hero/network/android/src/main/AndroidManifest.xml:4:22-64
+uses-permission#android.permission.READ_EXTERNAL_STORAGE
+ADDED from /Users/musicode/workspace/fe-team/finstao-app/node_modules/@react-native-hero/network/android/src/main/AndroidManifest.xml:5:5-80
+	android:name
+		ADDED from /Users/musicode/workspace/fe-team/finstao-app/node_modules/@react-native-hero/network/android/src/main/AndroidManifest.xml:5:22-77
+uses-sdk
+INJECTED from /Users/musicode/workspace/fe-team/finstao-app/node_modules/@react-native-hero/network/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from /Users/musicode/workspace/fe-team/finstao-app/node_modules/@react-native-hero/network/android/src/main/AndroidManifest.xml
+INJECTED from /Users/musicode/workspace/fe-team/finstao-app/node_modules/@react-native-hero/network/android/src/main/AndroidManifest.xml
+INJECTED from /Users/musicode/workspace/fe-team/finstao-app/node_modules/@react-native-hero/network/android/src/main/AndroidManifest.xml
+INJECTED from /Users/musicode/workspace/fe-team/finstao-app/node_modules/@react-native-hero/network/android/src/main/AndroidManifest.xml
+	android:targetSdkVersion
+		INJECTED from /Users/musicode/workspace/fe-team/finstao-app/node_modules/@react-native-hero/network/android/src/main/AndroidManifest.xml
+		ADDED from /Users/musicode/workspace/fe-team/finstao-app/node_modules/@react-native-hero/network/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/musicode/workspace/fe-team/finstao-app/node_modules/@react-native-hero/network/android/src/main/AndroidManifest.xml
+	android:minSdkVersion
+		INJECTED from /Users/musicode/workspace/fe-team/finstao-app/node_modules/@react-native-hero/network/android/src/main/AndroidManifest.xml
+		ADDED from /Users/musicode/workspace/fe-team/finstao-app/node_modules/@react-native-hero/network/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/musicode/workspace/fe-team/finstao-app/node_modules/@react-native-hero/network/android/src/main/AndroidManifest.xml

package/android/src/main/java/com/github/reactnativehero/network/RNTNetworkModule.kt

@@ -4,18 +4,24 @@ import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import okhttp3.*
 import okhttp3.Callback
-import okio.Buffer
-import okio.BufferedSink
-import okio.Okio
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.RequestBody.Companion.toRequestBody
+import okio.*
+import org.json.JSONObject
 import java.io.File
 import java.io.IOException
 import java.util.*
 
+
 class RNTNetworkModule(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
 
     companion object {
         private const val ERROR_CODE_DOWNLOAD_FAILURE = "1"
         private const val ERROR_CODE_UPLOAD_FAILURE = "2"
+        private const val ERROR_CODE_FETCH_FAILURE = "3"
+        private val JSON = "application/json; charset=utf-8".toMediaType()
     }
 
     override fun getName(): String {
@@ -28,6 +34,7 @@ class RNTNetworkModule(private val reactContext: ReactApplicationContext) : Reac
 
         constants["ERROR_CODE_DOWNLOAD_FAILURE"] = ERROR_CODE_DOWNLOAD_FAILURE
         constants["ERROR_CODE_UPLOAD_FAILURE"] = ERROR_CODE_UPLOAD_FAILURE
+        constants["ERROR_CODE_FETCH_FAILURE"] = ERROR_CODE_FETCH_FAILURE
 
         return constants
 
@@ -55,12 +62,12 @@ class RNTNetworkModule(private val reactContext: ReactApplicationContext) : Reac
             }
 
             override fun onResponse(call: Call, response: Response) {
-                response.body()?.let { body ->
+                response.body?.let { body ->
 
                     val file = File(path)
 
-                    val sink = Okio.buffer(Okio.sink(file))
-                    val sinkBuffer = sink.buffer()
+                    val sink = file.sink().buffer()
+                    val sinkBuffer = sink.buffer
 
                     val source = body.source()
 
@@ -111,14 +118,14 @@ class RNTNetworkModule(private val reactContext: ReactApplicationContext) : Reac
         val file = options.getMap("file") as ReadableMap
 
         val data = if (options.hasKey("data")) {
-            options.getMap("data")
+            options.getMap("data")?.toHashMap()
         }
         else {
             null
         }
 
         val headers = if (options.hasKey("headers")) {
-            options.getMap("headers")
+            options.getMap("headers")?.toHashMap()
         }
         else {
             null
@@ -141,7 +148,7 @@ class RNTNetworkModule(private val reactContext: ReactApplicationContext) : Reac
                         name,
                         fileName,
                         createCustomRequestBody(
-                            MediaType.parse(mimeType),
+                            mimeType.toMediaTypeOrNull(),
                             localFile
                         ) {
                             if (index > 0) {
@@ -154,7 +161,7 @@ class RNTNetworkModule(private val reactContext: ReactApplicationContext) : Reac
                 )
 
         data?.let {
-            for ((key,value) in it.toHashMap()) {
+            for ((key,value) in it) {
                 formBuilder.addFormDataPart(key, value.toString())
             }
         }
@@ -163,7 +170,7 @@ class RNTNetworkModule(private val reactContext: ReactApplicationContext) : Reac
         val requestBuilder = Request.Builder().url(url).post(formBuilder.build())
 
         headers?.let {
-            for ((key, value) in it.toHashMap()) {
+            for ((key, value) in it) {
                 requestBuilder.addHeader(key, value.toString())
             }
         }
@@ -175,8 +182,76 @@ class RNTNetworkModule(private val reactContext: ReactApplicationContext) : Reac
 
             override fun onResponse(call: Call, response: Response) {
                 val map = Arguments.createMap()
-                map.putInt("status_code", response.code())
-                map.putString("body", response.body()?.string())
+                map.putInt("status_code", response.code)
+                map.putString("body", response.body?.string())
+                promise.resolve(map)
+            }
+        })
+
+    }
+
+    @ReactMethod
+    fun fetch(options: ReadableMap, promise: Promise) {
+
+        var url = options.getString("url") as String
+        val method = options.getString("method") as String
+
+        val data = if (options.hasKey("data")) {
+            options.getMap("data")?.toHashMap()
+        }
+        else {
+            null
+        }
+
+        val headers = if (options.hasKey("headers")) {
+            options.getMap("headers")?.toHashMap()
+        }
+        else {
+            null
+        }
+
+        val client = OkHttpClient()
+        val isPost = method.toUpperCase(Locale.ROOT) == "POST"
+
+        var requestBody: RequestBody? = null
+
+        if (isPost) {
+            data?.let {
+                requestBody = JSONObject(it).toString().toRequestBody(JSON)
+            }
+        }
+        else {
+            val httpUrl = url.toHttpUrlOrNull() ?: return
+            val urlBuilder = httpUrl.newBuilder()
+            data?.let {
+                for ((key, value) in it) {
+                    urlBuilder.addQueryParameter(key, value.toString())
+                }
+            }
+            url = urlBuilder.build().toString()
+        }
+
+        var requestBuilder = Request.Builder().url(url)
+
+        requestBody?.let {
+            requestBuilder = requestBuilder.post(it)
+        }
+
+        headers?.let {
+            for ((key, value) in it) {
+                requestBuilder.addHeader(key, value.toString())
+            }
+        }
+
+        client.newCall(requestBuilder.build()).enqueue(object : Callback {
+            override fun onFailure(call: Call, e: IOException) {
+                promise.reject(ERROR_CODE_FETCH_FAILURE, e.localizedMessage)
+            }
+
+            override fun onResponse(call: Call, response: Response) {
+                val map = Arguments.createMap()
+                map.putInt("status_code", response.code)
+                map.putString("body", response.body?.string())
                 promise.resolve(map)
             }
         })
@@ -195,7 +270,7 @@ class RNTNetworkModule(private val reactContext: ReactApplicationContext) : Reac
 
             override fun writeTo(sink: BufferedSink) {
 
-                val source = Okio.source(file)
+                val source = file.source()
                 val buf = Buffer()
 
                 val totalSize = contentLength()
@@ -219,4 +294,4 @@ class RNTNetworkModule(private val reactContext: ReactApplicationContext) : Reac
                 .emit(eventName, params)
     }
 
-}
+}

package/index.js

@@ -22,6 +22,7 @@ eventEmitter.addListener('upload_progress', handleProgress)
 export const CODE = {
   DOWNLOAD_FAILURE: RNTNetwork.ERROR_CODE_DOWNLOAD_FAILURE,
   UPLOAD_FAILURE: RNTNetwork.ERROR_CODE_UPLOAD_FAILURE,
+  FETCH_FAILURE: RNTNetwork.ERROR_CODE_FETCH_FAILURE,
 }
 
 /**
@@ -55,3 +56,10 @@ export function upload(options, onProgress) {
       }
     })
 }
+
+/**
+ * 发送请求
+ */
+export function fetch(options) {
+  return RNTNetwork.fetch(options)
+}

package/ios/RNTNetwork/RNTNetwork.m

@@ -2,19 +2,21 @@
 #import <React/RCTConvert.h>
 #import <AFNetworking/AFNetworking.h>
 
-NSString *FILE_PREFIX = @"file://";
+@implementation RNTNetwork
 
-NSString *ERROR_CODE_DOWNLOAD_FAILURE = @"1";
-NSString *ERROR_CODE_UPLOAD_FAILURE = @"2";
+static NSString *ERROR_CODE_DOWNLOAD_FAILURE = @"1";
+static NSString *ERROR_CODE_UPLOAD_FAILURE = @"2";
+static NSString *ERROR_CODE_FETCH_FAILURE = @"3";
 
-NSDictionary* getFileInfo(NSURL *url) {
+static NSDictionary* getFileInfo(NSURL *url) {
     
     NSData *data = [NSData dataWithContentsOfURL:url];
     NSInteger size = [data length];
 
     NSString *path = url.absoluteString;
-    if ([path hasPrefix:FILE_PREFIX]) {
-        path = [path substringFromIndex:[FILE_PREFIX length]];
+    NSString *prefix = @"file://";
+    if ([path hasPrefix:prefix]) {
+        path = [path substringFromIndex:[prefix length]];
     }
 
     return @{
@@ -25,22 +27,19 @@ NSDictionary* getFileInfo(NSURL *url) {
     
 }
 
-NSData* getFileData(NSString *path) {
-    
-    NSData *data = [NSData dataWithContentsOfFile:path];
-    return data;
+static NSData* getFileData(NSString *path) {
     
+    return [NSData dataWithContentsOfFile:path];
+
 }
 
-NSString* dictionary2JsonString(NSDictionary *dict) {
+static NSString* dictionary2JsonString(NSDictionary *dict) {
     
     NSData *jsonData = [NSJSONSerialization dataWithJSONObject:dict options:0 error:nil];
     return [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
     
 }
 
-@implementation RNTNetwork
-
 + (BOOL)requiresMainQueueSetup {
     return YES;
 }
@@ -50,16 +49,17 @@ NSString* dictionary2JsonString(NSDictionary *dict) {
 }
 
 - (NSArray<NSString *> *)supportedEvents {
-  return @[
-      @"download_progress",
-      @"upload_progress",
-  ];
+    return @[
+        @"download_progress",
+        @"upload_progress",
+    ];
 }
 
 - (NSDictionary *)constantsToExport {
     return @{
         @"ERROR_CODE_DOWNLOAD_FAILURE": ERROR_CODE_DOWNLOAD_FAILURE,
         @"ERROR_CODE_UPLOAD_FAILURE": ERROR_CODE_UPLOAD_FAILURE,
+        @"ERROR_CODE_FETCH_FAILURE": ERROR_CODE_FETCH_FAILURE,
     };
 }
 
@@ -189,4 +189,81 @@ RCT_EXPORT_METHOD(upload:(NSDictionary*)options resolve:(RCTPromiseResolveBlock)
 
 }
 
+RCT_EXPORT_METHOD(fetch:(NSDictionary*)options resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+
+    NSString *url = [RCTConvert NSString:options[@"url"]];
+    NSString *method = [RCTConvert NSString:options[@"method"]];
+    NSDictionary *data = [RCTConvert NSDictionary:options[@"data"]];
+    NSDictionary *headers = [RCTConvert NSDictionary:options[@"headers"]];
+
+    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
+    manager.responseSerializer = [AFJSONResponseSerializer serializer];
+    
+    if ([method.uppercaseString isEqual: @"POST"]) {
+        manager.requestSerializer = [AFJSONRequestSerializer serializer];
+        [manager
+            POST:url
+            parameters:data
+            headers:headers
+            progress:nil
+            success:^(NSURLSessionDataTask *task, id responseObject) {
+                
+                NSURLResponse *response = task.response;
+            
+                NSMutableDictionary *result = [[NSMutableDictionary alloc] init];
+            
+                if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
+                    NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse*)response;
+                    result[@"status_code"] = @(httpResponse.statusCode);
+                }
+                
+                if ([responseObject isKindOfClass:[NSDictionary class]]) {
+                    NSDictionary *json = (NSDictionary*)responseObject;
+                    // 安卓返回 map 比较麻烦，因此这里统一改成返回字符串
+                    result[@"body"] = dictionary2JsonString(json);
+                }
+                
+                resolve(result);
+            
+            }
+            failure:^(NSURLSessionDataTask *task, NSError *error) {
+                reject(ERROR_CODE_FETCH_FAILURE, error.localizedDescription, error);
+            }
+         ];
+    }
+    else {
+        [manager
+            GET:url
+            parameters:data
+            headers:headers
+            progress:nil
+            success:^(NSURLSessionDataTask *task, id responseObject) {
+                
+                NSURLResponse *response = task.response;
+            
+                NSMutableDictionary *result = [[NSMutableDictionary alloc] init];
+            
+                if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
+                    NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse*)response;
+                    result[@"status_code"] = @(httpResponse.statusCode);
+                }
+                
+                if ([responseObject isKindOfClass:[NSDictionary class]]) {
+                    NSDictionary *json = (NSDictionary*)responseObject;
+                    // 安卓返回 map 比较麻烦，因此这里统一改成返回字符串
+                    result[@"body"] = dictionary2JsonString(json);
+                }
+                
+                resolve(result);
+                
+            }
+            failure:^(NSURLSessionDataTask *task, NSError *error) {
+                reject(ERROR_CODE_FETCH_FAILURE, error.localizedDescription, error);
+            }
+         ];
+    }
+    
+
+}
+
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-hero/network",
-  "version": "0.0.4",
+  "version": "0.0.8",
   "description": "react native network",
   "main": "index.js",
   "scripts": {