Fix compilation options issue

Author: mobizt

README.md

@@ -2,9 +2,9 @@
 
 ![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/mobizt/FirebaseClient/.github%2Fworkflows%2Fcompile_library.yml?logo=github&label=compile) [![Github Stars](https://img.shields.io/github/stars/mobizt/FirebaseClient?logo=github)](https://github.com/mobizt/FirebaseClient/stargazers) ![Github Issues](https://img.shields.io/github/issues/mobizt/FirebaseClient?logo=github)
 
-![GitHub Release](https://img.shields.io/github/v/release/mobizt/FirebaseClient) ![Arduino](https://img.shields.io/badge/Arduino-v2.0.1-57C207?logo=arduino) ![PlatformIO](https://badges.registry.platformio.org/packages/mobizt/library/FirebaseClient.svg) ![GitHub Release Date](https://img.shields.io/github/release-date/mobizt/FirebaseClient)
+![GitHub Release](https://img.shields.io/github/v/release/mobizt/FirebaseClient) ![Arduino](https://img.shields.io/badge/Arduino-v2.0.2-57C207?logo=arduino) ![PlatformIO](https://badges.registry.platformio.org/packages/mobizt/library/FirebaseClient.svg) ![GitHub Release Date](https://img.shields.io/github/release-date/mobizt/FirebaseClient)
 
-Revision `2025-03-26`
+Revision `2025-04-07`
 
 ## Introduction
 
@@ -737,8 +737,8 @@ FIREBASE_DISABLE_ONBOARD_WIFI // For disabling on-board WiFI functionality in ca
 FIREBASE_DISABLE_NATIVE_ETHERNET // For disabling native (sdk) Ethernet functionality in case external Client usage.
 FIREBASE_DISABLE_NATIVE_PPP // For disabling native ESP32 (sdk) PPP functionality.
 ENABLE_ASYNC_TCP_CLIENT // For Async TCP Client usage.
-FIREBASE_ASYNC_QUEUE_LIMIT // For maximum async queue limit setting for an async client.
-FIREBASE_PRINTF_PORT // For Firebase.printf debug port.
+FIREBASE_ASYNC_QUEUE_LIMIT // For maximum async queue limit (number) setting for an async client.
+FIREBASE_PRINTF_PORT // For Firebase.printf debug port class object.
 FIREBASE_PRINTF_BUFFER // Firebase.printf buffer size. The default printf buffer size is 1024 for ESP8266 and SAMD otherwise 4096. Some debug message may be truncated for larger text.
 ```
 
@@ -773,7 +773,7 @@ DISABLE_FIRESTORE // For disabling Firestore support
 DISABLE_FIRESTORE_QUERY // For Firestore Query feature compilation
 DISABLE_MESSAGING // For disabling Firebase Cloud Messaging support
 DISABLE_STORAGE // For disabling Firebase Storage support
-ENABLE_CLOUD_STORAGE // For disabling Google Cloud Storage support
+DISABLE_CLOUD_STORAGE // For disabling Google Cloud Storage support
 DISABLE_FUNCTIONS // For disabling Google Cloud Functions support
 DISABLE_RULESETS // For disabling RuleSets support
 DISABLE_PSRAM // For disabling PSRAM support

library.json

@@ -1,6 +1,6 @@
 {
   "name": "FirebaseClient",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "keywords": "communication, REST, esp32, esp8266, arduino",
   "description": "Async Firebase Client library for Arduino.",
   "repository": {

library.properties

@@ -1,6 +1,6 @@
 name=FirebaseClient
 
-version=2.0.1
+version=2.0.2
 
 author=Mobizt
 

src/client/SSLClient/ESP_SSLClient.h

@@ -1,8 +1,8 @@
 /**
  *
- * The ESP SSL Client Class, ESP_SSLClient.h v2.1.16
+ * The ESP SSL Client Class, ESP_SSLClient.h v2.1.17
  *
- * Created January 9, 2025
+ * Created April 7, 2025
  *
  * The MIT License (MIT)
  * Copyright (c) 2025 K. Suwatchai (Mobizt)

src/client/SSLClient/client/BSSL_SSL_Client.cpp

@@ -1,7 +1,7 @@
 /**
- * BSSL_SSL_Client library v1.0.19 for Arduino devices.
+ * BSSL_SSL_Client library v1.0.20 for Arduino devices.
  *
- * Created January 9, 2025
+ * Created April 7, 2025
  *
  * This work contains codes based on WiFiClientSecure from Earle F. Philhower and SSLClient from OSU OPEnS Lab.
  *
@@ -403,7 +403,7 @@ size_t BSSL_SSL_Client::write(Stream &stream)
 int BSSL_SSL_Client::peek()
 {
 
-    if (!_sc || !available())
+    if ((!_sc && _secure) || !available())
     {
 #if defined(ESP_SSLCLIENT_ENABLE_DEBUG)
         esp_ssl_debug_print(PSTR("Not connected, none left available."), _debug_level, esp_ssl_debug_error, __func__);

src/client/SSLClient/client/BSSL_SSL_Client.h

@@ -1,7 +1,7 @@
 /**
- * BSSL_SSL_Client library v1.0.19 for Arduino devices.
+ * BSSL_SSL_Client library v1.0.20 for Arduino devices.
  *
- * Created January 9, 2025
+ * Created April 7, 2025
  *
  * This work contains codes based on WiFiClientSecure from Earle F. Philhower and SSLClient from OSU OPEnS Lab.
  *

src/core/AsyncClient/AsyncClient.h

@@ -6,10 +6,15 @@
 #include "./core/Utils/OTA.h"
 #include "./core/Utils/StringUtil.h"
 #include "./core/AsyncClient/SlotManager.h"
+#if defined(ENABLE_DATABASE)
+#define PUBLIC_DATABASE_RESULT_IMPL_BASE : public RTDBResultImpl
+#else
+#define PUBLIC_DATABASE_RESULT_IMPL_BASE
+#endif
 
 using namespace firebase_ns;
 
-class AsyncClientClass : public RTDBResultImpl
+class AsyncClientClass PUBLIC_DATABASE_RESULT_IMPL_BASE
 {
     friend class AppBase;
     friend class RealtimeDatabase;
@@ -413,8 +418,8 @@ class AsyncClientClass : public RTDBResultImpl
             // Hadles redirection (stop and connect).
             String ext;
             String _host = sData->request.getHost(false, &sData->response.val[resns::location], &ext);
-            conn.stop();
-            if (conn.connect(_host.c_str(), sData->request.port) > ret_failure)
+            sman.stop();
+            if (sman.connect(sData, _host.c_str(), sData->request.port) > ret_failure)
             {
                 uut.relocate(sData->request.val[reqns::header], _host, ext);
                 sut.clear(sData->request.val[reqns::payload]);

src/core/AsyncClient/SlotManager.h

@@ -8,7 +8,13 @@
 #include "./core/AsyncClient/AsyncData.h"
 #include "./core/Debug.h"
 
-class SlotManager : public RTDBResultImpl
+#if defined(ENABLE_DATABASE)
+#define PUBLIC_DATABASE_RESULT_IMPL_BASE : public RTDBResultImpl
+#else
+#define PUBLIC_DATABASE_RESULT_IMPL_BASE
+#endif
+
+class SlotManager PUBLIC_DATABASE_RESULT_IMPL_BASE
 {
     friend class AsyncClientClass;
 
@@ -62,9 +68,15 @@ class SlotManager : public RTDBResultImpl
             else if (sse_index > -1)
                 slot = sse_index;
 
-            // Multiple SSE modes
-            if ((sse_index > -1 && options.sse) || sVec.size() >= FIREBASE_ASYNC_QUEUE_LIMIT)
+// Multiple SSE modes
+#if defined(FIREBASE_ASYNC_QUEUE_LIMIT)
+
+            if ((sse_index > -1 && options.sse) || sVec.size() >= (int)FIREBASE_ASYNC_QUEUE_LIMIT + 0)
                 slot = -2;
+#else
+            if (sse_index > -1 && options.sse)
+                slot = -2;
+#endif
 
             if (slot >= (int)sVec.size())
                 slot = -1;
@@ -150,6 +162,7 @@ class SlotManager : public RTDBResultImpl
 
     bool sseFilter(async_data *sData)
     {
+#if defined(ENABLE_DATABASE)
         String event = sData->aResult.rtdbResult.event();
         return (sse_events_filter.length() == 0 ||
                 (sData->response.flags.http_response && sse_events_filter.indexOf("get") > -1 && event.indexOf("put") > -1) ||
@@ -158,6 +171,9 @@ class SlotManager : public RTDBResultImpl
                 (sse_events_filter.indexOf("keep-alive") > -1 && event.indexOf("keep-alive") > -1) ||
                 (sse_events_filter.indexOf("cancel") > -1 && event.indexOf("cancel") > -1) ||
                 (sse_events_filter.indexOf("auth_revoked") > -1 && event.indexOf("auth_revoked") > -1));
+#else
+        return false;
+#endif
     }
 
     void reset(async_data *sData, bool disconnect)

src/core/AsyncResult/AsyncResult.h

@@ -11,6 +11,12 @@
 #include "./core/AsyncResult/RTDBResult.h"
 #include "./core/AsyncResult/AppProgress.h"
 
+#if defined(ENABLE_DATABASE)
+#define PUBLIC_DATABASE_RESULT_BASE : public RealtimeDatabaseResult
+#else
+#define PUBLIC_DATABASE_RESULT_BASE
+#endif
+
 using namespace firebase_ns;
 
 namespace ares_ns
@@ -25,7 +31,7 @@ namespace ares_ns
     };
 }
 
-class AsyncResult : public RealtimeDatabaseResult
+class AsyncResult PUBLIC_DATABASE_RESULT_BASE
 {
     friend class AsyncClientClass;
     friend class AppBase;
@@ -280,8 +286,10 @@ class AsyncResult : public RealtimeDatabaseResult
     {
         data_log.read();
         static T o;
+#if defined(ENABLE_RTDB)
         if (std::is_same<T, RealtimeDatabaseResult>::value)
             return rtdbResult;
+#endif
         return o;
     }
 

src/core/AsyncResult/RTDBResultImpl.h

@@ -3,6 +3,7 @@
 
 #include <Arduino.h>
 #include "./core/AsyncResult/AsyncResult.h"
+#if defined(ENABLE_DATABASE)
 
 namespace firebase_ns
 {
@@ -19,4 +20,5 @@ namespace firebase_ns
         void setRefPayload(RealtimeDatabaseResult *rtdbResult, String *payload) { rtdbResult->ref_payload = payload; }
     };
 }
+#endif
 #endif