New interfaces introduced:

- SinricProInterface
- SinricProDeviceInterface

Marked deprecated functions:
- add(SinricProDeviceInterface& newDevice);
- add(SinricProDeviceInterface* newDevice);

Author: sivar2311

src/SinricPro.h

@@ -8,8 +8,8 @@
 #ifndef _SINRIC_H_
 #define _SINRIC_H_
 
-#include "SinricProEventSender.h"
-#include "SinricProDevice.h"
+#include "SinricProInterface.h"
+#include "SinricProDeviceInterface.h"
 #include "SinricProWebsocket.h"
 #include "SinricProUDP.h"
 #include "SinricProSignature.h"
@@ -19,14 +19,14 @@
 
 #include "extralib/ESPTrueRandom/ESPTrueRandom.h"
 
-class SinricProClass : public EventSender {
+class SinricProClass : public SinricProInterface {
   public:
     void begin(String socketAuthToken, String signingKey, String serverURL = SERVER_URL);
     template <typename DeviceType>
     DeviceType& add(const char* deviceId, unsigned long eventWaitTime = 1000);
 
-    void add(SinricProDevice& newDevice);
-    void add(SinricProDevice* newDevice);
+    void add(SinricProDeviceInterface& newDevice);
+    void add(SinricProDeviceInterface* newDevice);
     void handle();
     void stop();
     bool isConnected();
@@ -40,7 +40,9 @@ class SinricProClass : public EventSender {
       SinricProClass* ptr;
       String deviceId;
       template <typename DeviceType>
-      operator DeviceType&() { return ptr->getDeviceInstance<DeviceType>(deviceId); }
+      operator DeviceType&() { return as<DeviceType>(); }
+      template <typename DeviceType>
+      DeviceType& as() { return ptr->getDeviceInstance<DeviceType>(deviceId); }
     };
 
     proxy operator[](const String deviceId) { return proxy(this, deviceId); }
@@ -53,12 +55,12 @@ class SinricProClass : public EventSender {
     void reconnect();
     bool checkDeviceId(String deviceId);
 
-    SinricProDevice* getDevice(String deviceId);
+    SinricProDeviceInterface* getDevice(String deviceId);
 
     template <typename DeviceType>
     DeviceType& getDeviceInstance(String deviceId) { return (DeviceType&) *getDevice(deviceId); }
 
-    std::vector<SinricProDevice*> devices;
+    std::vector<SinricProDeviceInterface*> devices;
     String socketAuthToken;
     String signingKey;
     String serverURL;
@@ -70,7 +72,7 @@ class SinricProClass : public EventSender {
     SinricProQueue_t sendQueue;
 };
 
-SinricProDevice* SinricProClass::getDevice(String deviceId) {
+SinricProDeviceInterface* SinricProClass::getDevice(String deviceId) {
   for (auto& device : devices) {
     if (deviceId == String(device->getDeviceId())) return device;
   }
@@ -94,14 +96,18 @@ DeviceType& SinricProClass::add(const char* deviceId, unsigned long eventWaitTim
   return *newDevice;
 }
 
-void SinricProClass::add(SinricProDevice* newDevice) {
+__attribute__ ((deprecated("Please use DeviceType& myDevice = SinricPro.add<DeviceType>(DeviceId);")))
+void SinricProClass::add(SinricProDeviceInterface* newDevice) {
   if (!checkDeviceId(String(newDevice->getDeviceId()))) return;
   newDevice->begin(this);
   devices.push_back(newDevice);
 }
 
-void SinricProClass::add(SinricProDevice& newDevice) {
-  add(&newDevice);
+__attribute__ ((deprecated("Please use DeviceType& myDevice = SinricPro.add<DeviceType>(DeviceId);")))
+void SinricProClass::add(SinricProDeviceInterface& newDevice) {
+  if (!checkDeviceId(String(newDevice.getDeviceId()))) return;
+  newDevice.begin(this);
+  devices.push_back(&newDevice);
 }
 
 void SinricProClass::handle() {

src/SinricProDevice.h

@@ -8,22 +8,22 @@
 #ifndef _SINRICDEVICE_H_
 #define _SINRICDEVICE_H_
 
-#include "SinricProEventSender.h"
+#include "SinricProDeviceInterface.h"
 #include <map>
 
-class SinricProDevice {
+class SinricProDevice : public SinricProDeviceInterface {
   public:
     SinricProDevice(const char* newDeviceId, unsigned long eventWaitTime=100);
     virtual ~SinricProDevice();
     virtual bool handleRequest(const char* deviceId, const char* action, JsonObject &request_value, JsonObject &response_value) { return false; };
-    const char* getDeviceId();
-    void begin(EventSender* eventSender);
+    virtual const char* getDeviceId();
+    virtual void begin(SinricProInterface* eventSender);
   protected:
+    virtual bool sendEvent(JsonDocument& event);
+    virtual DynamicJsonDocument prepareEvent(const char* deviceId, const char* action, const char* cause);
     char* deviceId;
-    bool sendEvent(JsonDocument& event);
-    DynamicJsonDocument prepareEvent(const char* deviceId, const char* action, const char* cause);
   private:
-    EventSender* eventSender;
+    SinricProInterface* eventSender;
     unsigned long eventWaitTime;
     std::map<String, unsigned long> eventFilter;
 };
@@ -39,7 +39,7 @@ SinricProDevice::~SinricProDevice() {
   if (deviceId) free(deviceId);
 }
 
-void SinricProDevice::begin(EventSender* eventSender) {
+void SinricProDevice::begin(SinricProInterface* eventSender) {
   this->eventSender = eventSender;
 }
 

src/SinricProDeviceInterface.h

@@ -0,0 +1,16 @@
+#ifndef _SINRICPRODEVICEINTERFACE_
+#define _SINRICPRODEVICEINTERFACE_
+
+#include <SinricProInterface.h>
+
+class SinricProDeviceInterface {
+  public:
+    virtual bool handleRequest(const char* deviceId, const char* action, JsonObject &request_value, JsonObject &response_value) = 0;
+    virtual const char* getDeviceId() = 0;
+    virtual void begin(SinricProInterface* eventSender) = 0;
+  protected:
+    virtual bool sendEvent(JsonDocument& event) = 0;
+    virtual DynamicJsonDocument prepareEvent(const char* deviceId, const char* action, const char* cause) = 0;
+};
+
+#endif

src/SinricProEventSender.h renamed to src/SinricProInterface.h

@@ -5,13 +5,13 @@
  *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
  */
 
-#ifndef _EVENTSENDER_H_
-#define _EVENTSENDER_H_
+#ifndef _SINRICPRO_INTERFACE_H_
+#define _SINRICPRO_INTERFACE_H_
 
 #include "ArduinoJson.h"
 #include "SinricProQueue.h"
 
-class EventSender {
+class SinricProInterface {
   public:
     virtual void sendEvent(JsonDocument& jsonEvent);
     virtual DynamicJsonDocument prepareEvent(const char* deviceId, const char* action, const char* cause);

src/SinricProWebsocket.h

@@ -21,7 +21,7 @@
 #include "SinricProDebug.h"
 #include "SinricProConfig.h"
 #include "SinricProQueue.h"
-#include "SinricProEventSender.h"
+#include "SinricProInterface.h"
 
 class websocketListener
 {