Added configurable NSURLSessionConfiguration, and retry attempts.

Author: richardjrossiii

Parse/Internal/Commands/CommandRunner/URLSession/PFURLSessionCommandRunner.h

@@ -16,6 +16,17 @@ NS_ASSUME_NONNULL_BEGIN
 @interface PFURLSessionCommandRunner : NSObject <PFCommandRunning>
 
 - (instancetype)init NS_UNAVAILABLE;
+- (instancetype)initWithDataSource:(id<PFInstallationIdentifierStoreProvider>)dataSource
+              sessionConfiguration:(NSURLSessionConfiguration *)configuration
+                     retryAttempts:(NSUInteger)retryAttempts
+                     applicationId:(NSString *)applicationId
+                         clientKey:(NSString *)clientKey;
+
++ (instancetype)commandRunnerWithDataSource:(id<PFInstallationIdentifierStoreProvider>)dataSource
+                       sessionConfiguration:(NSURLSessionConfiguration *)configuration
+                              retryAttempts:(NSUInteger)retryAttempts
+                              applicationId:(NSString *)applicationId
+                                  clientKey:(NSString *)clientKey;
 
 @end
 

Parse/Internal/Commands/CommandRunner/URLSession/PFURLSessionCommandRunner.m

@@ -33,6 +33,7 @@
 @interface PFURLSessionCommandRunner () <PFURLSessionDelegate>
 
 @property (nonatomic, strong) NSNotificationCenter *notificationCenter;
+@property (nonatomic, assign) NSUInteger retryAttempts;
 
 @end
 
@@ -53,8 +54,23 @@ - (instancetype)init {
 - (instancetype)initWithDataSource:(id<PFInstallationIdentifierStoreProvider>)dataSource
                      applicationId:(NSString *)applicationId
                          clientKey:(NSString *)clientKey {
-    NSURLSessionConfiguration *configuration = [[self class] _urlSessionConfigurationForApplicationId:applicationId
-                                                                                            clientKey:clientKey];
+    return [self initWithDataSource:dataSource
+               sessionConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]
+                      retryAttempts:PFCommandRunningDefaultMaxAttemptsCount
+                      applicationId:applicationId
+                          clientKey:clientKey];
+
+}
+
+- (instancetype)initWithDataSource:(id<PFInstallationIdentifierStoreProvider>)dataSource
+              sessionConfiguration:(NSURLSessionConfiguration *)configuration
+                     retryAttempts:(NSUInteger)retryAttempts
+                     applicationId:(NSString *)applicationId
+                         clientKey:(NSString *)clientKey {
+    configuration = [[self class] _modifyUrlSessionConfiguration:configuration
+                                                forApplicationId:applicationId
+                                                       clientKey:clientKey];
+
     PFURLSession *session = [PFURLSession sessionWithConfiguration:configuration delegate:self];
     PFCommandURLRequestConstructor *constructor = [PFCommandURLRequestConstructor constructorWithDataSource:dataSource];
     self = [self initWithDataSource:dataSource
@@ -63,6 +79,7 @@ - (instancetype)initWithDataSource:(id<PFInstallationIdentifierStoreProvider>)da
                  notificationCenter:[NSNotificationCenter defaultCenter]];
     if (!self) return nil;
 
+    _retryAttempts = retryAttempts;
     _applicationId = [applicationId copy];
     _clientKey = [clientKey copy];
 
@@ -77,6 +94,7 @@ - (instancetype)initWithDataSource:(id<PFInstallationIdentifierStoreProvider>)da
     if (!self) return nil;
 
     _initialRetryDelay = PFCommandRunningDefaultRetryDelay;
+    _retryAttempts = PFCommandRunningDefaultMaxAttemptsCount;
 
     _requestConstructor = requestConstructor;
     _session = session;
@@ -91,6 +109,18 @@ + (instancetype)commandRunnerWithDataSource:(id<PFInstallationIdentifierStorePro
     return [[self alloc] initWithDataSource:dataSource applicationId:applicationId clientKey:clientKey];
 }
 
++ (instancetype)commandRunnerWithDataSource:(id<PFInstallationIdentifierStoreProvider>)dataSource
+                       sessionConfiguration:(NSURLSessionConfiguration *)configuration
+                              retryAttempts:(NSUInteger)retryAttempts
+                              applicationId:(NSString *)applicationId
+                                  clientKey:(NSString *)clientKey {
+    return [[self alloc] initWithDataSource:dataSource
+                       sessionConfiguration:configuration
+                              retryAttempts:retryAttempts
+                              applicationId:applicationId
+                                  clientKey:clientKey];
+}
+
 ///--------------------------------------
 #pragma mark - Dealloc
 ///--------------------------------------
@@ -192,7 +222,7 @@ - (BFTask *)_performCommandRunningBlock:(nonnull id (^)())block
     return [self _performCommandRunningBlock:block
                        withCancellationToken:cancellationToken
                                        delay:delay
-                                 forAttempts:PFCommandRunningDefaultMaxAttemptsCount];
+                                 forAttempts:_retryAttempts];
 }
 
 - (BFTask *)_performCommandRunningBlock:(nonnull id (^)())block
@@ -209,7 +239,7 @@ - (BFTask *)_performCommandRunningBlock:(nonnull id (^)())block
         if ([[task.error userInfo][@"temporary"] boolValue] && attempts > 1) {
             PFLogError(PFLoggingTagCommon,
                        @"Network connection failed. Making attempt %lu after sleeping for %f seconds.",
-                       (unsigned long)(PFCommandRunningDefaultMaxAttemptsCount - attempts + 1), (double)delay);
+                       (unsigned long)(_retryAttempts - attempts + 1), (double)delay);
 
             return [[BFTask taskWithDelay:(int)(delay * 1000)] continueWithBlock:^id(BFTask *task) {
                 return [self _performCommandRunningBlock:block
@@ -226,9 +256,10 @@ - (BFTask *)_performCommandRunningBlock:(nonnull id (^)())block
 #pragma mark - NSURLSessionConfiguration
 ///--------------------------------------
 
-+ (NSURLSessionConfiguration *)_urlSessionConfigurationForApplicationId:(NSString *)applicationId
-                                                              clientKey:(NSString *)clientKey {
-    NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
++ (NSURLSessionConfiguration *)_modifyUrlSessionConfiguration:(NSURLSessionConfiguration *)configuration
+                                             forApplicationId:(NSString *)applicationId
+                                                    clientKey:(NSString *)clientKey {
+    configuration = [configuration copy];
 
     // No cookies, they are bad for you.
     configuration.HTTPCookieAcceptPolicy = NSHTTPCookieAcceptPolicyNever;
@@ -243,7 +274,11 @@ + (NSURLSessionConfiguration *)_urlSessionConfigurationForApplicationId:(NSStrin
     NSDictionary *headers = [PFCommandURLRequestConstructor defaultURLRequestHeadersForApplicationId:applicationId
                                                                                            clientKey:clientKey
                                                                                               bundle:bundle];
-    configuration.HTTPAdditionalHeaders = headers;
+
+    NSMutableDictionary *existingHeaders = [configuration.HTTPAdditionalHeaders mutableCopy];
+    [existingHeaders addEntriesFromDictionary:headers];
+
+    configuration.HTTPAdditionalHeaders = existingHeaders;
 
     return configuration;
 }

Parse/Internal/ParseManager.m

@@ -313,6 +313,8 @@ - (PFInstallationIdentifierStore *)installationIdentifierStore {
     dispatch_sync(_commandRunnerAccessQueue, ^{
         if (!_commandRunner) {
             _commandRunner = [PFURLSessionCommandRunner commandRunnerWithDataSource:self
+                                                               sessionConfiguration:self.configuration.URLSessionConfiguration
+                                                                      retryAttempts:self.configuration.URLSessionRetryAttempts
                                                                       applicationId:self.configuration.applicationId
                                                                           clientKey:self.configuration.clientKey];
         }

Parse/ParseClientConfiguration.h

@@ -23,6 +23,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nullable, nonatomic, copy, readwrite) NSString *applicationGroupIdentifier;
 @property (nullable, nonatomic, copy, readwrite) NSString *containingApplicationBundleIdentifier;
 
+@property (null_resettable, nonatomic, copy, readwrite) NSURLSessionConfiguration *URLSessionConfiguration;
+@property (nonatomic, assign, readwrite) NSUInteger URLSessionRetryAttempts;
+
 @end
 
 /*!
@@ -38,6 +41,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nullable, nonatomic, copy, readonly) NSString *applicationGroupIdentifier;
 @property (nullable, nonatomic, copy, readonly) NSString *containingApplicationBundleIdentifier;
 
+@property (null_resettable, nonatomic, copy, readonly) NSURLSessionConfiguration *URLSessionConfiguration;
+@property (nonatomic, assign, readonly) NSUInteger URLSessionRetryAttempts;
+
 + (instancetype)configurationWithBlock:(void(^)(id<ParseMutableClientConfiguration> configuration))configurationBlock;
 
 + (instancetype)new NS_UNAVAILABLE;

Parse/ParseClientConfiguration.m

@@ -10,6 +10,7 @@
 #import "ParseClientConfiguration.h"
 
 #import "PFHash.h"
+#import "PFCommandRunningConstants.h"
 
 @interface ParseClientConfiguration()
 
@@ -21,6 +22,9 @@ @interface ParseClientConfiguration()
 @property (nullable, nonatomic, copy, readwrite) NSString *applicationGroupIdentifier;
 @property (nullable, nonatomic, copy, readwrite) NSString *containingApplicationBundleIdentifier;
 
+@property (null_resettable, nonatomic, copy, readwrite) NSURLSessionConfiguration *URLSessionConfiguration;
+@property (nonatomic, assign, readwrite) NSUInteger URLSessionRetryAttempts;
+
 @end
 
 // We must implement the protocol here otherwise clang issues warnings about non-matching property declarations.
@@ -38,6 +42,9 @@ - (instancetype)initWithConfigurationBlock:(void (^)(id<ParseMutableClientConfig
     self = [super init];
     if (!self) return nil;
 
+    _URLSessionConfiguration = [NSURLSessionConfiguration defaultSessionConfiguration];
+    _URLSessionRetryAttempts = PFCommandRunningDefaultMaxAttemptsCount;
+
     configurationBlock(self);
 
     return self;
@@ -47,6 +54,17 @@ + (instancetype)configurationWithBlock:(void (^)(id<ParseMutableClientConfigurat
     return [[self alloc] initWithConfigurationBlock:configurationBlock];
 }
 
+///--------------------------------------
+#pragma mark - Properties
+///--------------------------------------
+
+- (void)setURLSessionConfiguration:(NSURLSessionConfiguration *)URLSessionConfiguration {
+    if (URLSessionConfiguration == nil) {
+        URLSessionConfiguration = [NSURLSessionConfiguration defaultSessionConfiguration];
+    }
+    _URLSessionConfiguration = URLSessionConfiguration;
+}
+
 ///--------------------------------------
 #pragma mark - NSObject
 ///--------------------------------------