Fix FirebaseJson leading CRLF parsing issue

mobizt · mobizt · commit 470258a94711 · 2025-08-11T20:05:38.000+07:00
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 mobizt
+Copyright (c) 2025 mobizt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
@@ -1592,27 +1592,18 @@ bool search(String *response, <string> spreadsheetId, FirebaseJsonArray *dataFil
 
 ## License
 
-The MIT License (MIT)
+The codes and examples in this repository are licensed under the MIT License. 
 
-Copyright (C) 2024 K. Suwatchai (Mobizt)
+Copyright (c) 2025, Suwatchai K. All rights reserved.
 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-Permission is hereby granted, free of charge, to any person returning a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+*The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.*
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+`THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.`
+
+*Last updated 2025-08-11 UTC.*
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "ESP-Google-Sheet-Client",
-  "version": "1.4.9",
+  "version": "1.4.10",
   "keywords": "communication, REST, esp32, esp8266, raspberrypi, arduino",
   "description": "Arduino Google Sheet REST client library for Arduino devices. This library allows devices to communicate with Google Sheet API to read, edit and delete the spreadsheets",
   "repository": {
diff --git a/library.properties b/library.properties
@@ -1,6 +1,6 @@
 name=ESP-Google-Sheet-Client
 
-version=1.4.9
+version=1.4.10
 
 author=Mobizt
 
diff --git a/src/ESP_Google_Sheet_Client.cpp b/src/ESP_Google_Sheet_Client.cpp
@@ -1,12 +1,12 @@
 /**
- * Google Sheet Client, ESP_GOOGLE_SHEET_CLIENT_Google_Sheet_Client.cpp v1.4.9
+ * Google Sheet Client, ESP_GOOGLE_SHEET_CLIENT_Google_Sheet_Client.cpp v1.4.10
  *
  * This library supports Espressif ESP8266 and ESP32 MCUs
  *
- * Created April 15, 2025
+ * Created August 11, 2025
  *
  * The MIT License (MIT)
- * Copyright (c) 2023 K. Suwatchai (Mobizt)
+ * Copyright (c) 2025 K. Suwatchai (Mobizt)
  *
  *
  * Permission is hereby granted, free of charge, to any person returning a copy of
diff --git a/src/ESP_Google_Sheet_Client.h b/src/ESP_Google_Sheet_Client.h
@@ -1,16 +1,16 @@
 #ifndef ESP_GOOGLE_SHEET_CLIENT_VERSION
-#define ESP_GOOGLE_SHEET_CLIENT_VERSION "1.4.9"
+#define ESP_GOOGLE_SHEET_CLIENT_VERSION "1.4.10"
 #endif
 
 /**
- * Google Sheet Client, ESP_Google_Sheet_Client.h v1.4.9
+ * Google Sheet Client, ESP_Google_Sheet_Client.h v1.4.10
  *
  * This library supports Espressif ESP8266 and ESP32 MCUs
  *
- * Created April 15, 2025
+ * Created August 11, 2025
  *
  * The MIT License (MIT)
- * Copyright (c) 2023 K. Suwatchai (Mobizt)
+ * Copyright (c) 2025 K. Suwatchai (Mobizt)
  *
  *
  * Permission is hereby granted, free of charge, to any person returning a copy of
diff --git a/src/json/FirebaseJson.cpp b/src/json/FirebaseJson.cpp
@@ -1,9 +1,9 @@
 /*
- * FirebaseJson, version 3.0.10
+ * FirebaseJson, version 3.0.9
  *
  * The Easiest Arduino library to parse, create and edit JSON object using a relative path.
  *
- * Created March 25, 2024
+ * Created June 20, 2024
  *
  * Features
  * - Using path to access node element in search style e.g. json.get(result,"a/b/c")
@@ -80,8 +80,8 @@ bool FirebaseJsonBase::setRaw(const char *raw)
 
     if (raw)
     {
-        size_t i = 0;
-        while (i < strlen(raw) && raw[i] == ' ')
+        size_t i = 0, len = strlen(raw);
+        while (i < len && (raw[i] == ' ' || raw[i] == '\t' || raw[i] == '\r' || raw[i] == '\n'))
         {
             i++;
         }
diff --git a/src/json/FirebaseJson.h b/src/json/FirebaseJson.h
@@ -1,9 +1,9 @@
 /*
- * FirebaseJson, version 3.0.10
+ * FirebaseJson, version 3.0.9
  *
  * The Easiest Arduino library to parse, create and edit JSON object using a relative path.
  *
- * Created March 25, 2024
+ * Created June 20, 2024
  *
  * Features
  * - Using path to access node element in search style e.g. json.get(result,"a/b/c")
@@ -128,10 +128,6 @@
 #endif
 #endif
 
-#if defined(FIREBASEJSON_USE_PSRAM) || defined(FIREBASE_USE_PSRAM)
-#define MB_STRING_USE_PSRAM
-#endif
-
 #include "MB_String.h"
 
 using namespace mb_string;
@@ -166,7 +162,7 @@ extern "C"
 
 #define Serial_Printf Serial.printf
 
-#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__)
+#elif 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"
 
@@ -221,7 +217,7 @@ static void *fb_js_malloc(size_t len)
     void *p;
     size_t newLen = getReservedLen(len);
 
-#if defined(BOARD_HAS_PSRAM) && defined(MB_STRING_USE_PSRAM)
+#if defined(BOARD_HAS_PSRAM) 
     if (ESP.getPsramSize() > 0)
         p = (void *)ps_malloc(newLen);
     else
@@ -256,7 +252,7 @@ static void fb_js_free(void *ptr)
 static void *fb_js_realloc(void *ptr, size_t sz)
 {
     size_t newLen = getReservedLen(sz);
-#if defined(BOARD_HAS_PSRAM) && defined(MB_STRING_USE_PSRAM)
+#if defined(BOARD_HAS_PSRAM)
     if (ESP.getPsramSize() > 0)
         ptr = (void *)ps_realloc(ptr, newLen);
     else
@@ -879,7 +875,7 @@ class FirebaseJsonBase
     {
         void *p;
         size_t newLen = getReservedLen(len);
-#if defined(BOARD_HAS_PSRAM) && defined(MB_STRING_USE_PSRAM)
+#if defined(BOARD_HAS_PSRAM)
         if (ESP.getPsramSize() > 0)
             p = (void *)ps_malloc(newLen);
         else
diff --git a/src/json/MB_JSON/MB_JSON.c b/src/json/MB_JSON/MB_JSON.c
@@ -3,7 +3,7 @@
 
   All original static cJSON functions and static variables will be prefixed with MB_JSON_.
   
-  Created December 20, 2021
+  Created December 20, 2022
 
   Copyright (c) 2023 Mobizt (K. Suwatchai)
 
diff --git a/src/json/MB_JSON/MB_JSON.h b/src/json/MB_JSON/MB_JSON.h
@@ -3,7 +3,7 @@
 
   All original static cJSON functions and static variables will be prefixed with MB_JSON_.
   
-  Created December 20, 2021
+  Created December 20, 2022
 
   Copyright (c) 2023 Mobizt (K. Suwatchai)
 
diff --git a/src/json/MB_String.h b/src/json/MB_String.h
@@ -1,19 +1,13 @@
 
 /**
- * Mobizt's SRAM/PSRAM supported String, version 1.2.12
+ * Mobizt's SRAM/PSRAM supported String, version 1.2.10
  *
- * Created March 25, 2024
+ * Created June 20, 2024
  *
  * Changes Log
  *
- * v1.2.12
- * - using std namespace
- * 
- * v1.2.11
- * - fix float to string conversion
- * 
  * v1.2.10
- * - add support Arduino UNO WiFi R4
+ * - use std namespace
  * 
  * v1.2.9
  * - substring optimization
@@ -97,7 +91,7 @@
 #define MB_STRING_MINOR 2
 #define MB_STRING_PATCH 5
 
-#if defined(ESP8266) && defined(MMU_EXTERNAL_HEAP) && defined(MB_STRING_USE_PSRAM)
+#if defined(ESP8266) && defined(MMU_EXTERNAL_HEAP)
 #include <umm_malloc/umm_malloc.h>
 #include <umm_malloc/umm_heap_select.h>
 #define ESP8266_USE_EXTERNAL_HEAP
@@ -116,7 +110,6 @@ class MB_String;
 #define pgm2Str(p) (MB_String().appendP(p).c_str())
 #define num2Str(v, p) (MB_String().appendNum(v, p).c_str())
 
-
 namespace mb_string
 {
     enum mb_string_sub_type
@@ -902,15 +895,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) || defined(ARDUINO_UNOWIFIR4)
+#if defined(ARDUINO_ARCH_SAMD) || defined(__AVR_ATmega4809__) || defined(ARDUINO_NANO_RP2040_CONNECT)
             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) || defined(ARDUINO_UNOWIFIR4)
+#if defined(ARDUINO_ARCH_SAMD) || defined(__AVR_ATmega4809__) || defined(ARDUINO_NANO_RP2040_CONNECT)
             s = uint32Str(value);
 #else
             s = uint64Str(value);
@@ -1477,7 +1470,7 @@ class MB_String
     static const size_t npos = -1;
 
 private:
-#if defined(ARDUINO_ARCH_SAMD) || defined(__AVR_ATmega4809__) || defined(ARDUINO_NANO_RP2040_CONNECT) || defined(ARDUINO_UNOWIFIR4)
+#if defined(ARDUINO_ARCH_SAMD) || defined(__AVR_ATmega4809__) || defined(ARDUINO_NANO_RP2040_CONNECT)
 
     char *int32Str(signed long value)
     {
@@ -1526,18 +1519,10 @@ class MB_String
         {
             MB_String fmt = MBSTRING_FLASH_MCR("%.");
             fmt += precision;
-
-            if (type < 2)
-            {
-                fmt += MBSTRING_FLASH_MCR("f");
-                sprintf(t, fmt.c_str(), (double)value);
-            }
-            else
-            {
-                fmt += MBSTRING_FLASH_MCR("Lf");
-                sprintf(t, fmt.c_str(), value);
-            }
-
+            if (type == 2)
+                fmt += MBSTRING_FLASH_MCR("L");
+            fmt += MBSTRING_FLASH_MCR("f");
+            sprintf(t, fmt.c_str(), value);
             trim(t);
         }
 
@@ -1582,7 +1567,7 @@ class MB_String
     {
         void *p;
         size_t newLen = getReservedLen(len);
-#if defined(BOARD_HAS_PSRAM) && defined(MB_STRING_USE_PSRAM)
+#if defined(BOARD_HAS_PSRAM)
         if (ESP.getPsramSize() > 0)
             p = (void *)ps_malloc(newLen);
         else
@@ -1733,7 +1718,7 @@ class MB_String
             {
                 int slen = length();
 
-#if defined(BOARD_HAS_PSRAM) && defined(MB_STRING_USE_PSRAM)
+#if defined(BOARD_HAS_PSRAM)
                 if (ESP.getPsramSize() > 0)
                     buf = (char *)ps_realloc(buf, len);
                 else
@@ -1749,7 +1734,7 @@ class MB_String
             }
             else
             {
-#if defined(BOARD_HAS_PSRAM) && defined(MB_STRING_USE_PSRAM)
+#if defined(BOARD_HAS_PSRAM)
                 if (ESP.getPsramSize() > 0)
                     buf = (char *)ps_malloc(len);
                 else

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ESP-Google-Sheet-Client",`
`3`		`- "version": "1.4.9",`
	`3`	`+ "version": "1.4.10",`
`4`	`4`	`"keywords": "communication, REST, esp32, esp8266, raspberrypi, arduino",`
`5`	`5`	`"description": "Arduino Google Sheet REST client library for Arduino devices. This library allows devices to communicate with Google Sheet API to read, edit and delete the spreadsheets",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`/**`
`2`		`- * Google Sheet Client, ESP_GOOGLE_SHEET_CLIENT_Google_Sheet_Client.cpp v1.4.9`
	`2`	`+ * Google Sheet Client, ESP_GOOGLE_SHEET_CLIENT_Google_Sheet_Client.cpp v1.4.10`
`3`	`3`	`*`
`4`	`4`	`* This library supports Espressif ESP8266 and ESP32 MCUs`
`5`	`5`	`*`
`6`		`- * Created April 15, 2025`
	`6`	`+ * Created August 11, 2025`
`7`	`7`	`*`
`8`	`8`	`* The MIT License (MIT)`
`9`		`- * Copyright (c) 2023 K. Suwatchai (Mobizt)`
	`9`	`+ * Copyright (c) 2025 K. Suwatchai (Mobizt)`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* Permission is hereby granted, free of charge, to any person returning a copy of`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,16 @@`
`1`	`1`	`#ifndef ESP_GOOGLE_SHEET_CLIENT_VERSION`
`2`		`-#define ESP_GOOGLE_SHEET_CLIENT_VERSION "1.4.9"`
	`2`	`+#define ESP_GOOGLE_SHEET_CLIENT_VERSION "1.4.10"`
`3`	`3`	`#endif`
`4`	`4`
`5`	`5`	`/**`
`6`		`- * Google Sheet Client, ESP_Google_Sheet_Client.h v1.4.9`
	`6`	`+ * Google Sheet Client, ESP_Google_Sheet_Client.h v1.4.10`
`7`	`7`	`*`
`8`	`8`	`* This library supports Espressif ESP8266 and ESP32 MCUs`
`9`	`9`	`*`
`10`		`- * Created April 15, 2025`
	`10`	`+ * Created August 11, 2025`
`11`	`11`	`*`
`12`	`12`	`* The MIT License (MIT)`
`13`		`- * Copyright (c) 2023 K. Suwatchai (Mobizt)`
	`13`	`+ * Copyright (c) 2025 K. Suwatchai (Mobizt)`
`14`	`14`	`*`
`15`	`15`	`*`
`16`	`16`	`* Permission is hereby granted, free of charge, to any person returning a copy of`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`/*`
`2`		`- * FirebaseJson, version 3.0.10`
	`2`	`+ * FirebaseJson, version 3.0.9`
`3`	`3`	`*`
`4`	`4`	`* The Easiest Arduino library to parse, create and edit JSON object using a relative path.`
`5`	`5`	`*`
`6`		`- * Created March 25, 2024`
	`6`	`+ * Created June 20, 2024`
`7`	`7`	`*`
`8`	`8`	`* Features`
`9`	`9`	`* - Using path to access node element in search style e.g. json.get(result,"a/b/c")`
`@@ -80,8 +80,8 @@ bool FirebaseJsonBase::setRaw(const char *raw)`
`80`	`80`
`81`	`81`	`if (raw)`
`82`	`82`	`{`
`83`		`- size_t i = 0;`
`84`		`- while (i < strlen(raw) && raw[i] == ' ')`
	`83`	`+ size_t i = 0, len = strlen(raw);`
	`84`	`+ while (i < len && (raw[i] == ' ' \|\| raw[i] == '\t' \|\| raw[i] == '\r' \|\| raw[i] == '\n'))`
`85`	`85`	`{`
`86`	`86`	`i++;`
`87`	`87`	`}`