Merge pull request #10 from ayushsharma82/dev

1.0.9

Author: ayushsharma82

README.md

@@ -51,7 +51,7 @@ NetWizard works on the following microcontrollers/boards:
 <br/>
 <br/>
 
-## Looking for more? Upgrade to Pro.
+## Looking for more? Upgrade to Pro
 
 Netwizard Pro comes with the following extended functionality:
 

examples/AsyncDemo/AsyncDemo.ino

@@ -13,23 +13,22 @@
 
   Works with following hardware:
   - ESP32
-  - RP2040 (with WiFi) (Example: Raspberry Pi Pico W)
+  - RP2040+W (Example: Raspberry Pi Pico W)
 
   Important note for RP2040 users:
   - RP2040 requires LittleFS partition for saving credentials.
     Without LittleFS partition, the app will fail to persist any data.
     Make sure to select Tools > Flash Size > "2MB (Sketch 1MB, FS 1MB)" option.
-  - Doesn't works with bare RP2040, it requires WiFi module/chip (network co-processor)
+  - Doesn't work with bare RP2040, it requires WiFi module/chip (network co-processor)
     like in Pico W for NetWizard to work.
 
-  NOTE: Asnyc mode required AsyncWebServer dependency and
+  NOTE: Async mode requires ESPAsyncWebServer dependency and
   please make sure to enable async flag in NetWizard.h as per the docs:
   https://docs.netwizard.pro/async-mode
 
   -------------------------------
 
   Upgrade to NetWizard Pro: https://netwizard.pro
-
 */
 
 #if defined(ESP32)
@@ -50,7 +49,7 @@ NetWizard NW(&server);
 NetWizardParameter nw_header(&NW, NW_HEADER, "MQTT");
 NetWizardParameter nw_divider1(&NW, NW_DIVIDER);
 NetWizardParameter nw_mqtt_host(&NW, NW_INPUT, "Host", "", "mqtt.example.com");
-NetWizardParameter nw_mqtt_port(&NW, NW_INPUT, "Port", "1883");
+NetWizardParameter nw_mqtt_port(&NW, NW_INPUT, "Port", "", "1883");
 
 void setup(void) {
   delay(3000);

examples/Demo/Demo.ino

@@ -13,19 +13,18 @@
 
   Works with following hardware:
   - ESP32
-  - RP2040 (with WiFi) (Example: Raspberry Pi Pico W)
-
+  - RP2040+W (Example: Raspberry Pi Pico W)
 
   Important note for RP2040 users:
   - RP2040 requires LittleFS partition for saving credentials.
     Without LittleFS partition, the app will fail to persist any data.
     Make sure to select Tools > Flash Size > "2MB (Sketch 1MB, FS 1MB)" option.
-  - If using bare RP2040, it requires WiFi module like Pico W for NetWizard to work.
+  - Doesn't work with bare RP2040, it requires WiFi module/chip (network co-processor)
+    like in Pico W for NetWizard to work.
 
   -------------------------------
 
   Upgrade to NetWizard Pro: https://netwizard.pro
-
 */
 
 #include <WebServer.h>

library.json

@@ -35,7 +35,10 @@
       "platforms": ["espressif8266", "raspberrypi"]
     }
   ],
-  "version": "1.0.8",
+  "version": "1.0.9",
   "frameworks": "arduino",
-  "platforms": ["espressif32", "raspberrypi"]
+  "platforms": ["espressif32", "raspberrypi"],
+  "build": {
+    "libCompatMode": "strict"
+  }
 }

library.properties

@@ -1,5 +1,5 @@
 name=NetWizard
-version=1.0.8
+version=1.0.9
 author=Ayush Sharma
 category=Communication
 maintainer=Ayush Sharma <[email protected]>

src/NetWizard.cpp

@@ -97,7 +97,7 @@ void NetWizard::autoConnect(const char* ssid, const char* password) {
     unsigned long startMillis = millis();
     unsigned long lastConnectMillis = startMillis;
 
-    while ((unsigned long)(millis() - startMillis) < NETWIZARD_CONNECT_TIMEOUT) {
+    while ((unsigned long)(millis() - startMillis) < _nw.sta.timeout) {
       yield();
       this->loop();
 
@@ -351,8 +351,8 @@ void NetWizard::loop() {
     }
   }
 
-  // If exit flag is set and more than 30 seconds have passed, stop portal
-  if (_nw.portal.exit.flag && ((unsigned long)(millis() - _nw.portal.exit.millis) > 30000)) {
+  // If exit flag is set and more than NETWIZARD_EXIT_TIMEOUT milliseconds have passed, stop portal
+  if (_nw.portal.exit.flag && ((unsigned long)(millis() - _nw.portal.exit.millis) > NETWIZARD_EXIT_TIMEOUT)) {
     _stopPortal();
     _nw.portal.exit.flag = false;
     _nw.portal.exit.millis = 0;
@@ -789,7 +789,7 @@ void NetWizard::_startHTTP() {
       }
     }).setFilter(this->_onAPFilter);
 
-    _save_handler = &_server->on("/netwizard/save", HTTP_POST, [&](AsyncWebServerRequest *request){
+    _save_handler = new AsyncCallbackJsonWebHandler("/netwizard/save", [&](AsyncWebServerRequest *request, JsonVariant &json) {
       if (_nw.portal.auth.enabled && !request->authenticate(_nw.portal.auth.username.c_str(), _nw.portal.auth.password.c_str())) {
         return request->requestAuthentication();
       }
@@ -798,21 +798,6 @@ void NetWizard::_startHTTP() {
         return request->send(503, "text/plain", "Busy");
       }
 
-      // check if JSON object is available
-      if (request->hasArg("plain") == false) {
-        NETWIZARD_DEBUG_MSG("Invalid request data\n");
-        return request->send(400, "text/plain", "Request body not found");
-      }
-      
-      #if ARDUINOJSON_VERSION_MAJOR == 7
-        JsonDocument json;
-      #else
-        DynamicJsonDocument json(NETWIZARD_CONFIG_JSON_SIZE);
-      #endif
-
-      // parse JSON object
-      deserializeJson(json, request->arg("plain"));
-
       // check if JSON object is valid
       if (!json.is<JsonObject>() || json.size() == 0) {
         NETWIZARD_DEBUG_MSG("Invalid json\n");
@@ -841,7 +826,10 @@ void NetWizard::_startHTTP() {
       }
 
       return request->send(200, "text/plain", "OK");
-    }).setFilter(this->_onAPFilter);
+    });
+
+    _save_handler->setFilter(this->_onAPFilter);
+    _server->addHandler(_save_handler);
 
     _clear_handler = &_server->on("/netwizard/clear", HTTP_POST, [&](AsyncWebServerRequest *request){
       if (_nw.portal.auth.enabled && !request->authenticate(_nw.portal.auth.username.c_str(), _nw.portal.auth.password.c_str())) {
@@ -856,7 +844,7 @@ void NetWizard::_startHTTP() {
       }
     }).setFilter(this->_onAPFilter);
 
-    _exit_handler = &_server->on("/netwizard/exit", HTTP_GET, [&](AsyncWebServerRequest *request){
+    _exit_handler = &_server->on("/netwizard/exit", HTTP_POST, [&](AsyncWebServerRequest *request){
       if(_nw.portal.auth.enabled && !request->authenticate(_nw.portal.auth.username.c_str(), _nw.portal.auth.password.c_str())){
         return request->requestAuthentication();
       }
@@ -866,14 +854,16 @@ void NetWizard::_startHTTP() {
       }
 
       if (!_nw.portal.exit.flag) {
-        _nw.portal.exit.flag = true;
         _nw.portal.exit.millis = millis();
+        _nw.portal.exit.flag = true;
       }
       return request->send(200, "text/plain", "OK");
     }).setFilter(this->_onAPFilter);
 
     _server->onNotFound([](AsyncWebServerRequest *request){
-      return request->redirect("/");
+      AsyncWebServerResponse *response = request->beginResponse(302, "text/plain", "");
+      response->addHeader("Location", String("http://") + request->client()->localIP().toString());
+      request->send(response);
     });
 
   #else

src/NetWizard.h

@@ -43,6 +43,7 @@ Upgrade to NetWizard Pro: https://netwizard.pro
   #include "ESP8266WiFi.h"
   #if NETWIZARD_USE_ASYNC_WEBSERVER == 1
     #include "ESPAsyncTCP.h"
+    #include "AsyncJson.h"
     #include "ESPAsyncWebServer.h"
     #define NETWIZARD_WEBSERVER AsyncWebServer
     #define NETWIZARD_REQ_HANDLER AsyncWebHandler
@@ -56,6 +57,7 @@ Upgrade to NetWizard Pro: https://netwizard.pro
   #include "WiFi.h"
   #if NETWIZARD_USE_ASYNC_WEBSERVER == 1
     #include "AsyncTCP.h"
+    #include "AsyncJson.h"
     #include "ESPAsyncWebServer.h"
     #define NETWIZARD_WEBSERVER AsyncWebServer
     #define NETWIZARD_REQ_HANDLER AsyncWebHandler
@@ -69,6 +71,7 @@ Upgrade to NetWizard Pro: https://netwizard.pro
   #include "WiFi.h"
   #if NETWIZARD_USE_ASYNC_WEBSERVER == 1
     #include "AsyncTCP_RP2040W.h"
+    #include "AsyncJson.h"
     #include "ESPAsyncWebServer.h"
     #define NETWIZARD_WEBSERVER AsyncWebServer
     #define NETWIZARD_REQ_HANDLER AsyncWebHandler