- changed SinricPro.begin() that it is not blocking

sivar2311 · sivar2311 · commit ab4cd4c922e6 · 2019-10-15T06:47:04.000+02:00
- added licence info
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ We recommend using [VS Code](https://code.visualstudio.com/) as code editor.
 
 1. Install [VS Code](https://code.visualstudio.com/)  
 2. Install [platform.io](https://platformio.org/platformio-ide)  
-3. Install library by using [Library Manager](https://docs.platformio.org/en/latest/librarymanager/)
+3. Install SinricPro library by using [Library Manager](https://docs.platformio.org/en/latest/librarymanager/)
 4. Follow Quickstart Instructions on [SinricPro](https://help.sinric.pro/pages/quickstart.html)
 
 ---
@@ -29,6 +29,9 @@ We recommend using [VS Code](https://code.visualstudio.com/) as code editor.
 #define signingKey  	"your-signing-key"
 #define myDeviceId  	"your-device-id"
 ```
+*Note:*  
+socketAuthToken may be named "APP KEY" in portal.sinric.pro  
+signingKey may be named "APP SECRET" in portal.sinric.pro
 #### Define callback routine(s)
 ```C++
 bool onPowerState(const String deviceId, bool &state) {
diff --git a/library.json b/library.json
@@ -13,7 +13,7 @@
       "maintainer": true
     }
   ],
-  "version": "2.0.0.6",
+  "version": "2.0.0.7",
   "frameworks": "arduino",
   "platforms": [
     "espressif8266",
diff --git a/src/SinricPro.h b/src/SinricPro.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 #ifndef _SINRIC_H_
 #define _SINRIC_H_
 
@@ -147,18 +154,15 @@ void SinricProClass::handleSendQueue() {
 }
 
 void SinricProClass::connect() {
-    String deviceList;
-    int i = 0;
-    for (auto& device : devices) {
-        if (i>0) deviceList += ";";
-        deviceList += String(device->getDeviceId());
-        i++;
-    }
+  String deviceList;
+  int i = 0;
+  for (auto& device : devices) {
+    if (i>0) deviceList += ";";
+    deviceList += String(device->getDeviceId());
+    i++;
+  }
 
-    _websocketListener.begin(serverURL, socketAuthToken, deviceList.c_str(), &receiveQueue);
-    while (_websocketListener.isConnected() == false) { DEBUG_SINRIC("."); delay(250); }
-    DEBUG_SINRIC("\r\n");
-    _udpListener.begin(&receiveQueue);
+  _websocketListener.begin(serverURL, socketAuthToken, deviceList.c_str(), &receiveQueue);
 }
 
 
@@ -175,7 +179,7 @@ bool SinricProClass::isConnected() {
 
 void SinricProClass::reconnect() {
   DEBUG_SINRIC("SinricProClass.reconnect(): disconnecting\r\n");
-  disconnect();
+  stop();
   DEBUG_SINRIC("SinricProClass.reconnect(): wait 1second\r\n");
   delay(1000);
   DEBUG_SINRIC("SinricProClass.reconnect(): connecting\r\n");
diff --git a/src/SinricProConfig.h b/src/SinricProConfig.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 #ifndef __SINRICPRO_CONFIG_H__
 #define __SINRICPRO_CONFIG_H__
 
diff --git a/src/SinricProContactsensor.h b/src/SinricProContactsensor.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 #ifndef _SINRICCONTACTSENSOR_H_
 #define _SINRICCONTACTSENSOR_H_
 
diff --git a/src/SinricProDebug.h b/src/SinricProDebug.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 #ifndef __SINRICPRODEBUG_H__
 #define __SINRICPRODEBUG_H__
 
diff --git a/src/SinricProDevice.h b/src/SinricProDevice.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 #ifndef _SINRICDEVICE_H_
 #define _SINRICDEVICE_H_
 
diff --git a/src/SinricProDimSwitch.h b/src/SinricProDimSwitch.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 #ifndef _SINRICDIMSWITCH_H_
 #define _SINRICDIMSWITCH_H_
 
diff --git a/src/SinricProDoorbell.h b/src/SinricProDoorbell.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 #ifndef _SINRICDOORBELL_H_
 #define _SINRICDOORBELL_H_
 
diff --git a/src/SinricProEventSender.h b/src/SinricProEventSender.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 #ifndef _EVENTSENDER_H_
 #define _EVENTSENDER_H_
 
diff --git a/src/SinricProFan.h b/src/SinricProFan.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 #ifndef _SINRICFAN_H_
 #define _SINRICFAN_H_
 
diff --git a/src/SinricProFanUS.h b/src/SinricProFanUS.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 #ifndef _SINRICFANUS_H_
 #define _SINRICFANUS_H_
 
diff --git a/src/SinricProLight.h b/src/SinricProLight.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 #ifndef _SINRICLIGHT_H_
 #define _SINRICLIGHT_H_
 
diff --git a/src/SinricProLock.h b/src/SinricProLock.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 #ifndef _SINRICLOCK_H_
 #define _SINRICLOCK_H_
 
diff --git a/src/SinricProMessageid.h b/src/SinricProMessageid.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 #ifndef __MESSAGEID_H__
 #define __MESSAGEID_H__
 
diff --git a/src/SinricProMotionsensor.h b/src/SinricProMotionsensor.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 #ifndef _SINRICMOTIONSENSOR_H_
 #define _SINRICMOTIONSENSOR_H_
 
diff --git a/src/SinricProNTP.h b/src/SinricProNTP.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 #ifndef _NTP_H_
 #define _NTP_H_
 
diff --git a/src/SinricProQueue.h b/src/SinricProQueue.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 #ifndef __SINRICPRO_QUEUE_H__
 #define __SINRICPRO_QUEUE_H__
 
diff --git a/src/SinricProSignature.h b/src/SinricProSignature.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 #ifndef _SIGNATURE_H_
 #define _SIGNATURE_H_
 
diff --git a/src/SinricProSpeaker.h b/src/SinricProSpeaker.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 #ifndef _SINRICSPEAKER_H_
 #define _SINRICSPEAKER_H_
 
diff --git a/src/SinricProSwitch.h b/src/SinricProSwitch.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 #ifndef _SINRICSWITCH_H_
 #define _SINRICSWITCH_H_
 
diff --git a/src/SinricProTV.h b/src/SinricProTV.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 #ifndef _SINRICTV_H_
 #define _SINRICTV_H_
 
diff --git a/src/SinricProTemperaturesensor.h b/src/SinricProTemperaturesensor.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 #ifndef _SINRICTEMPERATURESENSOR_H_
 #define _SINRICTEMPERATURESENSOR_H_
 
diff --git a/src/SinricProThermostat.h b/src/SinricProThermostat.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 #ifndef _SINRICTHERMOSTAT_H_
 #define _SINRICTHERMOSTAT_H_
 
diff --git a/src/SinricProUDP.h b/src/SinricProUDP.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 #ifndef __SINRIC_PRO_UDP_H__
 #define __SINRIC_PRO_UDP_H__
 
diff --git a/src/SinricProWebsocket.h b/src/SinricProWebsocket.h
@@ -1,3 +1,10 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+
 
 #ifndef _SINRICPRO_WEBSOCKET_H__
 #define _SINRICPRO_WEBSOCKET_H__
@@ -38,6 +45,7 @@ class websocketListener
 
     void disconnect() { webSocket.disconnect(); }
   private:
+    bool _begin = false;
     bool _isConnected = false;
 
     WebSocketsClient webSocket;
@@ -57,31 +65,27 @@ websocketListener::~websocketListener() {
 }
 
 void websocketListener::begin(String server, String appkey, String deviceIds, SinricProQueue_t* receiveQueue) {
-    this->receiveQueue = receiveQueue;
-    DEBUG_SINRIC("[SinricPro:Websocket]: Conecting to WebSocket Server\r\n");
+  if (_begin) return;
+  _begin = true;
+  this->receiveQueue = receiveQueue;
+  DEBUG_SINRIC("[SinricPro:Websocket]: Conecting to WebSocket Server\r\n");
 
-    if (_isConnected) {
-        stop();
-    }
+  if (_isConnected) {
+    stop();
+  }
 
-    String headers = "appkey:" + appkey + "\r\n" + "deviceids:" + deviceIds + "\r\nplatform:";
-    #ifdef ESP8266
-      headers += "ESP8266";
-    #endif
-    #ifdef ESP32
-      headers += "ESP32";
-    #endif
-    DEBUG_SINRIC("[SinricPro:Websocket]: headers: \"%s\"\r\n", headers.c_str());
-    webSocket.setExtraHeaders(headers.c_str());
-    webSocket.begin(server, SERVER_PORT, "/"); // server address, port and URL
-    webSocket.onEvent([&](WStype_t type, uint8_t * payload, size_t length) { webSocketEvent(type, payload, length); });
-    webSocket.enableHeartbeat(WEBSOCKET_PING_INTERVAL, WEBSOCKET_PING_TIMEOUT, WEBSOCKET_RETRY_COUNT);
-    DEBUG_SINRIC("[SinricPro:Websocket]: connecting");
-    while (!_isConnected) {
-      DEBUG_SINRIC(".");
-      webSocket.loop();
-      delay(100);
-    }
+  String headers = "appkey:" + appkey + "\r\n" + "deviceids:" + deviceIds + "\r\nplatform:";
+  #ifdef ESP8266
+         headers += "ESP8266";
+  #endif
+  #ifdef ESP32
+         headers += "ESP32";
+  #endif
+  DEBUG_SINRIC("[SinricPro:Websocket]: headers: \"%s\"\r\n", headers.c_str());
+  webSocket.setExtraHeaders(headers.c_str());
+  webSocket.onEvent([&](WStype_t type, uint8_t * payload, size_t length) { webSocketEvent(type, payload, length); });
+  webSocket.enableHeartbeat(WEBSOCKET_PING_INTERVAL, WEBSOCKET_PING_TIMEOUT, WEBSOCKET_RETRY_COUNT);
+  webSocket.begin(server, SERVER_PORT, "/"); // server address, port and URL
 }
 
 void websocketListener::handle() {
@@ -92,6 +96,7 @@ void websocketListener::stop() {
   if (_isConnected) {
     webSocket.disconnect();
   }
+  _begin = false;
 }
 
 void websocketListener::sendResponse(String response) {
diff --git a/src/SinricProWindowAC.h b/src/SinricProWindowAC.h

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`"maintainer": true`
`14`	`14`	`}`
`15`	`15`	`],`
`16`		`- "version": "2.0.0.6",`
	`16`	`+ "version": "2.0.0.7",`
`17`	`17`	`"frameworks": "arduino",`
`18`	`18`	`"platforms": [`
`19`	`19`	`"espressif8266",`