diff --git a/library.json b/library.json index 148e013a6..1e89d8a23 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "Firebase Arduino Client Library for ESP8266 and ESP32", - "version": "4.4.0", + "version": "4.4.1", "keywords": "communication, REST, esp32, esp8266, arduino", "description": "The library supports Firebase products e.g. Realtime database, Cloud Firestore database, Firebase Storage and Google Cloud Storage, Cloud Functions for Firebase and Cloud Messaging. The library also supported other Arduino devices using Clients interfaces e.g. WiFiClient, EthernetClient, and GSMClient.", "repository": { diff --git a/library.properties b/library.properties index 63f07910b..1358b952e 100644 --- a/library.properties +++ b/library.properties @@ -1,6 +1,6 @@ name=Firebase Arduino Client Library for ESP8266 and ESP32 -version=4.4.0 +version=4.4.1 author=Mobizt diff --git a/src/FB_Const.h b/src/FB_Const.h index 314444f24..097c80295 100644 --- a/src/FB_Const.h +++ b/src/FB_Const.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/FB_Error.h b/src/FB_Error.h index 20ee7ea9e..c85610c80 100644 --- a/src/FB_Error.h +++ b/src/FB_Error.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/FB_Network.h b/src/FB_Network.h index a2caf91dc..4d5adeb8e 100644 --- a/src/FB_Network.h +++ b/src/FB_Network.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/FB_Utils.h b/src/FB_Utils.h index 15999eb6c..5bdbddbb2 100644 --- a/src/FB_Utils.h +++ b/src/FB_Utils.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/Firebase.cpp b/src/Firebase.cpp index b45bb3f36..8289cbd43 100644 --- a/src/Firebase.cpp +++ b/src/Firebase.cpp @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/Firebase.h b/src/Firebase.h index cb7e279bd..53d06daa1 100644 --- a/src/Firebase.h +++ b/src/Firebase.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/FirebaseFS.h b/src/FirebaseFS.h index 03964b3a8..6cccfb890 100644 --- a/src/FirebaseFS.h +++ b/src/FirebaseFS.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/client/FB_TCP_Client.h b/src/client/FB_TCP_Client.h index ad679c08b..8372938fa 100644 --- a/src/client/FB_TCP_Client.h +++ b/src/client/FB_TCP_Client.h @@ -1,7 +1,7 @@ /** - * Firebase TCP Client v1.0.0 + * Firebase TCP Client v1.0.1 * - * Created August 12, 2023 + * Created September 11, 2023 * * The MIT License (MIT) * Copyright (c) 2022 K. Suwatchai (Mobizt) @@ -380,8 +380,9 @@ class Firebase_TCP_Client : public Client if (!ethernetConnected()) ethernetConnect(); } - else if (WiFI_CONNECTED || ethLinkUp()) - _network_status = true; + // also check the native network before calling external cb + else if (_client_type == firebase_client_type_internal_basic_client || WiFI_CONNECTED || ethLinkUp()) + _network_status = WiFI_CONNECTED || ethLinkUp(); else if (_client_type == firebase_client_type_external_generic_client) { if (!_network_status_cb) @@ -389,6 +390,8 @@ class Firebase_TCP_Client : public Client else _network_status_cb(); } + else + _network_status = false; return _network_status; } diff --git a/src/client/SSLClient/Custom_ESP_SSLClient_FS.h b/src/client/SSLClient/Custom_ESP_SSLClient_FS.h index 0646fda9d..f056118fb 100644 --- a/src/client/SSLClient/Custom_ESP_SSLClient_FS.h +++ b/src/client/SSLClient/Custom_ESP_SSLClient_FS.h @@ -2,16 +2,6 @@ #ifndef CUSTOM_ESP_SSLCLIENT_FS_H #define CUSTOM_ESP_SSLCLIENT_FS_H -#include "../../FirebaseFS.h" - -#if defined(FIREBASE_USE_PSRAM) -#if !defined(ESP_SSLCLIENT_USE_PSRAM) -#define ESP_SSLCLIENT_USE_PSRAM -#endif -#else -#undef ESP_SSLCLIENT_USE_PSRAM -#endif - #undef ESP_SSLCLIENT_ENABLE_DEBUG #undef ESP_SSLCLIENT_ENABLE_SSL_ERROR_STRING diff --git a/src/client/SSLClient/ESP_SSLClient_FS.h b/src/client/SSLClient/ESP_SSLClient_FS.h index d8787dd11..cacae8c15 100644 --- a/src/client/SSLClient/ESP_SSLClient_FS.h +++ b/src/client/SSLClient/ESP_SSLClient_FS.h @@ -34,7 +34,7 @@ #define ESP_SSLCLIENT_USE_PSRAM #if defined __has_include -#if __has_include() +#if __has_include("Custom_ESP_SSLClient_FS.h") #include "Custom_ESP_SSLClient_FS.h" #endif #endif diff --git a/src/core/FirebaseCore.cpp b/src/core/FirebaseCore.cpp index bafbe05ee..c328fff99 100644 --- a/src/core/FirebaseCore.cpp +++ b/src/core/FirebaseCore.cpp @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif @@ -1703,15 +1703,17 @@ bool FirebaseCore::reconnect() bool noClient = tcpClient == nullptr; - // We need tcpClient for network checking. + // We need tcpClient for network checking and reconnect here, + // otherwise the networkStatus will not update + // and network cannot resume. - // if (noClient) - // newClient(&tcpClient); + if (noClient) + newClient(&tcpClient); - // reconnect(tcpClient, nullptr); + reconnect(tcpClient, nullptr); - // if (noClient) - // freeClient(&tcpClient); + if (noClient) + freeClient(&tcpClient); networkChecking = false; diff --git a/src/core/FirebaseCore.h b/src/core/FirebaseCore.h index 1683ed39b..e8ac73778 100644 --- a/src/core/FirebaseCore.h +++ b/src/core/FirebaseCore.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/core/Firebase_Client_Version.h b/src/core/Firebase_Client_Version.h index 53e2caa42..f710664a4 100644 --- a/src/core/Firebase_Client_Version.h +++ b/src/core/Firebase_Client_Version.h @@ -1,6 +1,6 @@ #ifndef FIREBASE_CLIENT_VERSION -#define FIREBASE_CLIENT_VERSION "4.4.0" -#define FIREBASE_CLIENT_VERSION_NUM 40400 +#define FIREBASE_CLIENT_VERSION "4.4.1" +#define FIREBASE_CLIENT_VERSION_NUM 40401 /* The inconsistent file version checking to prevent mixed versions compilation. */ #define FIREBASE_CLIENT_VERSION_CHECK(ver) (ver == FIREBASE_CLIENT_VERSION_NUM) diff --git a/src/firestore/FB_Firestore.cpp b/src/firestore/FB_Firestore.cpp index 3614de9b1..172214f07 100644 --- a/src/firestore/FB_Firestore.cpp +++ b/src/firestore/FB_Firestore.cpp @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/firestore/FB_Firestore.h b/src/firestore/FB_Firestore.h index b23155e7b..caffd656d 100644 --- a/src/firestore/FB_Firestore.h +++ b/src/firestore/FB_Firestore.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/functions/FB_Functions.cpp b/src/functions/FB_Functions.cpp index 73d412801..3cb52cbda 100644 --- a/src/functions/FB_Functions.cpp +++ b/src/functions/FB_Functions.cpp @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/functions/FB_Functions.h b/src/functions/FB_Functions.h index 087f6d83d..5ee575b72 100644 --- a/src/functions/FB_Functions.h +++ b/src/functions/FB_Functions.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/functions/FunctionsConfig.cpp b/src/functions/FunctionsConfig.cpp index 29a420bdf..003c23406 100644 --- a/src/functions/FunctionsConfig.cpp +++ b/src/functions/FunctionsConfig.cpp @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/functions/FunctionsConfig.h b/src/functions/FunctionsConfig.h index b4c5bc061..546ddf29f 100644 --- a/src/functions/FunctionsConfig.h +++ b/src/functions/FunctionsConfig.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/functions/PocicyBuilder.cpp b/src/functions/PocicyBuilder.cpp index 9b03d07e8..693290db0 100644 --- a/src/functions/PocicyBuilder.cpp +++ b/src/functions/PocicyBuilder.cpp @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/functions/PolicyBuilder.h b/src/functions/PolicyBuilder.h index e93307ffe..0fd98004f 100644 --- a/src/functions/PolicyBuilder.h +++ b/src/functions/PolicyBuilder.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/gcs/GCS.cpp b/src/gcs/GCS.cpp index 29b5da51a..ea86c2eec 100644 --- a/src/gcs/GCS.cpp +++ b/src/gcs/GCS.cpp @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/gcs/GCS.h b/src/gcs/GCS.h index 6d310abd6..43bb5319f 100644 --- a/src/gcs/GCS.h +++ b/src/gcs/GCS.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/message/FCM.cpp b/src/message/FCM.cpp index 74ba38f04..6528847fe 100644 --- a/src/message/FCM.cpp +++ b/src/message/FCM.cpp @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/message/FCM.h b/src/message/FCM.h index ce5f4415d..a2fbe5ae2 100644 --- a/src/message/FCM.h +++ b/src/message/FCM.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/message/LFCM.h b/src/message/LFCM.h index b7d0c45be..5d1a4667a 100644 --- a/src/message/LFCM.h +++ b/src/message/LFCM.h @@ -1,6 +1,6 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/FB_RTDB.cpp b/src/rtdb/FB_RTDB.cpp index 3d10c54ca..a877e9cbe 100644 --- a/src/rtdb/FB_RTDB.cpp +++ b/src/rtdb/FB_RTDB.cpp @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/FB_RTDB.h b/src/rtdb/FB_RTDB.h index 67e1cdd5e..4898b5b96 100644 --- a/src/rtdb/FB_RTDB.h +++ b/src/rtdb/FB_RTDB.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/QueryFilter.cpp b/src/rtdb/QueryFilter.cpp index 7d807a564..fd2b6bb84 100644 --- a/src/rtdb/QueryFilter.cpp +++ b/src/rtdb/QueryFilter.cpp @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/QueryFilter.h b/src/rtdb/QueryFilter.h index 2b91f0326..21d0f5849 100644 --- a/src/rtdb/QueryFilter.h +++ b/src/rtdb/QueryFilter.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/QueueInfo.cpp b/src/rtdb/QueueInfo.cpp index ba602cdab..cd80b4957 100644 --- a/src/rtdb/QueueInfo.cpp +++ b/src/rtdb/QueueInfo.cpp @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/QueueInfo.h b/src/rtdb/QueueInfo.h index 2af36791d..ac8dbeb3f 100644 --- a/src/rtdb/QueueInfo.h +++ b/src/rtdb/QueueInfo.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/QueueManager.cpp b/src/rtdb/QueueManager.cpp index 987240fce..5c259ba8b 100644 --- a/src/rtdb/QueueManager.cpp +++ b/src/rtdb/QueueManager.cpp @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/QueueManager.h b/src/rtdb/QueueManager.h index fbc2abd70..def7e3b0f 100644 --- a/src/rtdb/QueueManager.h +++ b/src/rtdb/QueueManager.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/stream/FB_MP_Stream.cpp b/src/rtdb/stream/FB_MP_Stream.cpp index 23eab147c..3cd296063 100644 --- a/src/rtdb/stream/FB_MP_Stream.cpp +++ b/src/rtdb/stream/FB_MP_Stream.cpp @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/stream/FB_MP_Stream.h b/src/rtdb/stream/FB_MP_Stream.h index d048035c8..e978b318e 100644 --- a/src/rtdb/stream/FB_MP_Stream.h +++ b/src/rtdb/stream/FB_MP_Stream.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/stream/FB_Stream.cpp b/src/rtdb/stream/FB_Stream.cpp index 363b47848..699179ffc 100644 --- a/src/rtdb/stream/FB_Stream.cpp +++ b/src/rtdb/stream/FB_Stream.cpp @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/stream/FB_Stream.h b/src/rtdb/stream/FB_Stream.h index ee6527dcc..110e8687b 100644 --- a/src/rtdb/stream/FB_Stream.h +++ b/src/rtdb/stream/FB_Stream.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/session/FB_Session.cpp b/src/session/FB_Session.cpp index 0773f2339..b5f0857f4 100644 --- a/src/session/FB_Session.cpp +++ b/src/session/FB_Session.cpp @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/session/FB_Session.h b/src/session/FB_Session.h index 1379dc6cf..31eb99e90 100644 --- a/src/session/FB_Session.h +++ b/src/session/FB_Session.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/storage/FCS.cpp b/src/storage/FCS.cpp index 4387362f3..6b6a0d514 100644 --- a/src/storage/FCS.cpp +++ b/src/storage/FCS.cpp @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif diff --git a/src/storage/FCS.h b/src/storage/FCS.h index 5e1d472aa..d5aa3ecb7 100644 --- a/src/storage/FCS.h +++ b/src/storage/FCS.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40400) +#if !FIREBASE_CLIENT_VERSION_CHECK(40401) #error "Mixed versions compilation." #endif