Merge remote-tracking branch 'upstream/master'

lib/config/GWConfig.cpp

@@ -66,13 +66,10 @@ bool GwConfigHandler::loadConfig(){
 bool GwConfigHandler::saveConfig(){
     prefs.begin(PREF_NAME,false);
     for (int i=0;i<getNumConfig();i++){
-        String val=configs[i]->asString();
+        if (configs[i]->hasChangedValue){
-        auto it=changedValues.find(configs[i]->getName());
+            LOG_DEBUG(GwLog::LOG,"saving %s=%s",configs[i]->getName().c_str(),configs[i]->changedValue.c_str());
-        if (it != changedValues.end()){
+            prefs.putString(configs[i]->getName().c_str(),configs[i]->changedValue);
-            val=it->second;
         }
-        LOG_DEBUG(GwLog::LOG,"saving %s=%s",configs[i]->getName().c_str(),val.c_str());
-        prefs.putString(configs[i]->getName().c_str(),val);
     }
     prefs.end();
     LOG_DEBUG(GwLog::LOG,"saved config");
@@ -87,14 +84,14 @@ bool GwConfigHandler::updateValue(String name, String value){
     }
     else{
         LOG_DEBUG(GwLog::LOG,"update config %s=>%s",name.c_str(),i->isSecret()?"***":value.c_str());
-        changedValues[name]=value;
+        i->updateValue(value);
     }
     return true;
 }
 bool GwConfigHandler::reset(bool save){
     LOG_DEBUG(GwLog::LOG,"reset config");
     for (int i=0;i<getNumConfig();i++){
-        changedValues[configs[i]->getName()]=configs[i]->getDefault();
+        configs[i]->updateValue(configs[i]->getDefault());
     }
     if (!save) return true;
     return saveConfig();

lib/config/GWConfig.h

@@ -13,7 +13,6 @@ class GwConfigHandler: public GwConfigDefinitions{
         Preferences prefs;
         GwLog *logger;
         typedef std::map<String,String> StringMap;
-        StringMap changedValues;
         boolean allowChanges=true;
     public:
         public:

lib/config/GwConfigItem.h

@@ -7,11 +7,23 @@ class GwConfigHandler;
 class GwConfigInterface{
     private:
         String name;
-        String initialValue;
+        const char * initialValue;
         String value;
         bool secret=false;
+        String changedValue;
+        bool hasChangedValue=false;
+        void updateValue(String value)
+        {
+            hasChangedValue = false;
+            if (value != this->value)
+            {
+                changedValue = value;
+                hasChangedValue = true;
+            }
+        }
+
     public:
-        GwConfigInterface(const String &name, const String initialValue, bool secret=false){
+        GwConfigInterface(const String &name, const char * initialValue, bool secret=false){
             this->name=name;
             this->initialValue=initialValue;
             this->value=initialValue;

lib/queue/GwMessage.h

@@ -56,6 +56,7 @@ class GwRequestMessage : public GwMessage{
     String getContentType(){
       return contentType;
     }
+    virtual int getTimeout(){return 500;}
 
 };
 

lib/webserver/GwWebServer.cpp

@@ -68,7 +68,7 @@ GwWebServer::~GwWebServer(){
 }
 void GwWebServer::handleAsyncWebRequest(AsyncWebServerRequest *request, GwRequestMessage *msg)
 {
-  GwRequestQueue::MessageSendStatus st=queue->sendAndWait(msg,500);      
+  GwRequestQueue::MessageSendStatus st=queue->sendAndWait(msg,msg->getTimeout());      
   if (st == GwRequestQueue::MSG_ERR)
   {
     msg->unref(); //our

src/main.cpp

@@ -458,43 +458,58 @@ protected:
 class SetConfigRequest : public GwRequestMessage
 {
 public:
-  SetConfigRequest() : GwRequestMessage(F("application/json"),F("setConfig")){};
+  //we rely on the message living not longer then the request
-  StringMap args;
+  AsyncWebServerRequest *request;
-
+  SetConfigRequest(AsyncWebServerRequest *rq) : GwRequestMessage(F("application/json"),F("setConfig")),
+    request(rq)
+  {};
+  virtual int getTimeout(){return 4000;}
 protected:
   virtual void processRequest()
   {
     bool ok = true;
+    const char * hashArg="_hash";
     String error;
     String hash;
-    auto it=args.find("_hash");
+    if (request->hasArg(hashArg)){
-    if (it != args.end()){
+      hash=request->arg(hashArg);
-      hash=it->second;
     }
     if (! checkPass(hash)){
       result=JSON_INVALID_PASS;
       return;
     }
-    for (StringMap::iterator it = args.begin(); it != args.end(); it++)
+    logger.logDebug(GwLog::DEBUG,"Heap free=%ld, minFree=%ld",
-    {
+          (long)xPortGetFreeHeapSize(),
-      if (it->first.indexOf("_")>= 0) continue;
+          (long)xPortGetMinimumEverFreeHeapSize()
-      if (it->first == GwConfigDefinitions::apPassword && fixedApPass) continue;
+      );
-      bool rt = config.updateValue(it->first, it->second);
+    for (int i = 0; i < request->args(); i++){
+      String name=request->argName(i);
+      String value=request->arg(i);                                  
+      if (name.indexOf("_")>= 0) continue;
+      if (name == GwConfigDefinitions::apPassword && fixedApPass) continue;
+      bool rt = config.updateValue(name, value);
       if (!rt)
       {
-        logger.logDebug(GwLog::ERROR,"ERR: unable to update %s to %s", it->first.c_str(), it->second.c_str());
+        logger.logDebug(GwLog::ERROR,"ERR: unable to update %s to %s", name.c_str(), value.c_str());
         ok = false;
-        error += it->first;
+        error += name;
         error += "=";
-        error += it->second;
+        error += value;
         error += ",";
       }
+      logger.flush();
     }
     if (ok)
     {
       result = JSON_OK;
       logger.logDebug(GwLog::ERROR,"update config and restart");
       config.saveConfig();
+      logger.flush();
+      logger.logDebug(GwLog::DEBUG,"Heap free=%ld, minFree=%ld",
+          (long)xPortGetFreeHeapSize(),
+          (long)xPortGetMinimumEverFreeHeapSize()
+      );
+      logger.flush();
       delayedRestart();
     }
     else
@@ -512,6 +527,7 @@ public:
   ResetConfigRequest(String hash) : GwRequestMessage(F("application/json"),F("resetConfig")){
     this->hash=hash;
   };
+  virtual int getTimeout(){return 4000;}
 
 protected:
   virtual void processRequest()
@@ -632,13 +648,7 @@ void setup() {
   webserver.registerMainHandler("/api/setConfig",
                               [](AsyncWebServerRequest *request)->GwRequestMessage *
                               {
-                                StringMap args;
+                                SetConfigRequest *msg = new SetConfigRequest(request);
-                                for (int i = 0; i < request->args(); i++)
-                                {
-                                  args[request->argName(i)] = request->arg(i);
-                                }
-                                SetConfigRequest *msg = new SetConfigRequest();
-                                msg->args = args;
                                 return msg;
                               });
   webserver.registerMainHandler("/api/resetConfig", [](AsyncWebServerRequest *request)->GwRequestMessage *