Replaced socketIO library

Author: lucalas

src/StreamlabsAPI.cpp

@@ -1,18 +1,16 @@
 #include "StreamlabsAPI.h"
-#include <ArduinoJson.h>
 
 
 void StreamlabsAPI::loop() {
     webSocket.loop();
 }
 
-bool StreamlabsAPI::connect(const char* socketToken) {
-    webSocket.on("event", std::bind(&StreamlabsAPI::event, this, std::placeholders::_1, std::placeholders::_2));    
-
+void StreamlabsAPI::connect(const char* socketToken) {
+    webSocket.onEvent(std::bind(&StreamlabsAPI::event, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
     String queryParams = SL_DEFAULT_QUERYPARAMETES;
-    queryParams += "&token=";
-    queryParams += socketToken;
-    webSocket.beginSSL(SL_HOSTNAME, SL_PORT, queryParams.c_str(), SL_FINGERPRINT);
+    queryParams.concat("token=");
+    queryParams.concat(socketToken);
+    webSocket.beginSSL(SL_HOSTNAME, SL_PORT, queryParams.c_str());
 }
 
 void StreamlabsAPI::followTwitchEvent(std::function<void (const char * payload)> func) {
@@ -39,18 +37,22 @@ void StreamlabsAPI::donationEvent(std::function<void (const char * payload)> fun
     events["donation"] = func;
 }
 
-StaticJsonDocument<10000> doc;
-void StreamlabsAPI::event(const char * payload, size_t length) {
-    // FIXME remove deserialized and parse string to get the type
-    DeserializationError error = deserializeJson(doc, payload);
-    if (error) {
-        Serial.print("deserializeJson() failed: ");
-        return;
-    }
+void StreamlabsAPI::event(socketIOmessageType_t type, uint8_t * payload, size_t length) {
+    const char* data = reinterpret_cast<char*>(payload);
+    DEBUG_STREAMLABS_ALERTS("------STREAMLABS EVENT------\n");
+    DEBUG_STREAMLABS_ALERTS("SocketIO message type: %d\n", type);
+    DEBUG_STREAMLABS_ALERTS("SocketIO data: %s\n", data);
+
+    String payloadS = String((char *) payload);
+    int startOfType = payloadS.indexOf("\"type\":\"");
+    int endOfType = payloadS.indexOf("\"", startOfType + 8);
+    String typeS = payloadS.substring(startOfType + 8, endOfType);
+
+    DEBUG_STREAMLABS_ALERTS("Streamlabs event type: %s\n", typeS.c_str());
+    DEBUG_STREAMLABS_ALERTS("-----------------------------\n");
 
-    const char* type = doc["type"];
-	auto e = events.find(type);
+	auto e = events.find(typeS);
 	if(e != events.end()) {
-		e->second(payload);
+		e->second(data);
     }
 }

src/StreamlabsAPI.h

@@ -1,24 +1,33 @@
 #include <Arduino.h>
 #include <map>
-#include <SocketIoClient.h>
+#include <SocketIOclient.h>
+
+#if defined(DEBUG_ESP_PORT) || defined(DEBUG_STREAMLABS)
+#define DEBUG_STREAMLABS_ALERTS(...)               \
+    {                                       \
+        DEBUG_ESP_PORT.printf(__VA_ARGS__); \
+        DEBUG_ESP_PORT.flush();             \
+    }
+#else
+#define DEBUG_STREAMLABS_ALERTS(...)
+#endif
 
 #define SL_HOSTNAME "sockets.streamlabs.com"
 #define SL_PORT 443
-#define SL_DEFAULT_QUERYPARAMETES "/socket.io/?transport=websocket"
-#define SL_FINGERPRINT "E7 93 77 36 DA D4 15 0F C1 C1 8F 14 D5 2A C8 72 93 D0 6F 2A"
+#define SL_DEFAULT_QUERYPARAMETES "/socket.io/?"
 
 
 #ifndef STREAMLABSAPI_H_
 #define STREAMLABSAPI_H_
 
 class StreamlabsAPI {
     private:
-        SocketIoClient webSocket;
+        SocketIOclient webSocket;
 	    std::map<String, std::function<void (const char * payload)>> events;
-        void event(const char * payload, size_t length);
+        void event(socketIOmessageType_t type, uint8_t * payload, size_t length);
     public:
         void loop();
-        bool connect(const char* socketToken);
+        void connect(const char* socketToken);
         void followTwitchEvent(std::function<void (const char * payload)> func);
         void subscriptionsTwitchEvent(std::function<void (const char * payload)> func);
         void hostTwitchEvent(std::function<void (const char * payload)> func);