# 5.9.0

1. SDK支持自定义简单上传或分块上传的阈值
                          2. 灯塔上报优化
                          3. 区分用户主动取消和系统取消的场景

Author: garenwang

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 5.9.0    
+1. SDK支持自定义简单上传或分块上传的阈值   
+                          2. 灯塔上报优化
+                          3. 区分用户主动取消和系统取消的场景
+    
 # 5.8.9    
 - 一些修复
 

QCloudCOSXML.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name             = "QCloudCOSXML"
 
-s.version              = "5.8.9"
+s.version              = "5.9.0"
 
   s.summary          = "QCloudCOSXML 腾讯云iOS-SDK组件"
 
@@ -20,15 +20,15 @@ s.version              = "5.8.9"
   s.subspec 'Default' do |default|
   default.source_files = 'QCloudCOSXML/Classes/**/*','Models/request.model','QCloudCOSXML/Classes/QCloudCOSXML/*'
 
-  default.dependency "QCloudCore",'5.8.9'
+  default.dependency "QCloudCore",'5.9.0'
     end
   s.subspec 'Slim' do |slim|
   slim.source_files = 'QCloudCOSXML/Classes/**/*','Models/request.model','QCloudCOSXML/Classes/QCloudCOSXML/*'
-  slim.dependency "QCloudCore/WithoutMTA",'5.8.9'
+  slim.dependency "QCloudCore/WithoutMTA",'5.9.0'
   end
   s.subspec 'Transfer' do |transfer|
   transfer.source_files = 'QCloudCOSXML/Classes/*','QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/**/*'
-  transfer.dependency "QCloudCore/WithoutMTA",'5.8.9'
+  transfer.dependency "QCloudCore/WithoutMTA",'5.9.0'
   end
 
 end

QCloudCOSXML/Classes/QCloudCOSXMLVersion.h

@@ -5,7 +5,7 @@
 
 #ifndef QCloudCOSXMLModuleVersion_h
 #define QCloudCOSXMLModuleVersion_h
-#define QCloudCOSXMLModuleVersionNumber 508008
+#define QCloudCOSXMLModuleVersionNumber 509000
 
 //dependency
 

QCloudCOSXML/Classes/QCloudCOSXMLVersion.m

@@ -1,5 +1,5 @@
 #import "QCloudCOSXMLVersion.h"
-NSString * const QCloudCOSXMLModuleVersion = @"5.8.9";
+NSString * const QCloudCOSXMLModuleVersion = @"5.9.0";
 NSString * const QCloudCOSXMLModuleName = @"QCloudCOSXML";
 @interface QCloudQCloudCOSXMLLoad : NSObject
 @end

QCloudCOSXML/Classes/Transfer/request/QCloudCOSXMLDownloadObjectRequest.m

@@ -23,7 +23,7 @@ @interface  QCloudCOSXMLDownloadObjectRequest()
 @implementation QCloudCOSXMLDownloadObjectRequest
 #pragma clang diagnostic pop
 - (void)dealloc {
-    NSLog(@"QCloudCOSXMLUploadObjectRequest = %@ dealloc", self);
+    QCloudLogInfo(@"QCloudCOSXMLUploadObjectRequest = %@ dealloc", self);
     if (NULL != _queueSource) {
         dispatch_source_cancel(_queueSource);
     }
@@ -72,7 +72,6 @@ - (void)fakeStart {
                                   @"etag":outputObject[@"Etag"],
                                   @"crc64ecma":outputObject[@"x-cos-hash-crc64ecma"],
             };
-            NSLog(@"file info = %@",dic);
             NSError *parseError;
             NSData *info =[NSJSONSerialization dataWithJSONObject:dic options:NSJSONWritingPrettyPrinted error:&parseError];
             NSError *writeDataError;
@@ -92,7 +91,6 @@ - (void)fakeStart {
                                        @"etag":outputObject[@"Etag"],
                                        @"crc64ecma":outputObject[@"x-cos-hash-crc64ecma"],
                  };
-                 NSLog(@"file info = %@",dic);
                  NSError *parseError;
                  NSData *info =[NSJSONSerialization dataWithJSONObject:dic options:NSJSONWritingPrettyPrinted error:&parseError];
                  NSError *writeDataError;
@@ -126,7 +124,7 @@ - (void)startGetObject {
     [request setDownProcessBlock:^(int64_t bytesDownload, int64_t totalBytesDownload, int64_t totalBytesExpectedToDownload) {
         __strong typeof(weakSelf) strongSelf = self;
         currentTotalBytesDownload = totalBytesDownload;
-        NSLog(@"🔽🔽🔽🔽🔽downProcess %lld %lld %ld",totalBytesDownload,currentTotalBytesDownload,totalBytesExpectedToDownload);
+        QCloudLogInfo(@"🔽🔽🔽🔽🔽downProcess %lld %lld %ld",totalBytesDownload,currentTotalBytesDownload,totalBytesExpectedToDownload);
         if(strongSelf.downProcessBlock){
             strongSelf.downProcessBlock(bytesDownload, totalBytesDownload, totalBytesExpectedToDownload);
         }

QCloudCOSXML/Classes/Transfer/request/QCloudCOSXMLUploadObjectRequest.h

@@ -45,7 +45,10 @@ typedef void (^RequestsMetricArrayBlock)(NSMutableArray *_Nullable requstMetricA
 
  */
 @interface QCloudCOSXMLUploadObjectRequest<BodyType> : QCloudAbstractRequest
+//自定义分片大小
 @property (nonatomic, assign) NSUInteger sliceSize;
+//自定义分片阈值
+@property (nonatomic, assign) NSInteger mutilThreshold;
 @property (nonatomic, assign) QCloudAbstractRequestPriority uploadPriority;
 /**
  上传文件（对象）的文件名，也是对象的key，请注意文件名中不可以含有问号即"?"字符

QCloudCOSXML/Classes/Transfer/request/QCloudCOSXMLUploadObjectRequest.m

@@ -67,7 +67,7 @@ @interface QCloudCOSXMLUploadObjectRequest () <QCloudHttpRetryHandlerProtocol> {
 @implementation QCloudCOSXMLUploadObjectRequest
 
 - (void)dealloc {
-    NSLog(@"QCloudCOSXMLUploadObjectRequest = %@ dealloc", self);
+    QCloudLogInfo(@"QCloudCOSXMLUploadObjectRequest = %@ dealloc", self);
     if (NULL != _queueSource) {
         dispatch_source_cancel(_queueSource);
     }
@@ -90,13 +90,14 @@ - (instancetype)init {
     _recursiveLock = [NSRecursiveLock new];
     _progressLock = [NSRecursiveLock new];
     _requstMetricArray = [NSMutableArray array];
-    ;
+    _mutilThreshold = kQCloudCOSXMLUploadLengthLimit;
     _enableMD5Verification = YES;
     _retryHandler = [QCloudHTTPRetryHanlder defaultRetryHandler];
     startPartNumber = -1;
     self.priority = QCloudAbstractRequestPriorityHigh;
     return self;
 }
+
 - (NSDictionary *)modelCustomWillTransformFromDictionary:(NSDictionary *)dictionary {
     NSMutableDictionary *dict = [dictionary mutableCopy];
     if ([dictionary valueForKey:@"body"]) {
@@ -249,7 +250,15 @@ - (void)fakeStart {
             return;
         }
         self.dataContentLength = QCloudFileSize(url.path);
-        if (self.dataContentLength > kQCloudCOSXMLUploadLengthLimit) {
+        if(_mutilThreshold<kQCloudCOSXMLUploadLengthLimit){
+            @throw [NSException
+                exceptionWithName:QCloudErrorDomain
+                           reason:[NSString
+                                      stringWithFormat:
+                                   @"分块接口的阈值不能小于 1MB ，当前阈值为 %ld", (long)_mutilThreshold]
+                         userInfo:nil];
+        }
+        if (self.dataContentLength > _mutilThreshold) {
             //开始分片上传的时候，上传的起始位置是0
             uploadedSize = 0;
             startPartNumber = 0;
@@ -277,8 +286,10 @@ - (void)startSimpleUpload {
     request.finishBlock = ^(id outputObject, NSError *error) {
         __strong typeof(weakSelf) strongSelf = weakSelf;
         __strong typeof(weakRequest) strongRequst = weakRequest;
-        [strongSelf.requstMetricArray addObject:@{ [NSString stringWithFormat:@"%@", strongRequst] : weakRequest.benchMarkMan.tastMetrics }];
-
+        [weakSelf.requstMetricArray addObject:@{ [NSString stringWithFormat:@"%@", strongRequst] : weakRequest.benchMarkMan.tastMetrics }];
+        if (self.requstsMetricArrayBlock) {
+            self.requstsMetricArrayBlock(weakSelf.requstMetricArray);
+        }
         if (error) {
             [weakSelf onError:error];
             [self cancel];
@@ -564,7 +575,6 @@ - (void)onError:(NSError *)error {
 - (void)finishUpload:(NSString *)uploadId {
     NSURL *url = (NSURL *)self.body;
     if(self.canceled){
-        NSLog(@"finishUpload canceled = %d",self.canceled?1:0);
         return;
     }
     if(!self.uploadBodyIsCompleted){
@@ -680,7 +690,7 @@ - (QCloudCOSXMLUploadObjectResumeData)cancelByProductingResumeData:(NSError *__a
 }
 
 - (QCloudCOSXMLUploadObjectResumeData)productingReqsumeData:(NSError *__autoreleasing *)error {
-    if (_dataContentLength <= kQCloudCOSXMLUploadLengthLimit) {
+    if (_dataContentLength <= _mutilThreshold) {
         if (NULL != error) {
             *error = [NSError qcloud_errorWithCode:QCloudNetworkErrorUnsupportOperationError
                                            message:@"UnsupportOperation:无法暂停当前的上传请求，因为使用的是单次上传"];

QCloudCore.podspec

@@ -9,7 +9,7 @@
 Pod::Spec.new do |s|
   s.name             = "QCloudCore"
 
-s.version              = "5.8.9"
+s.version              = "5.9.0"
 
 
   s.summary          = "QCloudCore--腾讯云iOS-SDK Foundation"

QCloudCore/Classes/Base/QCLOUDRestNet/CoreRequest/QCloudHTTPRequest.h

@@ -32,6 +32,7 @@ typedef void (^QCloudHTTPRequestConfigure)(QCloudRequestSerializer *_Nonnull req
 @property (nonatomic, strong, readonly) QCloudRequestSerializer *_Nonnull requestSerializer;
 @property (nonatomic, strong, readonly) QCloudRequestData *_Nonnull requestData;
 @property (nonatomic, strong, readonly) QCloudResponseSerializer *_Nonnull responseSerializer;
+@property (nonatomic, strong, readonly) NSURLRequest *_Nullable urlRequest;
 
 /**
  该任务所处的服务

QCloudCore/Classes/Base/QCLOUDRestNet/CoreRequest/QCloudHTTPRequest.m

@@ -32,6 +32,7 @@ @interface QCloudHTTPRequest () {
 @property (atomic, assign) BOOL isCancel;
 @property (nonatomic, strong, readonly) NSMutableURLRequest *cachedURLRequest;
 @property (nonatomic, strong, readonly) NSError *cachedURLRequestBuildError;
+@property (nonatomic, strong) NSURLRequest *_Nullable urlRequest;
 @end
 
 @implementation QCloudHTTPRequest
@@ -134,14 +135,15 @@ - (NSURLRequest *)buildURLRequest:(NSError *__autoreleasing *)error {
     }
     QCloudLogDebug(@"SendingRequest [%lld]\n%@\n%@ \nrequest content:%@", self.requestID, request, request.allHTTPHeaderFields,
                    [[NSString alloc] initWithData:request.HTTPBody encoding:NSUTF8StringEncoding]);
+    self.urlRequest = request;
     return request;
 }
 
 - (void)onReviveErrorResponse:(NSURLResponse *)response error:(NSError *)error {
     _httpURLResponse = (NSHTTPURLResponse *)response;
     _httpURLError = error;
     if (NSURLErrorCancelled == error.code && [NSURLErrorDomain isEqualToString:error.domain]) {
-        error = [NSError qcloud_errorWithCode:QCloudNetworkErrorCodeCanceled message:@"UserCancelled:The request is canceled"];
+        error = [NSError qcloud_errorWithCode:QCloudNetworkErrorCodeCanceled message:@"UserCancelled:The request is canceled" infos:@{kQCloudErrorDetailCode:@(NSURLErrorCancelled)}];
     }
     _httpURLError.__originHTTPURLResponse__ = _httpURLResponse;
     error.__originHTTPURLResponse__ = _httpURLResponse;