merge dns

letspod · Apr 28, 2020 · 42357ea · 42357ea
1 parent ef0c1d5
commit 42357ea
Show file tree

Hide file tree

Showing 75 changed files with 4,733 additions and 616 deletions.
diff --git a/Podfile b/Podfile
@@ -2,6 +2,7 @@ source 'https://github.com/CocoaPods/Specs.git'
 
 def shared_dependencies
 #  pod 'HappyDNS', '>= 0.3'
+  pod 'HappyDNS',:path => '../HappyDns_iOS'
 end
 
 def test_dependencies

diff --git a/QiniuDemo/Podfile b/QiniuDemo/Podfile
@@ -3,6 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git'
 target "QiniuDemo" do
   platform :ios, "7.0"
   pod 'Qiniu',:path => '../'
+  pod 'HappyDNS', :path => '../../HappyDns_iOS'
 end
 
 target "QiniuDemoTests" do

diff --git a/QiniuDemo/QiniuDemo/ViewController.m b/QiniuDemo/QiniuDemo/ViewController.m
@@ -7,6 +7,7 @@
 //
 
 #import "ViewController.h"
+#import "QNTransactionManager.h"
 
 @interface ViewController () <UINavigationControllerDelegate, UIImagePickerControllerDelegate>
 
@@ -42,7 +43,7 @@ - (IBAction)uploadAction:(id)sender {
 }
 
 - (void)uploadImageToQNFilePath:(NSString *)filePath {
-    self.token = @"你的token";
+    self.token = @"jH983zIUFIP1OVumiBVGeAfiLYJvwrF45S-t22eu:IN7H0Q5HC_4NrnPsrCgHdF-TIA8=:eyJzY29wZSI6InpvbmUwLXNwYWNlIiwiZGVhZGxpbmUiOjE1ODcwMTc4MzB9";
     QNUploadManager *upManager = [[QNUploadManager alloc] init];
     QNUploadOption *uploadOption = [[QNUploadOption alloc] initWithMime:nil progressHandler:^(NSString *key, float percent) {
         NSLog(@"percent == %.2f", percent);
@@ -112,6 +113,31 @@ - (NSString *)getImagePath:(UIImage *)Image {
     return filePath;
 }
 
+- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
+
+//    QNTransaction *t0 = [QNTransaction transaction:@"0" after:0 action:^{
+//        NSLog(@"== 0 == %@", [NSThread currentThread]);
+//    }];
+//    QNTransaction *t1 = [QNTransaction timeTransaction:@"1" after:0 interval:2 action:^{
+//        NSLog(@"== 1 == %@", [NSThread currentThread]);
+//        NSDate *date_from = [NSDate date];
+//        NSDate *date_current = [NSDate date];
+//
+//        while ([date_current timeIntervalSinceDate:date_from] < 3) {
+//            date_current = [NSDate date];
+//        }
+//    }];
+//    QNTransactionManager *manager = [QNTransactionManager manager];
+//
+//    [manager destroyResource];
+//    [manager addTransaction:t0];
+//    [manager addTransaction:t1];
+//
+//    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(20 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//        [manager destroyResource];
+//    });
+}
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.

diff --git a/QiniuSDK.xcodeproj/project.pbxproj b/QiniuSDK.xcodeproj/project.pbxproj
diff --git a/QiniuSDK.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/QiniuSDK.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/QiniuSDK.xcodeproj/xcshareddata/xcschemes/QiniuSDK_Mac.xcscheme b/QiniuSDK.xcodeproj/xcshareddata/xcschemes/QiniuSDK_Mac.xcscheme
@@ -20,6 +20,20 @@
                ReferencedContainer = "container:QiniuSDK.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DF2CDE0919DAC05500CE01FB"
+               BuildableName = "QiniuSDK_MacTests.xctest"
+               BlueprintName = "QiniuSDK_MacTests"
+               ReferencedContainer = "container:QiniuSDK.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction

diff --git a/QiniuSDK.xcodeproj/xcshareddata/xcschemes/QiniuSDK_iOS.xcscheme b/QiniuSDK.xcodeproj/xcshareddata/xcschemes/QiniuSDK_iOS.xcscheme
@@ -20,6 +20,20 @@
                ReferencedContainer = "container:QiniuSDK.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DF2CDE2319DAC08400CE01FB"
+               BuildableName = "QiniuSDK_iOSTests.xctest"
+               BlueprintName = "QiniuSDK_iOSTests"
+               ReferencedContainer = "container:QiniuSDK.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction

diff --git a/QiniuSDK/Common/QNAutoZone.h b/QiniuSDK/Common/QNAutoZone.h
@@ -0,0 +1,17 @@
+//
+//  QNAutoZone.h
+//  QiniuSDK
+//
+//  Created by yangsen on 2020/4/16.
+//  Copyright © 2020 Qiniu. All rights reserved.
+//
+
+#import "QNZone.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface QNAutoZone : QNZone
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/QiniuSDK/Common/QNAutoZone.m b/QiniuSDK/Common/QNAutoZone.m
@@ -0,0 +1,165 @@
+//
+//  QNAutoZone.m
+//  QiniuSDK
+//
+//  Created by yangsen on 2020/4/16.
+//  Copyright © 2020 Qiniu. All rights reserved.
+//
+
+#import "QNAutoZone.h"
+#import "QNSessionManager.h"
+#import "QNZoneInfo.h"
+#import "QNUpToken.h"
+#import "QNResponseInfo.h"
+
+@interface QNAutoZoneCache : NSObject
+@property(nonatomic, strong)NSMutableDictionary *cache;
+@end
+@implementation QNAutoZoneCache
+
++ (instancetype)share{
+    static QNAutoZoneCache *cache = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        cache = [[QNAutoZoneCache alloc] init];
+        [cache setupData];
+    });
+    return cache;
+}
+
+- (void)setupData{
+    self.cache = [NSMutableDictionary dictionary];
+}
+
+- (void)cache:(NSDictionary *)zonesInfo
+     forToken:(QNUpToken *)token{
+
+    NSString *cacheKey = token.index;
+    if (!cacheKey || [cacheKey isEqualToString:@""]) {
+        return;
+    }
+
+    @synchronized (self) {
+        if (zonesInfo) {
+            self.cache[cacheKey] = zonesInfo;
+        } else {
+            [self.cache removeObjectForKey:cacheKey];
+        }
+    }
+}
+
+- (QNZonesInfo *)zonesInfoForToken:(QNUpToken *)token{
+
+    NSString *cacheKey = token.index;
+    if (!cacheKey || [cacheKey isEqualToString:@""]) {
+        return nil;
+    }
+
+    NSDictionary *zonesInfoDic = nil;
+    @synchronized (self) {
+        zonesInfoDic = self.cache[cacheKey];
+    }
+
+    if (zonesInfoDic == nil) {
+        return nil;
+    }
+
+    QNZonesInfo *zonesInfo = [QNZonesInfo buildZonesInfoWithResp:zonesInfoDic];
+    NSMutableArray *zonesInfoArray = [NSMutableArray array];
+    for (QNZoneInfo *zoneInfo in zonesInfo.zonesInfo) {
+        if ([zoneInfo isValid]) {
+            [zonesInfoArray addObject:zoneInfo];
+        }
+    }
+    zonesInfo.zonesInfo = [zonesInfoArray copy];
+    return zonesInfo;
+}
+
+@end
+
+@implementation QNAutoZone {
+    NSString *server;
+    NSMutableDictionary *cache;
+    NSLock *lock;
+    QNSessionManager *sesionManager;
+}
+
+- (instancetype)init{
+    if (self = [super init]) {
+        server = @"https://uc.qbox.me";
+        cache = [NSMutableDictionary new];
+        lock = [NSLock new];
+        sesionManager = [[QNSessionManager alloc] initWithProxy:nil timeout:10 urlConverter:nil];
+    }
+    return self;
+}
+
+- (NSString *)up:(QNUpToken *)token
+    zoneInfoType:(QNZoneInfoType)zoneInfoType
+         isHttps:(BOOL)isHttps
+    frozenDomain:(NSString *)frozenDomain {
+
+    NSString *index = [token index];
+    [lock lock];
+    QNZonesInfo *zonesInfo = [cache objectForKey:index];
+    [lock unlock];
+    if (zonesInfo == nil) {
+        return nil;
+    }
+    return  [self upHost:[zonesInfo getZoneInfoWithType:zoneInfoType] isHttps:isHttps lastUpHost:frozenDomain];
+}
+
+- (QNZonesInfo *)getZonesInfoWithToken:(QNUpToken *)token {
+    if (token == nil) return nil;
+    [lock lock];
+    QNZonesInfo *zonesInfo = [cache objectForKey:[token index]];
+    [lock unlock];
+    return zonesInfo;
+}
+
+- (void)preQuery:(QNUpToken *)token
+              on:(QNPrequeryReturn)ret {
+
+    if (token == nil) {
+        ret(-1, nil);
+        return;
+    }
+
+    [lock lock];
+    QNZonesInfo *zonesInfo = [cache objectForKey:[token index]];
+    [lock unlock];
+
+    if (zonesInfo == nil) {
+        zonesInfo = [[QNAutoZoneCache share] zonesInfoForToken:token];
+        [self->lock lock];
+        [self->cache setValue:zonesInfo forKey:[token index]];
+        [self->lock unlock];
+    }
+
+    if (zonesInfo != nil) {
+        ret(0, nil);
+        return;
+    }
+
+    //https://uc.qbox.me/v3/query?ak=T3sAzrwItclPGkbuV4pwmszxK7Ki46qRXXGBBQz3&bucket=if-pbl
+    NSString *url = [NSString stringWithFormat:@"%@/v3/query?ak=%@&bucket=%@", server, token.access, token.bucket];
+    [sesionManager get:url withHeaders:nil withCompleteBlock:^(QNHttpResponseInfo *httpResponseInfo, NSDictionary *respBody) {
+        if (!httpResponseInfo.error) {
+
+            QNZonesInfo *zonesInfo = [QNZonesInfo buildZonesInfoWithResp:respBody];
+            if (httpResponseInfo == nil) {
+                ret(kQNInvalidToken, httpResponseInfo);
+            } else {
+                [self->lock lock];
+                [self->cache setValue:zonesInfo forKey:[token index]];
+                [self->lock unlock];
+                [[QNAutoZoneCache share] cache:respBody forToken:token];
+                ret(0, httpResponseInfo);
+            }
+        } else {
+            ret(kQNNetworkError, httpResponseInfo);
+        }
+    }];
+}
+
+@end
diff --git a/QiniuSDK/Common/QNConfig.h b/QiniuSDK/Common/QNConfig.h
@@ -0,0 +1,12 @@
+//
+//  QNConfig.h
+//  QiniuSDK
+//
+//  Created by yangsen on 2020/3/26.
+//  Copyright © 2020 Qiniu. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+//MArk: -- 内部布置 尽量不要修改
+#define kQNPreQueryHost @"uc.qbox.me"
diff --git a/QiniuSDK/Common/QNFixedZone.h b/QiniuSDK/Common/QNFixedZone.h
@@ -0,0 +1,75 @@
+//
+//  QNFixZone.h
+//  QiniuSDK
+//
+//  Created by yangsen on 2020/4/16.
+//  Copyright © 2020 Qiniu. All rights reserved.
+//
+
+#import "QNZone.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface QNFixedZone : QNZone
+
+/**
+ *    zone 0 华东
+ *
+ *    @return 实例
+ */
++ (instancetype)zone0;
+
+/**
+ *    zone 1 华北
+ *
+ *    @return 实例
+ */
++ (instancetype)zone1;
+
+/**
+ *    zone 2 华南
+ *
+ *    @return 实例
+ */
++ (instancetype)zone2;
+
+/**
+ *    zone Na0 北美
+ *
+ *    @return 实例
+ */
++ (instancetype)zoneNa0;
+
+/**
+ *    zone As0 新加坡
+ *
+ *    @return 实例
+*/
++ (instancetype)zoneAs0;
+
+/**
+ *    Zone初始化方法
+ *
+ *    @param upList     默认上传服务器地址列表
+ *    @param zoneRegion 区域
+ *    @return Zone实例
+ */
+- (instancetype)initWithupDomainList:(NSArray<NSString *> *)upList;
+
+/**
+ *    Zone初始化方法
+ *
+ *    @param upList     默认上传服务器地址列表
+ *
+ *    @return Zone实例
+ */
++ (instancetype)createWithHost:(NSArray<NSString *> *)upList;
+
+/**
+ *   获取本地所有固定zone信息
+ */
++ (NSArray <QNFixedZone *> *)localsZoneInfo;
+
+@end
+
+NS_ASSUME_NONNULL_END