Fix network and SSL client issues.

mobizt · Sep 10, 2023 · 369e036 · 369e036
1 parent d18feae
commit 369e036
Show file tree

Hide file tree

Showing 32 changed files with 46 additions and 51 deletions.
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "Firebase ESP8266 Client",
-  "version": "4.4.0",
+  "version": "4.4.1",
   "keywords": "communication, REST, esp8266, 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 ESP8266 Client
 
-version=4.4.0
+version=4.4.1
 
 author=Mobizt
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,15 +380,18 @@ 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)
         _last_error = 1;
       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
@@ -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
@@ -34,7 +34,7 @@
 #define ESP_SSLCLIENT_USE_PSRAM
 
 #if defined __has_include
-#if __has_include(<Custom_ESP_SSLClient_FS.h>)
+#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
@@ -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
@@ -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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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