1、新增track 库。2、重构core 上报。3、修复quic上传精度。4、修复 githubissue.

tencentyun · Jan 18, 2024 · f029091 · f029091
1 parent 0b31321
commit f029091
Show file tree

Hide file tree

Showing 87 changed files with 2,980 additions and 125 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # 6.3.3    
-pic-operations漏洞修复。
+
+修复pic-operations 漏洞
 
 # 6.3.1    
 1.修复quic弱网进度异常。2.优化重试策略配置逻辑。

diff --git a/Podfile b/Podfile
@@ -6,6 +6,8 @@ target 'QCloudCOSXMLDemo' do
  pod 'QCloudCOSXML', path:'.'
  pod 'QCloudCore', path:'.'
  pod 'QCloudQuic', path:'.'
+ pod 'QCloudTrack', path:'.'
+ pod 'QCloudTrack/Cls', path:'.'
 
 target 'QCloudCOSXMLDemoTests' do
   inherit! :search_paths

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,19 +1,36 @@
 PODS:
-  - QCloudCore (6.3.2):
-    - QCloudCore/Default (= 6.3.2)
-  - QCloudCore/Default (6.3.2)
-  - QCloudCOSXML (6.3.2):
-    - QCloudCOSXML/Default (= 6.3.2)
-  - QCloudCOSXML/Default (6.3.2):
-    - QCloudCore (= 6.3.2)
-  - QCloudQuic (6.3.2):
-    - QCloudQuic/Default (= 6.3.2)
-  - QCloudQuic/Default (6.3.2)
+  - GMOpenSSL (2.2.9)
+  - QCloudCore (6.3.4):
+    - QCloudCore/Default (= 6.3.4)
+  - QCloudCore/Default (6.3.4):
+    - QCloudTrack/Beacon
+  - QCloudCOSXML (6.3.4):
+    - QCloudCOSXML/Default (= 6.3.4)
+  - QCloudCOSXML/Default (6.3.4):
+    - QCloudCore (= 6.3.4)
+  - QCloudQuic (6.3.4):
+    - QCloudQuic/Default (= 6.3.4)
+  - QCloudQuic/Default (6.3.4)
+  - QCloudTrack (6.3.4):
+    - QCloudTrack/Default (= 6.3.4)
+  - QCloudTrack/Beacon (6.3.4)
+  - QCloudTrack/Cls (6.3.4):
+    - TencentCloudLogProducer/Core
+  - QCloudTrack/Default (6.3.4)
+  - TencentCloudLogProducer/Core (1.0.9):
+    - GMOpenSSL (~> 2.2.6)
 
 DEPENDENCIES:
   - QCloudCore (from `.`)
   - QCloudCOSXML (from `.`)
   - QCloudQuic (from `.`)
+  - QCloudTrack (from `.`)
+  - QCloudTrack/Cls (from `.`)
+
+SPEC REPOS:
+  https://github.com/CocoaPods/Specs:
+    - GMOpenSSL
+    - TencentCloudLogProducer
 
 EXTERNAL SOURCES:
   QCloudCore:
@@ -22,12 +39,17 @@ EXTERNAL SOURCES:
     :path: "."
   QCloudQuic:
     :path: "."
+  QCloudTrack:
+    :path: "."
 
 SPEC CHECKSUMS:
-  QCloudCore: ad71cd77b8e7a0c62e6a63f869106d160ee64d2f
-  QCloudCOSXML: 80b70aaddafadd36ba475af1dade4f6c4be533af
-  QCloudQuic: 909377017159e8bb48223e268f5c6c885792d846
+  GMOpenSSL: d6d119ff8f00d4e03c2cdf733fb61e98e22da9c7
+  QCloudCore: e7519fd3c3fa1ec83f808b12b8d9d2791b9cceca
+  QCloudCOSXML: ddce35e6324b3d1ed6aae8cd6e565e7f0c9b83a9
+  QCloudQuic: f16396598d892d47b7b69ee298a1a66681ab0823
+  QCloudTrack: 35e1acef25f9846a744829f7cbd363b2a1d8f8e6
+  TencentCloudLogProducer: 980e6a4b9ed49b7b3f41779203be5e4ba1b03b95
 
-PODFILE CHECKSUM: 87053f234f38ae6a394978f26bcb119015f9918e
+PODFILE CHECKSUM: 70fab69b55a156a2cdbbceeaba228ea43f530439
 
 COCOAPODS: 1.12.1
diff --git a/QCloudCOSXML.podspec b/QCloudCOSXML.podspec
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
   s.name             = "QCloudCOSXML"
 
 
-s.version              = "6.3.3"
+s.version              = "6.3.4"
 
 
   s.summary          = "QCloudCOSXML 腾讯云iOS-SDK组件"
@@ -22,15 +22,15 @@ s.version              = "6.3.3"
   s.subspec 'Default' do |default|
   default.source_files = 'QCloudCOSXML/Classes/**/*','QCloudCOSXML/Classes/QCloudCOSXML/*'
 
-  default.dependency "QCloudCore",'6.3.3'
+  default.dependency "QCloudCore",'6.3.4'
     end
   s.subspec 'Slim' do |slim|
   slim.source_files = 'QCloudCOSXML/Classes/**/*','QCloudCOSXML/Classes/QCloudCOSXML/*'
-  slim.dependency "QCloudCore/WithoutMTA",'6.3.3'
+  slim.dependency "QCloudCore/WithoutMTA",'6.3.4'
   end
   s.subspec 'Transfer' do |transfer|
   transfer.source_files = 'QCloudCOSXML/Classes/*','QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/**/*'
-  transfer.dependency "QCloudCore/WithoutMTA",'6.3.3'
+  transfer.dependency "QCloudCore/WithoutMTA",'6.3.4'
 
   end
 

diff --git a/QCloudCOSXML/Classes/Base/QCloudAbstractRequest+Quality.m b/QCloudCOSXML/Classes/Base/QCloudAbstractRequest+Quality.m
@@ -9,6 +9,7 @@
 #import <objc/runtime.h>
 #import <QCloudCore/QualityDataUploader.h>
 #import "QCloudCOSXMLVersion.h"
+#import "QCloudCOSXMLService+Quality.h"
 @implementation QCloudAbstractRequest (Quality)
 + (void)load {
     static dispatch_once_t onceToken;
@@ -30,21 +31,12 @@ + (void)exchangeImplementation {
 
 - (void)__quality__notifyError:(NSError *)error {
     [self __quality__notifyError:error];
-    [QualityDataUploader trackSDKRequestFailWithRequest:self error:error params:[self commonParams]];
+    [QualityDataUploader trackSDKRequestFailWithRequest:self error:error params:[QCloudCOSXMLService commonParams:kQCloudDataAppReleaseKey]];
 }
 
 - (void)__quality__notifySuccess:(id)object {
     [self __quality__notifySuccess:object];
-    [QualityDataUploader trackSDKRequestSuccessWithRequest:self params:[self commonParams]];
-}
-
--(NSMutableDictionary *)commonParams{
-    NSMutableDictionary * params = [NSMutableDictionary new];
-    params[kQCloudRequestAppkeyKey] = kQCloudUploadAppReleaseKey;
-    params[@"pName"] = @"cos";
-    params[@"sdkVersion"] = QCloudCOSXMLModuleVersion;
-    params[@"sdkVersionName"] = @(QCloudCOSXMLModuleVersionNumber);
-    return params;
+    [QualityDataUploader trackSDKRequestSuccessWithRequest:self params:[QCloudCOSXMLService commonParams:kQCloudDataAppReleaseKey]];
 }
 
 @end
diff --git a/QCloudCOSXML/Classes/Base/QCloudCOSXMLService+Quality.h b/QCloudCOSXML/Classes/Base/QCloudCOSXMLService+Quality.h
@@ -7,6 +7,9 @@
 
 #import <Foundation/Foundation.h>
 #import "QCloudCOSXMLService.h"
-@interface QCloudCOSXMLService (Quality)
 
+extern  NSString *const kQCloudDataAppReleaseKey;
+
+@interface QCloudCOSXMLService (Quality)
++(NSMutableDictionary *)commonParams:(NSString *)appKey;
 @end
diff --git a/QCloudCOSXML/Classes/Base/QCloudCOSXMLService+Quality.m b/QCloudCOSXML/Classes/Base/QCloudCOSXMLService+Quality.m
@@ -13,6 +13,9 @@
 #import "QCloudCOSXMLVersion.h"
 #import <QCloudCore/QualityDataUploader.h>
 #import <QCloudCore/QCloudServiceConfiguration+Quality.h>
+#import <QCloudCore/QCloudConfiguration_Private.h>
+
+NSString *const kQCloudDataAppReleaseKey = @"0IOS05O9HW7A9XPI";
 
 @implementation QCloudCOSXMLService (Quality)
 
@@ -33,16 +36,29 @@ + (void)changeImplementation {
 + (QCloudCOSXMLService *)Quality_registerDefaultCOSXMLWithConfiguration:(QCloudServiceConfiguration *)configuration {
     id result = [self Quality_registerDefaultCOSXMLWithConfiguration:configuration];
     if(!configuration.disableSetupBeacon){
-        [self initMTA];
+        [self initMTA:configuration];
     }
-
     return result;
 }
 
-+ (void)initMTA {
++ (void)initMTA:(QCloudServiceConfiguration *)configuration {
 #if defined(DEBUG) && DEBUG
 #else
-    [QualityDataUploader startWithAppkey:kQCloudUploadAppReleaseKey];
+    [QualityDataUploader startWithAppkey:kQCloudDataAppReleaseKey];
+    NSMutableDictionary * commonParams = [self commonParams:nil];
+    commonParams[@"sdk_bridge"] = configuration.bridge?:@"";
+    [QualityDataUploader trackBaseInfoToTrachCommonParams:commonParams];
 #endif
 }
+
++(NSMutableDictionary *)commonParams:(NSString *)appKey{
+    NSMutableDictionary * params = [NSMutableDictionary new];
+    if (appKey) {
+        params[kQCloudRequestAppkeyKey] = appKey;
+    }
+    params[@"pName"] = @"cos";
+    params[@"sdkVersion"] = QCloudCOSXMLModuleVersion;
+    params[@"sdkVersionName"] = @(QCloudCOSXMLModuleVersionNumber);
+    return params;
+}
 @end
diff --git a/QCloudCOSXML/Classes/CI/enum/QCloudGenerateSnapshotFormatEnum.h b/QCloudCOSXML/Classes/CI/enum/QCloudGenerateSnapshotFormatEnum.h
@@ -28,6 +28,7 @@
 //    ______ ______ ______ ______ ______ ______ ______ ______                                                                            | |
 //   |______|______|______|______|______|______|______|______|                                                                           |_|
 //
+#import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/QCloudCOSXML/Classes/CI/enum/QCloudGenerateSnapshotModeEnum.h b/QCloudCOSXML/Classes/CI/enum/QCloudGenerateSnapshotModeEnum.h
@@ -28,6 +28,7 @@
 //    ______ ______ ______ ______ ______ ______ ______ ______                                                                            | |
 //   |______|______|______|______|______|______|______|______|                                                                           |_|
 //
+#import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/QCloudCOSXML/Classes/CI/enum/QCloudGenerateSnapshotRotateTypeEnum.h b/QCloudCOSXML/Classes/CI/enum/QCloudGenerateSnapshotRotateTypeEnum.h
@@ -29,6 +29,8 @@
 //   |______|______|______|______|______|______|______|______|                                                                           |_|
 //
 
+#import <Foundation/Foundation.h>
+
 NS_ASSUME_NONNULL_BEGIN
 
 typedef NS_ENUM(NSInteger, QCloudGenerateSnapshotRotateType) {

diff --git a/QCloudCOSXML/Classes/Manager/enum/QCloudCOSIncludedObjectVersionsEnum.h b/QCloudCOSXML/Classes/Manager/enum/QCloudCOSIncludedObjectVersionsEnum.h
@@ -29,6 +29,8 @@
 //   |______|______|______|______|______|______|______|______|                                                                           |_|
 //
 
+#import <Foundation/Foundation.h>
+
 NS_ASSUME_NONNULL_BEGIN
 /**
 是否在清单中包含对象版本：

diff --git a/QCloudCOSXML/Classes/Manager/enum/QCloudIntelligentTieringStatusEnum.h b/QCloudCOSXML/Classes/Manager/enum/QCloudIntelligentTieringStatusEnum.h
@@ -29,6 +29,8 @@
 //   |______|______|______|______|______|______|______|______|                                                                           |_|
 //
 
+#import <Foundation/Foundation.h>
+
 NS_ASSUME_NONNULL_BEGIN
 
 typedef NS_ENUM(NSInteger, QCloudIntelligentTieringStatus) {

diff --git a/QCloudCOSXML/Classes/Manager/enum/QCloudInventoryStatueEnum.h b/QCloudCOSXML/Classes/Manager/enum/QCloudInventoryStatueEnum.h
@@ -29,6 +29,8 @@
 //   |______|______|______|______|______|______|______|______|                                                                           |_|
 //
 
+#import <Foundation/Foundation.h>
+
 NS_ASSUME_NONNULL_BEGIN
 
 typedef NS_ENUM(NSInteger, QCloudInventoryStatue) {

diff --git a/QCloudCOSXML/Classes/Manager/select/QCloudCOSXMLCompressionTypeEnum.h b/QCloudCOSXML/Classes/Manager/select/QCloudCOSXMLCompressionTypeEnum.h
@@ -29,6 +29,8 @@
 //   |______|______|______|______|______|______|______|______|                                                                           |_|
 //
 
+#import <Foundation/Foundation.h> 
+
 NS_ASSUME_NONNULL_BEGIN
 
 typedef NS_ENUM(NSInteger, QCloudCOSXMLCompressionType) {

diff --git a/QCloudCOSXML/Classes/Manager/select/QCloudExpressionTypeEnum.h b/QCloudCOSXML/Classes/Manager/select/QCloudExpressionTypeEnum.h
@@ -28,7 +28,7 @@
 //    ______ ______ ______ ______ ______ ______ ______ ______                                                                            | |
 //   |______|______|______|______|______|______|______|______|                                                                           |_|
 //
-
+#import <Foundation/Foundation.h>
 NS_ASSUME_NONNULL_BEGIN
 
 typedef NS_ENUM(NSInteger, QCloudExpressionType) {

diff --git a/QCloudCOSXML/Classes/Manager/select/QCloudInputFileHeaderInfoEnum.h b/QCloudCOSXML/Classes/Manager/select/QCloudInputFileHeaderInfoEnum.h
@@ -29,6 +29,8 @@
 //   |______|______|______|______|______|______|______|______|                                                                           |_|
 //
 
+#import <Foundation/Foundation.h>
+
 NS_ASSUME_NONNULL_BEGIN
 
 typedef NS_ENUM(NSInteger, QCloudInputFileHeaderInfo) {

diff --git a/QCloudCOSXML/Classes/Manager/select/QCloudInputJSONFileTypeEnum.h b/QCloudCOSXML/Classes/Manager/select/QCloudInputJSONFileTypeEnum.h
@@ -29,6 +29,8 @@
 //   |______|______|______|______|______|______|______|______|                                                                           |_|
 //
 
+#import <Foundation/Foundation.h>
+
 NS_ASSUME_NONNULL_BEGIN
 
 typedef NS_ENUM(NSInteger, QCloudInputJSONFileType) {

diff --git a/QCloudCOSXML/Classes/Manager/select/QCloudOutputQuoteFieldsEnum.h b/QCloudCOSXML/Classes/Manager/select/QCloudOutputQuoteFieldsEnum.h
@@ -29,6 +29,8 @@
 //   |______|______|______|______|______|______|______|______|                                                                           |_|
 //
 
+#import <Foundation/Foundation.h>
+
 NS_ASSUME_NONNULL_BEGIN
 
 typedef NS_ENUM(NSInteger, QCloudOutputQuoteFields) {

diff --git a/QCloudCOSXML/Classes/QCloudCOSXMLVersion.h b/QCloudCOSXML/Classes/QCloudCOSXMLVersion.h
@@ -5,12 +5,12 @@
 
 #ifndef QCloudCOSXMLModuleVersion_h
 #define QCloudCOSXMLModuleVersion_h
-#define QCloudCOSXMLModuleVersionNumber 603003
+#define QCloudCOSXMLModuleVersionNumber 603004
 
 //dependency
 
 //
 FOUNDATION_EXTERN NSString * const QCloudCOSXMLModuleVersion;
 FOUNDATION_EXTERN NSString * const QCloudCOSXMLModuleName;
 
-#endif
+#endif
diff --git a/QCloudCOSXML/Classes/QCloudCOSXMLVersion.m b/QCloudCOSXML/Classes/QCloudCOSXMLVersion.m
@@ -1,5 +1,5 @@
 #import "QCloudCOSXMLVersion.h"
-NSString * const QCloudCOSXMLModuleVersion = @"6.3.3";
+NSString * const QCloudCOSXMLModuleVersion = @"6.3.4";
 NSString * const QCloudCOSXMLModuleName = @"QCloudCOSXML";
 @interface QCloudQCloudCOSXMLLoad : NSObject
 @end
@@ -26,4 +26,4 @@ + (void) load
 #pragma clang diagnostic pop
     }
 }
-@end
+@end
diff --git a/QCloudCOSXML/Classes/Transfer/request/QCloudCOSXMLDownloadObjectRequest.m b/QCloudCOSXML/Classes/Transfer/request/QCloudCOSXMLDownloadObjectRequest.m
@@ -155,6 +155,9 @@ - (void)startGetObject {
             NSMutableDictionary *dic = [NSMutableDictionary dictionary];
             if(jsonData){
                 dic = [[NSJSONSerialization JSONObjectWithData:jsonData options:kNilOptions error:nil] mutableCopy];
+                if (dic == nil) {
+                    dic = [NSMutableDictionary dictionary];
+                }
             }
 
             if(error){

diff --git a/QCloudCOSXML/Classes/Transfer/request/QCloudCOSXMLUploadObjectRequest.m b/QCloudCOSXML/Classes/Transfer/request/QCloudCOSXMLUploadObjectRequest.m
@@ -504,7 +504,7 @@ - (void)uploadOffsetBodys:(NSArray<QCloudFileOffsetBody *> *)allParts {
             }
         }];
         [request setFinishBlock:^(QCloudUploadPartResult *outputObject, NSError *error) {
-            QCloudLogInfo(@"收到一个part  %d的响应 %@；是否重试：%ld", (i + 1), outputObject.eTag, weakRequest.isRetry);
+            QCloudLogInfo(@"收到一个part  %d的响应 %@；是否重试：%@", (i + 1), outputObject.eTag, weakRequest.isRetry?@"是":@"否");
             if (!weakSelf) {
                 return;
             }

diff --git a/QCloudCOSXMLDemo.xcworkspace/xcuserdata/garenwang.xcuserdatad/UserInterfaceState.xcuserstate b/QCloudCOSXMLDemo.xcworkspace/xcuserdata/garenwang.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/QCloudCore.podspec b/QCloudCore.podspec
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.name             = "QCloudCore"
 
 
-s.version              = "6.3.3"
+s.version              = "6.3.4"
 
 
 
@@ -39,12 +39,19 @@ QCloudCore--腾讯云iOS-SDK Foundation。提供腾讯云iOS相关SDK的基础
   s.frameworks ='CoreMedia', "Accelerate", "SystemConfiguration"
   s.libraries = "z","c++"
   s.static_framework = true
-    s.default_subspec = 'Default'
-    s.subspec 'Default' do |default|
-        default.source_files = 'QCloudCore/Classes/Base/**/*'
-        default.ios.vendored_frameworks = 'QCloudCore/Classes/BeaconFramework/BeaconAPI_Base.framework','QCloudCore/Classes/BeaconFramework/QimeiSDK.framework'
-    end
-    s.subspec 'WithoutMTA' do |withoutMTA|
-        withoutMTA.source_files = 'QCloudCore/Classes/Base/**/*'
-    end
+  s.default_subspec = 'Default'
+  s.subspec 'Default' do |default|
+      default.source_files = 'QCloudCore/Classes/Base/**/*'
+      default.dependency "QCloudTrack/Beacon"
+  end
+
+  s.subspec 'WithoutMTA' do |withoutMTA|
+      withoutMTA.source_files = 'QCloudCore/Classes/Base/**/*'
+  end
+
+  s.subspec 'DNSLoader' do |tdns|
+    tdns.dependency "MSDKDns_C11";
+    tdns.dependency "QCloudCore/WithoutMTA";
+    tdns.source_files = 'Pod/Classes/DNSLoader/*';
+  end
 end
diff --git a/QCloudCore/Classes/Base/QCLOUDRestNet/CoreRequest/QCloudHTTPRequest.h b/QCloudCore/Classes/Base/QCLOUDRestNet/CoreRequest/QCloudHTTPRequest.h
@@ -37,6 +37,7 @@ typedef void (^QCloudHTTPRequestConfigure)(QCloudRequestSerializer *_Nonnull req
 
 /// sdk内部管理，业务测无需设置。
 @property (nonatomic, assign, readonly) BOOL isRetry;
+@property (nonatomic, assign) NSInteger retryCount;
 
 /**
  该任务所处的服务

diff --git a/QCloudCore/Classes/Base/QCLOUDRestNet/CoreRequest/QCloudRequestData.h b/QCloudCore/Classes/Base/QCLOUDRestNet/CoreRequest/QCloudRequestData.h
@@ -31,6 +31,7 @@ extern NSString *const emergencyHost;
  */
 @property (strong, nonatomic ,nullable) NSString *serverURL;
 
+/// 重试时是否需要更换域名
 @property (assign, nonatomic) BOOL needChangeHost;
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,6 +31,7 @@ extern NSString *const emergencyHost; @@
      */
     @property (strong, nonatomic ,nullable) NSString *serverURL;
+    /// 重试时是否需要更换域名
     @property (assign, nonatomic) BOOL needChangeHost;
     /**
@@ Expand Down @@