yehor/ha_client
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix connection timeout handling

Browse Source
This commit is contained in:
Yegor Vialov 2019-11-29 10:58:24 +00:00
parent 890da650dc
commit cd81fc72fd
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/managers/connection_manager.class.dart
View File

@ -98,16 +98,21 @@ class ConnectionManager {
void _doConnect({Completer completer, bool forceReconnect}) { void _doConnect({Completer completer, bool forceReconnect}) {
if (forceReconnect || !isConnected) { if (forceReconnect || !isConnected) {
_connect().timeout(connectTimeout, onTimeout: () { _connect().timeout(connectTimeout).then((_) {
_disconnect().then((_) {
if (completer != null && !completer.isCompleted) {
completer.completeError(HAError("Connection timeout"));
}
});
}).then((_) {
completer?.complete(); completer?.complete();
}).catchError((e) { }).catchError((e) {
_disconnect().then((_) {
if (e is TimeoutException) {
if (connecting != null && !connecting.isCompleted) {
connecting.completeError(HAError("Connection timeout"));
}
completer?.completeError(HAError("Connection timeout"));
} else if (e is HAError) {
completer?.completeError(e); completer?.completeError(e);
} else {
completer?.completeError(HAError("${e.toString()}"));
}
});
}); });
} else { } else {
completer?.complete(); completer?.complete();
@ -329,6 +334,7 @@ class ConnectionManager {
_messageResolver[callbackName] = _completer; _messageResolver[callbackName] = _completer;
String rawMessage = json.encode(dataObject); String rawMessage = json.encode(dataObject);
if (!isConnected) { if (!isConnected) {
//TODO fix onTImeout
_connect().timeout(connectTimeout, onTimeout: (){ _connect().timeout(connectTimeout, onTimeout: (){
if (!_completer.isCompleted) { if (!_completer.isCompleted) {
_completer.completeError(HAError("No connection to Home Assistant", actions: [HAErrorAction.reconnect()])); _completer.completeError(HAError("No connection to Home Assistant", actions: [HAErrorAction.reconnect()]));