Release 4.5.0

Author: runner

SourceCode/Private/Core/Api/USRVApiRequest.m

@@ -11,6 +11,7 @@
 #import "UADSCommonNetworkErrorProxy.h"
 #import "UADSCorePresenceChecker.h"
 #import "NSDictionary+Headers.h"
+#import "UADSServiceProvider.h"
 
 @implementation USRVApiRequest
 static NSString *webRequestEventCategory = @"REQUEST";
@@ -207,7 +208,7 @@ + (void)WebViewExposed_sendRequest: (NSDictionary *)requestDictionary
 }
 
 + (UADSCommonNetworkProxy *)network {
-    return [UADSServiceProviderProxy shared].mainNetworkLayer;
+    return UADSServiceProvider.sharedInstance.objBridge.nativeNetworkLayer;
 }
 
 @end

SourceCode/Private/Core/Api/USRVApiSdk.h

@@ -1,3 +1,4 @@
+#import "USRVWebViewCallback.h"
 @interface USRVApiSdk : NSObject
 
 typedef NS_ENUM (NSInteger, USRVDownloadLatestWebViewStatus) {
@@ -6,5 +7,6 @@ typedef NS_ENUM (NSInteger, USRVDownloadLatestWebViewStatus) {
     kDownloadLatestWebViewStatusMissingLatestConfig,
     kDownloadLatestWebViewStatusBackgroundDownloadStarted
 };
-
++ (void)setServiceProviderForTesting: (id)sProvider;
++ (void)WebViewExposed_getTrrData: (USRVWebViewCallback *)callback;
 @end

SourceCode/Private/Core/Api/USRVApiSdk.m

@@ -6,8 +6,18 @@
 #import "USRVInitialize.h"
 #import "USRVDevice.h"
 #import "UADSServiceProvider.h"
+
+static UADSServiceProvider* serviceProvider;
 @implementation USRVApiSdk
 
++ (void)load {
+    serviceProvider = UADSServiceProvider.sharedInstance;
+}
+
++ (void)setServiceProviderForTesting: (UADSServiceProvider*)sProvider {
+    serviceProvider = sProvider;
+}
+
 + (void)WebViewExposed_loadComplete: (USRVWebViewCallback *)callback {
     USRVLogDebug(@"Web application loaded");
     [[USRVWebViewApp getCurrentApp] setWebAppLoaded: true];
@@ -103,4 +113,8 @@ + (NSString *)privacyState {
     return uads_privacyResponseStateToString(state);
 }
 
++ (void)WebViewExposed_getTrrData: (USRVWebViewCallback *)callback {
+    [callback invoke: serviceProvider.configurationStorage.getCurrentConfiguration.originalJSON, nil];
+}
+
 @end

SourceCode/Private/Core/Configuration/ConfigurationStorage/UADSConfigurationCRUDBase.h

@@ -2,6 +2,7 @@
 #import "USRVConfiguration.h"
 #import "UADSConfigurationMetricTagsReader.h"
 #import "UADSGenericMediator.h"
+#import "UADSServiceProviderProxy.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -10,14 +11,15 @@ typedef void (^UADSConfigurationObserver)(USRVConfiguration *);
 @protocol UADSConfigurationSaver <NSObject>
 
 - (void)saveConfiguration: (USRVConfiguration *)configuration;
-
+- (void)triggerSaved: (USRVConfiguration *)config;
 @end
 
 @protocol UADSConfigurationReader <NSObject>
 
 - (USRVConfiguration *)getCurrentConfiguration;
 - (NSDictionary *)     currentSessionExperimentsAsDictionary;
 - (UADSConfigurationExperiments *)     currentSessionExperiments;
+- (NSString *)getCurrentMetricsUrl;
 @end
 
 
@@ -35,6 +37,7 @@ typedef void (^UADSConfigurationObserver)(USRVConfiguration *);
 
 
 @interface UADSConfigurationCRUDBase : NSObject<UADSConfigurationCRUD>
+@property (nonatomic, weak) UADSServiceProviderProxy *serviceProviderBridge;
 @end
 
 NS_ASSUME_NONNULL_END

SourceCode/Private/Core/Configuration/ConfigurationStorage/UADSConfigurationCRUDBase.m

@@ -2,6 +2,7 @@
 #import "USRVSdkProperties.h"
 #import "USRVWebViewApp.h"
 #import "UADSServiceProviderProxy.h"
+#import "NSMutableDictionary+SafeOperations.h"
 
 @interface UADSConfigurationCRUDBase ()
 @property (nonatomic, assign) BOOL localRead;
@@ -24,7 +25,7 @@ - (USRVConfiguration *)localConfiguration {
     dispatch_sync(self.syncQueue, ^{
         if (!self.localRead) {
             self.localConfig = [self getConfigFromFile];
-            self.localRead = YES;
+            self.localRead = true;
         }
     });
 
@@ -33,13 +34,26 @@ - (USRVConfiguration *)localConfiguration {
 
 #pragma mark UADSConfigurationReader
 - (USRVConfiguration *)getCurrentConfiguration {
+    
     if ([self.remoteConfig hasValidWebViewURL]) {
         return self.remoteConfig;
     }
 
     return [self localConfiguration];
 }
 
+- (NSString *)getCurrentMetricsUrl {
+    if (![self.remoteConfig.metricsUrl isEqualToString: @""]) {
+        return self.remoteConfig.metricsUrl;
+    }
+
+    return self.localConfiguration.metricsUrl;
+}
+
+- (UADSConfigurationExperiments *)currentSessionExperiments {
+    return [UADSConfigurationExperiments newWithJSON: self.currentSessionExperimentsAsDictionary];
+}
+
 - (NSDictionary *)currentSessionExperimentsAsDictionary {
     USRVConfiguration *config = [ self getCurrentConfiguration];
 
@@ -57,10 +71,6 @@ - (NSDictionary *)currentSessionExperimentsAsDictionary {
     return experiments;
 }
 
-- (UADSConfigurationExperiments *)currentSessionExperiments {
-    return [UADSConfigurationExperiments newWithJSON: self.currentSessionExperimentsAsDictionary];
-}
-
 #pragma mark UADSConfigurationMetricTagsReader
 - (NSDictionary *)metricTags {
     USRVConfiguration *currentConfig = [self getCurrentConfiguration];
@@ -82,26 +92,39 @@ - (NSDictionary *)metricInfo {
     if (currentConfig == nil) {
         return nil;
     }
-
-    return @{
-        kUnityServicesConfigValueMetricSamplingRate: [@(currentConfig.metricSamplingRate) stringValue]
-    };
+    NSMutableDictionary *info = [NSMutableDictionary new];
+    info[kUnityServicesConfigValueMetricSamplingRate] = [@(currentConfig.metricSamplingRate) stringValue];
+    [info uads_setValueIfNotNil: currentConfig.sessionToken
+                         forKey: @"sTkn"];
+    return info;
 }
 
+
 - (void)subscribeToConfigUpdates: (UADSConfigurationObserver)observer {
     [self.mediator subscribe: observer];
 }
 
 - (void)saveConfiguration: (USRVConfiguration *)configuration {
+    [self saveConfiguration:configuration notifyBridge:YES];
+}
+
+- (void)saveConfiguration: (USRVConfiguration *)configuration notifyBridge: (bool)notify {
     dispatch_sync(self.syncQueue, ^{
-        [configuration saveToDisk];
+        
         self.remoteConfig = configuration;
     });
+    
+    if (notify) {
+        [self.serviceProviderBridge saveConfiguration: configuration.originalJSON];
+    }
 
-    [UADSServiceProviderProxy.shared saveConfiguration: configuration.originalJSON];
     [self.mediator notifyObserversWithObjectAndRemove: configuration];
 }
 
+- (void)triggerSaved: (USRVConfiguration *)config {
+    [self saveConfiguration: config notifyBridge: NO];
+}
+
 - (USRVConfiguration *)getConfigFromFile {
     if ([[NSFileManager defaultManager] fileExistsAtPath: [USRVSdkProperties getLocalConfigFilepath]]) {
         NSData *configData = [NSData dataWithContentsOfFile: [USRVSdkProperties getLocalConfigFilepath]

SourceCode/Private/Core/Configuration/SDKConfigurationReader/ConfigurationLoader/UADSConfigurationLoaderBuilder.h

@@ -1,5 +1,4 @@
 #import <Foundation/Foundation.h>
-#import "UADSConfigurationLoaderStrategy.h"
 #import "UADSConfigurationExperiments.h"
 #import "UADSConfigurationLoaderWithPersistence.h"
 #import "UADSPrivacyStorage.h"
@@ -11,12 +10,16 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef id<UADSClientConfig, UADSPrivacyConfig> UADSConfigurationLoaderBuilderConfig;
+@protocol UADSConfigurationLoaderProvider <NSObject>
+- (id<UADSConfigurationLoader>)configurationLoader;
+@end
+
+//typedef id<UADSConfigurationRequestFactoryConfig, UADSPrivacyConfig> UADSConfigurationLoaderBuilderConfig;
 
-@interface UADSConfigurationLoaderBuilder : NSObject
+@interface UADSConfigurationLoaderBuilder : NSObject<UADSConfigurationLoaderProvider>
 @property (nonatomic, strong) id<USRVInitializationRequestFactory> mainRequestFactory;
 @property (nonatomic, strong) id<UADSConfigurationSaver> configurationSaver;
-@property (nonatomic, strong) id<ISDKMetrics> metricsSender;
+@property (nonatomic, strong) id<ISDKMetrics, ISDKPerformanceMetricsSender> metricsSender;
 @property (nonatomic, strong) id<UADSPrivacyResponseSaver, UADSPrivacyResponseReader> privacyStorage;
 @property (nonatomic, strong) id<UADSPrivacyLoader>privacyLoader;
 @property (nonatomic, strong) id<UADSDeviceInfoReader>deviceInfoReader;
@@ -27,12 +30,11 @@ typedef id<UADSClientConfig, UADSPrivacyConfig> UADSConfigurationLoaderBuilderCo
 @property (nonatomic, strong) id<UADSGameSessionIdReader> gameSessionIdReader;
 @property (nonatomic) BOOL noCompression;
 
-- (id<UADSConfigurationLoader>)         loader;
 - (id<USRVInitializationRequestFactory>)requestFactoryWithExtendedInfo: (BOOL)hasExtendedInfo;
 
-+ (instancetype)newWithConfig: (UADSConfigurationLoaderBuilderConfig)config
++ (instancetype)newWithConfig: (id<UADSClientConfig>)config
          andWebRequestFactory: (id<IUSRVWebRequestFactory>)webRequestFactory
-                 metricSender: (id<ISDKMetrics>)metricSender;
+                 metricSender: (id<ISDKMetrics, ISDKPerformanceMetricsSender>)metricSender;
 @end
 
 NS_ASSUME_NONNULL_END

SourceCode/Private/Core/Configuration/SDKConfigurationReader/ConfigurationLoader/UADSConfigurationLoaderBuilder.m

@@ -13,20 +13,20 @@
 #import "UADSWebRequestFactorySwiftAdapter.h"
 #import "UADSPrivacyLoaderWithMetrics.h"
 #import "UADSConfigurationLoaderWithMetrics.h"
-
+#import "UADSConfigurationLoaderStrategy.h"
 #import "UADSServiceProvider.h"
 
 @interface UADSConfigurationLoaderBuilder ()
-@property (nonatomic, strong) UADSConfigurationLoaderBuilderConfig config;
+@property (nonatomic, strong) id<UADSClientConfig> config;
 @property (nonatomic, strong) id<IUSRVWebRequestFactory> webRequestFactory;
 @end
 
 @implementation UADSConfigurationLoaderBuilder
 
 
-+ (instancetype)newWithConfig: (UADSConfigurationLoaderBuilderConfig)config
++ (instancetype)newWithConfig: (id<UADSClientConfig>)config
          andWebRequestFactory: (id<IUSRVWebRequestFactory>)webRequestFactory
-                 metricSender: (id<ISDKMetrics>)metricSender  {
+                 metricSender: (id<ISDKMetrics, ISDKPerformanceMetricsSender>)metricSender  {
     UADSConfigurationLoaderBuilder *builder = [self new];
 
     builder.metricsSender = metricSender;
@@ -36,13 +36,14 @@ + (instancetype)newWithConfig: (UADSConfigurationLoaderBuilderConfig)config
     return builder;
 }
 
-- (id<UADSConfigurationLoader>)loader {
+- (id<UADSConfigurationLoader>)configurationLoader {
     id<UADSConfigurationLoader> loaderToReturn = self.baseStrategy;
 
     loaderToReturn = [self decorateWithSaving: loaderToReturn];
     return loaderToReturn;
 }
 
+
 - (id<UADSConfigurationLoader>)baseStrategy {
     id<UADSConfigurationLoader>mainLoader = self.mainLoader;
 
@@ -102,7 +103,7 @@ + (instancetype)newWithConfig: (UADSConfigurationLoaderBuilderConfig)config
     UADSDeviceInfoReaderBuilder *builder = [UADSDeviceInfoReaderBuilder new];
 
     builder.metricsSender = _metricsSender;
-    builder.selectorConfig = self.config;
+    builder.clientConfig = self.config;
     builder.extendedReader = extended;
     builder.privacyReader = self.privacyStorage;
     builder.logger = self.logger;

SourceCode/Private/Core/Configuration/SDKConfigurationReader/UADSClientConfig.h

@@ -4,7 +4,7 @@
 NS_ASSUME_NONNULL_BEGIN
 @class UADSConfigurationExperiments;
 
-@protocol UADSClientConfig <NSObject>
+@protocol UADSClientConfig <NSObject, UADSPrivacyConfig>
 - (NSString *)  gameID;
 - (NSString *)  sdkVersionName;
 - (NSString *)  sdkVersion;

SourceCode/Private/Core/Configuration/SDKConfigurationReader/UADSConfigurationExperimentValue.m

@@ -1,6 +1,6 @@
 #import "UADSConfigurationExperimentValue.h"
 
-#define NEXT_SESSION_FLAGS     @[@"tsi", @"tsi_upii", @"tsi_p", @"tsi_nt", @"tsi_prr", @"tsi_prw"]
+#define NEXT_SESSION_FLAGS     @[@"tsi", @"tsi_upii", @"tsi_p", @"tsi_nt", @"tsi_prr", @"tsi_prw", @"s_init", @"s_pte", @"s_ntf", @"s_nrq", @"s_wbrq", @"s_wd"]
 #define NEXT_SESSION_FLAGS_SET [NSSet setWithArray: NEXT_SESSION_FLAGS]
 
 @implementation UADSConfigurationExperimentValue

SourceCode/Private/Core/Configuration/SDKConfigurationReader/UADSConfigurationExperiments.h

@@ -15,6 +15,9 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)        isSwiftDownloadEnabled;
 - (BOOL)        isSwiftNativeRequestsEnabled;
 - (BOOL)        isSwiftWebViewRequestsEnabled;
+- (BOOL)        isSwiftInitFlowEnabled;
+- (BOOL)        isUseNewTasksEnabled;
+- (BOOL)        isParallelExecutionEnabled;
 
 - (NSDictionary<NSString *, NSString *> *)nextSessionFlags;
 - (NSDictionary<NSString *, NSString *> *)currentSessionFlags;