v1.2.1 to fix bug of wrong reqStates

khoih-prog · web-flow · commit 19d5b540f4ed · 2022-10-21T18:30:03.000-04:00
### Release v1.2.1 1. Fix bug of wrong `reqStates`. Check [Release 1.9 breakes previously running code #39](khoih-prog/AsyncHTTPRequest_Generic#39) and [Callback behaviour is buggy (ESP8266) #43](khoih-prog/AsyncHTTPRequest_Generic#43) 2. Optional larger `DEFAULT_RX_TIMEOUT` from default 3s, for slower networks
diff --git a/changelog.md b/changelog.md
@@ -22,6 +22,11 @@
 
 ## Changelog
 
+### Release v1.2.1
+
+1. Fix bug of wrong `reqStates`. Check [Release 1.9 breakes previously running code #39](https://github.com/khoih-prog/AsyncHTTPRequest_Generic/issues/39) and [Callback behaviour is buggy (ESP8266) #43](https://github.com/khoih-prog/AsyncHTTPRequest_Generic/issues/43)
+2. Optional larger `DEFAULT_RX_TIMEOUT` from default 3s, for slower networks
+
 ### Release v1.2.0
 
 1. Fix bug. 
diff --git a/examples/AsyncCustomHeader/AsyncCustomHeader.ino b/examples/AsyncCustomHeader/AsyncCustomHeader.ino
@@ -18,8 +18,8 @@
 
 #include "defines.h"
 
-#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN_TARGET      "AsyncHTTPRequest_RP2040W v1.2.0"
-#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN             1002000
+#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN_TARGET      "AsyncHTTPRequest_RP2040W v1.2.1"
+#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN             1002001
 
 // Level from 0-4
 #define ASYNC_HTTP_DEBUG_PORT     Serial
diff --git a/examples/AsyncDweetGet/AsyncDweetGet.ino b/examples/AsyncDweetGet/AsyncDweetGet.ino
@@ -27,8 +27,8 @@
 
 #include "defines.h"
 
-#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN_TARGET      "AsyncHTTPRequest_RP2040W v1.2.0"
-#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN             1002000
+#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN_TARGET      "AsyncHTTPRequest_RP2040W v1.2.1"
+#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN             1002001
 
 // Level from 0-4
 #define ASYNC_HTTP_DEBUG_PORT     Serial
diff --git a/examples/AsyncDweetPost/AsyncDweetPost.ino b/examples/AsyncDweetPost/AsyncDweetPost.ino
@@ -21,8 +21,8 @@
 
 #include "defines.h"
 
-#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN_TARGET      "AsyncHTTPRequest_RP2040W v1.2.0"
-#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN             1002000
+#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN_TARGET      "AsyncHTTPRequest_RP2040W v1.2.1"
+#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN             1002001
 
 // Level from 0-4
 #define ASYNC_HTTP_DEBUG_PORT     Serial
diff --git a/examples/AsyncHTTPRequest/AsyncHTTPRequest.ino b/examples/AsyncHTTPRequest/AsyncHTTPRequest.ino
@@ -40,8 +40,8 @@
 
 #include "defines.h"
 
-#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN_TARGET      "AsyncHTTPRequest_RP2040W v1.2.0"
-#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN             1002000
+#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN_TARGET      "AsyncHTTPRequest_RP2040W v1.2.1"
+#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN             1002001
 
 // Level from 0-4
 #define ASYNC_HTTP_DEBUG_PORT     Serial
diff --git a/examples/AsyncSimpleGET/AsyncSimpleGET.ino b/examples/AsyncSimpleGET/AsyncSimpleGET.ino
@@ -18,8 +18,8 @@
  
 #include "defines.h"
 
-#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN_TARGET      "AsyncHTTPRequest_RP2040W v1.2.0"
-#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN             1002000
+#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN_TARGET      "AsyncHTTPRequest_RP2040W v1.2.1"
+#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN             1002001
 
 // Level from 0-4
 #define ASYNC_HTTP_DEBUG_PORT     Serial
diff --git a/examples/AsyncWebClientRepeating/AsyncWebClientRepeating.ino b/examples/AsyncWebClientRepeating/AsyncWebClientRepeating.ino
@@ -18,8 +18,8 @@
 
 #include "defines.h"
 
-#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN_TARGET      "AsyncHTTPRequest_RP2040W v1.2.0"
-#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN             1002000
+#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN_TARGET      "AsyncHTTPRequest_RP2040W v1.2.1"
+#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN             1002001
 
 // Level from 0-4
 #define ASYNC_HTTP_DEBUG_PORT     Serial
diff --git a/examples/multiFileProject/multiFileProject.ino b/examples/multiFileProject/multiFileProject.ino
@@ -15,8 +15,8 @@
   #error For RASPBERRY_PI_PICO_W only
 #endif
 
-#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN_TARGET      "AsyncHTTPRequest_RP2040W v1.2.0"
-#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN             1002000
+#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN_TARGET      "AsyncHTTPRequest_RP2040W v1.2.1"
+#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MIN             1002001
 
 // Level from 0-4
 #define ASYNC_HTTP_DEBUG_PORT     Serial
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "AsyncHTTPRequest_RP2040W",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "keywords": "communication, http, async, websocket, webserver, async-webserver, async-tcp, async-udp, async-websocket, async-http, ssl, tls, mbed, mbed-portenta, portenta-h7, portentah7, portenta-h7-m7, portenta-h7-m4, portentah7-m7, portentah7-m4, stm32h7",
   "description": "Simple Async HTTP Request library, supporting GET, POST, PUT, PATCH, DELETE and HEAD, on top of AsyncTCP_RP2040W library for RASPBERRY_PI_PICO_W with CYW43439 WiFi. This library, which relies on AsyncTCP_RP2040W, is part of a series of advanced Async libraries, such as AsyncTCP_RP2040W, AsyncUDP_RP2040W, AsyncWebSockets_RP2040W, AsyncWebServer_RP2040W, AsyncHTTPRequest_RP2040W, AsyncHTTPSRequest_RP2040W, etc.",
   "authors": 
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=AsyncHTTPRequest_RP2040W
-version=1.2.0
+version=1.2.1
 author=Bob Lemaire,Khoi Hoang
 maintainer=Khoi Hoang <khoih.prog@gmail.com>
 sentence=Simple Async HTTP Request library, supporting GET, POST, PUT, PATCH, DELETE and HEAD, on top of AsyncTCP_RP2040W library for RASPBERRY_PI_PICO_W with CYW43439 WiFi.
diff --git a/src/AsyncHTTPRequest_RP2040W.h b/src/AsyncHTTPRequest_RP2040W.h
@@ -16,7 +16,7 @@
   You should have received a copy of the GNU General Public License along with this program.  
   If not, see <https://www.gnu.org/licenses/> 
  
-  Version: 1.2.0
+  Version: 1.2.1
   
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -25,6 +25,7 @@
   1.1.0   K Hoang      01/09/2022 Fix bug. Improve debug messages. Optimize code
   1.1.1   K Hoang      19/10/2022 Not try to reconnect to the same host:port after connected
   1.2.0   K Hoang      21/10/2022 Fix bug. Clean up
+  1.2.1   K Hoang      22/10/2022 Fix bug of wrong reqStates
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/AsyncHTTPRequest_RP2040W.hpp b/src/AsyncHTTPRequest_RP2040W.hpp
@@ -16,7 +16,7 @@
   You should have received a copy of the GNU General Public License along with this program.  
   If not, see <https://www.gnu.org/licenses/> 
  
-  Version: 1.2.0
+  Version: 1.2.1
   
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -25,6 +25,7 @@
   1.1.0   K Hoang      01/09/2022 Fix bug. Improve debug messages. Optimize code
   1.1.1   K Hoang      19/10/2022 Not try to reconnect to the same host:port after connected
   1.2.0   K Hoang      21/10/2022 Fix bug. Clean up
+  1.2.1   K Hoang      22/10/2022 Fix bug of wrong reqStates
  *****************************************************************************************************************************/
 
 #pragma once
@@ -72,13 +73,13 @@
 
 ////////////////////////////////////////
 
-#define ASYNC_HTTP_REQUEST_RP2040W_VERSION            "AsyncHTTPRequest_RP2040W v1.2.0"
+#define ASYNC_HTTP_REQUEST_RP2040W_VERSION            "AsyncHTTPRequest_RP2040W v1.2.1"
 
 #define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MAJOR      1
 #define ASYNC_HTTP_REQUEST_RP2040W_VERSION_MINOR      2
-#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_PATCH      0
+#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_PATCH      1
 
-#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_INT        1002000
+#define ASYNC_HTTP_REQUEST_RP2040W_VERSION_INT        1002001
 
 ////////////////////////////////////////
 
@@ -231,7 +232,9 @@ class xbuf: public Print
     DEBUG_IOTA_PORT.printf("Debug(%3ld): ", millis()-_requestStartTime);\
     DEBUG_IOTA_PORT.printf_P(PSTR(format),##__VA_ARGS__);}
 
-#define DEFAULT_RX_TIMEOUT 3                    // Seconds for timeout
+#if !defined(DEFAULT_RX_TIMEOUT)
+  #define DEFAULT_RX_TIMEOUT         3          // Seconds for timeout
+#endif
 
 ////////////////////////////////////////
 
@@ -276,9 +279,6 @@ class AsyncHTTPRequest
       SAFE_DELETE_ARRAY(name)
       SAFE_DELETE_ARRAY(value)
       SAFE_DELETE(next)
-      //delete[] name;
-      //delete[] value;
-      //delete next;
     }
   };
 
@@ -314,7 +314,6 @@ class AsyncHTTPRequest
     AsyncHTTPRequest();
     ~AsyncHTTPRequest();
 
-
     //External functions in typical order of use:
     
     ////////////////////////////////////////
@@ -324,7 +323,6 @@ class AsyncHTTPRequest
 
     bool        open(const char* /*GET/POST*/, const char* URL);        // Initiate a request
     void        onReadyStateChange(readyStateChangeCB, void* arg = 0);  // Optional event handler for ready state change
-    // or you can simply poll readyState()
     void        setTimeout(int);                                        // overide default timeout (seconds)
 
     void        setReqHeader(const char* name, const char* value);      // add a request header
@@ -358,7 +356,7 @@ class AsyncHTTPRequest
     char*       responseLongText();                                     // response long (whole* or partial* as string)
     
     size_t      responseRead(uint8_t* buffer, size_t len);              // Read response into buffer
-    uint32_t    elapsedTime();                                          // Elapsed time of in progress transaction or last completed (ms)
+    uint32_t    elapsedTime();                                          // Elapsed time of transaction or last completed (ms)
     String      version();                                              // Version of AsyncHTTPRequest
     
     ////////////////////////////////////////
diff --git a/src/AsyncHTTPRequest_RP2040W_Debug.h b/src/AsyncHTTPRequest_RP2040W_Debug.h
@@ -16,7 +16,7 @@
   You should have received a copy of the GNU General Public License along with this program.  
   If not, see <https://www.gnu.org/licenses/> 
  
-  Version: 1.2.0
+  Version: 1.2.1
   
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -25,6 +25,7 @@
   1.1.0   K Hoang      01/09/2022 Fix bug. Improve debug messages. Optimize code
   1.1.1   K Hoang      19/10/2022 Not try to reconnect to the same host:port after connected
   1.2.0   K Hoang      21/10/2022 Fix bug. Clean up
+  1.2.1   K Hoang      22/10/2022 Fix bug of wrong reqStates
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/AsyncHTTPRequest_RP2040W_Impl.h b/src/AsyncHTTPRequest_RP2040W_Impl.h
@@ -16,7 +16,7 @@
   You should have received a copy of the GNU General Public License along with this program.  
   If not, see <https://www.gnu.org/licenses/> 
  
-  Version: 1.2.0
+  Version: 1.2.1
   
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -25,6 +25,7 @@
   1.1.0   K Hoang      01/09/2022 Fix bug. Improve debug messages. Optimize code
   1.1.1   K Hoang      19/10/2022 Not try to reconnect to the same host:port after connected
   1.2.0   K Hoang      21/10/2022 Fix bug. Clean up
+  1.2.1   K Hoang      22/10/2022 Fix bug of wrong reqStates
  *****************************************************************************************************************************/
  
 #pragma once
@@ -154,6 +155,7 @@ size_t xbuf::read(uint8_t* buf, const size_t len)
     size_t supply = (_offset + _used) > _segSize ? _segSize - _offset : _used;
     size_t demand = len - read;
     size_t chunk = supply < demand ? supply : demand;
+    
     memcpy(buf + read, _head->data + _offset, chunk);
     _offset += chunk;
     _used -= chunk;
@@ -405,7 +407,7 @@ void xbuf::addSeg()
     _tail = _head = (xseg*) new uint32_t[_segSize / 4 + 1];
 
     if (_tail == NULL)
-      AHTTP_LOGDEBUG(("xbuf::addSeg: NULL tail"));
+      AHTTP_LOGERROR(("xbuf::addSeg: NULL tail"));
   }
 
   if (_tail)
@@ -451,7 +453,6 @@ AsyncHTTPRequest::~AsyncHTTPRequest()
   if (_client)
     _client->close(true);
 
-
   SAFE_DELETE(_URL)
   SAFE_DELETE(_headers)
   SAFE_DELETE(_request)
@@ -1220,12 +1221,9 @@ size_t  AsyncHTTPRequest::_send()
     return 0;
 
   if ( ! _client->connected())
-  {
+  {   
     // KH fix bug https://github.com/khoih-prog/AsyncHTTPRequest_Generic/issues/38
-    _HTTPcode = HTTPCODE_NOT_CONNECTED;
-    _setReadyState(readyStateDone);
-
-    ///////////////////////////
+    _timeout = DEFAULT_RX_TIMEOUT;
 
     return 0;
   }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "AsyncHTTPRequest_RP2040W",`
`3`		`- "version": "1.2.0",`
	`3`	`+ "version": "1.2.1",`
`4`	`4`	`"keywords": "communication, http, async, websocket, webserver, async-webserver, async-tcp, async-udp, async-websocket, async-http, ssl, tls, mbed, mbed-portenta, portenta-h7, portentah7, portenta-h7-m7, portenta-h7-m4, portentah7-m7, portentah7-m4, stm32h7",`
`5`	`5`	`"description": "Simple Async HTTP Request library, supporting GET, POST, PUT, PATCH, DELETE and HEAD, on top of AsyncTCP_RP2040W library for RASPBERRY_PI_PICO_W with CYW43439 WiFi. This library, which relies on AsyncTCP_RP2040W, is part of a series of advanced Async libraries, such as AsyncTCP_RP2040W, AsyncUDP_RP2040W, AsyncWebSockets_RP2040W, AsyncWebServer_RP2040W, AsyncHTTPRequest_RP2040W, AsyncHTTPSRequest_RP2040W, etc.",`
`6`	`6`	`"authors":`