optimize caculate speed & get request server logic

Author: yangsen

.idea/gradle.xml

@@ -3,7 +3,7 @@ import java.util.regex.Matcher
 apply plugin: 'com.android.library'
 
 def versionName() {
-    String config = 'library/src/main/java/com/qiniu/android/common/Constants.java'
+    String config = getProjectDir().getPath() + '/src/main/java/com/qiniu/android/common/Constants.java'
     String fileContents = new File(config).text
     Matcher myMatcher = fileContents =~ /VERSION = "(.+)";/
     String version = myMatcher[0][1]

.idea/misc.xml

@@ -41,10 +41,15 @@ public synchronized void initData() {
         networkStatusManager.asyncRecoverNetworkStatusFromDisk();
     }
 
+    @Deprecated
     public static String getNetworkStatusType(String host, String ip) {
         return Utils.getIpType(ip, host);
     }
 
+    public static String getNetworkStatusType(String httpVersion, String host, String ip) {
+        return Utils.getIpType(httpVersion, ip, host);
+    }
+
     public NetworkStatus getNetworkStatus(String type) {
         if (type == null || type.length() == 0) {
             return null;
@@ -165,7 +170,7 @@ private synchronized void setupRecorder() {
 
     public static class NetworkStatus {
 
-        private int speed;
+        private int speed = 600;
 
         public int getSpeed() {
             return speed;

.idea/modules.xml

@@ -8,18 +8,19 @@ public static IUploadServer getBetterNetworkServer(IUploadServer serverA, IUploa
         return isServerNetworkBetter(serverA, serverB) ? serverA : serverB;
     }
 
+    // 如果两个 Server 网速相同优先使用 serverA
     public static boolean isServerNetworkBetter(IUploadServer serverA, IUploadServer serverB) {
         if (serverA == null) {
             return false;
         } else if (serverB == null) {
             return true;
         }
 
-        String serverTypeA = NetworkStatusManager.getNetworkStatusType(serverA.getHost(), serverA.getIp());
-        String serverTypeB = NetworkStatusManager.getNetworkStatusType(serverB.getHost(), serverB.getIp());
-        if (serverTypeA == null) {
+        String serverTypeA = NetworkStatusManager.getNetworkStatusType(serverA.getHttpVersion(), serverA.getHost(), serverA.getIp());
+        String serverTypeB = NetworkStatusManager.getNetworkStatusType(serverA.getHttpVersion(), serverB.getHost(), serverB.getIp());
+        if (serverTypeA == null || serverTypeA.length() == 0) {
             return false;
-        } else if (serverTypeB == null) {
+        } else if (serverTypeB == null || serverTypeB.length() == 0) {
             return true;
         }
 

QiNiu_Android.iml

@@ -219,12 +219,36 @@ private void updateHostNetworkStatus(ResponseInfo responseInfo, IUploadServer se
             return;
         }
         long byteCount = requestMetrics.bytesSend();
-        long second = requestMetrics.totalElapsedTime();
-        if (second > 0 && byteCount >= 1024 * 1024) {
-            int speed = (int) (byteCount * 1000 / second);
-            String type = NetworkStatusManager.getNetworkStatusType(server.getHost(), server.getIp());
-            NetworkStatusManager.getInstance().updateNetworkStatus(type, speed);
+        long milliSecond = requestMetrics.totalElapsedTime();
+        if (milliSecond <= 0) {
+            return;
+        }
+
+        if (byteCount <= 8 * 1024) {
+            milliSecond = (long)((float)milliSecond * 0.08);
+        } else if (byteCount <= 16 * 1024) {
+            milliSecond = (long)((float)milliSecond * 0.15);
+        } else if (byteCount <= 32 * 1024) {
+            milliSecond = (long)((float)milliSecond * 0.22);
+        } else if (byteCount <= 64 * 1024) {
+            milliSecond = (long)((float)milliSecond * 0.30);
+        } else if (byteCount <= 128 * 1024) {
+            milliSecond = (long)((float)milliSecond * 0.45);
+        } else if (byteCount <= 256 * 1024) {
+            milliSecond = (long)((float)milliSecond * 0.73);
+        } else if (byteCount <= 512 * 1024) {
+            milliSecond = (long)((float)milliSecond * 0.86);
+        } else if (byteCount <= 1024 * 1024) {
+            milliSecond = (long)((float)milliSecond * 0.95);
         }
+
+        if (milliSecond <= 0) {
+            milliSecond = 10;
+        }
+
+        int speed = (int) (byteCount / milliSecond);
+        String type = NetworkStatusManager.getNetworkStatusType(server.getHttpVersion(), server.getHost(), server.getIp());
+        NetworkStatusManager.getInstance().updateNetworkStatus(type, speed);
     }
 
     private void updateHttpServerInfo(IUploadServer server, ResponseInfo responseInfo) {

library/build.gradle

@@ -126,7 +126,6 @@ public IUploadServer getNextServer(UploadRequestState requestState, ResponseInfo
 
         freezeServerIfNeed(responseInfo, freezeServer);
 
-        UploadServer server = null;
         ArrayList<String> hostList = domainHostList;
         HashMap<String, UploadServerDomain> domainInfo = domainHashMap;
         if (requestState.isUseOldServer()
@@ -137,6 +136,7 @@ public IUploadServer getNextServer(UploadRequestState requestState, ResponseInfo
         }
 
         // 1. 优先选择http3
+        UploadServer http3Server = null;
         if (couldUseHttp3() && requestState.couldUseHttp3()) {
             for (String host : hostList) {
                 UploadServerDomain domain = domainInfo.get(host);
@@ -166,20 +166,20 @@ public boolean condition(String host, UploadServer serverP, UploadServer filterS
                     }
                 });
 
-                server = (UploadServer) UploadServerNetworkStatus.getBetterNetworkServer(domainServer, server);
+                http3Server = (UploadServer) UploadServerNetworkStatus.getBetterNetworkServer(domainServer, http3Server);
 
-                if (server != null) {
+                if (http3Server != null) {
                     break;
                 }
             }
 
-            if (server != null) {
-                server.setHttpVersion(IUploadServer.HttpVersion3);
-                return server;
+            if (http3Server != null) {
+                http3Server.setHttpVersion(IUploadServer.HttpVersion3);
             }
         }
 
         // 2. 挑选http2
+        UploadServer http2Server = null;
         for (String host : hostList) {
             UploadServerDomain domain = domainInfo.get(host);
             if (domain == null) {
@@ -208,13 +208,14 @@ public boolean condition(String host, UploadServer serverP, UploadServer filterS
                 }
             });
 
-            server = (UploadServer) UploadServerNetworkStatus.getBetterNetworkServer(domainServer, server);
+            http2Server = (UploadServer) UploadServerNetworkStatus.getBetterNetworkServer(domainServer, http2Server);
 
-            if (server != null) {
+            if (http2Server != null) {
                 break;
             }
         }
 
+        UploadServer server = (UploadServer) UploadServerNetworkStatus.getBetterNetworkServer(http3Server, http2Server);
         if (server == null && !hasFreezeHost && hostList.size() > 0) {
             int index = (int) (Math.random() * hostList.size());
             String host = hostList.get(index);
@@ -300,6 +301,7 @@ private void unfreezeServer(IUploadServer freezeServer) {
 
         String frozenType = UploadServerFreezeUtil.getFrozenType(freezeServer.getHost(), freezeServer.getIp());
         partialHttp2Freezer.unfreezeType(frozenType);
+        partialHttp3Freezer.unfreezeType(frozenType);
     }
 
     private boolean couldUseHttp3() {

library/src/main/java/com/qiniu/android/http/networkStatus/NetworkStatusManager.java

@@ -153,6 +153,7 @@ public static String formEscape(String string) {
         return ret;
     }
 
+    @Deprecated
     public static String getIpType(String ip, String host) {
         String type = host;
         if (ip == null || ip.length() == 0) {
@@ -166,6 +167,23 @@ public static String getIpType(String ip, String host) {
         return type;
     }
 
+    public static String getIpType(String httpVersion, String ip, String host) {
+        if (httpVersion == null) {
+            httpVersion = "";
+        }
+
+        String type = host;
+        if (ip == null || ip.length() == 0) {
+            return httpVersion + "-" + type;
+        }
+        if (ip.contains(":")) {
+            type = getIPV6StringType(ip, host);
+        } else if (ip.contains(".")) {
+            type = getIPV4StringType(ip, host);
+        }
+        return httpVersion + "-" + type;
+    }
+
     public static boolean isIpv6(String ip) {
         if (StringUtils.isNullOrEmpty(ip)) {
             return false;