Merge pull request #355 from sivar2311/master

Fix for #348
sinricpro · Nov 30, 2023 · 7b097ae · 7b097ae
2 parents 443cdd2 + f8b7b6f
commit 7b097ae
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 10 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,4 +1,9 @@
 # Changelog
+## Version 3.0.1
+Fixed:
+- SinricPro.isConnected() still returns true if the connection was lost
+- onDisconnectCallback does not fire if the connection is lost.
+
 ## Version 3.0.0
 - BREAKING CHANGE: Remove PowerStateController from Air Quality, Contact, Motion and Temperature sensor.
 - Fix examples

diff --git a/library.json b/library.json
@@ -13,7 +13,7 @@
       "maintainer": true
     }
   ],
-  "version": "3.0.0",
+  "version": "3.0.1",
   "frameworks": "arduino",
   "platforms": [
     "espressif8266",

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=SinricPro
-version=3.0.0
+version=3.0.1
 author=Boris Jaeger <sivar2311@gmail.com>
 maintainer=Boris Jaeger <sivar2311@gmail.com>
 sentence=Library for https://sinric.pro - simple way to connect your device to alexa

diff --git a/src/SinricPro.h b/src/SinricPro.h
@@ -243,11 +243,9 @@ void SinricProClass::handle() {
         return;
     }
 
-    if (WiFi.isConnected()) {
-        if (!isConnected()) connect();
-        _websocketListener.handle();
-        _udpListener.handle();
-    }
+    if (!isConnected()) connect();
+    _websocketListener.handle();
+    _udpListener.handle();
 
     handleReceiveQueue();
     handleSendQueue();

diff --git a/src/SinricProVersion.h b/src/SinricProVersion.h
@@ -6,7 +6,7 @@
 // Version Configuration
 #define SINRICPRO_VERSION_MAJOR     3
 #define SINRICPRO_VERSION_MINOR     0
-#define SINRICPRO_VERSION_REVISION  0
+#define SINRICPRO_VERSION_REVISION  1
 #define SINRICPRO_VERSION STR(SINRICPRO_VERSION_MAJOR) "." STR(SINRICPRO_VERSION_MINOR) "." STR(SINRICPRO_VERSION_REVISION)
 #define SINRICPRO_VERSION_STR "SinricPro (v" SINRICPRO_VERSION ")"
 #define SINRICPRO_VERISON_INT SINRICPRO_VERSION_MAJOR * 1000000 + SINRICPRO_VERSION_MINOR * 1000 + SINRICPRO_VERSION_REVISION
diff --git a/src/SinricProWebsocket.h b/src/SinricProWebsocket.h
@@ -23,6 +23,12 @@
 #include "SinricProQueue.h"
 namespace SINRICPRO_NAMESPACE {
 
+enum class ConnectionState {
+    disconnected,
+    connecting,
+    connected
+};
+
 #if !defined(WEBSOCKETS_VERSION_INT) || (WEBSOCKETS_VERSION_INT < 2003005)
 #error "Wrong WebSockets Version! Minimum Version is 2.3.5!!!"
 #endif
@@ -53,6 +59,7 @@ class WebsocketListener : protected WebSocketsClient {
   protected:
     bool _begin;
     bool restoreDeviceStates;
+    ConnectionState connectionState;
 
     wsConnectedCallback    _wsConnectedCb;
     wsDisconnectedCallback _wsDisconnectedCb;
@@ -69,6 +76,7 @@ class WebsocketListener : protected WebSocketsClient {
 WebsocketListener::WebsocketListener()
     : _begin(false)
     , restoreDeviceStates(false)
+    , connectionState(ConnectionState::disconnected)
     , _wsConnectedCb(nullptr)
     , _wsDisconnectedCb(nullptr)
     , _wsPongCb(nullptr) {}
@@ -105,6 +113,7 @@ void WebsocketListener::setExtraHeaders() {
 void WebsocketListener::begin(String server, String appKey, String deviceIds, SinricProQueue_t* receiveQueue) {
     if (_begin) return;
     _begin = true;
+    connectionState = ConnectionState::connecting;
 
     this->receiveQueue = receiveQueue;
     this->appKey       = appKey;
@@ -133,6 +142,7 @@ void WebsocketListener::handle() {
 void WebsocketListener::stop() {
     disconnect();
     _begin = false;
+    connectionState = ConnectionState::disconnected;
 }
 
 void WebsocketListener::setRestoreDeviceStates(bool flag) {
@@ -161,8 +171,9 @@ void WebsocketListener::runCbEvent(WStype_t type, uint8_t* payload, size_t lengt
     switch (type) {
         case WStype_DISCONNECTED: {
                 DEBUG_SINRIC("[SinricPro:Websocket]: disconnected\r\n");
-                if (_wsDisconnectedCb) _wsDisconnectedCb();
-            }
+                if (connectionState == ConnectionState::connected && _wsDisconnectedCb) _wsDisconnectedCb();
+                connectionState = ConnectionState::disconnected;
+           }
             break;
 
         case WStype_CONNECTED:
@@ -172,6 +183,7 @@ void WebsocketListener::runCbEvent(WStype_t type, uint8_t* payload, size_t lengt
                 restoreDeviceStates = false;
                 setExtraHeaders();
             }
+            connectionState = ConnectionState::connected;
             break;
 
         case WStype_TEXT: {