v1.2.1 to fix bug of wrong reqStates

khoih-prog · web-flow · commit e860ca64d8fa · 2022-10-21T19:22:58.000-04:00
### Release v1.9.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
@@ -13,6 +13,7 @@
 
 * [Table of contents](#table-of-contents)
 * [Changelog](#changelog)
+  * [Releases v1.9.1](#releases-v191)
   * [Releases v1.9.0](#releases-v190)
   * [Releases v1.8.1](#releases-v181)
   * [Releases v1.8.0](#releases-v180)
@@ -23,6 +24,11 @@
 
 ## Changelog
 
+### Release v1.9.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.9.0
 
 1. Fix bug. 
diff --git a/examples/AsyncCustomHeader/AsyncCustomHeader.ino b/examples/AsyncCustomHeader/AsyncCustomHeader.ino
@@ -19,8 +19,8 @@
 //char GET_ServerAddress[]      = "192.168.2.110/";
 char GET_ServerAddress[]    = "http://worldtimeapi.org/api/timezone/America/Toronto.txt";
 
-#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN_TARGET      "AsyncHTTPRequest_Teensy41 v1.9.0"
-#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN             1009000
+#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN_TARGET      "AsyncHTTPRequest_Teensy41 v1.9.1"
+#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN             1009001
 
 // Level from 0-4
 #define ASYNC_HTTP_DEBUG_PORT     Serial
diff --git a/examples/AsyncDweetGet/AsyncDweetGet.ino b/examples/AsyncDweetGet/AsyncDweetGet.ino
@@ -30,8 +30,8 @@ const char GET_ServerAddress[] = "dweet.io";
 // use your own thing name here
 String dweetName = "/dweet/for/currentSecond?second=";
 
-#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN_TARGET      "AsyncHTTPRequest_Teensy41 v1.9.0"
-#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN             1009000
+#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN_TARGET      "AsyncHTTPRequest_Teensy41 v1.9.1"
+#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN             1009001
 
 // Level from 0-4
 #define ASYNC_HTTP_DEBUG_PORT     Serial
diff --git a/examples/AsyncDweetPost/AsyncDweetPost.ino b/examples/AsyncDweetPost/AsyncDweetPost.ino
@@ -24,8 +24,8 @@ const char POST_ServerAddress[] = "dweet.io";
 // use your own thing name here
 String dweetName = "/dweet/for/pinA0-Read?";
 
-#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN_TARGET      "AsyncHTTPRequest_Teensy41 v1.9.0"
-#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN             1009000
+#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN_TARGET      "AsyncHTTPRequest_Teensy41 v1.9.1"
+#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN             1009001
 
 // Level from 0-4
 #define ASYNC_HTTP_DEBUG_PORT     Serial
diff --git a/examples/AsyncHTTPRequest/AsyncHTTPRequest.ino b/examples/AsyncHTTPRequest/AsyncHTTPRequest.ino
@@ -37,8 +37,8 @@
 
 #include "defines.h"
 
-#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN_TARGET      "AsyncHTTPRequest_Teensy41 v1.9.0"
-#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN             1009000
+#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN_TARGET      "AsyncHTTPRequest_Teensy41 v1.9.1"
+#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN             1009001
 
 // Level from 0-4
 #define ASYNC_HTTP_DEBUG_PORT     Serial
diff --git a/examples/AsyncSimpleGET/AsyncSimpleGET.ino b/examples/AsyncSimpleGET/AsyncSimpleGET.ino
@@ -19,8 +19,8 @@
 //char GET_ServerAddress[]    = "ipv4bot.whatismyipaddress.com/";
 char GET_ServerAddress[]    = "http://worldtimeapi.org/api/timezone/America/Toronto.txt";
 
-#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN_TARGET      "AsyncHTTPRequest_Teensy41 v1.9.0"
-#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN             1009000
+#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN_TARGET      "AsyncHTTPRequest_Teensy41 v1.9.1"
+#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN             1009001
 
 // Level from 0-4
 #define ASYNC_HTTP_DEBUG_PORT     Serial
diff --git a/examples/multiFileProject/multiFileProject.ino b/examples/multiFileProject/multiFileProject.ino
@@ -21,8 +21,8 @@
   #error Only Teensy 4.1 supported
 #endif
 
-#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN_TARGET      "AsyncHTTPRequest_Teensy41 v1.9.0"
-#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN             1009000
+#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN_TARGET      "AsyncHTTPRequest_Teensy41 v1.9.1"
+#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MIN             1009001
 
 // Level from 0-4
 #define ASYNC_HTTP_DEBUG_PORT     Serial
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name":"AsyncHTTPRequest_Teensy41",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description":"Simple Async HTTP Request library, supporting GET, POST, PUT, PATCH, DELETE and HEAD, on top of Teensy41_AsyncTCP for Teensy 4.1 using QNEthernet. This library is one of the current or future Async libraries to support Teensy 4.1 using QNEthernet, such as AsyncHTTPRequest_Generic, AsyncHTTPSRequest_Generic, AsyncMQTT_Generic, Teensy41_AsyncWebServer, Teensy41_AsyncUDP, Teensy41_AsyncDNSServer, AsyncHTTPRequest_Teensy41_SSL, etc.",
   "keywords":"communication, async, tcp, http, async-tcp, async-http, teensy, teensy41, teensy-41, qnethernet, lwip",
   "authors": [
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=AsyncHTTPRequest_Teensy41
-version=1.9.0
+version=1.9.1
 author=Bob Lemaire, Khoi Hoang <khoih.prog@gmail.com>
 maintainer=Khoi Hoang <khoih.prog@gmail.com>
 sentence=Simple Async HTTP Request library, supporting GET, POST, PUT, PATCH, DELETE and HEAD, on top of Teensy41_AsyncTCP for Teensy 4.1 using QNEthernet.
diff --git a/src/AsyncHTTPRequest_Teensy41.h b/src/AsyncHTTPRequest_Teensy41.h
@@ -20,15 +20,16 @@
   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.9.0
+  Version: 1.9.1
   
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
   1.7.1    K Hoang     18/03/2022 Initial coding for Teensy 4.1 using built-in QNEthernet.
                                   Bump up version to v1.7.1 to sync with AsyncHTTPRequest_Generic v1.7.1
   1.8.0    K Hoang     01/09/2022 Fix bug. Improve debug messages. Optimize code
   1.8.1    K Hoang     18/10/2022 Not try to reconnect to the same host:port after connected
-  1.9.0    K Hoang      21/10/2022 Fix bug. Clean up
+  1.9.0    K Hoang     21/10/2022 Fix bug. Clean up
+  1.9.1    K Hoang     22/10/2022 Fix bug of wrong reqStates
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/AsyncHTTPRequest_Teensy41.hpp b/src/AsyncHTTPRequest_Teensy41.hpp
@@ -20,15 +20,16 @@
   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.9.0
+  Version: 1.9.1
   
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
   1.7.1    K Hoang     18/03/2022 Initial coding for Teensy 4.1 using built-in QNEthernet.
                                   Bump up version to v1.7.1 to sync with AsyncHTTPRequest_Generic v1.7.1
   1.8.0    K Hoang     01/09/2022 Fix bug. Improve debug messages. Optimize code
   1.8.1    K Hoang     18/10/2022 Not try to reconnect to the same host:port after connected
-  1.9.0    K Hoang      21/10/2022 Fix bug. Clean up
+  1.9.0    K Hoang     21/10/2022 Fix bug. Clean up
+  1.9.1    K Hoang     22/10/2022 Fix bug of wrong reqStates
  *****************************************************************************************************************************/
 
 #pragma once
@@ -38,13 +39,13 @@
 
 ////////////////////////////////////////
 
-#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION            "AsyncHTTPRequest_Teensy41 v1.9.0"
+#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION            "AsyncHTTPRequest_Teensy41 v1.9.1"
 
 #define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MAJOR      1
 #define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_MINOR      9
-#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_PATCH      0
+#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_PATCH      1
 
-#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_INT        1009000
+#define ASYNC_HTTP_REQUEST_TEENSY41_VERSION_INT        1009001
 
 ////////////////////////////////////////
 
@@ -194,7 +195,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
 
 ////////////////////////////////////////
 
@@ -284,7 +287,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
@@ -318,7 +320,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_Teensy41_Debug.h b/src/AsyncHTTPRequest_Teensy41_Debug.h
@@ -20,15 +20,16 @@
   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.9.0
+  Version: 1.9.1
   
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
   1.7.1    K Hoang     18/03/2022 Initial coding for Teensy 4.1 using built-in QNEthernet.
                                   Bump up version to v1.7.1 to sync with AsyncHTTPRequest_Generic v1.7.1
   1.8.0    K Hoang     01/09/2022 Fix bug. Improve debug messages. Optimize code
   1.8.1    K Hoang     18/10/2022 Not try to reconnect to the same host:port after connected
-  1.9.0    K Hoang      21/10/2022 Fix bug. Clean up
+  1.9.0    K Hoang     21/10/2022 Fix bug. Clean up
+  1.9.1    K Hoang     22/10/2022 Fix bug of wrong reqStates
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/AsyncHTTPRequest_Teensy41_Impl.h b/src/AsyncHTTPRequest_Teensy41_Impl.h
@@ -20,15 +20,16 @@
   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.9.0
+  Version: 1.9.1
   
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
   1.7.1    K Hoang     18/03/2022 Initial coding for Teensy 4.1 using built-in QNEthernet.
                                   Bump up version to v1.7.1 to sync with AsyncHTTPRequest_Generic v1.7.1
   1.8.0    K Hoang     01/09/2022 Fix bug. Improve debug messages. Optimize code
   1.8.1    K Hoang     18/10/2022 Not try to reconnect to the same host:port after connected
-  1.9.0    K Hoang      21/10/2022 Fix bug. Clean up
+  1.9.0    K Hoang     21/10/2022 Fix bug. Clean up
+  1.9.1    K Hoang     22/10/2022 Fix bug of wrong reqStates
  *****************************************************************************************************************************/
  
 #pragma once
@@ -158,6 +159,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;
@@ -455,7 +457,6 @@ AsyncHTTPRequest::~AsyncHTTPRequest()
   if (_client)
     _client->close(true);
 
-
   SAFE_DELETE(_URL)
   SAFE_DELETE(_headers)
   SAFE_DELETE(_request)
@@ -790,35 +791,35 @@ int AsyncHTTPRequest::responseHTTPcode()
 
 String AsyncHTTPRequest::responseHTTPString()
 {
-	switch(_HTTPcode)
-	{
-		case 0: 						
-		  return F("OK");
-		case HTTPCODE_CONNECTION_REFUSED: 
-		  return F("CONNECTION_REFUSED");
-		case HTTPCODE_SEND_HEADER_FAILED: 
-		  return F("SEND_HEADER_FAILED");
-		case HTTPCODE_SEND_PAYLOAD_FAILED: 
-		  return F("SEND_PAYLOAD_FAILED");
-		case HTTPCODE_NOT_CONNECTED: 
-		  return F("NOT_CONNECTED");
-		case HTTPCODE_CONNECTION_LOST: 
-		  return F("CONNECTION_LOST");
-		case HTTPCODE_NO_STREAM: 
-		  return F("NO_STREAM");
-		case HTTPCODE_NO_HTTP_SERVER: 
-		  return F("NO_HTTP_SERVER");
-		case HTTPCODE_TOO_LESS_RAM: 
-		  return F("TOO_LESS_RAM");
-		case HTTPCODE_ENCODING: 
-		  return F("ENCODING");
-		case HTTPCODE_STREAM_WRITE: 
-		  return F("STREAM_WRITE");
-		case HTTPCODE_TIMEOUT: 
-		  return F("TIMEOUT");
-		  
-		// HTTP positive code  
-		case 100: return F("Continue");
+  switch(_HTTPcode)
+  {
+    case 0:             
+      return F("OK");
+    case HTTPCODE_CONNECTION_REFUSED: 
+      return F("CONNECTION_REFUSED");
+    case HTTPCODE_SEND_HEADER_FAILED: 
+      return F("SEND_HEADER_FAILED");
+    case HTTPCODE_SEND_PAYLOAD_FAILED: 
+      return F("SEND_PAYLOAD_FAILED");
+    case HTTPCODE_NOT_CONNECTED: 
+      return F("NOT_CONNECTED");
+    case HTTPCODE_CONNECTION_LOST: 
+      return F("CONNECTION_LOST");
+    case HTTPCODE_NO_STREAM: 
+      return F("NO_STREAM");
+    case HTTPCODE_NO_HTTP_SERVER: 
+      return F("NO_HTTP_SERVER");
+    case HTTPCODE_TOO_LESS_RAM: 
+      return F("TOO_LESS_RAM");
+    case HTTPCODE_ENCODING: 
+      return F("ENCODING");
+    case HTTPCODE_STREAM_WRITE: 
+      return F("STREAM_WRITE");
+    case HTTPCODE_TIMEOUT: 
+      return F("TIMEOUT");
+      
+    // HTTP positive code  
+    case 100: return F("Continue");
     case 101: return F("Switching Protocols");
     case 200: return F("HTTP OK");
     case 201: return F("Created");
@@ -858,8 +859,8 @@ String AsyncHTTPRequest::responseHTTPString()
     case 503: return F("Service Unavailable");
     case 504: return F("Gateway Time-out");
     case 505: return F("HTTP Version not supported");  
-		default:  return "UNKNOWN";
-	}
+    default:  return "UNKNOWN";
+  }
 }
 
 ////////////////////////////////////////
@@ -1224,12 +1225,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_Teensy41",`
`3`		`- "version": "1.9.0",`
	`3`	`+ "version": "1.9.1",`
`4`	`4`	`"description":"Simple Async HTTP Request library, supporting GET, POST, PUT, PATCH, DELETE and HEAD, on top of Teensy41_AsyncTCP for Teensy 4.1 using QNEthernet. This library is one of the current or future Async libraries to support Teensy 4.1 using QNEthernet, such as AsyncHTTPRequest_Generic, AsyncHTTPSRequest_Generic, AsyncMQTT_Generic, Teensy41_AsyncWebServer, Teensy41_AsyncUDP, Teensy41_AsyncDNSServer, AsyncHTTPRequest_Teensy41_SSL, etc.",`
`5`	`5`	`"keywords":"communication, async, tcp, http, async-tcp, async-http, teensy, teensy41, teensy-41, qnethernet, lwip",`
`6`	`6`	`"authors": [`