Merge pull request #386 from YangSen-qn/network_status_check

Network status check & optimize upload progress & optimize some concurrent logic

Author: Mei-Zhao

.github/workflows/ci-test.yml

@@ -28,6 +28,6 @@ jobs:
         env:
           QINIU_TEST_ENV: travis
         run: |
-          xcodebuild test -workspace QiniuSDK.xcworkspace -scheme QiniuSDK_iOS -configuration Debug -destination 'platform=iOS Simulator,OS=14.2,name=iPhone 8 Plus' -enableCodeCoverage YES
+          xcodebuild test -workspace QiniuSDK.xcworkspace -scheme QiniuSDK_iOS -configuration Debug -destination 'platform=iOS Simulator,name=iPhone 8 Plus' -enableCodeCoverage YES
           xcodebuild test -workspace QiniuSDK.xcworkspace -scheme QiniuSDK_Mac -configuration Debug -destination 'platform=macOS,arch=x86_64'
           bash <(curl -s https://codecov.io/bash)

CHANGELOG.md

@@ -1,4 +1,10 @@
 #Changelog
+## 8.2.0(2021-02-20)
+## 增加
+- 增加网络监控功能，选择最优Host进行上传
+- 处理上传进度不准确问题
+- 优化日志统计
+
 ## 8.1.2(2021-01-18)
 ## 增加
 - 区域查询采用SingleFlight模式

Qiniu.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'Qiniu'
-  s.version      = '8.1.2'
+  s.version      = '8.2.0'
   s.summary      = 'Qiniu Resource Storage SDK for iOS and Mac'
   s.homepage     = 'https://github.com/qiniu/objc-sdk'
   s.social_media_url = 'http://weibo.com/qiniutek'

QiniuDemo/Podfile

@@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git'
 target "QiniuDemo" do
   platform :ios, "7.0"
 
-#  pod 'Qiniu'
+#  pod 'Qiniu', '~> 8.1.1'
   pod 'Qiniu',:path => '../'
 end
 

QiniuDemo/QiniuDemo/ViewController.m

@@ -48,8 +48,8 @@ - (IBAction)uploadAction:(UIButton *)sender {
     if (self.uploadState == UploadStatePrepare) {
 
 #ifdef YourToken
-//        NSString *path = [[NSBundle mainBundle] pathForResource:@"UploadResource.dmg" ofType:nil];
-        NSString *path = [[NSBundle mainBundle] pathForResource:@"UploadResource_49M.zip" ofType:nil];
+        NSString *path = [[NSBundle mainBundle] pathForResource:@"UploadResource.dmg" ofType:nil];
+//        NSString *path = [[NSBundle mainBundle] pathForResource:@"UploadResource_49M.zip" ofType:nil];
         [self uploadImageToQNFilePath:path];
         [self changeUploadState:UploadStateUploading];
 #else

QiniuSDK.xcodeproj/project.pbxproj

@@ -56,6 +56,7 @@ extern NSString *const QNReportRequestKeyUpTime;
 extern NSString *const QNReportRequestKeyStatusCode;
 extern NSString *const QNReportRequestKeyRequestId;
 extern NSString *const QNReportRequestKeyHost;
+extern NSString *const QNReportRequestKeyHttpVersion;
 extern NSString *const QNReportRequestKeyRemoteIp;
 extern NSString *const QNReportRequestKeyPort;
 extern NSString *const QNReportRequestKeyTargetBucket;
@@ -88,6 +89,7 @@ extern NSString *const QNReportRequestKeySignalStrength;
 extern NSString *const QNReportRequestKeyPrefetchedDnsSource;
 extern NSString *const QNReportRequestKeyPrefetchedBefore;
 extern NSString *const QNReportRequestKeyPrefetchedErrorMessage;
+extern NSString *const QNReportRequestKeyNetworkMeasuring;
 
 
 //MARK:-- 分块上传统计⽇志

QiniuSDK/Collect/QNReportItem.h

@@ -171,6 +171,7 @@ - (NSString *)qualityResult{
 NSString * const QNReportRequestKeyStatusCode = @"status_code";
 NSString * const QNReportRequestKeyRequestId = @"req_id";
 NSString * const QNReportRequestKeyHost = @"host";
+NSString * const QNReportRequestKeyHttpVersion = @"http_version";
 NSString * const QNReportRequestKeyRemoteIp = @"remote_ip";
 NSString * const QNReportRequestKeyPort = @"port";
 NSString * const QNReportRequestKeyTargetBucket = @"target_bucket";
@@ -203,6 +204,7 @@ - (NSString *)qualityResult{
 NSString * const QNReportRequestKeyPrefetchedDnsSource = @"prefetched_dns_source";
 NSString * const QNReportRequestKeyPrefetchedBefore = @"prefetched_before";
 NSString * const QNReportRequestKeyPrefetchedErrorMessage = @"prefetched_error_message";
+NSString * const QNReportRequestKeyNetworkMeasuring = @"network_measuring";
 
 //MARK:-- 分块上传统计⽇志
 NSString * const QNReportBlockKeyLogType = @"log_type";

QiniuSDK/Collect/QNReportItem.m

@@ -110,9 +110,9 @@ - (instancetype)init{
 
 - (QNZonesInfo *)getZonesInfoWithToken:(QNUpToken *)token {
     if (token == nil) return nil;
-    [_lock lock];
+    [self.lock lock];
     QNZonesInfo *zonesInfo = [_cache objectForKey:[token index]];
-    [_lock unlock];
+    [self.lock unlock];
     return zonesInfo;
 }
 
@@ -161,7 +161,7 @@ - (void)preQuery:(QNUpToken *)token
             value.response = response;
             value.metrics = metrics;
             complete(value, nil);
-
+            
             [self destroyUploadRequestTransaction:transaction];
         }];
 
@@ -198,13 +198,17 @@ - (QNRequestTransaction *)createUploadRequestTransaction:(QNUpToken *)token{
     QNRequestTransaction *transaction = [[QNRequestTransaction alloc] initWithHosts:@[kQNPreQueryHost00, kQNPreQueryHost01]
                                                                            regionId:QNZoneInfoEmptyRegionId
                                                                               token:token];
+    [self.lock lock];
     [self.transactions addObject:transaction];
+    [self.lock unlock];
     return transaction;
 }
 
 - (void)destroyUploadRequestTransaction:(QNRequestTransaction *)transaction{
     if (transaction) {
+        [self.lock lock];
         [self.transactions removeObject:transaction];
+        [self.lock unlock];
     }
 }
 

QiniuSDK/Common/QNAutoZone.m

@@ -16,6 +16,7 @@ extern NSString *const QNZoneInfoEmptyRegionId;
 @interface QNZoneInfo : NSObject
 
 @property(nonatomic, assign, readonly)long ttl;
+@property(nonatomic, assign, readonly)BOOL http3Enabled;
 @property(nonatomic, strong, readonly)NSArray<NSString *> *domains;
 @property(nonatomic, strong, readonly)NSArray<NSString *> *old_domains;