refactored bunch of code, & added local-limiting

Author: SiddheshNan

keywords.txt

@@ -3,23 +3,23 @@
 #######################################
 
 #######################################
-# Datatypes (KEYWORD1) Classes
+# Datatypes (KEYWORD1)
 #######################################
 
-WH_ESP8266   KEYWORD1
+ThingESP32   KEYWORD1
+ThingESP8266   KEYWORD1
 
 #######################################
-# Datatypes (KEYWORD2) Methods
+# Methods and Functions (KEYWORD2)
 #######################################
 
-DeviceClient KEYWORD2
+SetWiFi KEYWORD2
+initDevice KEYWORD2
+setCallback KEYWORD2
+Handle KEYWORD2
+sendMsg KEYWORD2
 
+######################################
+# Constants (LITERAL1)
 #######################################
-# Datatypes (KEYWORD3) Setup & Loop
-#######################################
-
-SetDevice    KEYWORD3
-SetWiFi    KEYWORD3
-initDevice    KEYWORD3
-Handle    KEYWORD3
-HandleResponse    KEYWORD3
+HandleResponse    LITERAL1

library.properties

@@ -1,5 +1,5 @@
 name=ThingESP
-version=1.2.2
+version=1.3.0
 author=SiddheshNan <hello@siddhesh.me>
 maintainer=SiddheshNan <hello@siddhesh.me>
 sentence=Arduino library for the ThingsESP Platform.

src/ThingESP.h

@@ -1,7 +1,19 @@
 #define MQTT_MAX_PACKET_SIZE 1024
+#include "./ThingESPClient.cpp"
 
 #if defined(ESP8266)
-    #include "ThingESP_8266.cpp"
+    class ThingESP8266 : public thing_esp::ThingESPClient {
+        public:
+            ThingESP8266(const char* _username, const char* _projectName, const char* _credentials) : ThingESPClient(_username, _projectName, _credentials)
+            {}
+    };
 #elif defined(ESP32)
-    #include "ThingESP_32.cpp"
+    class ThingESP32 : public thing_esp::ThingESPClient {
+        public:
+            ThingESP32(const char* _username, const char* _projectName, const char* _credentials) : ThingESPClient(_username, _projectName, _credentials)
+            {}
+    };
 #endif
+
+
+

src/ThingESPClient.cpp

@@ -0,0 +1,133 @@
+#pragma once
+
+#if defined(ESP8266)
+#include <ESP8266WiFi.h>
+#elif defined(ESP32)
+#include <WiFi.h>
+#endif
+
+#ifndef _DISABLE_TLS_
+
+#include <WiFiClientSecure.h>
+
+#endif
+
+#include <stdint.h>
+#include <string.h>
+
+#include "PubSubClient/PubSubClient.h"
+#include "ArduinoJson.h"
+
+#include "thingesp/Logger.cpp"
+#include "thingesp/Device.cpp"
+#include "thingesp/RateLimiter.cpp"
+#include "thingesp/Message.cpp"
+
+namespace thing_esp {
+    class ThingESPClient : public DeviceData, public Message {
+    public:
+        ThingESPClient(const char *_username, const char *_projectName, const char *_credentials) : client(espClient) {
+
+            #if !defined(_DISABLE_TLS_) && !defined(ESP32)
+                espClient.setInsecure();
+                delay(2);
+            #endif
+
+            username = _username;
+            projectName = _projectName;
+            credentials = _credentials;
+
+            genMetaData();
+        };
+
+        void initDevice() {
+            if (wifi_configured) {
+
+                LOG_VALUE("WiFi", "Connecting to: ", ssid)
+
+                WiFi.begin(ssid, ssid_password);
+
+                while (WiFi.status() != WL_CONNECTED) {
+                    delay(500);
+                }
+
+                LOG("WiFi", "Connected successfully");
+                LOG_VALUE("WiFi", "IP address: ", WiFi.localIP());
+
+
+            }
+
+            randomSeed(micros());
+
+            client.setServer(MQTT_SERVER, MQTT_PORT);
+            client.setCallback([this](char *topic, byte *payload, unsigned int length) {
+                callback(topic, payload, length);
+            });
+        }
+
+        void Handle() {
+            if (!client.connected()) {
+                while (!client.connected()) {
+                    LOG("SOCKET", "Attempting connection to ThingESP")
+
+                    if (client.connect(outName.c_str(), outName.c_str(), credentials)) {
+                        LOG("SOCKET", "Connected to ThingESP successfully")
+                        client.subscribe(topic.c_str());
+                        publishMSG(get_rate_limits_msg());
+                    } else {
+                        LOG_VALUE("SOCKET", "Error connecting to ThingESP! Error code: ", client.state());
+                        if (client.state() == 5) {
+                            LOG("SOCKET", "Please check your username, project name or credentials! ");
+                        }
+                        LOG("SOCKET", "Trying again in 10 seconds..");
+                        delay(10000);
+                    }
+                }
+            }
+            client.loop();
+        }
+
+
+    protected:
+
+        /*
+         * the callback function
+         */
+        String (*callbackFunction)(String)
+
+        override;
+
+
+        /*
+         * the WiFi Client
+         */
+        #if !defined(_DISABLE_TLS_) && !defined(ESP32)
+                WiFiClientSecure espClient;
+        #else
+                WiFiClient espClient;
+        #endif
+
+
+        /*
+        * PubSubClient for MQTT
+        */
+        PubSubClient client;
+
+
+        void publishMSG(const char *_msg) override {
+            client.publish(topic.c_str(), _msg);
+        }
+
+        void callback(char *topic, byte *payload, unsigned int length) {
+            String msg;
+
+            for (int i = 0; i < length; i++)
+                msg.concat((char) payload[i]);
+
+            this->onMessage(msg);
+        }
+
+
+    };
+
+}