RSA4c

Source/ARTAuth+Private.h

@@ -32,6 +32,7 @@ ART_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readonly, assign) NSTimeInterval timeOffset;
 
 @property (art_nullable, weak) id<ARTAuthDelegate> delegate;
+@property (readonly, assign) BOOL authorizing;
 
 @end
 

Source/ARTAuth.m

@@ -352,6 +352,7 @@ - (void)authorize:(ARTTokenParams *)tokenParams options:(ARTAuthOptions *)authOp
         if (callback) {
             callback(self.tokenDetails, nil);
         }
+        _authorizing = false;
     };
 
     // Failure
@@ -360,6 +361,7 @@ - (void)authorize:(ARTTokenParams *)tokenParams options:(ARTAuthOptions *)authOp
         if (callback) {
             callback(nil, error);
         }
+        _authorizing = false;
     };
 
     __weak id<ARTAuthDelegate> lastDelegate = self.delegate;
@@ -378,6 +380,7 @@ - (void)authorize:(ARTTokenParams *)tokenParams options:(ARTAuthOptions *)authOp
 
     // Request always a new token
     [self.logger verbose:@"RS:%p ARTAuth: requesting new token.", _rest];
+    _authorizing = true;
     [self requestToken:currentTokenParams withOptions:replacedOptions callback:^(ARTTokenDetails *tokenDetails, NSError *error) {
         if (error) {
             failureBlock(error);

Source/ARTAuthOptions.m

@@ -75,8 +75,7 @@ - (id)copyWithZone:(NSZone *)zone {
 }
 
 - (NSString *)description {
-    return [NSString stringWithFormat: @"%@: key=%@ token=%@ authUrl=%@ authMethod=%@ hasAuthCallback=%d",
-            NSStringFromClass([self class]), self.key, self.token, self.authUrl, self.authMethod, self.authCallback != nil];
+    return [NSString stringWithFormat:@"%@ - \n\t key: %@; \n\t token: %@; \n\t authUrl: %@; \n\t authMethod: %@; \n\t hasAuthCallback: %d;", [super description], self.key, self.token, self.authUrl, self.authMethod, self.authCallback != nil];
 }
 
 - (NSString *)token {

Source/ARTClientOptions.m

@@ -46,6 +46,10 @@ - (instancetype)initDefaults {
     return self;
 }
 
+- (NSString *)description {
+    return [NSString stringWithFormat:@"%@\n\t clientId: %@;", [super description], self.clientId];
+}
+
 - (NSString*)getRestHost {
     if (_restHost) {
         return _restHost;

Source/ARTGCD.h

@@ -13,5 +13,8 @@
 
 void artDispatchSpecifyMainQueue();
 void artDispatchMainQueue(dispatch_block_t block);
+void artDispatchGlobalQueue(dispatch_block_t block);
+dispatch_block_t artDispatchScheduled(NSTimeInterval seconds, dispatch_block_t block);
+void artDispatchCancel(dispatch_block_t block);
 
 #endif /* ARTGCD_h */

Source/ARTGCD.m

@@ -22,8 +22,20 @@ void artDispatchMainQueue(dispatch_block_t block) {
         block();
     }
     else {
-        dispatch_async(dispatch_get_main_queue(), ^{
-            block();
-        });
+        dispatch_async(dispatch_get_main_queue(), block);
     }
 }
+
+void artDispatchGlobalQueue(dispatch_block_t block) {
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), block);
+}
+
+dispatch_block_t artDispatchScheduled(NSTimeInterval seconds, dispatch_block_t block) {
+    dispatch_block_t work = dispatch_block_create(0, block);
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(NSEC_PER_SEC * seconds)), dispatch_get_main_queue(), work);
+    return work;
+}
+
+void artDispatchCancel(dispatch_block_t block) {
+    dispatch_block_cancel(block);
+}

Source/ARTRealtime.m

@@ -33,6 +33,7 @@
 #import "ARTRealtimeTransport.h"
 #import "ARTFallback.h"
 #import "ARTAuthDetails.h"
+#import "ARTGCD.h"
 
 @interface ARTConnectionStateChange ()
 
@@ -153,7 +154,20 @@ - (NSString *)getClientId {
 }
 
 - (NSString *)description {
-    return [NSString stringWithFormat:@"Realtime: %@", self.clientId];
+    NSString *info;
+    if (self.options.token) {
+        info = [NSString stringWithFormat:@"token: %@", self.options.token];
+    }
+    else if (self.options.authUrl) {
+        info = [NSString stringWithFormat:@"authUrl: %@", self.options.authUrl];
+    }
+    else if (self.options.authCallback) {
+        info = [NSString stringWithFormat:@"authCallback: %@", self.options.authCallback];
+    }
+    else {
+        info = [NSString stringWithFormat:@"key: %@", self.options.key];
+    }
+    return [NSString stringWithFormat:@"%@ - \n\t %@;", [super description], info];
 }
 
 - (ARTAuth *)getAuth {
@@ -268,11 +282,12 @@ - (void)transition:(ARTRealtimeConnectionState)state withErrorInfo:(ARTErrorInfo
 
 - (void)transitionSideEffects:(ARTConnectionStateChange *)stateChange {
     ARTStatus *status = nil;
+    __weak __typeof(self) weakSelf = self;
 
     switch (stateChange.current) {
         case ARTRealtimeConnecting: {
             [self unlessStateChangesBefore:[ARTDefault realtimeRequestTimeout] do:^{
-                [self transition:ARTRealtimeDisconnected withErrorInfo:[ARTErrorInfo createWithCode:0 status:ARTStateConnectionFailed message:@"timed out"]];
+                [weakSelf onConnectionTimeOut];
             }];
 
             if (!_reachability) {
@@ -295,19 +310,19 @@ - (void)transitionSideEffects:(ARTConnectionStateChange *)stateChange {
             if (self.connection.state != ARTRealtimeFailed && self.connection.state != ARTRealtimeClosed && self.connection.state != ARTRealtimeDisconnected) {
                 [_reachability listenForHost:[_transport host] callback:^(BOOL reachable) {
                     if (reachable) {
-                        switch (_connection.state) {
+                        switch ([[weakSelf connection] state]) {
                             case ARTRealtimeDisconnected:
                             case ARTRealtimeSuspended:
-                                [self transition:ARTRealtimeConnecting];
+                                [weakSelf transition:ARTRealtimeConnecting];
                             default:
                                 break;
                         }
                     } else {
-                        switch (_connection.state) {
+                        switch ([[weakSelf connection] state]) {
                             case ARTRealtimeConnecting:
                             case ARTRealtimeConnected: {
                                 ARTErrorInfo *unreachable = [ARTErrorInfo createWithCode:-1003 message:@"unreachable host"];
-                                [self transition:ARTRealtimeDisconnected withErrorInfo:unreachable];
+                                [weakSelf transition:ARTRealtimeDisconnected withErrorInfo:unreachable];
                                 break;
                             }
                             default:
@@ -322,7 +337,7 @@ - (void)transitionSideEffects:(ARTConnectionStateChange *)stateChange {
         case ARTRealtimeClosing: {
             [_reachability off];
             [self unlessStateChangesBefore:[ARTDefault realtimeRequestTimeout] do:^{
-                [self transition:ARTRealtimeClosed];
+                [weakSelf transition:ARTRealtimeClosed];
             }];
             [self.transport sendClose];
             break;
@@ -365,7 +380,7 @@ - (void)transitionSideEffects:(ARTConnectionStateChange *)stateChange {
             [stateChange setRetryIn:self.options.disconnectedRetryTimeout];
 
             [self unlessStateChangesBefore:stateChange.retryIn do:^{
-                [self transition:ARTRealtimeConnecting];
+                [weakSelf transition:ARTRealtimeConnecting];
             }];
 
             break;
@@ -376,7 +391,7 @@ - (void)transitionSideEffects:(ARTConnectionStateChange *)stateChange {
             _transport = nil;
             [stateChange setRetryIn:self.options.suspendedRetryTimeout];
             [self unlessStateChangesBefore:stateChange.retryIn do:^{
-                [self transition:ARTRealtimeConnecting];
+                [weakSelf transition:ARTRealtimeConnecting];
             }];
             [_authorizationEmitter emit:[NSNumber numberWithInt:ARTAuthorizationFailed] with:[ARTErrorInfo createWithCode:ARTStateAuthorizationFailed message:@"Connection has been suspended"]];
             break;
@@ -433,6 +448,24 @@ - (void)transitionSideEffects:(ARTConnectionStateChange *)stateChange {
     [self.connection emit:stateChange.current with:stateChange];
 }
 
+- (void)onConnectionTimeOut {
+    NSInteger errorCode;
+    if (self.auth.authorizing && (self.options.authUrl || self.options.authCallback)) {
+        errorCode = ARTCodeErrorAuthConfiguredProviderFailure;
+    }
+    else {
+        errorCode = ARTCodeErrorConnectionTimedOut;
+    }
+    switch (self.connection.state) {
+        case ARTRealtimeConnected:
+            [self transition:ARTRealtimeConnected withErrorInfo:[ARTErrorInfo createWithCode:errorCode status:ARTStateConnectionFailed message:@"timed out"]];
+            break;
+        default:
+            [self transition:ARTRealtimeDisconnected withErrorInfo:[ARTErrorInfo createWithCode:errorCode status:ARTStateConnectionFailed message:@"timed out"]];
+            break;
+    }
+}
+
 - (void)unlessStateChangesBefore:(NSTimeInterval)deadline do:(void(^)())callback {
     // Defer until next event loop execution so that any event emitted in the current
     // one doesn't cancel the timeout.
@@ -536,13 +569,26 @@ - (void)onClosed {
     }
 }
 
+- (void)onAuth {
+    [self.logger info:@"R:%p server has requested an authorise", self];
+    switch (self.connection.state) {
+        case ARTRealtimeConnecting:
+        case ARTRealtimeConnected:
+            [self transportReconnectWithRenewedToken];
+            break;
+        default:
+            NSAssert(false, @"Invalid Realtime state: expected Connecting or Connected");
+            break;
+    }
+}
+
 - (void)onError:(ARTProtocolMessage *)message {
-    // TODO work out which states this can be received in
     if (message.channel) {
         [self onChannelMessage:message];
     } else {
         ARTErrorInfo *error = message.error;
         if ([self shouldRenewToken:&error]) {
+            [self.transport close];
             [self transportReconnectWithRenewedToken];
             return;
         }
@@ -567,12 +613,43 @@ - (void)transportReconnectWithHost:(NSString *)host {
     [self.transport connect];
 }
 
-- (void)transportReconnectWithRenewedToken {
-    _renewingToken = true;
+- (void)transportReconnectWithTokenDetails:(ARTTokenDetails *)tokenDetails error:(NSError *)error {
+    if (error && (self.options.authUrl || self.options.authCallback)) {
+        [self.connection setErrorReason:[ARTErrorInfo createWithCode:ARTCodeErrorAuthConfiguredProviderFailure message:error.localizedDescription]];
+        return;
+    }
     [_transport close];
     _transport = [[_transportClass alloc] initWithRest:self.rest options:self.options resumeKey:_transport.resumeKey connectionSerial:_transport.connectionSerial];
     _transport.delegate = self;
-    [_transport connectForcingNewToken:true];
+    [_transport connectWithToken:tokenDetails.token error:error];
+}
+
+- (void)transportReconnectWithRenewedToken {
+    self.auth.delegate = nil;
+    @try {
+        _renewingToken = true;
+        __weak __typeof(self) weakSelf = self;
+        dispatch_block_t work = artDispatchScheduled([ARTDefault realtimeRequestTimeout], ^{
+            [weakSelf onConnectionTimeOut];
+        });
+        [self.auth authorize:nil options:self.options callback:^(ARTTokenDetails *tokenDetails, NSError *error) {
+            // Cancel scheduled work
+            artDispatchCancel(work);
+            // It's still valid?
+            switch ([[weakSelf connection] state]) {
+            case ARTRealtimeClosing:
+            case ARTRealtimeClosed:
+                return;
+            default:
+                break;
+            }
+            [[weakSelf getLogger] debug:__FILE__ line:__LINE__ message:@"R:%p WS:%p authorised: %@ error: %@", weakSelf, [weakSelf getTransport], tokenDetails, error];
+            [weakSelf transportReconnectWithTokenDetails:tokenDetails error:error];
+        }];
+    }
+    @finally {
+        self.auth.delegate = self;
+    }
 }
 
 - (void)onAck:(ARTProtocolMessage *)message {
@@ -584,7 +661,9 @@ - (void)onNack:(ARTProtocolMessage *)message {
 }
 
 - (void)onChannelMessage:(ARTProtocolMessage *)message {
-    // TODO work out which states this can be received in / error info?
+    if (message.channel == nil) {
+        return;
+    }
     ARTRealtimeChannel *channel = [self.channels get:message.channel];
     [channel onChannelMessage:message];
 }
@@ -886,6 +965,9 @@ - (void)realtimeTransport:(id)transport didReceiveMessage:(ARTProtocolMessage *)
         case ARTProtocolMessageClosed:
             [self onClosed];
             break;
+        case ARTProtocolMessageAuth:
+            [self onAuth];
+            break;
         default:
             [self onChannelMessage:message];
             break;

Source/ARTRealtimeTransport.h

@@ -77,8 +77,8 @@ typedef NS_ENUM(NSUInteger, ARTRealtimeTransportState) {
 - (void)send:(ARTProtocolMessage *)msg;
 - (void)receive:(ARTProtocolMessage *)msg;
 - (void)connect;
-- (void)connectWithToken:(NSString *)token; //?!
-- (void)connectForcingNewToken:(BOOL)forceNewToken;
+- (void)connectWithToken:(NSString *)token;
+- (void)connectWithToken:(NSString *)token error:(art_nullable NSError *)error;
 - (void)sendClose;
 - (void)sendPing;
 - (void)close;

Source/ARTRest.m

@@ -96,6 +96,23 @@ - (void)dealloc {
     [self.logger debug:__FILE__ line:__LINE__ message:@"RS:%p dealloc", self];
 }
 
+- (NSString *)description {
+    NSString *info;
+    if (self.options.token) {
+        info = [NSString stringWithFormat:@"token: %@", self.options.token];
+    }
+    else if (self.options.authUrl) {
+        info = [NSString stringWithFormat:@"authUrl: %@", self.options.authUrl];
+    }
+    else if (self.options.authCallback) {
+        info = [NSString stringWithFormat:@"authCallback: %@", self.options.authCallback];
+    }
+    else {
+        info = [NSString stringWithFormat:@"key: %@", self.options.key];
+    }
+    return [NSString stringWithFormat:@"%@ - \n\t %@;", [super description], info];
+}
+
 - (void)executeRequest:(NSMutableURLRequest *)request withAuthOption:(ARTAuthentication)authOption completion:(void (^)(NSHTTPURLResponse *__art_nullable, NSData *__art_nullable, NSError *__art_nullable))callback {
     request.URL = [NSURL URLWithString:request.URL.relativeString relativeToURL:self.baseUrl];
 

Source/ARTStatus.h

@@ -37,7 +37,9 @@ typedef NS_ENUM(NSUInteger, ARTState) {
  */
 typedef CF_ENUM(NSUInteger, ARTCodeError) {
     // FIXME: check hard coded errors
-    ARTCodeErrorAPIKeyMissing = 80001
+    ARTCodeErrorAPIKeyMissing = 80001,
+    ARTCodeErrorConnectionTimedOut = 80014,
+    ARTCodeErrorAuthConfiguredProviderFailure = 80019
 };
 
 ART_ASSUME_NONNULL_BEGIN

Source/ARTTypes.h

@@ -125,4 +125,7 @@ NSString *generateNonce();
 @interface NSDictionary (ARTJsonCompatible) <ARTJsonCompatible>
 @end
 
+@interface NSURL (ARTLog)
+@end
+
 ART_ASSUME_NONNULL_END

Source/ARTTypes.m

@@ -128,3 +128,11 @@ - (NSDictionary *)toJSON:(NSError *__art_nullable *__art_nullable)error {
 }
 
 @end
+
+@implementation NSURL (ARTLog)
+
+- (NSString *)description {
+    return [NSString stringWithFormat:@"%@", self.absoluteString];
+}
+
+@end