Release 1.0.2

Author: yaoyue

SensorsABTest/Network/SABRequest.h

@@ -35,6 +35,7 @@ extern NSString *const kSABRequestBodyParamName;
 
 @end
 
+/// 分流试验请求
 @interface SABExperimentRequest : NSObject <SABRequestProtocol>
 
 @property (nonatomic, assign) NSTimeInterval timeoutInterval;
@@ -74,6 +75,7 @@ extern NSString *const kSABRequestBodyParamName;
 
 @end
 
+/// 上传白名单请求
 @interface SABWhiteListRequest : NSObject <SABRequestProtocol>
 
 @property (nonatomic, copy) NSURL *openURL;

SensorsABTest/Network/SABRequest.m

@@ -51,6 +51,17 @@ @interface SABExperimentRequest()
 
 @implementation SABExperimentRequest
 
+// 初始化 App 原生分流请求
+- (instancetype)initWithBaseURL:(NSURL *)url projectKey:(NSString *)key userIdenty:(SABUserIdenty *)userIdenty {
+    self = [[SABExperimentRequest alloc] initWebRequestWithBaseURL:url projectKey:key userIdenty:userIdenty];
+    if (self) {
+        // 拼接自定义主体 ID
+        [self appendCustomIDs:userIdenty.customIDs];
+    }
+    return self;
+}
+
+// 初始化 App 内嵌 H5 分流请求
 - (instancetype)initWebRequestWithBaseURL:(NSURL *)url projectKey:(NSString *)key userIdenty:(SABUserIdenty *)userIdenty {
     self = [super init];
     if (self) {
@@ -93,16 +104,6 @@ - (instancetype)initWebRequestWithBaseURL:(NSURL *)url projectKey:(NSString *)ke
     return self;
 }
 
-- (instancetype)initWithBaseURL:(NSURL *)url projectKey:(NSString *)key userIdenty:(SABUserIdenty *)userIdenty {
-    self = [[SABExperimentRequest alloc] initWebRequestWithBaseURL:url projectKey:key userIdenty:userIdenty];
-    if (self) {
-        // 拼接自定义主体 ID
-        [self appendCustomIDs:userIdenty.customIDs];
-
-    }
-    return self;
-}
-
 - (void)appendCustomIDs:(NSDictionary *)customIDs {
     if (customIDs.count == 0) {
         return;

SensorsABTest/SABConstants.m

@@ -25,7 +25,7 @@
 #import "SABConstants.h"
 
 // 当前版本号
-NSString *const kSABLibVersion = @"1.0.1";
+NSString *const kSABLibVersion = @"1.0.2";
 
 // SA 最低支持版本
 NSString *const kSABMinSupportedSALibVersion = @"4.5.6";

SensorsABTest/SABManager.m

@@ -373,7 +373,9 @@ - (void)fetchAsyncABTestWithExperiment:(SensorsABTestExperiment *)experiment {
         return;
     }
 
-    [self.requestManager addRequestTask:requestData experiment:experiment];
+    if (experiment.modeType == SABFetchABTestModeTypeFast) {
+        [self.requestManager addRequestTask:requestData experiment:experiment];
+    }
 
     __weak typeof(self) weakSelf = self;
     [self.dataManager asyncFetchAllExperimentWithRequest:requestData completionHandler:^(SABFetchResultResponse *_Nullable responseData, NSError *_Nullable error) {
@@ -383,6 +385,13 @@ - (void)fetchAsyncABTestWithExperiment:(SensorsABTestExperiment *)experiment {
             SABLogError(@"asyncFetchAllExperimentWithRequest failure，error: %@", error);
             // 请求失败，主线程回调结果
             dispatch_async(dispatch_get_main_queue(), ^{
+                
+                if (experiment.modeType == SABFetchABTestModeTypeAsync) {
+                    experiment.handler(experiment.defaultValue);
+                    return;
+                }
+
+                // 请求合并，只针对 fast 调用
                 [strongSelf.requestManager excuteExperimentsWithRequest:requestData completion:^(SensorsABTestExperiment *obj) {
                     obj.handler(obj.defaultValue);
                 }];
@@ -392,10 +401,17 @@ - (void)fetchAsyncABTestWithExperiment:(SensorsABTestExperiment *)experiment {
 
         // 通过请求管理器统一回调试验结果，切到主线程回调结果
         dispatch_async(dispatch_get_main_queue(), ^{
+            if (experiment.modeType == SABFetchABTestModeTypeAsync) {
+                id cacheValue = [strongSelf fetchCacheABTestWithExperiment:experiment];
+                experiment.handler(cacheValue ?: experiment.defaultValue);
+                return;
+            }
+
+            // 请求合并，只针对 fast 调用
             [strongSelf.requestManager excuteExperimentsWithRequest:requestData completion:^(SensorsABTestExperiment *obj) {
                 // 获取缓存并触发 $ABTestTrigger 事件
                 id cacheValue = [strongSelf fetchCacheABTestWithExperiment:obj];
-                obj.handler(cacheValue ? : obj.defaultValue);
+                obj.handler(cacheValue ?: obj.defaultValue);
             }];
         });
     }];

SensorsABTest/SABRequestManager.h

@@ -23,14 +23,17 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+/// 请求任务管理
+///
+/// 考虑到 asyncFetch 请求，都是直接触发，所以此处只针对 fastFetch 触发的请求
 @interface SABRequestManager : NSObject
 
 /// 检查当前是否已存在相同的请求任务
 /// @param request 检查对象
 /// @return 检查结果
 - (BOOL)containsRequest:(SABExperimentRequest *)request;
 
-/// 合并当前试验至已存在的相同请求任务中
+/// 合并当前请求参数至已存在的相同请求任务中
 /// @param request 当前请求
 /// @param experiment 当前试验
 - (void)mergeExperimentWithRequest:(SABExperimentRequest *)request experiment:(SensorsABTestExperiment *)experiment;

SensorsABTesting.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'SensorsABTesting'
-  s.version      = "1.0.1"
+  s.version      = "1.0.2"
   s.summary      = 'The official iOS/macOS SDK of Sensors A/B Testing.'
   s.homepage     = 'http://www.sensorsdata.cn'
   s.license      = { :type => 'Apache 2.0', :file => 'LICENSE' }