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

Decline all timeouts as variables

Browse Source
This commit is contained in:
estevez
2018-10-02 18:05:50 +03:00
parent d910e4dd43
commit ebb2f2b4e5
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/home_assistant.class.dart
View File

@ -25,6 +25,10 @@ class HomeAssistant {
Timer _connectionTimer; Timer _connectionTimer;
Timer _fetchTimer; Timer _fetchTimer;
int messageExpirationTime = 20; //seconds
Duration fetchTimeout = Duration(seconds: 30);
Duration connectTimeout = Duration(seconds: 10);
String get locationName => _instanceConfig["location_name"] ?? ""; String get locationName => _instanceConfig["location_name"] ?? "";
int get viewsCount => _entities.viewList.length ?? 0; int get viewsCount => _entities.viewList.length ?? 0;
UIBuilder get uiBuilder => _uiBuilder; UIBuilder get uiBuilder => _uiBuilder;
@ -37,7 +41,7 @@ class HomeAssistant {
_hassioAuthType = authType; _hassioAuthType = authType;
_entities = EntityCollection(); _entities = EntityCollection();
_uiBuilder = UIBuilder(); _uiBuilder = UIBuilder();
_messageQueue = SendMessageQueue(20); _messageQueue = SendMessageQueue(messageExpirationTime);
} }
Future fetch() { Future fetch() {
@ -45,7 +49,7 @@ class HomeAssistant {
TheLogger.log("Warning","Previous fetch is not complited"); TheLogger.log("Warning","Previous fetch is not complited");
} else { } else {
_fetchCompleter = new Completer(); _fetchCompleter = new Completer();
_fetchTimer = Timer(Duration(seconds: 30), () { _fetchTimer = Timer(fetchTimeout, () {
closeConnection(); closeConnection();
_finishFetching({"errorCode" : 9,"errorMessage": "Connection timeout or connection issues"}); _finishFetching({"errorCode" : 9,"errorMessage": "Connection timeout or connection issues"});
}); });
@ -69,11 +73,10 @@ class HomeAssistant {
if ((_connectionCompleter != null) && (!_connectionCompleter.isCompleted)) { if ((_connectionCompleter != null) && (!_connectionCompleter.isCompleted)) {
TheLogger.log("Debug","Previous connection is not complited"); TheLogger.log("Debug","Previous connection is not complited");
} else { } else {
if ((_hassioChannel == null) || (_hassioChannel.closeCode != null)) { if ((_hassioChannel == null) || (_hassioChannel.sink == null) || (_hassioChannel.closeCode != null)) {
TheLogger.log("Debug", "Socket connecting..."); TheLogger.log("Debug", "Socket connecting...");
_connectionCompleter = new Completer(); _connectionCompleter = new Completer();
//TODO: Connection timeout timer. Should be removed after #21 fix _connectionTimer = Timer(connectTimeout, () {
_connectionTimer = Timer(Duration(seconds: 10), () {
closeConnection(); closeConnection();
_finishConnecting({"errorCode" : 1,"errorMessage": "Connection timeout or connection issues"}); _finishConnecting({"errorCode" : 1,"errorMessage": "Connection timeout or connection issues"});
}); });