keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add session manager pools.

Browse Source
pull/1/head
Matthew Chen 6 years ago
parent 280b9378b5
commit e2b92ed42b
1 changed files with 136 additions and 169 deletions
Show Stats Download Patch File Download Diff File

305
SignalServiceKit/src/Network/API/TSNetworkManager.m
Unescape Escape View File

@ -55,6 +55,7 @@ BOOL IsNSErrorNetworkFailure(NSError *_Nullable error)
} }
- (void)performRequest:(TSRequest *)request - (void)performRequest:(TSRequest *)request
canUseAuth:(BOOL)canUseAuth
success:(TSNetworkManagerSuccess)success success:(TSNetworkManagerSuccess)success
failure:(TSNetworkManagerFailure)failure failure:(TSNetworkManagerFailure)failure
{ {
@ -73,7 +74,7 @@ BOOL IsNSErrorNetworkFailure(NSError *_Nullable error)
[self.sessionManager.requestSerializer setValue:headerValue forHTTPHeaderField:headerField]; [self.sessionManager.requestSerializer setValue:headerValue forHTTPHeaderField:headerField];
} }
if (request.shouldHaveAuthorizationHeaders) { if (canUseAuth && request.shouldHaveAuthorizationHeaders) {
[self.sessionManager.requestSerializer setAuthorizationHeaderFieldWithUsername:request.authUsername [self.sessionManager.requestSerializer setAuthorizationHeaderFieldWithUsername:request.authUsername
password:request.authPassword]; password:request.authPassword];
} }
@ -174,8 +175,6 @@ BOOL IsNSErrorNetworkFailure(NSError *_Nullable error)
@property (atomic, readonly) dispatch_queue_t serialQueue; @property (atomic, readonly) dispatch_queue_t serialQueue;
typedef void (^failureBlock)(NSURLSessionDataTask *task, NSError *error);
@end @end
#pragma mark - #pragma mark -
@ -229,19 +228,15 @@ typedef void (^failureBlock)(NSURLSessionDataTask *task, NSError *error);
- (void)makeRequest:(TSRequest *)request - (void)makeRequest:(TSRequest *)request
completionQueue:(dispatch_queue_t)completionQueue completionQueue:(dispatch_queue_t)completionQueue
success:(TSNetworkManagerSuccess)successBlock success:(TSNetworkManagerSuccess)success
failure:(TSNetworkManagerFailure)failureBlock failure:(TSNetworkManagerFailure)failure
{ {
OWSAssertDebug(request); OWSAssertDebug(request);
OWSAssertDebug(successBlock); OWSAssertDebug(success);
OWSAssertDebug(failureBlock); OWSAssertDebug(failure);
dispatch_async(self.serialQueue, ^{ dispatch_async(self.serialQueue, ^{
if (request.isUDRequest) { [self makeRequestSync:request completionQueue:completionQueue success:success failure:failure];
[self makeUDRequestSync:request success:successBlock failure:failureBlock];
} else {
[self makeRequestSync:request completionQueue:completionQueue success:successBlock failure:failureBlock];
}
}); });
} }
@ -254,10 +249,18 @@ typedef void (^failureBlock)(NSURLSessionDataTask *task, NSError *error);
OWSAssertDebug(successParam); OWSAssertDebug(successParam);
OWSAssertDebug(failureParam); OWSAssertDebug(failureParam);
OWSLogInfo(@"Making Non-UD request: %@", request); BOOL isUDRequest = request.isUDRequest;
BOOL canUseAuth = !isUDRequest;
if (isUDRequest) {
OWSAssert(!request.shouldHaveAuthorizationHeaders);
OWSLogInfo(@"Making UD request: %@", request);
} else {
OWSLogInfo(@"Making Non-UD request: %@", request);
}
OWSSessionManagerPool *sessionManagerPool = self.nonUdSessionManagerPool; OWSSessionManagerPool *sessionManagerPool
= (isUDRequest ? self.udSessionManagerPool : self.nonUdSessionManagerPool);
OWSSessionManager *sessionManager = [sessionManagerPool get]; OWSSessionManager *sessionManager = [sessionManagerPool get];
TSNetworkManagerSuccess success = ^(NSURLSessionDataTask *task, _Nullable id responseObject) { TSNetworkManagerSuccess success = ^(NSURLSessionDataTask *task, _Nullable id responseObject) {
@ -268,7 +271,7 @@ typedef void (^failureBlock)(NSURLSessionDataTask *task, NSError *error);
dispatch_async(completionQueue, ^{ dispatch_async(completionQueue, ^{
OWSLogInfo(@"Non-UD request succeeded : %@", request); OWSLogInfo(@"Non-UD request succeeded : %@", request);
if (request.shouldHaveAuthorizationHeaders) { if (canUseAuth && request.shouldHaveAuthorizationHeaders) {
[TSNetworkManager.tsAccountManager setIsDeregistered:NO]; [TSNetworkManager.tsAccountManager setIsDeregistered:NO];
} }
@ -282,54 +285,18 @@ typedef void (^failureBlock)(NSURLSessionDataTask *task, NSError *error);
[sessionManagerPool returnToPool:sessionManager]; [sessionManagerPool returnToPool:sessionManager];
}); });
// TODO: Refactor this.
[TSNetworkManager [TSNetworkManager
errorPrettifyingForFailureBlock:^(NSURLSessionDataTask *task, NSError *error) { handleNetworkFailure:^(NSURLSessionDataTask *task, NSError *error) {
dispatch_async(completionQueue, ^{ dispatch_async(completionQueue, ^{
failureParam(task, error); failureParam(task, error);
}); });
} }
request:request](task, error); request:request
task:task
error:error];
}; };
[sessionManager performRequest:request success:success failure:failure]; [sessionManager performRequest:request canUseAuth:canUseAuth success:success failure:failure];
}
- (void)makeUDRequestSync:(TSRequest *)request
success:(TSNetworkManagerSuccess)successParam
failure:(TSNetworkManagerFailure)failureParam
{
OWSAssertDebug(request);
OWSAssert(!request.shouldHaveAuthorizationHeaders);
OWSAssertDebug(successParam);
OWSAssertDebug(failureParam);
OWSLogInfo(@"Making UD request: %@", request);
OWSSessionManagerPool *sessionManagerPool = self.udSessionManagerPool;
OWSSessionManager *sessionManager = [sessionManagerPool get];
TSNetworkManagerSuccess success = ^(NSURLSessionDataTask *task, _Nullable id responseObject) {
OWSLogInfo(@"UD request succeeded : %@", request);
dispatch_async(self.serialQueue, ^{
[sessionManagerPool returnToPool:sessionManager];
});
successParam(task, responseObject);
[OutageDetection.sharedManager reportConnectionSuccess];
};
TSNetworkManagerSuccess failure = ^(NSURLSessionDataTask *task, NSError *error) {
dispatch_async(self.serialQueue, ^{
[sessionManagerPool returnToPool:sessionManager];
});
// TODO: Refactor this.
[TSNetworkManager errorPrettifyingForFailureBlock:failureParam request:request](task, error);
};
[sessionManager performRequest:request success:success failure:failure];
} }
#ifdef DEBUG #ifdef DEBUG
@ -372,127 +339,127 @@ typedef void (^failureBlock)(NSURLSessionDataTask *task, NSError *error);
} }
#endif #endif
+ (failureBlock)errorPrettifyingForFailureBlock:(failureBlock)failureBlock request:(TSRequest *)request + (void)handleNetworkFailure:(TSNetworkManagerFailure)failureBlock
request:(TSRequest *)request
task:(NSURLSessionDataTask *)task
error:(NSError *)networkError
{ {
OWSAssertDebug(failureBlock); OWSAssertDebug(failureBlock);
OWSAssertDebug(request); OWSAssertDebug(request);
OWSAssertDebug(task);
OWSAssertDebug(networkError);
return ^(NSURLSessionDataTask *_Nullable task, NSError *_Nonnull networkError) { NSInteger statusCode = [task statusCode];
NSInteger statusCode = [task statusCode];
#ifdef DEBUG #ifdef DEBUG
[TSNetworkManager logCurlForTask:task]; [TSNetworkManager logCurlForTask:task];
#endif #endif
[OutageDetection.sharedManager reportConnectionFailure]; [OutageDetection.sharedManager reportConnectionFailure];
NSError *error = [self errorWithHTTPCode:statusCode NSError *error = [self errorWithHTTPCode:statusCode
description:nil description:nil
failureReason:nil failureReason:nil
recoverySuggestion:nil recoverySuggestion:nil
fallbackError:networkError]; fallbackError:networkError];
switch (statusCode) { switch (statusCode) {
case 0: { case 0: {
NSError *connectivityError = NSError *connectivityError =
[self errorWithHTTPCode:TSNetworkManagerErrorFailedConnection [self errorWithHTTPCode:TSNetworkManagerErrorFailedConnection
description:NSLocalizedString(@"ERROR_DESCRIPTION_NO_INTERNET", description:NSLocalizedString(@"ERROR_DESCRIPTION_NO_INTERNET",
@"Generic error used whenever Signal can't contact the server") @"Generic error used whenever Signal can't contact the server")
failureReason:networkError.localizedFailureReason failureReason:networkError.localizedFailureReason
recoverySuggestion:NSLocalizedString(@"NETWORK_ERROR_RECOVERY", nil) recoverySuggestion:NSLocalizedString(@"NETWORK_ERROR_RECOVERY", nil)
fallbackError:networkError]; fallbackError:networkError];
connectivityError.isRetryable = YES; connectivityError.isRetryable = YES;
OWSLogWarn(@"The network request failed because of a connectivity error: %@", request); OWSLogWarn(@"The network request failed because of a connectivity error: %@", request);
failureBlock(task, connectivityError); failureBlock(task, connectivityError);
break; break;
} }
case 400: { case 400: {
OWSLogError( OWSLogError(@"The request contains an invalid parameter : %@, %@", networkError.debugDescription, request);
@"The request contains an invalid parameter : %@, %@", networkError.debugDescription, request);
error.isRetryable = NO;
error.isRetryable = NO;
failureBlock(task, error);
failureBlock(task, error); break;
break; }
} case 401: {
case 401: { OWSLogError(@"The server returned an error about the authorization header: %@, %@",
OWSLogError(@"The server returned an error about the authorization header: %@, %@", networkError.debugDescription,
networkError.debugDescription, request);
request); error.isRetryable = NO;
error.isRetryable = NO; [self deregisterAfterAuthErrorIfNecessary:task request:request statusCode:statusCode];
[self deregisterAfterAuthErrorIfNecessary:task request:request statusCode:statusCode]; failureBlock(task, error);
failureBlock(task, error); break;
break; }
} case 403: {
case 403: { OWSLogError(
OWSLogError( @"The server returned an authentication failure: %@, %@", networkError.debugDescription, request);
@"The server returned an authentication failure: %@, %@", networkError.debugDescription, request); error.isRetryable = NO;
error.isRetryable = NO; [self deregisterAfterAuthErrorIfNecessary:task request:request statusCode:statusCode];
[self deregisterAfterAuthErrorIfNecessary:task request:request statusCode:statusCode]; failureBlock(task, error);
failureBlock(task, error); break;
break; }
} case 404: {
case 404: { OWSLogError(@"The requested resource could not be found: %@, %@", networkError.debugDescription, request);
OWSLogError(@"The requested resource could not be found: %@, %@", networkError.debugDescription, request); error.isRetryable = NO;
error.isRetryable = NO; failureBlock(task, error);
failureBlock(task, error); break;
break; }
} case 411: {
case 411: { OWSLogInfo(@"Multi-device pairing: %ld, %@, %@", (long)statusCode, networkError.debugDescription, request);
OWSLogInfo( NSError *customError = [self errorWithHTTPCode:statusCode
@"Multi-device pairing: %ld, %@, %@", (long)statusCode, networkError.debugDescription, request); description:NSLocalizedString(@"MULTIDEVICE_PAIRING_MAX_DESC",
NSError *customError = @"alert title: cannot link - reached max linked devices")
[self errorWithHTTPCode:statusCode failureReason:networkError.localizedFailureReason
description:NSLocalizedString(@"MULTIDEVICE_PAIRING_MAX_DESC", recoverySuggestion:NSLocalizedString(@"MULTIDEVICE_PAIRING_MAX_RECOVERY",
@"alert title: cannot link - reached max linked devices") @"alert body: cannot link - reached max linked devices")
failureReason:networkError.localizedFailureReason fallbackError:networkError];
recoverySuggestion:NSLocalizedString(@"MULTIDEVICE_PAIRING_MAX_RECOVERY", customError.isRetryable = NO;
@"alert body: cannot link - reached max linked devices") failureBlock(task, customError);
fallbackError:networkError]; break;
customError.isRetryable = NO; }
failureBlock(task, customError); case 413: {
break; OWSLogWarn(@"Rate limit exceeded: %@", request);
} NSError *customError = [self errorWithHTTPCode:statusCode
case 413: { description:NSLocalizedString(@"REGISTER_RATE_LIMITING_ERROR", nil)
OWSLogWarn(@"Rate limit exceeded: %@", request); failureReason:networkError.localizedFailureReason
NSError *customError = [self errorWithHTTPCode:statusCode recoverySuggestion:NSLocalizedString(@"REGISTER_RATE_LIMITING_BODY", nil)
description:NSLocalizedString(@"REGISTER_RATE_LIMITING_ERROR", nil) fallbackError:networkError];
failureReason:networkError.localizedFailureReason customError.isRetryable = NO;
recoverySuggestion:NSLocalizedString(@"REGISTER_RATE_LIMITING_BODY", nil) failureBlock(task, customError);
fallbackError:networkError]; break;
customError.isRetryable = NO; }
failureBlock(task, customError); case 417: {
break; // TODO: Is this response code obsolete?
} OWSLogWarn(@"The number is already registered on a relay. Please unregister there first: %@", request);
case 417: { NSError *customError = [self errorWithHTTPCode:statusCode
// TODO: Is this response code obsolete? description:NSLocalizedString(@"REGISTRATION_ERROR", nil)
OWSLogWarn(@"The number is already registered on a relay. Please unregister there first: %@", request); failureReason:networkError.localizedFailureReason
NSError *customError = [self errorWithHTTPCode:statusCode recoverySuggestion:NSLocalizedString(@"RELAY_REGISTERED_ERROR_RECOVERY", nil)
description:NSLocalizedString(@"REGISTRATION_ERROR", nil) fallbackError:networkError];
failureReason:networkError.localizedFailureReason customError.isRetryable = NO;
recoverySuggestion:NSLocalizedString(@"RELAY_REGISTERED_ERROR_RECOVERY", nil) failureBlock(task, customError);
fallbackError:networkError]; break;
customError.isRetryable = NO; }
failureBlock(task, customError); case 422: {
break; OWSLogError(@"The registration was requested over an unknown transport: %@, %@",
} networkError.debugDescription,
case 422: { request);
OWSLogError(@"The registration was requested over an unknown transport: %@, %@", error.isRetryable = NO;
networkError.debugDescription, failureBlock(task, error);
request); break;
error.isRetryable = NO; }
failureBlock(task, error); default: {
break; OWSLogWarn(@"Unknown error: %ld, %@, %@", (long)statusCode, networkError.debugDescription, request);
} error.isRetryable = NO;
default: { failureBlock(task, error);
OWSLogWarn(@"Unknown error: %ld, %@, %@", (long)statusCode, networkError.debugDescription, request); break;
error.isRetryable = NO; }
failureBlock(task, error); }
break;
}
}
};
} }
+ (void)deregisterAfterAuthErrorIfNecessary:(NSURLSessionDataTask *)task + (void)deregisterAfterAuthErrorIfNecessary:(NSURLSessionDataTask *)task

Write Preview
Loading…
Cancel
Save