# 6.0.3

garenwang · garenwang · commit 58bb0fa85043 · 2022-01-18T19:21:11.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 6.0.3    
+
+    
 # 6.0.2    
 
     
diff --git a/QCloudCOSXML.podspec b/QCloudCOSXML.podspec
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
   s.name             = "QCloudCOSXML"
 
 
-s.version              = "6.0.2"
+s.version              = "6.0.3"
 
 
   s.summary          = "QCloudCOSXML 腾讯云iOS-SDK组件"
@@ -22,15 +22,15 @@ s.version              = "6.0.2"
   s.subspec 'Default' do |default|
   default.source_files = 'QCloudCOSXML/Classes/**/*','QCloudCOSXML/Classes/QCloudCOSXML/*'
 
-  default.dependency "QCloudCore",'6.0.2'
+  default.dependency "QCloudCore",'6.0.3'
     end
   s.subspec 'Slim' do |slim|
   slim.source_files = 'QCloudCOSXML/Classes/**/*','QCloudCOSXML/Classes/QCloudCOSXML/*'
-  slim.dependency "QCloudCore/WithoutMTA",'6.0.2'
+  slim.dependency "QCloudCore/WithoutMTA",'6.0.3'
   end
   s.subspec 'Transfer' do |transfer|
   transfer.source_files = 'QCloudCOSXML/Classes/*','QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/**/*'
-  transfer.dependency "QCloudCore/WithoutMTA",'6.0.2'
+  transfer.dependency "QCloudCore/WithoutMTA",'6.0.3'
 
   end
 
diff --git a/QCloudCOSXML/Classes/Base/QCloudCOSXMLService+Quality.m b/QCloudCOSXML/Classes/Base/QCloudCOSXMLService+Quality.m
@@ -12,6 +12,7 @@
 #import <QCloudCore/QCloudLogger.h>
 #import "QCloudCOSXMLVersion.h"
 #import <QCloudCore/QualityDataUploader.h>
+#import <QCloudCore/QCloudServiceConfiguration+Quality.h>
 
 @implementation QCloudCOSXMLService (Quality)
 
@@ -31,8 +32,10 @@ + (void)changeImplementation {
 
 + (QCloudCOSXMLService *)Quality_registerDefaultCOSXMLWithConfiguration:(QCloudServiceConfiguration *)configuration {
     id result = [self Quality_registerDefaultCOSXMLWithConfiguration:configuration];
-
-    [self initMTA];
+    if(!configuration.disableSetupBeacon){
+        [self initMTA];
+    }
+    
     return result;
 }
 
diff --git a/QCloudCOSXML/Classes/QCloudCOSXMLVersion.h b/QCloudCOSXML/Classes/QCloudCOSXMLVersion.h
@@ -5,7 +5,7 @@
 
 #ifndef QCloudCOSXMLModuleVersion_h
 #define QCloudCOSXMLModuleVersion_h
-#define QCloudCOSXMLModuleVersionNumber 600002
+#define QCloudCOSXMLModuleVersionNumber 600003
 
 //dependency
 
diff --git a/QCloudCOSXML/Classes/QCloudCOSXMLVersion.m b/QCloudCOSXML/Classes/QCloudCOSXMLVersion.m
@@ -1,5 +1,5 @@
 #import "QCloudCOSXMLVersion.h"
-NSString * const QCloudCOSXMLModuleVersion = @"6.0.2";
+NSString * const QCloudCOSXMLModuleVersion = @"6.0.3";
 NSString * const QCloudCOSXMLModuleName = @"QCloudCOSXML";
 @interface QCloudQCloudCOSXMLLoad : NSObject
 @end
diff --git a/QCloudCore.podspec b/QCloudCore.podspec
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.name             = "QCloudCore"
 
 
-s.version              = "6.0.2"
+s.version              = "6.0.3"
 
 
 
diff --git a/QCloudCore/Classes/Base/QCLOUDRestNet/SessionSupport/QCloudHTTPSessionManager.m b/QCloudCore/Classes/Base/QCLOUDRestNet/SessionSupport/QCloudHTTPSessionManager.m
@@ -548,16 +548,17 @@ - (void)executeRestHTTPReqeust:(QCloudHTTPRequest *)httpRequest {
             ipAddr = [[QCloudHttpDNS shareDNS] queryIPForHost:host];
         }
         if (!ipAddr) {
-            // 查询 可用的 ip 地址
+            // 查询 可用的 ip 地址tc
             [[QCloudHttpDNS shareDNS] prepareFetchIPListForHost:host port:@"443"];
             ipAddr = [[QCloudHttpDNS shareDNS] findHealthyIpFor:host];
         }
         if (!ipAddr) {
             @throw [NSException exceptionWithName:NSURLErrorDomain reason:@"No Available IP Address for QUIC." userInfo:nil];
         }
 
-        NSMutableDictionary *dic = [NSMutableDictionary dictionary];
-
+        NSMutableDictionary *dic = [NSMutableDictionary dictionaryWithDictionary:transformRequest.allHTTPHeaderFields];
+  
+ 
         dic[@"quicHost"] = host;
         dic[@"quicIP"] = ipAddr;
         if (uploadFileURL) {
diff --git a/QCloudCore/Classes/Base/QCloudBase/QualityAssurance/QCloudServiceConfiguration+Quality.h b/QCloudCore/Classes/Base/QCloudBase/QualityAssurance/QCloudServiceConfiguration+Quality.h
@@ -0,0 +1,17 @@
+//
+//  QCloudServiceConfiguration+Quality.h
+//  QCloudCore
+//
+//  Created by karisli(李雪) on 2022/1/18.
+//
+
+#import <QCloudCore/QCloudCore.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface QCloudServiceConfiguration (Quality)
+
+@property (nonatomic, assign) BOOL disableSetupBeacon;
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/QCloudCore/Classes/Base/QCloudBase/QualityAssurance/QCloudServiceConfiguration+Quality.m b/QCloudCore/Classes/Base/QCloudBase/QualityAssurance/QCloudServiceConfiguration+Quality.m
@@ -0,0 +1,20 @@
+//
+//  QCloudServiceConfiguration+Quality.m
+//  QCloudCore
+//
+//  Created by karisli(李雪) on 2022/1/18.
+//
+
+#import "QCloudServiceConfiguration+Quality.h"
+#import <objc/runtime.h>
+@implementation QCloudServiceConfiguration (Quality)
+NSString *const disableSetupBeaconKey = @"disableBeaconKey";
+
+-(void)setDisableSetupBeacon:(BOOL)disableSetupBeacon{
+    objc_setAssociatedObject(self, &disableSetupBeaconKey, [NSNumber numberWithBool:disableSetupBeacon], OBJC_ASSOCIATION_ASSIGN);
+}
+-(BOOL)disableSetupBeacon{
+    //因为在set方法中转成了number类型,所以这里需要转成Bool类型
+    return [objc_getAssociatedObject(self, &disableSetupBeaconKey) boolValue];
+}
+@end
diff --git a/QCloudCore/Classes/Base/QCloudClientBase/Request/QCloudBizHTTPRequest.m b/QCloudCore/Classes/Base/QCloudClientBase/Request/QCloudBizHTTPRequest.m
@@ -61,6 +61,11 @@ QCloudResponseSerializerBlock QCloudResponseObjectSerilizerBlock(Class modelClas
           return (id)(transformData.data);
       };
 
+@interface QCloudBizHTTPRequest ()
+@property (nonatomic,strong,nullable)dispatch_semaphore_t semaphore;
+@end
+
+
 @implementation QCloudBizHTTPRequest
 
 - (instancetype)init {
@@ -108,7 +113,7 @@ - (QCloudSignatureFields *)signatureFields {
 
 - (BOOL)prepareInvokeURLRequest:(NSMutableURLRequest *)urlRequest error:(NSError *__autoreleasing *)error {
     //    NSAssert(self.runOnService, @"RUN ON SERVICE is nil%@", self.runOnService);
-    __block dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+    self.semaphore = dispatch_semaphore_create(0);
     __block NSError *localError;
     __block BOOL isSigned;
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
@@ -141,11 +146,12 @@ - (BOOL)prepareInvokeURLRequest:(NSMutableURLRequest *)urlRequest error:(NSError
                                   // null authorization
                               }
                           }
-                          dispatch_semaphore_signal(semaphore);
+                          dispatch_semaphore_signal(self.semaphore);
+                          self.semaphore = nil;
                       }];
     });
 
-    dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, 15 * NSEC_PER_SEC));
+    dispatch_semaphore_wait(self.semaphore, dispatch_time(DISPATCH_TIME_NOW, 15 * NSEC_PER_SEC));
     if (localError) {
         if (NULL != error) {
             *error = localError;
@@ -177,6 +183,14 @@ - (void)loadQCloudSignature {
     NSData *md5data = [NSData dataWithBytes:result length:CC_MD5_DIGEST_LENGTH];
     return [md5data base64EncodedStringWithOptions:0];
 }
+
+- (void)dealloc{
+    if (self.semaphore) {
+        dispatch_semaphore_signal(self.semaphore);
+        self.semaphore = nil;
+    }
+}
+
 - (void)setCOSServerSideEncyption {
     self.customHeaders[@"x-cos-server-side-encryption"] = @"AES256";
 }
diff --git a/QCloudCore/Classes/Base/QCloudClientBase/Request/QCloudServiceConfiguration.m b/QCloudCore/Classes/Base/QCloudClientBase/Request/QCloudServiceConfiguration.m
@@ -8,6 +8,7 @@
 
 #import "QCloudServiceConfiguration.h"
 #import "QCloudServiceConfiguration_Private.h"
+#import "QCloudServiceConfiguration+Quality.h"
 #if TARGET_OS_IOS
 #import <UIKit/UIKit.h>
 #endif
@@ -46,6 +47,7 @@ - (instancetype)copyWithZone:(NSZone *)zone {
     config.isCloseShareLog = self.isCloseShareLog;
     config.timeoutInterval = self.timeoutInterval;
     config.enableQuic = self.enableQuic;
+    config.disableSetupBeacon = self.disableSetupBeacon;
     return config;
 }
 @end
diff --git a/QCloudCore/Classes/Base/QCloudCore.h b/QCloudCore/Classes/Base/QCloudCore.h
@@ -13,6 +13,7 @@
 #import "QCloudLogger.h"
 #import "QCloudBundle.h"
 #import "QCloudServiceConfiguration.h"
+#import "QCloudServiceConfiguration+Quality.h"
 #import "QCloudService.h"
 #import "QCloudFileUtils.h"
 #import "QCloudEndPoint.h"
diff --git a/QCloudCore/Classes/Base/QCloudCoreVersion.h b/QCloudCore/Classes/Base/QCloudCoreVersion.h
@@ -5,7 +5,7 @@
 
 #ifndef QCloudCoreModuleVersion_h
 #define QCloudCoreModuleVersion_h
-#define QCloudCoreModuleVersionNumber 600002
+#define QCloudCoreModuleVersionNumber 600003
 
 //dependency
 
diff --git a/QCloudCore/Classes/Base/QCloudCoreVersion.m b/QCloudCore/Classes/Base/QCloudCoreVersion.m
@@ -1,5 +1,5 @@
 #import "QCloudCoreVersion.h"
-NSString * const QCloudCoreModuleVersion = @"6.0.2";
+NSString * const QCloudCoreModuleVersion = @"6.0.3";
 NSString * const QCloudCoreModuleName = @"QCloudCore";
 @interface QCloudQCloudCoreLoad : NSObject
 @end
diff --git a/QCloudQuic.podspec b/QCloudQuic.podspec
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.name             = "QCloudQuic"
 
 
-s.version              = "6.0.2"
+s.version              = "6.0.3"
 
 
   s.summary          = "QCloudQuic 腾讯云iOS-SDK组件"
@@ -36,7 +36,7 @@ s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
   s.source_files = 'QCloudQuic/Classes/QCloudBase/**/*','QCloudQuic/Classes/QuicFramework//*.{h}'
   s.vendored_frameworks = 'QCloudQuic/Classes/QuicFramework/Tquic.framework'
   s.static_framework = true
-  s.dependency "QCloudCOSXML",'6.0.2'
+  s.dependency "QCloudCOSXML",'6.0.3'
   
 
 end
diff --git a/QCloudQuic/Classes/QCloudBase/QCloudQuicConfig.h b/QCloudQuic/Classes/QCloudBase/QCloudQuicConfig.h
@@ -33,6 +33,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 // 设置连接超时时间，单位为ms，默认为4000ms
 @property (nonatomic,assign)NSInteger connect_timeout_millisec_;
+@property (nonatomic,assign)NSInteger total_timeout_millisec_;
 //设置连接空闲时间，单位为ms，默认值为与服务端协商值，一般为90000ms
 @property (nonatomic,assign) NSInteger idle_timeout_millisec_;
 @property (nonatomic,assign)QCloudRaceType race_type;
diff --git a/QCloudQuic/Classes/QCloudBase/QCloudQuicConfig.m b/QCloudQuic/Classes/QCloudBase/QCloudQuicConfig.m
@@ -31,7 +31,7 @@ - (instancetype)init
     self.tcp_port = 80;
     self.race_type = QCloudRaceTypeOnlyQUIC;
     self.congestion_type = QCloudCongestionTypeBBR;
-    self.is_custom = YES;
+    self.is_custom = NO;
     return self;
 }
 @end
diff --git a/QCloudQuic/Classes/QCloudBase/QCloudQuicDataTask.m b/QCloudQuic/Classes/QCloudBase/QCloudQuicDataTask.m
@@ -17,7 +17,7 @@ - (instancetype)initWithHTTPRequest:(NSMutableURLRequest *)httpRequest
                            quicHost:(NSString *)quicHost
                              quicIp:(NSString *)quicIp
                                body:(id)body
-                        headers:(nonnull NSDictionary *)headers
+                            headers:(nonnull NSDictionary *)headers
                         quicSession:(QCloudQuicSession *)quicSession {
     if (self = [super init]) {
         id bodyData = nil;
@@ -26,48 +26,96 @@ - (instancetype)initWithHTTPRequest:(NSMutableURLRequest *)httpRequest
         } else if (httpRequest.HTTPBody) {
             bodyData = httpRequest.HTTPBody;
         }
+        
+ 
+        
+        //
+        NSMutableDictionary *quicHeaders = [NSMutableDictionary dictionary];
+        [httpRequest.allHTTPHeaderFields enumerateKeysAndObjectsUsingBlock:^(id  _Nonnull key, id  _Nonnull obj, BOOL * _Nonnull stop) {
+            if([key isEqualToString:@"path"]){
+                [quicHeaders setValue:obj forKey:@":path"];
+            }else if ([key isEqualToString:@"method"]){
+                [quicHeaders setValue:obj forKey:@":method"];
+            }
+            else if ([key isEqualToString:@"scheme"]){
+                [quicHeaders setValue:obj forKey:@":scheme"];
+            }else{
+                [quicHeaders setValue:obj forKey:key];
+            }
+        }];
+        quicHeaders[@":method"] = httpRequest.HTTPMethod;
+        quicHeaders[@":scheme"] = httpRequest.URL.scheme;
+        NSString *path = httpRequest.URL.path;
+     
+        quicHeaders[@":authority"]= quicHost;
+        quicHeaders[@"vod-forward-cos"]= quicHost;
+        [quicHeaders removeObjectForKey:@"Host"];
+        if (httpRequest.URL.query) {
+            path = [NSString stringWithFormat:@"%@?%@",path,httpRequest.URL.query];
+        }
+        if (path.length!=0) {
+            if (![[path substringToIndex:1] isEqualToString:@"/"]) {
+                path = [NSString stringWithFormat:@"/?%@",httpRequest.URL.query];
+            }
+        }else{
+            path = @"/";
+        }
+        
+        quicHeaders[@":path"] = path;
+        if([httpRequest.HTTPMethod isEqualToString:@"POST"] && body == [NSNull null]){
+            quicHeaders[@"content-length"] = @"0";
+        }
+        
         TquicRequest *req = [[TquicRequest alloc] initWithURL:httpRequest.URL
                                                          host:quicHost
                                                    httpMethod:httpRequest.HTTPMethod
                                                            ip:quicIp
                                                          body:bodyData
-                                                 headerFileds:headers];
+                                                 headerFileds:[quicHeaders copy]];
         _manager = [TquicConnection new];
         __weak typeof(self) weakSelf = self;
         [_manager tquicConnectWithQuicRequest:req
-            didReceiveResponse:^(TquicResponse *_Nonnull response) {
-                __strong typeof(weakSelf) strngSelf = weakSelf;
-                strngSelf.response = [[NSHTTPURLResponse alloc] initWithURL:httpRequest.URL
-                                                                 statusCode:response.statusCode
-                                                                HTTPVersion:response.httpVersion
-                                                               headerFields:[response.allHeaderFields copy]];
-                if ([strngSelf.quicDelegate respondsToSelector:@selector(URLSession:dataTask:didReceiveResponse:completionHandler:)]) {
-                    [strngSelf.quicDelegate URLSession:quicSession dataTask:strngSelf didReceiveResponse:strngSelf.response completionHandler:nil];
+                                   didConnect:^(NSError * _Nonnull error) {
+            __strong typeof(weakSelf) strngSelf = weakSelf;
+                                       
+            if(error){
+                if ([strngSelf.quicDelegate respondsToSelector:@selector(URLSession:task:didCompleteWithError:)]) {
+                    [strngSelf.quicDelegate URLSession:quicSession task:strngSelf didCompleteWithError:error];
                 }
             }
-            didReceiveData:^(NSData *_Nonnull data) {
-                __strong typeof(weakSelf) strngSelf = weakSelf;
-                if ([strngSelf.quicDelegate respondsToSelector:@selector(URLSession:dataTask:didReceiveData:)]) {
-                    [strngSelf.quicDelegate URLSession:quicSession dataTask:strngSelf didReceiveData:data];
-                }
+        } didReceiveResponse:^(TquicResponse *_Nonnull response) {
+            __strong typeof(weakSelf) strngSelf = weakSelf;
+            strngSelf.response = [[NSHTTPURLResponse alloc] initWithURL:httpRequest.URL
+                                                             statusCode:response.statusCode
+                                                            HTTPVersion:response.httpVersion
+                                                           headerFields:[response.allHeaderFields copy]];
+            if ([strngSelf.quicDelegate respondsToSelector:@selector(URLSession:dataTask:didReceiveResponse:completionHandler:)]) {
+                [strngSelf.quicDelegate URLSession:quicSession dataTask:strngSelf didReceiveResponse:strngSelf.response completionHandler:nil];
             }
-            didSendBodyData:^(int64_t bytesSent, int64_t totolSentBytes, int64_t totalBytesExpectedToSend) {
-                __strong typeof(weakSelf) strngSelf = weakSelf;
-                if ([strngSelf.quicDelegate respondsToSelector:@selector(URLSession:task:didSendBodyData:totalBytesSent:totalBytesExpectedToSend:)]) {
-                    [strngSelf.quicDelegate URLSession:quicSession
+        }
+                               didReceiveData:^(NSData *_Nonnull data) {
+            __strong typeof(weakSelf) strngSelf = weakSelf;
+            if ([strngSelf.quicDelegate respondsToSelector:@selector(URLSession:dataTask:didReceiveData:)]) {
+                [strngSelf.quicDelegate URLSession:quicSession dataTask:strngSelf didReceiveData:data];
+            }
+        }
+                              didSendBodyData:^(int64_t bytesSent, int64_t totolSentBytes, int64_t totalBytesExpectedToSend) {
+            __strong typeof(weakSelf) strngSelf = weakSelf;
+            if ([strngSelf.quicDelegate respondsToSelector:@selector(URLSession:task:didSendBodyData:totalBytesSent:totalBytesExpectedToSend:)]) {
+                [strngSelf.quicDelegate URLSession:quicSession
                                               task:strngSelf
                                    didSendBodyData:bytesSent
                                     totalBytesSent:totolSentBytes
                           totalBytesExpectedToSend:totalBytesExpectedToSend];
-                }
             }
-            RequestDidCompleteWithError:^(NSError *_Nonnull error) {
-                __strong typeof(weakSelf) strngSelf = weakSelf;
-                strngSelf.originalRequest = [[NSURLRequest alloc] initWithURL:httpRequest.URL];
-                if ([strngSelf.quicDelegate respondsToSelector:@selector(URLSession:task:didCompleteWithError:)]) {
-                    [strngSelf.quicDelegate URLSession:quicSession task:strngSelf didCompleteWithError:error];
-                }
-            }];
+        }
+                  RequestDidCompleteWithError:^(NSError *_Nonnull error) {
+            __strong typeof(weakSelf) strngSelf = weakSelf;
+            strngSelf.originalRequest = [[NSURLRequest alloc] initWithURL:httpRequest.URL];
+            if ([strngSelf.quicDelegate respondsToSelector:@selector(URLSession:task:didCompleteWithError:)]) {
+                [strngSelf.quicDelegate URLSession:quicSession task:strngSelf didCompleteWithError:error];
+            }
+        }];
     }
     return self;
 }
diff --git a/QCloudQuic/Classes/QCloudBase/TquicConnection.h b/QCloudQuic/Classes/QCloudBase/TquicConnection.h
diff --git a/QCloudQuic/Classes/QCloudBase/TquicConnection.mm b/QCloudQuic/Classes/QCloudBase/TquicConnection.mm
diff --git a/QCloudQuic/Classes/QCloudBase/TquicRequest.mm b/QCloudQuic/Classes/QCloudBase/TquicRequest.mm
diff --git a/QCloudQuic/Classes/QCloudQuicVersion.h b/QCloudQuic/Classes/QCloudQuicVersion.h
diff --git a/QCloudQuic/Classes/QCloudQuicVersion.m b/QCloudQuic/Classes/QCloudQuicVersion.m
diff --git a/QCloudQuic/Classes/QuicFramework/Tquic.framework/Tquic b/QCloudQuic/Classes/QuicFramework/Tquic.framework/Tquic

-Original file line number
+Diff line change
@@ @@ -1,3 +1,6 @@ @@
 +# 6.0.3
++
++
 # 6.0.2
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ Pod::Spec.new do \|s\|`
`10`	`10`	`s.name = "QCloudCore"`
`11`	`11`
`12`	`12`
`13`		`-s.version = "6.0.2"`
	`13`	`+s.version = "6.0.3"`
`14`	`14`
`15`	`15`
`16`	`16`