Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: connection resume does not fire channel detached #539

Merged
merged 9 commits into from
Nov 24, 2016
Merged

Fix: connection resume does not fire channel detached #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d32f6a3
Add test: connection id change and channel state
ricardopereira Nov 23, 2016
b33b686
Add test: auth renewal and connection resume
ricardopereira Nov 23, 2016
6ae562c
Remove pending tests from Realtime Connection specs
ricardopereira Nov 23, 2016
6839aee
Fix: detach all channels if the connectionId has changed
ricardopereira Nov 23, 2016
8b6367e
Fix: emit Connected connection state when a token is renewed
ricardopereira Nov 23, 2016
79aca61
Fix: resume connection when a token has been renewed
ricardopereira Nov 23, 2016
8cac966
Fix: If the ATTACHED message contains an error, the error should be e…
ricardopereira Nov 23, 2016
cd0fa78
Fix RTN15h
ricardopereira Nov 23, 2016
286b516
Fix: if the token is renewable, then the error should not be set
ricardopereira Nov 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Source/ARTRealtime.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ - (void)onConnected:(ARTProtocolMessage *)message {

// Resuming
if (_resuming) {
if (message.error && ![message.connectionId isEqualToString:self.connection.id]) {
if (![message.connectionId isEqualToString:self.connection.id]) {
[self.logger warn:@"R:%p ARTRealtime: connection has reconnected, but resume failed. Detaching all channels", self];
// Fatal error, detach all channels
for (ARTRealtimeChannel *channel in self.channels) {
Expand Down Expand Up @@ -449,6 +449,7 @@ - (void)onConnected:(ARTProtocolMessage *)message {
case ARTRealtimeConnected:
// Renewing token.
[self transitionSideEffects:[[ARTConnectionStateChange alloc] initWithCurrent:ARTRealtimeConnected previous:ARTRealtimeConnected reason:nil]];
[self transition:ARTRealtimeConnected withErrorInfo:message.error];
default:
break;
}
Expand All @@ -466,6 +467,8 @@ - (void)onDisconnected:(ARTProtocolMessage *)message {
}
if (!_renewingToken && error && error.statusCode == 401 && error.code >= 40140 && error.code < 40150 && [self isTokenRenewable]) {
[self connectWithRenewedToken];
[self transition:ARTRealtimeDisconnected withErrorInfo:error];
[self.connection setErrorReason:nil];
return;
}
[self transition:ARTRealtimeDisconnected withErrorInfo:error];
Expand Down
8 changes: 7 additions & 1 deletion Source/ARTRealtimeChannel.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,13 @@ - (void)setAttached:(ARTProtocolMessage *)message {

[self sendQueuedMessages];

[self transition:ARTRealtimeChannelAttached status:[ARTStatus state:ARTStateOk]];
if (message.error) {
_errorReason = message.error;
[self transition:ARTRealtimeChannelAttached status:[ARTStatus state:ARTStateError info:message.error]];
}
else {
[self transition:ARTRealtimeChannelAttached status:[ARTStatus state:ARTStateOk]];
}
[_attachedEventEmitter emit:[NSNull null] with:nil];
}

Expand Down
Loading