v1.4.1 to fix bug of wrong reqStates

khoih-prog · web-flow · commit 6ad432146ddc · 2022-10-21T18:58:25.000-04:00
### Releases v1.4.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
@@ -11,6 +11,7 @@
 ## Table of Contents
 
 * [Changelog](#changelog)
+  * [Releases v1.4.1](#releases-v141)
   * [Releases v1.4.0](#releases-v140)
   * [Releases v1.3.1](#releases-v131)
   * [Releases v1.3.0](#releases-v130)
@@ -23,6 +24,11 @@
 
 ## Changelog
 
+### Releases v1.4.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
+
 ### Releases v1.4.0
 
 1. Fix bug. 
diff --git a/examples/Ethernet/AsyncCustomHeader/AsyncCustomHeader.ino b/examples/Ethernet/AsyncCustomHeader/AsyncCustomHeader.ino
@@ -19,8 +19,8 @@
 
 #include "defines.h"
 
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.0"
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004000
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.1"
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004001
 
 // Select a test server address
 //char GET_ServerAddress[]      = "192.168.2.110/";
diff --git a/examples/Ethernet/AsyncDweetGet/AsyncDweetGet.ino b/examples/Ethernet/AsyncDweetGet/AsyncDweetGet.ino
@@ -30,8 +30,8 @@
 
 #include "defines.h"
 
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.0"
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004000
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.1"
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004001
 
 // Select a test server address           
 const char GET_ServerAddress[] = "dweet.io";
diff --git a/examples/Ethernet/AsyncDweetPost/AsyncDweetPost.ino b/examples/Ethernet/AsyncDweetPost/AsyncDweetPost.ino
@@ -24,8 +24,8 @@
 
 #include "defines.h"
 
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.0"
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004000
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.1"
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004001
 
 // Select a test server address           
 const char POST_ServerAddress[] = "dweet.io";
diff --git a/examples/Ethernet/AsyncHTTPRequest/AsyncHTTPRequest.ino b/examples/Ethernet/AsyncHTTPRequest/AsyncHTTPRequest.ino
@@ -43,8 +43,8 @@
 
 #include "defines.h"
 
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.0"
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004000
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.1"
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004001
 
 // To be included only in main(), .ino with setup() to avoid `Multiple Definitions` Linker Error
 #include <Portenta_H7_AsyncHTTPRequest.h>         // https://github.com/khoih-prog/Portenta_H7_AsyncHTTPRequest
diff --git a/examples/Ethernet/AsyncSimpleGET/AsyncSimpleGET.ino b/examples/Ethernet/AsyncSimpleGET/AsyncSimpleGET.ino
@@ -21,8 +21,8 @@
  
 #include "defines.h"
 
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.0"
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004000
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.1"
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004001
 
 // Select a test server address           
 //char GET_ServerAddress[]    = "ipv4bot.whatismyipaddress.com/";
diff --git a/examples/Ethernet/AsyncWebClientRepeating/AsyncWebClientRepeating.ino b/examples/Ethernet/AsyncWebClientRepeating/AsyncWebClientRepeating.ino
@@ -21,8 +21,8 @@
 
 #include "defines.h"
 
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.0"
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004000
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.1"
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004001
 
 // Select a test server address           
 const char GET_ServerAddress[] = "arduino.tips";
diff --git a/examples/WiFi/AsyncCustomHeader/AsyncCustomHeader.ino b/examples/WiFi/AsyncCustomHeader/AsyncCustomHeader.ino
@@ -21,8 +21,8 @@
 
 #include "defines.h"
 
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.0"
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004000
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.1"
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004001
 
 // Select a test server address
 //char GET_ServerAddress[]      = "192.168.2.110/";
diff --git a/examples/WiFi/AsyncDweetGet/AsyncDweetGet.ino b/examples/WiFi/AsyncDweetGet/AsyncDweetGet.ino
@@ -30,8 +30,8 @@
 
 #include "defines.h"
 
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.0"
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004000
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.1"
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004001
 
 // Select a test server address           
 const char GET_ServerAddress[] = "dweet.io";
diff --git a/examples/WiFi/AsyncDweetPost/AsyncDweetPost.ino b/examples/WiFi/AsyncDweetPost/AsyncDweetPost.ino
@@ -24,8 +24,8 @@
 
 #include "defines.h"
 
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.0"
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004000
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.1"
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004001
 
 // Select a test server address           
 const char POST_ServerAddress[] = "dweet.io";
diff --git a/examples/WiFi/AsyncHTTPRequest/AsyncHTTPRequest.ino b/examples/WiFi/AsyncHTTPRequest/AsyncHTTPRequest.ino
@@ -43,8 +43,11 @@
 
 #include "defines.h"
 
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.0"
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004000
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.1"
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004001
+
+// Seconds for timeout, default is 3s
+#define DEFAULT_RX_TIMEOUT           10  
 
 // To be included only in main(), .ino with setup() to avoid `Multiple Definitions` Linker Error
 #include <Portenta_H7_AsyncHTTPRequest.h>         // https://github.com/khoih-prog/Portenta_H7_AsyncHTTPRequest
diff --git a/examples/WiFi/AsyncSimpleGET/AsyncSimpleGET.ino b/examples/WiFi/AsyncSimpleGET/AsyncSimpleGET.ino
@@ -21,8 +21,8 @@
  
 #include "defines.h"
 
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.0"
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004000
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.1"
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004001
 
 // Select a test server address           
 //char GET_ServerAddress[]    = "ipv4bot.whatismyipaddress.com/";
diff --git a/examples/WiFi/AsyncWebClientRepeating/AsyncWebClientRepeating.ino b/examples/WiFi/AsyncWebClientRepeating/AsyncWebClientRepeating.ino
@@ -21,8 +21,8 @@
 
 #include "defines.h"
 
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.0"
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004000
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.1"
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004001
 
 // Select a test server address           
 const char GET_ServerAddress[] = "arduino.tips";
diff --git a/examples/multiFileProject/multiFileProject.ino b/examples/multiFileProject/multiFileProject.ino
@@ -16,8 +16,8 @@
   #error This code is intended to run on the Portenta_H7 platform! Please check your Tools->Board setting.
 #endif
 
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.0"
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004000
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN_TARGET      "Portenta_H7_AsyncHTTPRequest v1.4.1"
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MIN             1004001
 
 #include "multiFileProject.h"
 
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "Portenta_H7_AsyncHTTPRequest",
-  "version": "1.4.0",
+  "version": "1.4.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 Portenta_H7_AsyncTCP library for Portenta_7, using Vision-shield Ethernet or Murata WiFi.",
   "authors": 
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Portenta_H7_AsyncHTTPRequest
-version=1.4.0
+version=1.4.1
 author=Hristo Gochkov,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 Portenta_H7_AsyncTCP library for Portenta_7, using Vision-shield thernet or Murata WiFi.
diff --git a/src/Portenta_H7_AsyncHTTPRequest.h b/src/Portenta_H7_AsyncHTTPRequest.h
@@ -18,7 +18,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.4.0
+  Version: 1.4.1
   
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -28,6 +28,7 @@
   1.3.0    K Hoang     02/09/2022 Fix bug. Improve debug messages. Optimize code
   1.3.1    K Hoang     18/10/2022 Not try to reconnect to the same host:port after connected
   1.4.0    K Hoang     20/10/2022 Fix bug. Clean up
+  1.4.1    K Hoang     22/10/2022 Fix bug of wrong reqStates
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/Portenta_H7_AsyncHTTPRequest.hpp b/src/Portenta_H7_AsyncHTTPRequest.hpp
@@ -18,7 +18,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.4.0
+  Version: 1.4.1
   
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -28,6 +28,7 @@
   1.3.0    K Hoang     02/09/2022 Fix bug. Improve debug messages. Optimize code
   1.3.1    K Hoang     18/10/2022 Not try to reconnect to the same host:port after connected
   1.4.0    K Hoang     20/10/2022 Fix bug. Clean up
+  1.4.1    K Hoang     22/10/2022 Fix bug of wrong reqStates
  *****************************************************************************************************************************/
 
 #pragma once
@@ -68,13 +69,13 @@
 
 ////////////////////////////////////////
 
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION            "Portenta_H7_AsyncHTTPRequest v1.4.0"
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION            "Portenta_H7_AsyncHTTPRequest v1.4.1"
 
 #define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MAJOR      1
 #define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_MINOR      4
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_PATCH      0
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_PATCH      1
 
-#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_INT        1004000
+#define PORTENTA_H7_ASYNC_HTTP_REQUEST_VERSION_INT        1004001
 
 ////////////////////////////////////////
 
@@ -227,7 +228,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
 
 ////////////////////////////////////////
 
@@ -272,23 +275,20 @@ class AsyncHTTPRequest
       SAFE_DELETE_ARRAY(name)
       SAFE_DELETE_ARRAY(value)
       SAFE_DELETE(next)
-      //delete[] name;
-      //delete[] value;
-      //delete next;
     }
   };
 
   struct  URL 
   {
-    char 		*buffer;
-    char 		*scheme;
-    char 		*host;
-    int 		port;
-    char 		*path;
-    char 		*query;
+    char     *buffer;
+    char    *scheme;
+    char    *host;
+    int     port;
+    char    *path;
+    char    *query;
     
-    URL():	buffer(nullptr), scheme(nullptr), host(nullptr),
-      			port(80), path(nullptr), query(nullptr)
+    URL():  buffer(nullptr), scheme(nullptr), host(nullptr),
+            port(80), path(nullptr), query(nullptr)
     {};
       
     ~URL()
@@ -310,7 +310,6 @@ class AsyncHTTPRequest
     AsyncHTTPRequest();
     ~AsyncHTTPRequest();
 
-
     //External functions in typical order of use:  
     ////////////////////////////////////////
 
@@ -319,7 +318,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
@@ -353,7 +351,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/Portenta_H7_AsyncHTTPRequest_Debug.h b/src/Portenta_H7_AsyncHTTPRequest_Debug.h
@@ -18,7 +18,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.4.0
+  Version: 1.4.1
   
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -28,6 +28,7 @@
   1.3.0    K Hoang     02/09/2022 Fix bug. Improve debug messages. Optimize code
   1.3.1    K Hoang     18/10/2022 Not try to reconnect to the same host:port after connected
   1.4.0    K Hoang     20/10/2022 Fix bug. Clean up
+  1.4.1    K Hoang     22/10/2022 Fix bug of wrong reqStates
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/Portenta_H7_AsyncHTTPRequest_Impl.h b/src/Portenta_H7_AsyncHTTPRequest_Impl.h
