Merge pull request #419 from YangSen-qn/multi-region

server config retry interval to [2min, 5min]

Author: bachue

CHANGELOG.md

@@ -1,4 +1,8 @@
 #Changelog
+## 8.5.1 (2022-11-24)
+- 支持 multi 区域
+- 优化 Server 配置获取逻辑
+
 ## 8.5.0 (2022-10-25)
 - 优化分片上传 ctx 超时检测
 - QNDnsDelegate 代理函数名调整 lookup: 调整为 query:【不兼容变更】

Qiniu.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'Qiniu'
-  s.version      = '8.5.0'
+  s.version      = '8.5.1'
   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'

QiniuSDK/Collect/QNReportItem.m

@@ -37,6 +37,9 @@ - (void)setReportValue:(id _Nullable)value forKey:(NSString * _Nullable)key{
     if (!value || !key || ![key isKindOfClass:[NSString class]]) {
         return;
     }
+    if ([value isKindOfClass:[NSString class]] && [(NSString *)value length] > 1024) {
+        value = [(NSString *)value substringToIndex:1024];
+    }
     [self.keyValues setValue:value forKey:key];
 }
 

QiniuSDK/Common/QNAutoZone.h

@@ -10,12 +10,18 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+@class QNFixedZone;
 @interface QNAutoZone : QNZone
 
 + (instancetype)zoneWithUcHosts:(NSArray *)ucHosts;
 
 + (void)clearCache;
 
+/**
+ * 当 查询失败时，会使用 zones 进行上传，默认不配置。
+ */
+- (void)setDefaultZones:(NSArray <QNFixedZone *> *)zones;
+
 @end
 
 NS_ASSUME_NONNULL_END

QiniuSDK/Common/QNAutoZone.m

@@ -97,6 +97,7 @@ @implementation QNUCQuerySingleFlightValue
 @interface QNAutoZone()
 
 @property(nonatomic, strong)NSArray *ucHosts;
+@property(nonatomic, strong)QNFixedZone *defaultZone;
 @property(nonatomic, strong)NSMutableArray <QNRequestTransaction *> *transactions;
 
 @end
@@ -128,6 +129,10 @@ - (instancetype)init{
     return self;
 }
 
+- (void)setDefaultZones:(NSArray <QNFixedZone *> *)zones {
+    self.defaultZone = [QNFixedZone combineZones:zones];
+}
+
 - (QNZonesInfo *)getZonesInfoWithToken:(QNUpToken * _Nullable)token
                             actionType:(QNActionType)actionType {
 
@@ -196,9 +201,17 @@ - (void)preQuery:(QNUpToken *)token actionType:(QNActionType)actionType on:(QNPr
             if (responseInfo.isConnectionBroken) {
                 ret(kQNNetworkError, responseInfo, metrics);
             } else {
-                QNZonesInfo *zonesInfo = [[QNFixedZone localsZoneInfo] getZonesInfoWithToken:token];
-                if ([zonesInfo isValid]) {
-                    [[QNAutoZoneCache share] cache:zonesInfo forKey:cacheKey];
+                QNZonesInfo *info = nil;
+                if (self.defaultZone) {
+                    QNZonesInfo * infoP = [self.defaultZone getZonesInfoWithToken:token actionType:actionType];
+                    if (infoP && [infoP isValid]) {
+                        [infoP toTemporary];
+                        info = infoP;
+                    }
+                }
+                
+                if (info) {
+                    [[QNAutoZoneCache share] cache:info forKey:cacheKey];
                     ret(0, responseInfo, metrics);
                 } else {
                     ret(-1, responseInfo, metrics);
@@ -213,7 +226,7 @@ - (QNRequestTransaction *)createUploadRequestTransaction:(QNUpToken *)token{
     if (self.ucHosts && self.ucHosts.count > 0) {
         hosts = [self.ucHosts copy];
     } else {
-        hosts = @[kQNPreQueryHost02, kQNPreQueryHost00, kQNPreQueryHost01];
+        hosts = kQNPreQueryHosts;
     }
     QNRequestTransaction *transaction = [[QNRequestTransaction alloc] initWithHosts:hosts
                                                                            regionId:QNZoneInfoEmptyRegionId

QiniuSDK/Common/QNConfig.h

@@ -12,4 +12,6 @@
 #define kQNPreQueryHost00 @"uc.qbox.me"
 #define kQNPreQueryHost01 @"api.qiniu.com"
 #define kQNPreQueryHost02 @"kodo-config.qiniuapi.com"
+#define kQNPreQueryHosts @[kQNPreQueryHost00, kQNPreQueryHost02, kQNPreQueryHost01]
+
 #define kQNUpLogHost @"uplog.qbox.me"

QiniuSDK/Common/QNFixedZone.h

@@ -83,6 +83,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (QNFixedZone *)localsZoneInfo;
 
+/**
+ *  合并区域
+ */
++ (QNFixedZone *)combineZones:(NSArray<QNFixedZone *> *)zones;
+
 @end
 
 NS_ASSUME_NONNULL_END

QiniuSDK/Common/QNFixedZone.m

@@ -103,6 +103,17 @@ + (QNFixedZone *)localsZoneInfo{
                        [QNFixedZone zoneNa0],
                        [QNFixedZone zoneApNorthEast1],
                        [QNFixedZone zoneAs0]];
+    QNFixedZone *zone = [self combineZones:zones];
+    if (zone) {
+        [zone.zonesInfo toTemporary];
+    }
+    return zone;
+}
+
++ (QNFixedZone *)combineZones:(NSArray<QNFixedZone *> *)zones {
+    if (zones == nil || zones.count == 0) {
+        return nil;
+    }
 
     NSMutableArray <QNZoneInfo *> *zoneInfoArray = [NSMutableArray array];
     for (QNFixedZone *zone in zones) {

QiniuSDK/Common/QNZoneInfo.m

@@ -191,7 +191,18 @@ - (void)toTemporary {
 }
 
 - (BOOL)isValid {
-    return [self.zonesInfo count] > 0 && [self.zonesInfo.firstObject isValid];
+    if ([self.zonesInfo count] == 0) {
+        return false;
+    }
+    
+    BOOL valid = true;
+    for (QNZoneInfo *info in self.zonesInfo) {
+        if (![info isValid]) {
+            valid = false;
+            break;
+        }
+    }
+    return valid;
 }
 
 - (id)copyWithZone:(NSZone *)zone {

QiniuSDK/Storage/ServerConfig/QNServerConfigMonitor.m

@@ -83,7 +83,8 @@ + (void)startMonitor {
             return;
         }
 
-        QNTransaction *transaction = [QNTransaction timeTransaction:kQNServerConfigTransactionKey after:0 interval:10 action:^{
+        int interval = 120 + arc4random()%240;
+        QNTransaction *transaction = [QNTransaction timeTransaction:kQNServerConfigTransactionKey after:0 interval:interval action:^{
             [[QNServerConfigMonitor share] monitor];
         }];
         [kQNTransactionManager addTransaction:transaction];