Fix Time and GSMClient integration issue in Core.

mobizt · mobizt · commit 0fe3a069b03d · 2023-12-27T10:18:15.000+07:00
diff --git a/examples/Authentications/SignInAsGuest/AnonymousSignin/AnonymousSignin.ino b/examples/Authentications/SignInAsGuest/AnonymousSignin/AnonymousSignin.ino
@@ -10,6 +10,8 @@
  *
  */
 
+/*░D░O░ ░N░O░T░ ░U░S░E░ ░T░H░I░S░ ░I░N░ ░P░R░O░D░U░T░I░O░N░*/
+
 /** This example will show how to authenticate as a anonymous user.
  *
  * You need to enable Anonymous provider.
@@ -113,6 +115,8 @@ void setup()
 
     Serial.print("Sign up new user... ");
 
+    /*░D░O░ ░N░O░T░ ░U░S░E░ ░T░H░I░S░ ░I░N░ ░P░R░O░D░U░T░I░O░N░*/
+
     /* Sign up */
     if (Firebase.signUp(&config, &auth, "", ""))
     {
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "Firebase ESP32 Client",
-  "version": "4.4.8",
+  "version": "4.4.10",
   "keywords": "communication, REST, esp32, arduino",
   "description": "The secure, fast and reliable Firebase Realtime database library to read, store, update, delete, listen, backup, and restore data. You can also read and modify the database security rules with this library.",
   "repository": {
diff --git a/library.properties b/library.properties
@@ -1,6 +1,6 @@
 name=Firebase ESP32 Client
 
-version=4.4.8
+version=4.4.10
 
 author=Mobizt
 
diff --git a/src/FB_Const.h b/src/FB_Const.h
@@ -1,7 +1,3 @@
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
  * Created September 14, 2023
diff --git a/src/FB_Error.h b/src/FB_Error.h
@@ -1,7 +1,3 @@
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
  * Created September 5, 2023
diff --git a/src/FB_Network.h b/src/FB_Network.h
@@ -1,7 +1,3 @@
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
  * Created September 14, 2023
diff --git a/src/FB_Utils.h b/src/FB_Utils.h
@@ -1,7 +1,3 @@
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
  *
diff --git a/src/Firebase.cpp b/src/Firebase.cpp
@@ -1,7 +1,3 @@
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
  * The Firebase class, Firebase.cpp v1.2.8
diff --git a/src/Firebase.h b/src/Firebase.h
@@ -1,7 +1,4 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
  * The Firebase class, Firebase.h v1.2.8
diff --git a/src/client/FB_TCP_Client.h b/src/client/FB_TCP_Client.h
@@ -1,7 +1,7 @@
 /**
- * Firebase TCP Client v1.0.2
+ * Firebase TCP Client v1.0.3
  *
- * Created September 14, 2023
+ * Created December 27, 2023
  *
  * The MIT License (MIT)
  * Copyright (c) 2022 K. Suwatchai (Mobizt)
@@ -1007,6 +1007,7 @@ class Firebase_TCP_Client : public Client
         timeinfo.tm_min = min3;
         timeinfo.tm_sec = sec3;
         time_t ts = mktime(&timeinfo);
+        ts -= timezone * 3600;
         return ts;
       }
     }
diff --git a/src/client/WiFiClientImpl.h b/src/client/WiFiClientImpl.h
@@ -465,12 +465,13 @@ class WiFiClientImpl : public Client
                 }
                 else if (res < 0)
                 {
-                    log_e("fail on fd %d, errno: %d, \"%s\"", _socket, errno, strerror(errno));
+                    // log_e("fail on fd %d, errno: %d, \"%s\"", _socket, errno, strerror(errno));
                     if (errno != EAGAIN)
                     {
                         // if resource was busy, can try again, otherwise give up
                         res = 0;
                         retry = 0;
+                        tcpClose();
                     }
                 }
                 else
diff --git a/src/core/FirebaseCore.cpp b/src/core/FirebaseCore.cpp
@@ -1,12 +1,8 @@
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
- * Google's Firebase Token Management class, FirebaseCore.cpp version 1.0.1
+ * Google's Firebase Token Management class, FirebaseCore.cpp version 1.0.2
  *
- * Created September 12, 2023
+ * Created December 27, 2023
  *
  * The MIT License (MIT)
  * Copyright (c) 2023 K. Suwatchai (Mobizt)
@@ -691,12 +687,17 @@ void FirebaseCore::tokenProcessingTask()
 
             if (_cli_type == firebase_client_type_external_gsm_client)
             {
+                if (!tcpClient)
+                    newClient(&tcpClient);
+
                 uint32_t _time = tcpClient->gprsGetTime();
                 if (_time > 0)
                 {
                     baseTs = _time;
                     setTimestamp(_time);
                 }
+
+                freeClient(&tcpClient);
             }
             else
             {
diff --git a/src/core/FirebaseCore.h b/src/core/FirebaseCore.h
@@ -1,12 +1,8 @@
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
- * Google's Firebase Token Management class, FirebaseCore.h version 1.0.1
+ * Google's Firebase Token Management class, FirebaseCore.h version 1.0.2
  * 
- * Created September 12, 2023
+ * Created December 27, 2023
  *
  * The MIT License (MIT)
  * Copyright (c) 2023 K. Suwatchai (Mobizt)
diff --git a/src/core/Firebase_Client_Version.h b/src/core/Firebase_Client_Version.h
@@ -1,7 +1,6 @@
 #ifndef FIREBASE_CLIENT_VERSION
-#define FIREBASE_CLIENT_VERSION "4.4.8"
-#define FIREBASE_CLIENT_VERSION_NUM 40408
+#define FIREBASE_CLIENT_VERSION "4.4.10"
+#define FIREBASE_CLIENT_VERSION_NUM 40410
 
-/* The inconsistent file version checking to prevent mixed versions compilation. */
-#define FIREBASE_CLIENT_VERSION_CHECK(ver) (ver == FIREBASE_CLIENT_VERSION_NUM)
+#define FIREBASE_CLIENT_VERSION_CHECK(ver) (true)
 #endif
diff --git a/src/json/FirebaseJson.h b/src/json/FirebaseJson.h
@@ -1,9 +1,9 @@
 /*
- * FirebaseJson, version 3.0.8
+ * FirebaseJson, version 3.0.9
  *
  * The Easiest Arduino library to parse, create and edit JSON object using a relative path.
  *
- * Created September 6, 2023
+ * Created November 17, 2023
  *
  * Features
  * - Using path to access node element in search style e.g. json.get(result,"a/b/c")
@@ -166,7 +166,7 @@ extern "C"
 
 #define Serial_Printf Serial.printf
 
-#elif defined(ARDUINO_ARCH_RP2040) || defined(ARDUINO_ARCH_SAMD) || defined(ARDUINO_ARCH_STM32) || defined(ARDUINO_ARCH_STM32F1) || defined(ARDUINO_ARCH_STM32F4) || defined(__AVR__)
+#elif defined(ARDUINO_UNOWIFIR4) || defined(ARDUINO_ARCH_RP2040) || defined(ARDUINO_ARCH_SAMD) || defined(ARDUINO_ARCH_STM32) || defined(ARDUINO_ARCH_STM32F1) || defined(ARDUINO_ARCH_STM32F4) || defined(__AVR__)
 
 #include "extras/print/fb_json_print.h"
 
diff --git a/src/json/MB_String.h b/src/json/MB_String.h
@@ -1,11 +1,15 @@
 
 /**
- * Mobizt's SRAM/PSRAM supported String, version 1.2.9
+ * Mobizt's SRAM/PSRAM supported String, version 1.2.10
  *
- * Created December 3, 2022
+ * Created November 15, 2023
  *
  * Changes Log
  *
+ * 
+ * v1.2.10
+ * - add support Arduino UNO WiFi R4
+ * 
  * v1.2.9
  * - substring optimization
  *
@@ -900,15 +904,15 @@ class MB_String
             s = boolStr(value);
         else if (is_num_neg_int<T>::value)
         {
-#if defined(ARDUINO_ARCH_SAMD) || defined(__AVR_ATmega4809__) || defined(ARDUINO_NANO_RP2040_CONNECT)
+#if defined(ARDUINO_ARCH_SAMD) || defined(__AVR_ATmega4809__) || defined(ARDUINO_NANO_RP2040_CONNECT) || defined(ARDUINO_UNOWIFIR4)
             s = int32Str(value);
 #else
             s = int64Str(value);
 #endif
         }
         else if (is_num_pos_int<T>::value)
         {
-#if defined(ARDUINO_ARCH_SAMD) || defined(__AVR_ATmega4809__) || defined(ARDUINO_NANO_RP2040_CONNECT)
+#if defined(ARDUINO_ARCH_SAMD) || defined(__AVR_ATmega4809__) || defined(ARDUINO_NANO_RP2040_CONNECT) || defined(ARDUINO_UNOWIFIR4)
             s = uint32Str(value);
 #else
             s = uint64Str(value);
@@ -1475,7 +1479,7 @@ class MB_String
     static const size_t npos = -1;
 
 private:
-#if defined(ARDUINO_ARCH_SAMD) || defined(__AVR_ATmega4809__) || defined(ARDUINO_NANO_RP2040_CONNECT)
+#if defined(ARDUINO_ARCH_SAMD) || defined(__AVR_ATmega4809__) || defined(ARDUINO_NANO_RP2040_CONNECT) || defined(ARDUINO_UNOWIFIR4)
 
     char *int32Str(signed long value)
     {
diff --git a/src/message/FCM.cpp b/src/message/FCM.cpp
@@ -1,7 +1,3 @@
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
  * Google's Firebase Cloud Messaging class, FCM.cpp version 1.1.0
diff --git a/src/message/FCM.h b/src/message/FCM.h
@@ -1,7 +1,3 @@
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
  * Google's Firebase Cloud Messaging class, FCM.h version 1.1.0
diff --git a/src/message/LFCM.h b/src/message/LFCM.h
@@ -1,9 +1,4 @@
 
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
-
 #include <Arduino.h>
 #include "./mbfs/MB_MCU.h"
 #include "./FirebaseFS.h"
diff --git a/src/rtdb/FB_RTDB.cpp b/src/rtdb/FB_RTDB.cpp
@@ -1,7 +1,3 @@
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
  * Google's Firebase Realtime Database class, FB_RTDB.cpp version 2.1.1
diff --git a/src/rtdb/FB_RTDB.h b/src/rtdb/FB_RTDB.h
@@ -1,7 +1,3 @@
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
  * Google's Firebase Realtime Database class, FB_RTDB.h version 2.1.1
diff --git a/src/rtdb/QueryFilter.cpp b/src/rtdb/QueryFilter.cpp
@@ -1,7 +1,3 @@
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
  * Google's Firebase QueryFilter class, QueryFilter.cpp version 1.0.7
diff --git a/src/rtdb/QueryFilter.h b/src/rtdb/QueryFilter.h
@@ -1,7 +1,3 @@
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
  * Google's Firebase QueryFilter class, QueryFilter.h version 1.0.7
diff --git a/src/rtdb/QueueInfo.cpp b/src/rtdb/QueueInfo.cpp
@@ -1,7 +1,3 @@
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
  * Google's Firebase QueueInfo class, QueueInfo.cpp version 1.0.6
diff --git a/src/rtdb/QueueInfo.h b/src/rtdb/QueueInfo.h
@@ -1,7 +1,3 @@
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
  * Google's Firebase QueueInfo class, QueueInfo.h version 1.0.6
diff --git a/src/rtdb/QueueManager.cpp b/src/rtdb/QueueManager.cpp
@@ -1,7 +1,3 @@
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
  * Google's Firebase QueueManager class, QueueManager.cpp version 1.0.5
diff --git a/src/rtdb/QueueManager.h b/src/rtdb/QueueManager.h
@@ -1,7 +1,3 @@
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
  * Google's Firebase QueueManager class, QueueManager.h version 1.0.5
diff --git a/src/rtdb/stream/FB_MP_Stream.cpp b/src/rtdb/stream/FB_MP_Stream.cpp
@@ -1,7 +1,3 @@
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
  * Google's Firebase MultiPathStream class, FB_MP_Stream.cpp version 1.1.7
diff --git a/src/rtdb/stream/FB_MP_Stream.h b/src/rtdb/stream/FB_MP_Stream.h
@@ -1,7 +1,3 @@
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
  * Google's Firebase MultiPathStream class, FB_MP_Stream.h version 1.1.7
diff --git a/src/rtdb/stream/FB_Stream.cpp b/src/rtdb/stream/FB_Stream.cpp
@@ -1,7 +1,3 @@
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
  * Google's Firebase Stream class, FB_Stream.cpp version 1.1.8
diff --git a/src/rtdb/stream/FB_Stream.h b/src/rtdb/stream/FB_Stream.h
@@ -1,7 +1,3 @@
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
  * Google's Firebase Stream class, FB_Stream.h version 1.1.8
diff --git a/src/session/FB_Session.cpp b/src/session/FB_Session.cpp
@@ -1,7 +1,3 @@
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
  * Google's Firebase Data class, FB_Session.cpp version 1.4.1
diff --git a/src/session/FB_Session.h b/src/session/FB_Session.h
@@ -1,7 +1,3 @@
-#include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)
-#error "Mixed versions compilation."
-#endif
 
 /**
  * Google's Firebase Data class, FB_Session.h version 1.4.1

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@`
`10`	`10`	`*`
`11`	`11`	`*/`
`12`	`12`
	`13`	`+/░D░O░ ░N░O░T░ ░U░S░E░ ░T░H░I░S░ ░I░N░ ░P░R░O░D░U░T░I░O░N░/`
	`14`	`+`
`13`	`15`	`/** This example will show how to authenticate as a anonymous user.`
`14`	`16`	`*`
`15`	`17`	`* You need to enable Anonymous provider.`
`@@ -113,6 +115,8 @@ void setup()`
`113`	`115`
`114`	`116`	`Serial.print("Sign up new user... ");`
`115`	`117`
	`118`	`+ /░D░O░ ░N░O░T░ ░U░S░E░ ░T░H░I░S░ ░I░N░ ░P░R░O░D░U░T░I░O░N░/`
	`119`	`+`
`116`	`120`	`/* Sign up */`
`117`	`121`	`if (Firebase.signUp(&config, &auth, "", ""))`
`118`	`122`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "Firebase ESP32 Client",`
`3`		`- "version": "4.4.8",`
	`3`	`+ "version": "4.4.10",`
`4`	`4`	`"keywords": "communication, REST, esp32, arduino",`
`5`	`5`	`"description": "The secure, fast and reliable Firebase Realtime database library to read, store, update, delete, listen, backup, and restore data. You can also read and modify the database security rules with this library.",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,3 @@`
`1`		`-#include "./core/Firebase_Client_Version.h"`
`2`		`-#if !FIREBASE_CLIENT_VERSION_CHECK(40408)`
`3`		`-#error "Mixed versions compilation."`
`4`		`-#endif`
`5`	`1`
`6`	`2`	`/**`
`7`	`3`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/**`
`2`		`- * Firebase TCP Client v1.0.2`
	`2`	`+ * Firebase TCP Client v1.0.3`
`3`	`3`	`*`
`4`		`- * Created September 14, 2023`
	`4`	`+ * Created December 27, 2023`
`5`	`5`	`*`
`6`	`6`	`* The MIT License (MIT)`
`7`	`7`	`* Copyright (c) 2022 K. Suwatchai (Mobizt)`
`@@ -1007,6 +1007,7 @@ class Firebase_TCP_Client : public Client`
`1007`	`1007`	`timeinfo.tm_min = min3;`
`1008`	`1008`	`timeinfo.tm_sec = sec3;`
`1009`	`1009`	`time_t ts = mktime(&timeinfo);`
	`1010`	`+ ts -= timezone * 3600;`
`1010`	`1011`	`return ts;`
`1011`	`1012`	`}`
`1012`	`1013`	`}`