Additional fix to library v4.4.15

mobizt · Dec 28, 2024 · ef75443 · ef75443
1 parent ab38f19
commit ef75443
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "Firebase ESP32 Client",
-  "version": "4.4.15",
+  "version": "4.4.16",
   "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.15
+version=4.4.16
 
 author=Mobizt
 

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.4
+ * Firebase TCP Client v1.0.5
  *
- * Created March 1, 2024
+ * Created December 27, 2024
  *
  * The MIT License (MIT)
  * Copyright (c) 2022 K. Suwatchai (Mobizt)
@@ -466,7 +466,7 @@ class Firebase_TCP_Client : public Client
     if (_client_type == firebase_client_type_external_generic_client &&
         (!_network_connection_cb || !_network_status_cb))
       rdy = false;
-    else if (_client_type != firebase_client_type_external_generic_client ||
+    else if (_client_type != firebase_client_type_external_generic_client &&
              _client_type != firebase_client_type_external_gsm_client)
       rdy = false;
 #else
@@ -849,6 +849,20 @@ class Firebase_TCP_Client : public Client
     return connect();
   }
 
+#if defined(ESP32_ARDUINO_CORE_CLIENT_CONNECT_HAS_TMO)
+  int connect(IPAddress ip, uint16_t port, int32_t timeout)
+  {
+    _tcp_client->setTimeout(timeout);
+    return connect(ip, port);
+  }
+
+  int connect(const char *host, uint16_t port, int32_t timeout)
+  {
+    _tcp_client->setTimeout(timeout);
+    return connect(host, port);
+  }
+#endif
+
   void setConfig(FirebaseConfig *config, MB_FS *mbfs)
   {
     _config = config;
@@ -871,7 +885,7 @@ class Firebase_TCP_Client : public Client
     return 0;
   }
 
-  void disconnect(){};
+  void disconnect() {};
 
   void keepAlive(int tcpKeepIdleSeconds, int tcpKeepIntervalSeconds, int tcpKeepCount)
   {

diff --git a/src/core/Firebase_Client_Version.h b/src/core/Firebase_Client_Version.h
@@ -1,5 +1,5 @@
 #ifndef FIREBASE_CLIENT_VERSION
-#define FIREBASE_CLIENT_VERSION "4.4.15"
-#define FIREBASE_CLIENT_VERSION_NUM 40415
+#define FIREBASE_CLIENT_VERSION "4.4.16"
+#define FIREBASE_CLIENT_VERSION_NUM 40416
 
 #endif