Merge pull request #1 from davirxavier/feature/esp8266-compat

Feature/esp8266 compat

Author: davirxavier

.gitignore

@@ -0,0 +1,2 @@
+.idea
+.venv

.idea/EmberIot.iml

@@ -9,6 +9,7 @@
 #include <EmberIotUtil.h>
 #include <WithSecureClient.h>
 #include <EmberIotAuth.h>
+#include <EmberIotShared.h>
 #include <EmberIotStream.h>
 #include <time.h>
 
@@ -39,6 +40,7 @@ class EmberIot : WithSecureClient
     {
         stream = nullptr;
         inited = false;
+        isPaused = false;
         path = nullptr;
         auth = nullptr;
         lastUpdatedChannels = 0;
@@ -73,7 +75,11 @@ class EmberIot : WithSecureClient
         stream->start();
         inited = true;
         EmberIotChannels::started = true;
+        isPaused = false;
+
+#ifdef ESP32
         configTime(0, 0, "pool.ntp.org");
+#endif
     }
 
     /**
@@ -86,13 +92,54 @@ class EmberIot : WithSecureClient
             return;
         }
 
-        auth->loop();
+        if (auth != nullptr && !auth->ready())
+        {
+            auth->loop();
+            return;
+        }
+
+        if (auth != nullptr && auth->isExpired())
+        {
+#ifdef ESP32
+            auth->loop();
+#elif ESP8266
+            pause();
+            auth->loop();
+            resume();
+#endif
+            return;
+        }
+        else if (auth != nullptr)
+        {
+            auth->loop();
+        }
+
+        if (!stream->isConnected())
+        {
+            EmberIotChannels::reconnectedFlag = true;
+        }
+
         stream->loop();
 
         if (enableHeartbeat && millis() - lastHeartbeat > UPDATE_LAST_SEEN_INTERVAL)
         {
-            writeLastSeen();
-            lastHeartbeat = millis();
+#ifdef ESP32
+            bool written = writeLastSeen();
+#elif ESP8266
+            pause();
+            bool written = writeLastSeen();
+            resume();
+#endif
+
+            if (written)
+            {
+                lastHeartbeat = millis();
+            }
+            else
+            {
+                HTTP_LOGN("Write heartbeat failed, trying again in one second.");
+                lastHeartbeat = millis() - UPDATE_LAST_SEEN_INTERVAL + 2000;
+            }
         }
 
         if (millis() - lastUpdatedChannels < 500)
@@ -130,7 +177,13 @@ class EmberIot : WithSecureClient
             char body[bodySize];
             serializeJson(doc, body, bodySize);
 
+#ifdef ESP32
             bool result = write(body);
+#elif ESP8266
+            pause();
+            bool result = write(body);
+            resume();
+#endif
             if (result)
             {
                 for (bool& i : hasUpdateByChannel)
@@ -192,6 +245,20 @@ class EmberIot : WithSecureClient
         sprintf(updateDataByChannel[channel], "%lld", value);
     }
 
+    void pause()
+    {
+        isPaused = true;
+        stream->stop();
+        delay(100);
+    }
+
+    void resume()
+    {
+        delay(100);
+        isPaused = false;
+        stream->start();
+    }
+
     /**
      * Enable or disable the heartbeat packet. If disabled the device will always appear as offline in the android app.
      * You can disable this to reduce transfers in the databse, if you want (you should probably disable this for board-to-board
@@ -202,9 +269,14 @@ class EmberIot : WithSecureClient
 private:
     bool write(const char* data)
     {
-        size_t bufSize = strlen(EmberIotStreamValues::PROTOCOL) +
+        if (auth != nullptr && auth->getUserUid() == nullptr)
+        {
+            return false;
+        }
+
+        size_t bufSize = EmberIotStreamValues::PROTOCOL_SIZE +
             strlen(dbUrl) +
-            strlen(EmberIotStreamValues::AUTH_PARAM) +
+            EmberIotStreamValues::AUTH_PARAM_SIZE +
             strlen(stream->getPath()) +
             (auth != nullptr ? auth->getTokenSize() : 0) + 8;
 
@@ -217,7 +289,7 @@ class EmberIot : WithSecureClient
         }
 
         char buf[bufSize];
-        sprintf(buf, "%s%s%s.json%s%s&print=silent",
+        sprintf_P(buf, PSTR("%S%s%s.json%S%s&print=silent"),
                 EmberIotStreamValues::PROTOCOL,
                 dbUrl,
                 finalPath,
@@ -229,15 +301,20 @@ class EmberIot : WithSecureClient
         return HTTP_UTIL::doJsonHttpRequest(client,
                                             buf,
                                             dbUrl,
-                                            HTTP_UTIL::METHOD_PATCH,
+                                            FPSTR(HTTP_UTIL::METHOD_PATCH),
                                             data);
     }
 
     bool writeLastSeen()
     {
-        size_t bufSize = strlen(EmberIotStreamValues::PROTOCOL) +
+        if (auth != nullptr && auth->getUserUid() == nullptr)
+        {
+            return false;
+        }
+
+        size_t bufSize = EmberIotStreamValues::PROTOCOL_SIZE +
             strlen(dbUrl) +
-            strlen(EmberIotStreamValues::AUTH_PARAM) +
+            EmberIotStreamValues::AUTH_PARAM_SIZE +
             strlen(stream->getPath()) +
             (auth != nullptr ? auth->getTokenSize() : 0) + 8;
 
@@ -258,7 +335,7 @@ class EmberIot : WithSecureClient
         }
 
         char buf[bufSize];
-        sprintf(buf, "%s%s%s.json%s%s&print=silent",
+        sprintf_P(buf, PSTR("%S%s%s.json%S%s&print=silent"),
                 EmberIotStreamValues::PROTOCOL,
                 dbUrl,
                 finalPath,
@@ -270,15 +347,20 @@ class EmberIot : WithSecureClient
         getLocalTime(&timeinfo);
         time(&now);
 
+#ifdef ESP32
         char bodyBuf[snprintf(NULL, 0, "%ld", now) + 16];
         sprintf(bodyBuf, "{\"%s\":%ld}", EmberIotStreamValues::LAST_SEEN_PATH, now);
+#elif ESP8266
+        char bodyBuf[snprintf(NULL, 0, "%lld", now) + 16];
+        sprintf_P(bodyBuf, PSTR("{\"%S\":%lld}"), EmberIotStreamValues::LAST_SEEN_PATH, now);
+#endif
 
         HTTP_LOGF("Setting last_seen in path: %s, body:\n%s\n", buf, bodyBuf);
 
         return HTTP_UTIL::doJsonHttpRequest(client,
                                             buf,
                                             dbUrl,
-                                            HTTP_UTIL::METHOD_PATCH,
+                                            FPSTR(HTTP_UTIL::METHOD_PATCH),
                                             bodyBuf);
     }
 
@@ -287,6 +369,7 @@ class EmberIot : WithSecureClient
     char* path;
     EmberIotStream* stream;
     EmberIotAuth* auth;
+    bool isPaused;
 
     unsigned long lastUpdatedChannels;
     unsigned long lastHeartbeat;