update qcloud sdk to 5.9.14

Author: jordanqin

QCloudCosXml/build.gradle

@@ -30,7 +30,7 @@ buildscript {
     }
 
     repositories {
-        mavenLocal()
+//        mavenLocal()
         mavenCentral()
         maven { url "https://mirrors.tencent.com/repository/maven/tencent_public" }
         maven {	url "https://mirrors.tencent.com/repository/maven/qmsp-oaid2" }
@@ -51,7 +51,7 @@ buildscript {
 
 allprojects {
     repositories {
-        mavenLocal()
+//        mavenLocal()
         mavenCentral()
         maven { url "https://mirrors.tencent.com/repository/maven/tencent_public" }
         maven {	url "https://mirrors.tencent.com/repository/maven/qmsp-oaid2" }

QCloudCosXml/cos-android-base/build.gradle

@@ -71,8 +71,12 @@ dependencies {
 
     api project(':foundation')
 
-    compileOnly 'com.tencent.beacon:beacon-android-release:4.2.80.6:official@aar'
-    compileOnly 'com.tencent.qimei:qimei:1.2.13.1'
+    compileOnly files(
+            'libs/beacon-android-release-4.2.80.6-official.aar',
+            'libs/qimei-1.2.13.1.aar',
+            'libs/qimei-core-1.2.13.1-normal.aar',
+            'libs/qmsp-oaid2-1.0.4.aar'
+    )
 }
 
 static String quotWrapper(key) {

QCloudCosXml/cos-android-base/libs/beacon-android-release-4.2.80.6-official.aar

@@ -168,7 +168,7 @@ public void reportDownloadTaskServiceException(CosXmlRequest request, QCloudServ
 //    private String cosDownloadName(boolean cse) {
 //        return cse? "COSDownloadTask-CSE" : "COSDownloadTask";
 //    }
-    
+
 //    public void reportCOSUploadTaskSuccess(CosXmlRequest request, boolean cse) {
 //        // 只需要一个 PutObjectRequest 壳，带上 HttpTaskMetrics 信息
 //        reportRequestSuccess(EVENT_CODE_UPLOAD, request,
@@ -431,8 +431,7 @@ private Map<String, String> parseDnsParams(CosXmlRequest request) {
         List<InetAddress> dns = null;
         try {
             dns = ConnectionRepository.getInstance().getDnsRecord(host);
-        } catch (UnknownHostException e) {
-            e.printStackTrace();
+        } catch (UnknownHostException ignored) {
         }
         params.put("ips", flatDns(taskMetrics.getConnectAddress(), dns));
         return params;

QCloudCosXml/cos-android-base/libs/qimei-1.2.13.1.aar

@@ -25,6 +25,8 @@
 import android.content.Context;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import com.tencent.cos.xml.base.BuildConfig;
 import com.tencent.cos.xml.common.ClientErrorCode;
 import com.tencent.cos.xml.exception.CosXmlClientException;
@@ -47,9 +49,10 @@
 import com.tencent.cos.xml.utils.StringUtils;
 import com.tencent.cos.xml.utils.URLEncodeUtils;
 import com.tencent.qcloud.core.auth.QCloudCredentialProvider;
-import com.tencent.qcloud.core.auth.QCloudLifecycleCredentials;
+import com.tencent.qcloud.core.auth.QCloudCredentials;
 import com.tencent.qcloud.core.auth.QCloudSelfSigner;
 import com.tencent.qcloud.core.auth.QCloudSigner;
+import com.tencent.qcloud.core.auth.ScopeLimitCredentialProvider;
 import com.tencent.qcloud.core.auth.SignerFactory;
 import com.tencent.qcloud.core.auth.StaticCredentialProvider;
 import com.tencent.qcloud.core.common.QCloudClientException;
@@ -80,7 +83,6 @@
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Executor;
@@ -147,6 +149,8 @@ public CosXmlBaseService(Context context, CosXmlServiceConfig configuration) {
         BeaconService.init(context.getApplicationContext(), IS_CLOSE_BEACON, BRIDGE);
         appCachePath = context.getApplicationContext().getFilesDir().getPath();
 
+        TaskExecutors.initExecutor(configuration.getUploadMaxThreadCount(), configuration.getDownloadMaxThreadCount());
+
         setNetworkClient(configuration);
         ContextHolder.setContext(context);
     }
@@ -247,6 +251,15 @@ public void addCustomerDNS(String domainName, String[] ipList) throws CosXmlClie
         }
     }
 
+    /**
+     * 添加自定义 DNS 解析器
+     * 支持添加多个，会顺序解析获取
+     * @param dnsFetch DNS 解析器
+     */
+    public void addCustomerDNSFetch(@NonNull QCloudHttpClient.QCloudDnsFetch dnsFetch){
+        client.addDnsFetch(dnsFetch);
+    }
+
     @Deprecated
     public void addVerifiedHost(String hostName) {
         client.addVerifiedHost(hostName);
@@ -262,14 +275,6 @@ public void setDomain(String domain) {
         this.requestDomain = domain;
     }
 
-    protected String getRequestHostHeader(CosXmlRequest request) {
-
-        String bucket = config.getBucket(request.getBucket());
-        String region = !TextUtils.isEmpty(request.getRegion()) ? request.getRegion() :
-                config.getRegion();
-        return String.format(Locale.ENGLISH, "%s.cos.%s.myqcloud.com", bucket, region);
-    }
-
     protected String getRequestHost(CosXmlRequest request) throws CosXmlClientException {
 
 
@@ -416,6 +421,8 @@ protected <T1 extends CosXmlRequest, T2 extends CosXmlResult> T2 execute(T1 cosX
 
             httpTask = client.resolveRequest(httpRequest, credentialProvider);
             httpTask.setTransferThreadControl(config.isTransferThreadControl());
+            httpTask.setUploadMaxThreadCount(config.getUploadMaxThreadCount());
+            httpTask.setDownloadMaxThreadCount(config.getDownloadMaxThreadCount());
             cosXmlRequest.setTask(httpTask);
 
             setProgressListener(cosXmlRequest, httpTask, false);
@@ -475,6 +482,8 @@ public void onFailure(QCloudClientException clientException, QCloudServiceExcept
             httpTask = client.resolveRequest(httpRequest, credentialProvider);
 
             httpTask.setTransferThreadControl(config.isTransferThreadControl());
+            httpTask.setUploadMaxThreadCount(config.getUploadMaxThreadCount());
+            httpTask.setDownloadMaxThreadCount(config.getDownloadMaxThreadCount());
 
             cosXmlRequest.setTask(httpTask);
 
@@ -564,11 +573,19 @@ public String getAccessUrl(CosXmlRequest cosXmlRequest) {
     public String getPresignedURL(CosXmlRequest cosXmlRequest) throws CosXmlClientException {
         try {
             //step1: obtain sign, contain token if it exist.
-            QCloudLifecycleCredentials qCloudLifecycleCredentials = (QCloudLifecycleCredentials) credentialProvider.getCredentials();
+            // 根据 provider 类型判断是否需要传入 credential scope
+            QCloudCredentials credentials;
+            if (credentialProvider instanceof ScopeLimitCredentialProvider) {
+                credentials = ((ScopeLimitCredentialProvider) credentialProvider).getCredentials(
+                        cosXmlRequest.getSTSCredentialScope(config));
+            } else {
+                credentials = credentialProvider.getCredentials();
+            }
+
             QCloudSigner signer = SignerFactory.getSigner(signerTypeCompat(signerType, cosXmlRequest));
 
             QCloudHttpRequest request = buildHttpRequest(cosXmlRequest, null);
-            signer.sign(request, qCloudLifecycleCredentials);
+            signer.sign(request, credentials);
             String sign = request.header(HttpConstants.Header.AUTHORIZATION);
             String token = request.header("x-cos-security-token");
             if(!TextUtils.isEmpty(token)){

QCloudCosXml/cos-android-base/libs/qimei-core-1.2.13.1-normal.aar

@@ -31,6 +31,7 @@
 import com.tencent.cos.xml.common.VersionInfo;
 import com.tencent.qcloud.core.http.QCloudHttpRetryHandler;
 import com.tencent.qcloud.core.task.RetryStrategy;
+import com.tencent.qcloud.core.task.TaskExecutors;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -68,50 +69,52 @@ public class CosXmlServiceConfig implements Parcelable {
      */
     public static final String DEFAULT_USER_AGENT = VersionInfo.getUserAgent();
 
-    private String protocol;
-    private String userAgent;
-    private String userAgentExtended;
+    private final String protocol;
+    private final String userAgent;
+    private final String userAgentExtended;
 
-    private String region;
-    private String appid;
+    private final String region;
+    private final String appid;
 
-    private String host;
-    private int port;
-    private String endpointSuffix;
+    private final String host;
+    private final int port;
+    private final String endpointSuffix;
 
-    private boolean isDebuggable;
+    private final boolean isDebuggable;
 
-    private RetryStrategy retryStrategy;
-    private QCloudHttpRetryHandler qCloudHttpRetryHandler;
+    private final RetryStrategy retryStrategy;
+    private final QCloudHttpRetryHandler qCloudHttpRetryHandler;
 
-    private int connectionTimeout;
-    private int socketTimeout;
+    private final int connectionTimeout;
+    private final int socketTimeout;
 
-    private Executor executor;
+    private final Executor executor;
 
-    private Executor observeExecutor;
+    private final Executor observeExecutor;
 
-    private boolean isQuic;
+    private final boolean isQuic;
 
     private List<String> prefetchHosts;
 
-    private Map<String, List<String>> commonHeaders;
+    private final Map<String, List<String>> commonHeaders;
 
-    private Set<String> noSignHeaders;
+    private final Set<String> noSignHeaders;
 
-    private boolean dnsCache;
+    private final boolean dnsCache;
 
     private String hostFormat = DEFAULT_HOST_FORMAT;
 
     private String hostHeaderFormat = null;
 
-    private boolean bucketInPath; // path style
+    private final boolean bucketInPath; // path style
 
-    private boolean accelerate; //
+    private final boolean accelerate; //
 
-    private boolean signInUrl; //
+    private final boolean signInUrl; //
 
-    private boolean transferThreadControl = true;
+    private final boolean transferThreadControl;
+    private final int uploadMaxThreadCount;
+    private final int downloadMaxThreadCount;
 
     public CosXmlServiceConfig(Builder builder) {
         this.protocol = builder.protocol;
@@ -148,6 +151,8 @@ public CosXmlServiceConfig(Builder builder) {
         this.dnsCache = builder.dnsCache;
         this.signInUrl = builder.signInUrl;
         this.transferThreadControl = builder.transferThreadControl;
+        this.uploadMaxThreadCount = builder.uploadMaxThreadCount;
+        this.downloadMaxThreadCount = builder.downloadMaxThreadCount;
     }
 
     public Builder newBuilder() {
@@ -410,6 +415,14 @@ public boolean isTransferThreadControl() {
         return transferThreadControl;
     }
 
+    public int getUploadMaxThreadCount() {
+        return uploadMaxThreadCount;
+    }
+
+    public int getDownloadMaxThreadCount() {
+        return downloadMaxThreadCount;
+    }
+
     @Deprecated
     public String getEndpointSuffix() {
         return getEndpointSuffix(region, false);
@@ -608,13 +621,17 @@ public final static class Builder {
         private boolean signInUrl;
 
         private boolean transferThreadControl = true;
+        private int uploadMaxThreadCount;
+        private int downloadMaxThreadCount;
 
         public Builder() {
             protocol = HTTPS_PROTOCOL;
             userAgent = DEFAULT_USER_AGENT;
             isDebuggable = false;
             retryStrategy = RetryStrategy.DEFAULT;
             bucketInPath = false;
+            uploadMaxThreadCount = TaskExecutors.DEFAULT_UPLOAD_THREAD_COUNT;
+            downloadMaxThreadCount = TaskExecutors.DEFAULT_DOWNLOAD_THREAD_COUNT;
         }
 
         public Builder(CosXmlServiceConfig config) {
@@ -652,6 +669,8 @@ public Builder(CosXmlServiceConfig config) {
 
             signInUrl = config.signInUrl;
             transferThreadControl = config.transferThreadControl;
+            uploadMaxThreadCount = config.uploadMaxThreadCount;
+            downloadMaxThreadCount = config.downloadMaxThreadCount;
         }
 
         /**
@@ -676,11 +695,32 @@ public Builder setSocketTimeout(int socketTimeoutMills) {
             return this;
         }
 
+        /**
+         * 设置传输时是否进行线程并发控制
+         * @param transferThreadControl 是否进行线程并发控制
+         */
         public Builder setTransferThreadControl(boolean transferThreadControl) {
             this.transferThreadControl = transferThreadControl;
             return this;
         }
 
+        /**
+         * 设置上传时线程并发的最大值
+         * @param uploadMaxThreadCount 线程并发的最大值
+         */
+        public Builder setUploadMaxThreadCount(int uploadMaxThreadCount) {
+            this.uploadMaxThreadCount = uploadMaxThreadCount;
+            return this;
+        }
+
+        /**
+         * 设置下载时线程并发的最大值
+         * @param downloadMaxThreadCount 线程并发的最大值
+         */
+        public Builder setDownloadMaxThreadCount(int downloadMaxThreadCount) {
+            this.downloadMaxThreadCount = downloadMaxThreadCount;
+            return this;
+        }
 
         /**
          * 设置是否 Https 协议，默认为 Https

QCloudCosXml/cos-android-base/libs/qmsp-oaid2-1.0.4.aar

@@ -25,6 +25,7 @@
 import android.text.TextUtils;
 
 import com.tencent.cos.xml.CosXmlServiceConfig;
+import com.tencent.cos.xml.common.ClientErrorCode;
 import com.tencent.cos.xml.exception.CosXmlClientException;
 import com.tencent.cos.xml.utils.URLEncodeUtils;
 import com.tencent.qcloud.core.auth.COSXmlSignSourceProvider;
@@ -38,10 +39,12 @@
 import com.tencent.qcloud.core.http.RequestBodySerializer;
 import com.tencent.qcloud.core.task.QCloudTask;
 
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -229,7 +232,22 @@ public Map<String, List<String>> getRequestHeaders(){
      * @return 请求体
      * @throws CosXmlClientException 客户异常
      */
-    public abstract RequestBodySerializer getRequestBody() throws CosXmlClientException;
+    public RequestBodySerializer getRequestBody() throws CosXmlClientException{
+        try {
+            return xmlBuilder();
+        } catch (XmlPullParserException e) {
+            throw new CosXmlClientException(ClientErrorCode.INVALID_ARGUMENT.getCode(), e);
+        } catch (IOException e) {
+            throw new CosXmlClientException(ClientErrorCode.INVALID_ARGUMENT.getCode(), e);
+        }
+    }
+
+    /**
+     * 收拢xml解析
+     */
+    protected RequestBodySerializer xmlBuilder() throws XmlPullParserException, IOException, CosXmlClientException {
+        throw new CosXmlClientException(ClientErrorCode.INVALID_ARGUMENT.getCode(), "xmlBuilder empty implementation");
+    }
 
     /**
      * sdk 参数校验
@@ -418,8 +436,11 @@ public void setSignSourceProvider(QCloudSignSourceProvider cosXmlSignSourceProvi
      */
     public STSCredentialScope[] getSTSCredentialScope(CosXmlServiceConfig config) {
         String action = "name/cos:" + getClass().getSimpleName().replace("Request", "");
-        STSCredentialScope scope = new STSCredentialScope(action, config.getBucket(bucket),
-                config.getRegion(), getPath(config));
+        STSCredentialScope scope = new STSCredentialScope(
+                action,
+                config.getBucket(bucket),
+                this.getRegion() == null ? config.getRegion() : this.getRegion(),
+                getPath(config));
         return scope.toArray();
     }