@react-native-hero/network 0.0.7 → 0.0.9

package/README.md

@@ -43,6 +43,7 @@ import {
   CODE,
   download,
   upload,
+  fetch,
 } from '@react-native-hero/network'
 
 download(
@@ -55,10 +56,10 @@ download(
   function (progress) {
     // [0, 1]
   }
-).then(data => {
-  data.name
-  data.path
-  data.size
+).then(response => {
+  response.name
+  response.path
+  response.size
 })
 .catch(err => {
   if (err.code === CODE.DOWNLOAD_FAILURE) {
@@ -91,9 +92,9 @@ upload(
   function (progress) {
     // [0, 1]
   }
-).then(data => {
-  data.status_code
-  data.body
+).then(response => {
+  response.status_code
+  response.body
 })
 .catch(err => {
   if (err.code === CODE.UPLOAD_FAILURE) {
@@ -101,4 +102,26 @@ upload(
   }
 })
 
+fetch({
+  url: '',
+  methods: 'post',
+  // optional, send request params
+  data: {
+    key1: 'value1',
+    key2: 'value2',
+  },
+  // optional, set request headers
+  headers: {
+
+  }
+})
+.then(response => {
+  response.status_code
+  response.body
+})
+.catch(err => {
+  if (err.code === CODE.FETCH_FAILURE) {
+    console.log('fetch error')
+  }
+})
 ```

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

@@ -4,17 +4,24 @@ import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import okhttp3.*
 import okhttp3.Callback
+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 {
@@ -27,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
 
@@ -110,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
@@ -153,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())
             }
         }
@@ -162,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,7 +183,89 @@ class RNTNetworkModule(private val reactContext: ReactApplicationContext) : Reac
             override fun onResponse(call: Call, response: Response) {
                 val map = Arguments.createMap()
                 map.putInt("status_code", response.code)
+
+                val headers = Arguments.createMap()
+                for ((key, value) in response.headers) {
+                    headers.putString(key, value)
+                }
+                map.putMap("headers", headers)
+                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)
+
+                val headers = Arguments.createMap()
+                for ((key, value) in response.headers) {
+                    headers.putString(key, value)
+                }
+                map.putMap("headers", headers)
                 map.putString("body", response.body?.string())
+
                 promise.resolve(map)
             }
         })

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

@@ -6,6 +6,7 @@
 
 static NSString *ERROR_CODE_DOWNLOAD_FAILURE = @"1";
 static NSString *ERROR_CODE_UPLOAD_FAILURE = @"2";
+static NSString *ERROR_CODE_FETCH_FAILURE = @"3";
 
 static NSDictionary* getFileInfo(NSURL *url) {
     
@@ -58,6 +59,7 @@ static NSString* dictionary2JsonString(NSDictionary *dict) {
     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,
     };
 }
 
@@ -166,6 +168,7 @@ RCT_EXPORT_METHOD(upload:(NSDictionary*)options resolve:(RCTPromiseResolveBlock)
                     if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
                         NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse*)response;
                         result[@"status_code"] = @(httpResponse.statusCode);
+                        result[@"headers"] = httpResponse.allHeaderFields;
                     }
                     
                     if ([responseObject isKindOfClass:[NSDictionary class]]) {
@@ -187,4 +190,83 @@ 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);
+                    result[@"headers"] = httpResponse.allHeaderFields;
+                }
+                
+                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);
+                    result[@"headers"] = httpResponse.allHeaderFields;
+                }
+                
+                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.7",
+  "version": "0.0.9",
   "description": "react native network",
   "main": "index.js",
   "scripts": {