Version 0.2.3

lib/entity_class/button_entity.class.dart

@@ -3,7 +3,7 @@ part of '../main.dart';
 class _ButtonEntityWidgetState extends _EntityWidgetState {
 
   @override
-  void sendNewState(newValue) {
+  void setNewState(newValue) {
     eventBus.fire(new ServiceCallEvent(widget.entity.domain, "turn_on", widget.entity.entityId, null));
   }
 
@@ -11,7 +11,7 @@ class _ButtonEntityWidgetState extends _EntityWidgetState {
   Widget _buildActionWidget(bool inCard, BuildContext context) {
     return FlatButton(
       onPressed: (() {
-        sendNewState(null);
+        setNewState(null);
       }),
       child: Text(
         "EXECUTE",

lib/entity_class/datetime_entity.class.dart

@@ -28,7 +28,7 @@ class _DateTimeEntityWidgetState extends _EntityWidgetState {
   }
 
   @override
-  void sendNewState(newValue) {
+  void setNewState(newValue) {
     eventBus.fire(new ServiceCallEvent(widget.entity.domain, "set_datetime", widget.entity.entityId,
         newValue));
   }
@@ -56,17 +56,17 @@ class _DateTimeEntityWidgetState extends _EntityWidgetState {
         if (date != null) {
           if (hasTime) {
             _showTimePicker(context).then((time){
-              sendNewState({"date": "${formatDate(date, [yyyy, '-', mm, '-', dd])}", "time": "${formatDate(DateTime(1970, 1, 1, time.hour, time.minute), [HH, ':', nn])}"});
+              setNewState({"date": "${formatDate(date, [yyyy, '-', mm, '-', dd])}", "time": "${formatDate(DateTime(1970, 1, 1, time.hour, time.minute), [HH, ':', nn])}"});
             });
           } else {
-            sendNewState({"date": "${formatDate(date, [yyyy, '-', mm, '-', dd])}"});
+            setNewState({"date": "${formatDate(date, [yyyy, '-', mm, '-', dd])}"});
           }
         }
       });
     } else if (hasTime) {
       _showTimePicker(context).then((time){
         if (time != null) {
-          sendNewState({"time": "${formatDate(DateTime(1970, 1, 1, time.hour, time.minute), [HH, ':', nn])}"});
+          setNewState({"time": "${formatDate(DateTime(1970, 1, 1, time.hour, time.minute), [HH, ':', nn])}"});
         }
       });
     } else {

lib/entity_class/entity.class.dart

@@ -22,6 +22,7 @@ class Entity {
   String _domain;
   String _entityId;
   String _state;
+  String assumedState;
   DateTime _lastUpdated;
 
   String get displayName =>
@@ -52,6 +53,7 @@ class Entity {
     _domain = rawData["entity_id"].split(".")[0];
     _entityId = rawData["entity_id"];
     _state = rawData["state"];
+    assumedState = _state;
     _lastUpdated = DateTime.tryParse(rawData["last_updated"]);
   }
 
@@ -179,7 +181,7 @@ class _EntityWidgetState extends State<EntityWidget> {
     eventBus.fire(new ShowEntityPageEvent(widget.entity));
   }
 
-  void sendNewState(newState) {
+  void setNewState(newState) {
     return;
   }
 

lib/entity_class/select_entity.class.dart

@@ -4,7 +4,7 @@ class _SelectEntityWidgetState extends _EntityWidgetState {
   List<String> _listOptions = [];
 
   @override
-  void sendNewState(newValue) {
+  void setNewState(newValue) {
     eventBus.fire(new ServiceCallEvent(widget.entity.domain, "select_option", widget.entity.entityId,
         {"option": "$newValue"}));
   }
@@ -17,8 +17,8 @@ class _SelectEntityWidgetState extends _EntityWidgetState {
         _listOptions.add(value.toString());
       });
     }
-    return Container(
+    return Expanded(
-      width: Entity.INPUT_WIDTH,
+      //width: Entity.INPUT_WIDTH,
       child: DropdownButton<String>(
         value: widget.entity.state,
         items: this._listOptions.map((String value) {
@@ -28,7 +28,7 @@ class _SelectEntityWidgetState extends _EntityWidgetState {
           );
         }).toList(),
         onChanged: (_) {
-          sendNewState(_);
+          setNewState(_);
         },
       ),
     );

lib/entity_class/slider_entity.class.dart

@@ -14,7 +14,7 @@ class _SliderEntityWidgetState extends _EntityWidgetState {
   }
 
   @override
-  void sendNewState(newValue) {
+  void setNewState(newValue) {
     eventBus.fire(new ServiceCallEvent(widget.entity.domain, "set_value", widget.entity.entityId,
         {"value": "${newValue.toString()}"}));
   }
@@ -26,8 +26,8 @@ class _SliderEntityWidgetState extends _EntityWidgetState {
     } else if (valueStep < 0.1) {
       _multiplier = 100;
     }
-    return Container(
+    return Expanded(
-      width: 200.0,
+      //width: 200.0,
       child: Row(
         children: <Widget>[
           Expanded(
@@ -46,7 +46,7 @@ class _SliderEntityWidgetState extends _EntityWidgetState {
                     (value.roundToDouble() / _multiplier).toString(), true));*/
               },
               onChangeEnd: (value) {
-                sendNewState(value.roundToDouble() / _multiplier);
+                setNewState(value.roundToDouble() / _multiplier);
               },
             ),
           ),

lib/entity_class/switch_entity.class.dart

@@ -8,7 +8,15 @@ class _SwitchEntityWidgetState extends _EntityWidgetState {
   }
 
   @override
-  void sendNewState(newValue) {
+  void setNewState(newValue) {
+    setState(() {
+      widget.entity.assumedState = newValue ? 'on' : 'off';
+    });
+    Timer(Duration(seconds: 2), (){
+      setState(() {
+        widget.entity.assumedState = widget.entity.state;
+      });
+    });
     eventBus.fire(new ServiceCallEvent(
         widget.entity.domain, (newValue as bool) ? "turn_on" : "turn_off", widget.entity.entityId, null));
   }
@@ -16,10 +24,9 @@ class _SwitchEntityWidgetState extends _EntityWidgetState {
   @override
   Widget _buildActionWidget(bool inCard, BuildContext context) {
     return Switch(
-      value: widget.entity.isOn,
+      value: widget.entity.assumedState == 'on',
       onChanged: ((switchState) {
-        sendNewState(switchState);
+        setNewState(switchState);
-        widget.entity.state = switchState ? 'on' : 'off';
       }),
     );
   }

lib/entity_class/text_entity.class.dart

@@ -19,7 +19,7 @@ class _TextEntityWidgetState extends _EntityWidgetState {
   }
 
   @override
-  void sendNewState(newValue) {
+  void setNewState(newValue) {
     if (validate(newValue)) {
       eventBus.fire(new ServiceCallEvent(widget.entity.domain, "set_value", widget.entity.entityId,
           {"value": "$newValue"}));
@@ -43,7 +43,7 @@ class _TextEntityWidgetState extends _EntityWidgetState {
 
   void _focusListener() {
     if (!_focusNode.hasFocus && (_tmpValue != widget.entity.state)) {
-      sendNewState(_tmpValue);
+      setNewState(_tmpValue);
     }
   }
 
@@ -53,8 +53,8 @@ class _TextEntityWidgetState extends _EntityWidgetState {
       _tmpValue = widget.entity.state;
     }
     if (this.isTextField || this.isPasswordField) {
-      return Container(
+      return Expanded(
-        width: Entity.INPUT_WIDTH,
+        //width: Entity.INPUT_WIDTH,
         child: TextField(
             focusNode: _focusNode,
             obscureText: this.isPasswordField,

lib/home_assistant.class.dart

@@ -6,6 +6,7 @@ class HomeAssistant {
   String _hassioAuthType;
 
   IOWebSocketChannel _hassioChannel;
+  SendMessageQueue _messageQueue;
 
   int _currentMessageId = 0;
   int _statesMessageId = 0;
@@ -20,7 +21,13 @@ class HomeAssistant {
   Completer _statesCompleter;
   Completer _servicesCompleter;
   Completer _configCompleter;
-  Timer _fetchingTimer;
+  Completer _connectionCompleter;
+  Timer _connectionTimer;
+  Timer _fetchTimer;
+
+  int messageExpirationTime = 50; //seconds
+  Duration fetchTimeout = Duration(seconds: 30);
+  Duration connectTimeout = Duration(seconds: 10);
 
   String get locationName => _instanceConfig["location_name"] ?? "";
   int get viewsCount => _entities.viewList.length ?? 0;
@@ -34,19 +41,19 @@ class HomeAssistant {
     _hassioAuthType = authType;
     _entities = EntityCollection();
     _uiBuilder = UIBuilder();
+    _messageQueue = SendMessageQueue(messageExpirationTime);
   }
 
   Future fetch() {
     if ((_fetchCompleter != null) && (!_fetchCompleter.isCompleted)) {
       TheLogger.log("Warning","Previous fetch is not complited");
     } else {
-      //TODO: Fetch timeout timer. Should be removed after #21 fix
-      _fetchingTimer = Timer(Duration(seconds: 15), () {
-        closeConnection();
-        _fetchCompleter.completeError({"errorCode" : 1,"errorMessage": "Connection timeout"});
-      });
       _fetchCompleter = new Completer();
-      _reConnectSocket().then((r) {
+      _fetchTimer = Timer(fetchTimeout, () {
+        closeConnection();
+        _finishFetching({"errorCode" : 9,"errorMessage": "Couldn't get data from server"});
+      });
+      _connection().then((r) {
         _getData();
       }).catchError((e) {
         _finishFetching(e);
@@ -62,18 +69,32 @@ class HomeAssistant {
     _hassioChannel = null;
   }
 
-  Future _reConnectSocket() {
+  Future _connection() {
-    var _connectionCompleter = new Completer();
+    if ((_connectionCompleter != null) && (!_connectionCompleter.isCompleted)) {
-    if ((_hassioChannel == null) || (_hassioChannel.closeCode != null)) {
+      TheLogger.log("Debug","Previous connection is not complited");
-      TheLogger.log("Debug","Socket connecting...");
+    } else {
-      _hassioChannel = IOWebSocketChannel.connect(_hassioAPIEndpoint);
+      if ((_hassioChannel == null) || (_hassioChannel.sink == null) || (_hassioChannel.closeCode != null)) {
+        TheLogger.log("Debug", "Socket connecting...");
+        _connectionCompleter = new Completer();
+        _connectionTimer = Timer(connectTimeout, () {
+          closeConnection();
+          _finishConnecting({"errorCode" : 1,"errorMessage": "Couldn't connect to Home Assistant. Looks like a network issues"});
+        });
+        _hassioChannel = IOWebSocketChannel.connect(
+              _hassioAPIEndpoint, pingInterval: Duration(seconds: 30));
         _hassioChannel.stream.handleError((e) {
-        TheLogger.log("Error","Unhandled socket error: ${e.toString()}");
+          TheLogger.log("Error", "Unhandled socket error: ${e.toString()}");
         });
         _hassioChannel.stream.listen((message) =>
             _handleMessage(_connectionCompleter, message));
+        _hassioChannel.sink.done.whenComplete(() {
+          TheLogger.log("Debug","Socket sink finished. Assuming it is closed.");
+          closeConnection();
+        });
       } else {
-      _connectionCompleter.complete();
+        //TheLogger.log("Debug","Socket looks connected...${_hassioChannel.protocol}, ${_hassioChannel.closeCode}, ${_hassioChannel.closeReason}");
+        _finishConnecting(null);
+      }
     }
     return _connectionCompleter.future;
   }
@@ -94,25 +115,39 @@ class HomeAssistant {
     });
   }
 
-  _finishFetching(error) {
+  void _finishFetching(error) {
-    _fetchingTimer.cancel();
+    _fetchTimer.cancel();
+    _finishConnecting(error);
     if (error != null) {
+      if (!_fetchCompleter.isCompleted)
         _fetchCompleter.completeError(error);
     } else {
+      if (!_fetchCompleter.isCompleted)
         _fetchCompleter.complete();
     }
   }
 
+  void _finishConnecting(error) {
+    _connectionTimer.cancel();
+    if (error != null) {
+      if (!_connectionCompleter.isCompleted)
+        _connectionCompleter.completeError(error);
+    } else {
+      if (!_connectionCompleter.isCompleted)
+        _connectionCompleter.complete();
+    }
+  }
+
   _handleMessage(Completer connectionCompleter, String message) {
     var data = json.decode(message);
     //TheLogger.log("Debug","[Received] => Message type: ${data['type']}");
     if (data["type"] == "auth_required") {
-      _sendMessageRaw('{"type": "auth","$_hassioAuthType": "$_hassioPassword"}');
+      _sendAuthMessageRaw('{"type": "auth","$_hassioAuthType": "$_hassioPassword"}');
     } else if (data["type"] == "auth_ok") {
+      _finishConnecting(null);
       _sendSubscribe();
-      connectionCompleter.complete();
     } else if (data["type"] == "auth_invalid") {
-      connectionCompleter.completeError({"errorCode": 6, "errorMessage": "${data["message"]}"});
+      _finishFetching({"errorCode": 6, "errorMessage": "${data["message"]}"});
     } else if (data["type"] == "result") {
       if (data["id"] == _configMessageId) {
         _parseConfig(data);
@@ -139,14 +174,14 @@ class HomeAssistant {
   void _sendSubscribe() {
     _incrementMessageId();
     _subscriptionMessageId = _currentMessageId;
-    _sendMessageRaw('{"id": $_subscriptionMessageId, "type": "subscribe_events", "event_type": "state_changed"}');
+    _sendMessageRaw('{"id": $_subscriptionMessageId, "type": "subscribe_events", "event_type": "state_changed"}', false);
   }
 
   Future _getConfig() {
     _configCompleter = new Completer();
     _incrementMessageId();
     _configMessageId = _currentMessageId;
-    _sendMessageRaw('{"id": $_configMessageId, "type": "get_config"}');
+    _sendMessageRaw('{"id": $_configMessageId, "type": "get_config"}', false);
 
     return _configCompleter.future;
   }
@@ -155,7 +190,7 @@ class HomeAssistant {
     _statesCompleter = new Completer();
     _incrementMessageId();
     _statesMessageId = _currentMessageId;
-    _sendMessageRaw('{"id": $_statesMessageId, "type": "get_states"}');
+    _sendMessageRaw('{"id": $_statesMessageId, "type": "get_states"}', false);
 
     return _statesCompleter.future;
   }
@@ -164,7 +199,7 @@ class HomeAssistant {
     _servicesCompleter = new Completer();
     _incrementMessageId();
     _servicesMessageId = _currentMessageId;
-    _sendMessageRaw('{"id": $_servicesMessageId, "type": "get_services"}');
+    _sendMessageRaw('{"id": $_servicesMessageId, "type": "get_services"}', false);
 
     return _servicesCompleter.future;
   }
@@ -173,17 +208,44 @@ class HomeAssistant {
     _currentMessageId += 1;
   }
 
-  _sendMessageRaw(String message) {
+  void _sendAuthMessageRaw(String message) {
-    if (message.indexOf('"type": "auth"') > 0) {
     TheLogger.log("Debug", "[Sending] ==> auth request");
-    } else {
-      TheLogger.log("Debug", "[Sending] ==> $message");
-    }
     _hassioChannel.sink.add(message);
   }
 
+  _sendMessageRaw(String message, bool queued) {
+    var sendCompleter = Completer();
+    if (queued) _messageQueue.add(message);
+    _connection().then((r) {
+      _messageQueue.getActualMessages().forEach((message){
+        TheLogger.log("Debug", "[Sending queued] ==> $message");
+        _hassioChannel.sink.add(message);
+      });
+      if (!queued) {
+        TheLogger.log("Debug", "[Sending] ==> $message");
+        _hassioChannel.sink.add(message);
+      }
+      sendCompleter.complete();
+    }).catchError((e){
+      sendCompleter.completeError(e);
+    });
+    return sendCompleter.future;
+  }
+
+  Future callService(String domain, String service, String entityId, Map<String, String> additionalParams) {
+    _incrementMessageId();
+    String message = '{"id": $_currentMessageId, "type": "call_service", "domain": "$domain", "service": "$service", "service_data": {"entity_id": "$entityId"';
+    if (additionalParams != null) {
+      additionalParams.forEach((name, value){
+        message += ', "$name" : "$value"';
+      });
+    }
+    message += '}}';
+    return _sendMessageRaw(message, true);
+  }
+
   void _handleEntityStateChange(Map eventData) {
-    TheLogger.log("Debug", "New state for ${eventData['entity_id']}");
+    //TheLogger.log("Debug", "New state for ${eventData['entity_id']}");
     _entities.updateState(eventData);
     eventBus.fire(new StateChangedEvent(eventData["entity_id"], null, false));
   }
@@ -232,29 +294,44 @@ class HomeAssistant {
     _uiBuilder.build(_entities);
     _statesCompleter.complete();
   }
+}
 
-  Future callService(String domain, String service, String entityId, Map<String, String> additionalParams) {
+class SendMessageQueue {
-    var sendCompleter = Completer();
+  int _messageTimeout;
-    //TODO: Send service call timeout timer. Should be removed after #21 fix
+  List<HAMessage> _queue = [];
-    Timer _sendTimer = Timer(Duration(seconds: 7), () {
+
-      sendCompleter.completeError({"errorCode" : 8,"errorMessage": "Connection timeout"});
+  SendMessageQueue(this._messageTimeout);
-    });
+
-    _reConnectSocket().then((r) {
+  void add(String message) {
-      _incrementMessageId();
+    _queue.add(HAMessage(_messageTimeout, message));
-      String message = '{"id": $_currentMessageId, "type": "call_service", "domain": "$domain", "service": "$service", "service_data": {"entity_id": "$entityId"';
-      if (additionalParams != null) {
-        additionalParams.forEach((name, value){
-          message += ', "$name" : "$value"';
-        });
   }
-      message += '}}';
+  
-      _sendMessageRaw(message);
+  List<String> getActualMessages() {
-      _sendTimer.cancel();
+    _queue.removeWhere((item) => item.isExpired());
-      sendCompleter.complete();
+    List<String> result = [];
-    }).catchError((e){
+    _queue.forEach((haMessage){
-      _sendTimer.cancel();
+      result.add(haMessage.message);
-      sendCompleter.completeError(e);
     });
-    return sendCompleter.future;
+    this.clear();
+    return result;
+  }
+  
+  void clear() {
+    _queue.clear();
+  }
+  
+}
+
+class HAMessage {
+  DateTime _timeStamp;
+  int _messageTimeout;
+  String message;
+  
+  HAMessage(this._messageTimeout, this.message) {
+    _timeStamp = DateTime.now();
+  }
+  
+  bool isExpired() {
+    return _timeStamp.difference(DateTime.now()).inSeconds > _messageTimeout;
   }
 }

lib/main.dart

@@ -34,7 +34,7 @@ part 'badge_class.dart';
 
 EventBus eventBus = new EventBus();
 const String appName = "HA Client";
-const appVersion = "0.2.2";
+const appVersion = "0.2.3";
 
 String homeAssistantWebHost;
 
@@ -197,14 +197,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
   }
 
   void _callService(String domain, String service, String entityId, Map<String, String> additionalParams) {
-    setState(() {
+    _homeAssistant.callService(domain, service, entityId, additionalParams).catchError((e) => _setErrorState(e));
-      _isLoading = true;
-    });
-    _homeAssistant.callService(domain, service, entityId, additionalParams).then((r) {
-      setState(() {
-        _isLoading = false;
-      });
-    }).catchError((e) => _setErrorState(e));
   }
 
   void _showEntityPage(Entity entity) {
@@ -505,6 +498,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
       String message = _lastErrorMessage;
       SnackBarAction action;
       switch (_errorCodeToBeShown) {
+        case 9:
         case 1: {
             action = SnackBarAction(
                 label: "Retry",

pubspec.yaml

@@ -1,7 +1,7 @@
 name: hass_client
 description: Home Assistant Android Client
 
-version: 0.2.2+24
+version: 0.2.3+25
 
 environment:
   sdk: ">=2.0.0-dev.68.0 <3.0.0"