update qcloud sdk to 1.5.55

jordanqin · jordanqin · commit 4167e05ead9f · 2023-07-21T22:08:21.000+08:00
diff --git a/QCloudFoundation/.idea/gradle.xml b/QCloudFoundation/.idea/gradle.xml
diff --git a/QCloudFoundation/foundation/build.gradle b/QCloudFoundation/foundation/build.gradle
@@ -7,8 +7,8 @@ android {
         minSdkVersion 15
         targetSdkVersion 28
 
-        versionCode 10553
-        versionName "1.5.53"
+        versionCode 10555
+        versionName "1.5.55"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
@@ -62,6 +62,20 @@ project.extensions.add('archiveFilePath', 'outputs/aar/qcloud-foundation-release
 
 apply from: '../../publishMavenCentral.gradle'
 
+//发布本地repo
+apply plugin: 'maven'
+uploadArchives {
+    repositories.mavenDeployer {
+        pom.project {
+            groupId 'com.qcloud.cos'
+            artifactId 'qcloud-foundation'
+            version android.defaultConfig.versionName
+            packaging 'aar'
+        }
+        repository(url: uri("${rootProject.projectDir}/repo"))
+    }
+}
+
 /*
  * Copyright (c) 2010-2020 Tencent Cloud. All rights reserved.
  *
diff --git a/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/auth/BasicLifecycleCredentialProvider.java b/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/auth/BasicLifecycleCredentialProvider.java
@@ -86,6 +86,13 @@ public void refresh() throws QCloudClientException {
         }
     }
 
+    /**
+     * 强制让凭证失效
+     */
+    public synchronized void forceInvalidationCredential(){
+        safeSetCredentials(null);
+    }
+
     private synchronized void safeSetCredentials(QCloudLifecycleCredentials credentials) {
         this.credentials = credentials;
     }
diff --git a/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/HttpResult.java b/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/HttpResult.java
@@ -33,6 +33,7 @@ public final class HttpResult<T> {
     private final String message;
     private final Map<String, List<String>> headers;
     private final HttpRequest<T> request;
+    private final long contentLength;
 
     private final T content;
 
@@ -42,6 +43,7 @@ public HttpResult(HttpResponse<T> response, T content) {
         this.headers = response.response.headers().toMultimap();
         this.content = content;
         this.request = response.request;
+        this.contentLength = response.contentLength();
     }
 
     public T content() {
@@ -64,6 +66,10 @@ public Map<String, List<String>> headers() {
         return headers;
     }
 
+    public long getContentLength() {
+        return contentLength;
+    }
+
     public final boolean isSuccessful() {
         return code >= 200 && code < 300;
     }
diff --git a/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/QCloudHttpClient.java b/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/QCloudHttpClient.java
@@ -61,7 +61,9 @@ public final class QCloudHttpClient {
     private final HttpLogger httpLogger;
 
     private final Set<String> verifiedHost;
+
     private final Map<String, List<InetAddress>> dnsMap;
+    private final ArrayList<QCloudDnsFetch> dnsFetchs;
 
     private final ConnectionRepository connectionRepository;
 
@@ -96,8 +98,25 @@ public List<InetAddress> lookup(String hostname) throws UnknownHostException {
                 dns = dnsMap.get(hostname);
             }
 
+            // 使用自定义Dns获取器
+            // 根据添加的DnsFetch顺序进行获取
+            if (dns == null || dns.size() == 0) {
+                for (QCloudDnsFetch dnsFetch : dnsFetchs) {
+                    if(dnsFetch != null) {
+                        try {
+                            dns = dnsFetch.fetch(hostname);
+                            if (dns != null) {
+                                break;
+                            }
+                        } catch (UnknownHostException ignored) {
+
+                        }
+                    }
+                }
+            }
+
             // 然后使用系统的 dns
-            if (dns == null) {
+            if (dns == null || dns.size() == 0) {
                 try {
                     dns = Dns.SYSTEM.lookup(hostname);
                 } catch (UnknownHostException e) {
@@ -106,20 +125,20 @@ public List<InetAddress> lookup(String hostname) throws UnknownHostException {
                 }
             }
 
-            if (dns == null && !dnsCache) {
+            if ((dns == null || dns.size() == 0) && !dnsCache) {
                 throw new UnknownHostException("can not resolve host name " + hostname);
             }
 
             // 最后使用缓存的 dns
-            if (dns == null) {
+            if (dns == null || dns.size() == 0) {
                 try {
                     dns = connectionRepository.getDnsRecord(hostname);
                 } catch (UnknownHostException e) {
                     QCloudLogger.w(HTTP_LOG_TAG, "Not found dns in cache records.");
                 }
             }
 
-            if (dns != null) {
+            if (dns != null && dns.size() > 0) {
                 ConnectionRepository.getInstance().insertDnsRecordCache(hostname, dns);
             } else {
                 throw new UnknownHostException(hostname);
@@ -154,6 +173,12 @@ public void addVerifiedHost(String hostname) {
         }
     }
 
+    /**
+     * 添加自定义DNS记录
+     * @param hostName host
+     * @param ipAddress ip集合
+     * @throws UnknownHostException 无法解析host异常
+     */
     public void addDnsRecord(@NonNull String hostName, @NonNull String[] ipAddress) throws UnknownHostException {
         if (ipAddress.length > 0) {
             List<InetAddress> addresses = new ArrayList<>(ipAddress.length);
@@ -164,13 +189,22 @@ public void addDnsRecord(@NonNull String hostName, @NonNull String[] ipAddress)
         }
     }
 
+    /**
+     * 添加自定义Dns获取器
+     * @param dnsFetch Dns获取器
+     */
+    public void addDnsFetch(@NonNull QCloudDnsFetch dnsFetch){
+        dnsFetchs.add(dnsFetch);
+    }
+
     public void setDebuggable(boolean debuggable) {
         httpLogger.setDebug(debuggable);
     }
 
     private QCloudHttpClient(Builder b) {
         this.verifiedHost = new HashSet<>(5);
         this.dnsMap = new ConcurrentHashMap<>(3);
+        this.dnsFetchs = new ArrayList<>(3);
         this.taskManager = TaskManager.getInstance();
         this.connectionRepository = ConnectionRepository.getInstance();
         httpLogger = new HttpLogger(false);
@@ -237,6 +271,19 @@ private <T> HttpTask<T> handleRequest(HttpRequest<T> request,
         return new HttpTask<T>(request, credentialProvider, networkClientMap.get(networkClientType.hashCode()));
     }
 
+    /**
+     * DNS获取
+     */
+    public interface QCloudDnsFetch {
+        /**
+         * 获取dns记录
+         * @param hostname host
+         * @return ip集合
+         * @throws UnknownHostException 无法解析host异常
+         */
+        List<InetAddress> fetch(String hostname) throws UnknownHostException;
+    }
+
     public final static class Builder {
         int connectionTimeout = 15 * 1000;  //in milliseconds
         int socketTimeout = 30 * 1000;  //in milliseconds
diff --git a/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/ResponseBodyConverter.java b/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/ResponseBodyConverter.java
@@ -29,10 +29,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import okio.Buffer;
-import okio.Okio;
-import okio.Source;
-
 /**
  * 响应体转换器
  * @param <T>
@@ -72,7 +68,7 @@ public byte[] convert(HttpResponse<byte[]> response) throws QCloudClientExceptio
         }
     }
 
-    private static final class InputStreamConverter extends ResponseBodyConverter<InputStream> {
+    private static final class InputStreamConverter extends ResponseBodyConverter<InputStream> implements SelfCloseConverter {
 
         @Override
         public InputStream convert(HttpResponse<InputStream> response) throws QCloudClientException, QCloudServiceException {
diff --git a/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/SelfCloseConverter.java b/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/SelfCloseConverter.java
@@ -1,4 +1,8 @@
 package com.tencent.qcloud.core.http;
 
+/**
+ * 安全关闭的Converter
+ * 设置为SelfCloseConverter 网络请求后不再自动关闭response，需要业务自己进行关闭
+ */
 public interface SelfCloseConverter {
 }
diff --git a/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/StreamingRequestBody.java b/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/StreamingRequestBody.java
@@ -158,13 +158,20 @@ public MediaType contentType() {
     @Override
     public long contentLength() throws IOException {
         long contentMaxLength = getContentRawLength();
+        long contentLength;
         if (contentMaxLength <= 0) {
-            return Math.max(requiredLength, -1);
+            contentLength = Math.max(requiredLength, -1);
         } else if (requiredLength <= 0) {
-            return Math.max(contentMaxLength - offset, -1);
+            contentLength = Math.max(contentMaxLength - offset, -1);
         } else {
-            return Math.min(contentMaxLength - offset, requiredLength);
+            contentLength = Math.min(contentMaxLength - offset, requiredLength);
         }
+
+        // 此处考虑文件被修改，大小发生变化，contentMaxLength - offset为负数的情况，会导致400 Bad Request
+        if(contentLength < 0){
+            contentLength = -1;
+        }
+        return contentLength;
     }
 
     protected long getContentRawLength() throws IOException {
diff --git a/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/interceptor/TrafficControlInterceptor.java b/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/interceptor/TrafficControlInterceptor.java
@@ -41,10 +41,6 @@
 import okhttp3.Response;
 
 public class TrafficControlInterceptor implements Interceptor {
-    // TODO: 2022/5/12 maxConcurrent为多少比较合适？
-    private TrafficStrategy uploadTrafficStrategy = new ModerateTrafficStrategy("UploadStrategy-", 2);
-    private TrafficStrategy downloadTrafficStrategy = new AggressiveTrafficStrategy("DownloadStrategy-", 3);
-
     private static class ResizableSemaphore extends Semaphore {
 
         ResizableSemaphore(int permit, boolean fair) {
@@ -172,7 +168,15 @@ private TrafficStrategy getSuitableStrategy(HttpTask task) {
         if (!task.isEnableTraffic()) {
             return null;
         }
-        return task.isDownloadTask() ? downloadTrafficStrategy : task.isUploadTask() ? uploadTrafficStrategy : null;
+        TrafficStrategy uploadTrafficStrategy = new ModerateTrafficStrategy("UploadStrategy-", task.getUploadMaxThreadCount());
+        TrafficStrategy downloadTrafficStrategy = new AggressiveTrafficStrategy("DownloadStrategy-", task.getDownloadMaxThreadCount());
+        if(task.isDownloadTask()){
+            return downloadTrafficStrategy;
+        } else if(task.isUploadTask()){
+            return uploadTrafficStrategy;
+        } else {
+            return null;
+        }
     }
 
     private double getAverageStreamingSpeed(HttpTask task, long networkMillsTook) {
diff --git a/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/task/QCloudTask.java b/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/task/QCloudTask.java
@@ -76,6 +76,8 @@ public abstract class QCloudTask<T> implements Callable<T> {
 
     private int weight = WEIGHT_LOW; //
     private boolean enableTraffic = true;
+    private int uploadMaxThreadCount;
+    private int downloadMaxThreadCount;
     private OnRequestWeightListener onRequestWeightListener;
 
     private Executor observerExecutor;
@@ -220,6 +222,22 @@ public boolean isEnableTraffic() {
         return enableTraffic;
     }
 
+    public int getUploadMaxThreadCount() {
+        return uploadMaxThreadCount;
+    }
+
+    public void setUploadMaxThreadCount(int uploadMaxThreadCount) {
+        this.uploadMaxThreadCount = uploadMaxThreadCount;
+    }
+
+    public int getDownloadMaxThreadCount() {
+        return downloadMaxThreadCount;
+    }
+
+    public void setDownloadMaxThreadCount(int downloadMaxThreadCount) {
+        this.downloadMaxThreadCount = downloadMaxThreadCount;
+    }
+
     /**
      * 任务是否已经取消
      *
diff --git a/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/task/TaskExecutors.java b/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/task/TaskExecutors.java
@@ -32,30 +32,44 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class TaskExecutors {
+    public static final int DEFAULT_UPLOAD_THREAD_COUNT = 2;
+    public static final int DEFAULT_DOWNLOAD_THREAD_COUNT = 5;
 
     public static final ThreadPoolExecutor COMMAND_EXECUTOR;
 
-    public static final ThreadPoolExecutor UPLOAD_EXECUTOR;
+    public static ThreadPoolExecutor UPLOAD_EXECUTOR;
 
-    public static final ThreadPoolExecutor DOWNLOAD_EXECUTOR;
+    public static ThreadPoolExecutor DOWNLOAD_EXECUTOR;
 
     public static final UIThreadExecutor UI_THREAD_EXECUTOR;
 
+    public static void initExecutor(int uploadMaxThreadCount, int downloadMaxThreadCount){
+        UPLOAD_EXECUTOR = new ThreadPoolExecutor(Math.min(DEFAULT_UPLOAD_THREAD_COUNT, uploadMaxThreadCount), uploadMaxThreadCount, 5L,
+                TimeUnit.SECONDS, new PriorityBlockingQueue<Runnable>(),
+                new TaskThreadFactory("Upload-", 3));
+        DOWNLOAD_EXECUTOR = new ThreadPoolExecutor(Math.min(DEFAULT_DOWNLOAD_THREAD_COUNT, downloadMaxThreadCount), downloadMaxThreadCount, 5L,
+                TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(Integer.MAX_VALUE),
+                new TaskThreadFactory("Download-", 3));
+        UPLOAD_EXECUTOR.allowCoreThreadTimeOut(true);
+        DOWNLOAD_EXECUTOR.allowCoreThreadTimeOut(true);
+    }
+
     static {
         COMMAND_EXECUTOR = new ThreadPoolExecutor(5, 5, 5L,
                 TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(Integer.MAX_VALUE),
                 new TaskThreadFactory("Command-", 8));
-        UPLOAD_EXECUTOR = new ThreadPoolExecutor(2, 2, 5L,
+        UPLOAD_EXECUTOR = new ThreadPoolExecutor(DEFAULT_UPLOAD_THREAD_COUNT, DEFAULT_UPLOAD_THREAD_COUNT, 5L,
                 TimeUnit.SECONDS, new PriorityBlockingQueue<Runnable>(),
                 new TaskThreadFactory("Upload-", 3));
-        DOWNLOAD_EXECUTOR = new ThreadPoolExecutor(3, 3, 5L,
+        DOWNLOAD_EXECUTOR = new ThreadPoolExecutor(DEFAULT_DOWNLOAD_THREAD_COUNT, DEFAULT_DOWNLOAD_THREAD_COUNT, 5L,
                 TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(Integer.MAX_VALUE),
                 new TaskThreadFactory("Download-", 3));
         UI_THREAD_EXECUTOR = new UIThreadExecutor();
 
         UPLOAD_EXECUTOR.allowCoreThreadTimeOut(true);
         COMMAND_EXECUTOR.allowCoreThreadTimeOut(true);
         DOWNLOAD_EXECUTOR.allowCoreThreadTimeOut(true);
+
     }
 
     static final class TaskThreadFactory implements ThreadFactory {
diff --git a/QCloudFoundation/quic/.gitignore b/QCloudFoundation/quic/.gitignore
@@ -1,2 +1,3 @@
 /build
-/.cxx
+/.cxx
+/.cxx/
diff --git a/QCloudFoundation/quic/build.gradle b/QCloudFoundation/quic/build.gradle
@@ -31,8 +31,8 @@ android {
         minSdkVersion 15
         targetSdkVersion 27
 
-        versionCode 10539
-        versionName "1.5.39"
+        versionCode 10540
+        versionName "1.5.40"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
diff --git a/QCloudFoundation/quic/src/main/java/com/tencent/qcloud/quic/QuicProxy.java b/QCloudFoundation/quic/src/main/java/com/tencent/qcloud/quic/QuicProxy.java

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,13 @@ public void refresh() throws QCloudClientException {`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
	`89`	`+ /**`
	`90`	`+ * 强制让凭证失效`
	`91`	`+ */`
	`92`	`+ public synchronized void forceInvalidationCredential(){`
	`93`	`+ safeSetCredentials(null);`
	`94`	`+ }`
	`95`	`+`
`89`	`96`	`private synchronized void safeSetCredentials(QCloudLifecycleCredentials credentials) {`
`90`	`97`	`this.credentials = credentials;`
`91`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,8 @@`
`1`	`1`	`package com.tencent.qcloud.core.http;`
`2`	`2`
	`3`	`+/**`
	`4`	`+ * 安全关闭的Converter`
	`5`	`+ * 设置为SelfCloseConverter 网络请求后不再自动关闭response，需要业务自己进行关闭`
	`6`	`+ */`
`3`	`7`	`public interface SelfCloseConverter {`
`4`	`8`	`}`