Fix for #294

Author: sivar2311

src/SinricPro.h

@@ -16,6 +16,7 @@
 #include "SinricProStrings.h"
 #include "SinricProUDP.h"
 #include "SinricProWebsocket.h"
+#include "Timestamp.h"
 namespace SINRICPRO_NAMESPACE {
 
 /**
@@ -107,7 +108,7 @@ class SinricProClass : public SinricProInterface {
     SinricProQueue_t  receiveQueue;
     SinricProQueue_t  sendQueue;
 
-    unsigned long baseTimestamp = 0;
+    Timestamp timestamp;
 
     bool   _begin             = false;
     String responseMessageStr = "";
@@ -356,7 +357,7 @@ void SinricProClass::handleReceiveQueue() {
 
 void SinricProClass::handleSendQueue() {
     if (!isConnected()) return;
-    if (!baseTimestamp) return;
+    if (!timestamp.getTimestamp()) return;
     while (sendQueue.size() > 0) {
         DEBUG_SINRIC("[SinricPro:handleSendQueue()]: %i message(s) in sendQueue\r\n", sendQueue.size());
         DEBUG_SINRIC("[SinricPro:handleSendQueue()]: Sending message...\r\n");
@@ -366,7 +367,7 @@ void SinricProClass::handleSendQueue() {
 
         DynamicJsonDocument jsonMessage(1024);
         deserializeJson(jsonMessage, rawMessage->getMessage());
-        jsonMessage[FSTR_SINRICPRO_payload][FSTR_SINRICPRO_createdAt] = getTimestamp();
+        jsonMessage[FSTR_SINRICPRO_payload][FSTR_SINRICPRO_createdAt] = timestamp.getTimestamp();
         signMessage(appSecret, jsonMessage);
 
         String messageStr;
@@ -467,7 +468,7 @@ void SinricProClass::extractTimestamp(JsonDocument& message) {
     // extract timestamp from timestamp message right after websocket connection is established
     tempTimestamp = message["timestamp"] | 0;
     if (tempTimestamp) {
-        baseTimestamp = tempTimestamp - (millis() / 1000);
+        timestamp.setTimestamp(tempTimestamp);
         DEBUG_SINRIC("[SinricPro:extractTimestamp(): Got Timestamp %lu\r\n", tempTimestamp);
         return;
     }
@@ -476,7 +477,7 @@ void SinricProClass::extractTimestamp(JsonDocument& message) {
     tempTimestamp = message[FSTR_SINRICPRO_payload][FSTR_SINRICPRO_createdAt] | 0;
     if (tempTimestamp) {
         DEBUG_SINRIC("[SinricPro:extractTimestamp(): Got Timestamp %lu\r\n", tempTimestamp);
-        baseTimestamp = tempTimestamp - (millis() / 1000);
+        timestamp.setTimestamp(tempTimestamp);
         return;
     }
 }
@@ -535,7 +536,7 @@ void SinricProClass::setResponseMessage(String&& message) {
  * @return unsigned long current timestamp (unix epoch time)
  */
 unsigned long SinricProClass::getTimestamp() {
-    return baseTimestamp + (millis() / 1000);
+    return timestamp.getTimestamp();
 }
 
 DynamicJsonDocument SinricProClass::prepareResponse(JsonDocument& requestMessage) {

src/Timestamp.cpp

@@ -0,0 +1,18 @@
+#include "Timestamp.h"
+
+uint32_t Timestamp::getTimestamp() {
+    update();
+    return timestamp_ms / 1000UL;
+}
+
+void Timestamp::setTimestamp(uint32_t new_timestamp) {
+    timestamp_ms = uint64_t(new_timestamp) * 1000;
+    last_update  = millis();
+}
+
+void Timestamp::update() {
+    if (!timestamp_ms) return;
+    uint32_t current_millis = millis();
+    uint32_t diff_millis    = current_millis - last_update;
+    last_update             = current_millis;
+}

src/Timestamp.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include <Arduino.h>
+
+class Timestamp {
+  public:
+    uint32_t getTimestamp();
+    void     setTimestamp(uint32_t);
+
+  protected:
+    void update();
+
+  protected:
+    uint64_t timestamp_ms = 0;
+    uint32_t last_update  = 0;
+};