6.0.0开发quic超时时间配置接口

Author: karisli

QCloudCore/Classes/Base/QCLOUDRestNet/SessionSupport/QCloudHTTPSessionManager.m

@@ -568,8 +568,6 @@ - (void)executeRestHTTPReqeust:(QCloudHTTPRequest *)httpRequest {
             dic[@"body"] = [NSNull null];
         }
 
-        dic[@"port"] = @(httpRequest.runOnService.configuration.port);
-        dic[@"tcp_port"] = @(httpRequest.runOnService.configuration.tcp_port);
         SEL createQuicTaskSelector = NSSelectorFromString(@"quicDataTaskWithRequst:infos:");
         if ([_quicSession respondsToSelector:createQuicTaskSelector]) {
             IMP imp = [_quicSession methodForSelector:createQuicTaskSelector];

QCloudCore/Classes/Base/QCloudClientBase/Request/QCloudServiceConfiguration.h

@@ -57,9 +57,7 @@
 
 @property (nonatomic, assign) NSTimeInterval timeoutInterval;
 
-@property (nonatomic, assign) NSInteger port;
 
-@property (nonatomic, assign) NSInteger tcp_port;
 
 
 @property (nonatomic, assign) BOOL enableQuic;

QCloudCore/Classes/Base/QCloudClientBase/Request/QCloudServiceConfiguration.m

@@ -21,8 +21,6 @@ - (instancetype)init
     if (!self) {
         return self;
     }
-    self.port = 443;
-    self.tcp_port = 80;
     return self;
 }
 - (NSString *)userAgent {
@@ -47,8 +45,6 @@ - (instancetype)copyWithZone:(NSZone *)zone {
     config.backgroundEnable = self.backgroundEnable;
     config.isCloseShareLog = self.isCloseShareLog;
     config.timeoutInterval = self.timeoutInterval;
-    config.port = self.port;
-    config.tcp_port = self.tcp_port;
     config.enableQuic = self.enableQuic;
     return config;
 }

QCloudQuic.podspec

@@ -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.0'
+  s.dependency "QCloudCOSXML",'6.0.0'
 
 
 end

QCloudQuic/Classes/QCloudBase/QCloudQuic.h

@@ -10,4 +10,5 @@
 
 
 
-#import <Foundation/Foundation.h>
+#import <Foundation/Foundation.h>
+#import "QCloudQuicConfig.h"

QCloudQuic/Classes/QCloudBase/QCloudQuicDataTask.m

@@ -33,7 +33,7 @@ - (instancetype)initWithHTTPRequest:(NSMutableURLRequest *)httpRequest
                                                  headerFileds:httpRequest.allHTTPHeaderFields];
         _manager = [TquicConnection new];
         __weak typeof(self) weakSelf = self;
-        [_manager tquicConnectWithQuicRequest:req session:quicSession
+        [_manager tquicConnectWithQuicRequest:req
             didReceiveResponse:^(TquicResponse *_Nonnull response) {
                 __strong typeof(weakSelf) strngSelf = weakSelf;
                 strngSelf.response = [[NSHTTPURLResponse alloc] initWithURL:httpRequest.URL

QCloudQuic/Classes/QCloudBase/QCloudQuicSession.h

@@ -15,8 +15,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (instancetype)quicSessionDelegate:(nullable id<NSURLSessionDataDelegate>)delegate;
 @property (nullable, readonly, retain) id<NSURLSessionDataDelegate> delegate;
-@property (nonatomic)NSInteger port;
-@property (nonatomic)NSInteger tcp_port;
 - (QCloudQuicDataTask *)quicDataTaskWithRequst:(NSMutableURLRequest *)httpRequs infos:(NSDictionary *)dic;
 @end
 

QCloudQuic/Classes/QCloudBase/QCloudQuicSession.m

@@ -26,8 +26,6 @@ - (QCloudQuicDataTask *)quicDataTaskWithRequst:(NSMutableURLRequest *)httpRequst
     id body = dic[@"body"];
     NSString *quicHost = dic[@"quicHost"];
     NSString *quicIp = dic[@"quicIP"];
-    self.port = [dic[@"port"] integerValue];
-    self.tcp_port = [dic[@"tcp_port"] integerValue];
     QCloudQuicDataTask *quicTask = [[QCloudQuicDataTask alloc] initWithHTTPRequest:httpRequst
                                                                           quicHost:quicHost
                                                                             quicIp:quicIp

QCloudQuic/Classes/QCloudBase/TquicConnection.h

@@ -10,7 +10,6 @@
 
 @class TquicRequest;
 @class TquicResponse;
-@class QCloudQuicSession;
 NS_ASSUME_NONNULL_BEGIN
 typedef void (^TquicRequestDidConnectBlock)(BOOL sucessed);
 typedef void (^TquicRequesDidReceiveResponseBlock)(TquicResponse *response);
@@ -22,7 +21,6 @@ typedef void (^TquicRequesDidCompleteWithErrorBlock)(NSError *error);
 
 @property (nonatomic, assign) BOOL connect;
 - (void)tquicConnectWithQuicRequest:(TquicRequest *)quicRequest
-                            session:(QCloudQuicSession *)session
                  didReceiveResponse:(TquicRequesDidReceiveResponseBlock)didReceiveResponse
                      didReceiveData:(TquicRequestDidReceiveDataBlock)didReceiveData
                     didSendBodyData:(TquicRequestDidSendBodyDataBlock)didSendBodyData

QCloudQuic/Classes/QCloudBase/TquicConnection.mm

@@ -16,7 +16,7 @@
 #include <chrono>
 #import "TquicResponse.h"
 #import "TquicRequest.h"
-#import "QCloudQuicSession.h"
+#import "QCloudQuicConfig.h"
 //每次发送的字节数
 static const int64_t sentByte = 32768;
 class TnetAsyncDelegate : public TnetRequestDelegate{
@@ -172,6 +172,7 @@ void OnConnectionClose(int error_code, const char* error_detail) override{
 
     // This request has received all the data and finished.
     void OnRequestFinish(int stream_error) override{
+
         NSError *error = nil;
         if (stream_error != 0) {
             error = [[NSError alloc] initWithDomain:NSURLErrorDomain code:stream_error userInfo:nil];
@@ -190,31 +191,68 @@ @interface TquicConnection (){
     std::shared_ptr<TnetAsyncDelegate>tquic_delegate_sp;
 }
 @property (nonatomic,strong)TquicRequest *quicReqeust;
-@property (nonatomic,weak)QCloudQuicSession *session;
+
 @end
 
 
 @implementation TquicConnection
 
 -(void)tquicConnectWithQuicRequest:(TquicRequest *)quicRequest
-                           session:(QCloudQuicSession *)session
+        
                         didReceiveResponse:(TquicRequesDidReceiveResponseBlock)didReceiveResponse didReceiveData:(TquicRequestDidReceiveDataBlock)didReceiveData didSendBodyData:(TquicRequestDidSendBodyDataBlock)didSendBodyData RequestDidCompleteWithError:(TquicRequesDidCompleteWithErrorBlock)requestDidCompleteWithError{
-     [self onHandleQuicRequest:quicRequest session:session didReceiveResponse:didReceiveResponse didReceiveData:didReceiveData didSendBodyData:didSendBodyData RequestDidCompleteWithError:requestDidCompleteWithError];
+     [self onHandleQuicRequest:quicRequest didReceiveResponse:didReceiveResponse didReceiveData:didReceiveData didSendBodyData:didSendBodyData RequestDidCompleteWithError:requestDidCompleteWithError];
 
 }
 
--(void)onHandleQuicRequest:(TquicRequest *)quicRequest   session:(QCloudQuicSession *)session didReceiveResponse:(TquicRequesDidReceiveResponseBlock)didReceiveResponse didReceiveData:(TquicRequestDidReceiveDataBlock)didReceiveData didSendBodyData:(TquicRequestDidSendBodyDataBlock)didSendBodyData RequestDidCompleteWithError:(TquicRequesDidCompleteWithErrorBlock)requestDidCompleteWithError{
+-(void)onHandleQuicRequest:(TquicRequest *)quicRequest  didReceiveResponse:(TquicRequesDidReceiveResponseBlock)didReceiveResponse didReceiveData:(TquicRequestDidReceiveDataBlock)didReceiveData didSendBodyData:(TquicRequestDidSendBodyDataBlock)didSendBodyData RequestDidCompleteWithError:(TquicRequesDidCompleteWithErrorBlock)requestDidCompleteWithError{
     tquic_delegate_sp.reset(new TnetAsyncDelegate (quicRequest, didReceiveResponse,didReceiveData,didSendBodyData,requestDidCompleteWithError));
     TnetConfig config = TnetConfig();
     if (quicRequest.body) {
         config.upload_optimize_ = true;
     }
-    config.congestion_type_ = kBBR;
-    config.race_type = kQUICHTTP;
+    
+    CongestionType congestion_type;
+    switch ([QCloudQuicConfig shareConfig].congestion_type) {
+        case QCloudCongestionTypeCubicBytes:
+            congestion_type = kCubicBytes;
+            break;
+        case QCloudCongestionTypeRenoBytes:
+            congestion_type = kRenoBytes;
+            break;
+        case QCloudCongestionTypeBBR:
+            congestion_type = kBBR;
+            break;
+        case QCloudCongestionTypePCC:
+            congestion_type = kPCC;
+            break;
+        case QCloudCongestionTypeGoogCC:
+            congestion_type = kGoogCC;
+            break;
+        default:
+            break;
+    }
+    config.congestion_type_ = congestion_type;
+    RaceType raceType;
+    switch ( [QCloudQuicConfig shareConfig].race_type) {
+        case QCloudRaceTypeOnlyQUIC:
+            raceType = kOnlyQUIC;
+            break;
+        case QCloudRaceTypeQUICHTTP:
+            raceType = kQUICHTTP;
+            break;
+        case QCloudRaceTypeOnlyHTTP:
+            raceType = kOnlyHTTP;
+            break;
+    }
+    config.race_type = raceType;
+    config.connect_timeout_millisec_ = [QCloudQuicConfig shareConfig].connect_timeout_millisec_;
+      // 设置连接空闲时间，单位为ms，默认值为与服务端协商值，一般为90000ms
+    config.idle_timeout_millisec_ =  [QCloudQuicConfig shareConfig].idle_timeout_millisec_;
+    config.is_custom_ = [QCloudQuicConfig shareConfig].is_custom;
     request_sp.reset(new TnetQuicRequest(tquic_delegate_sp.get(),config));
     tquic_delegate_sp.get()->request_sp = request_sp;
     self.quicReqeust = quicRequest;
-    self.session = session;
+
 }
 
 //cancle request
@@ -226,7 +264,8 @@ -(void)cancleRequest{
 //sent request
 -(void)startRequest{
     NSLog(@"Tquic startRequest: %@ (%@)", self.quicReqeust.host, self.quicReqeust.ip);
-    request_sp.get()->Connect([self.quicReqeust.host UTF8String] , [self.quicReqeust.ip UTF8String],  self.session.port, self.session.tcp_port);
+    request_sp.get()->Connect([self.quicReqeust.host UTF8String] , [self.quicReqeust.ip UTF8String],  [QCloudQuicConfig shareConfig].port, [QCloudQuicConfig shareConfig].tcp_port);
+//    request_sp.get()->Connect([@"iacc.stgw.qq.com" UTF8String] , [@"101.89.15.244" UTF8String],  [QCloudQuicConfig shareConfig].port, [QCloudQuicConfig shareConfig].tcp_port);
 }
 -(void)dealloc{
     NSLog(@"TquicConnection connect dealloc address = %@",self);