Fixes for new usermod system

Author: troyhacks

wled00/data/settings-core.js

@@ -289,13 +289,14 @@ const umCfg = {
 
     // Auto-discover form and its fields
     const form = document.querySelector('form');
-    if (!fieldMapOrOptions || typeof fieldMapOrOptions !== 'object' || Object.keys(fieldMapOrOptions).length === 0) {
-      fieldMapOrOptions = {};
+    let fieldMap = fieldMapOrOptions;
+    if (!fieldMap || typeof fieldMap !== 'object' || Object.keys(fieldMap).length === 0) {
+      fieldMap = {};
       if (form) {
         const els = form.querySelectorAll('input, select, textarea');
         els.forEach(el => {
           const name = el.name || el.id;
-          if (name) fieldMapOrOptions[name] = `[name="${name}"]`;
+          if (name) fieldMap[name] = `[name="${name}"]`;
         });
       }
     }

wled00/wled_server.cpp

@@ -225,6 +225,15 @@ void initServer()
     serveSettings(request);
   });
 
+  // Static JS served before the wildcard to avoid /settings* matching /settings-core.js
+  server.on("/settings-core.js", HTTP_GET, [](AsyncWebServerRequest* request) {
+    if (handleIfNoneMatchCacheHeader(request)) return;
+    AsyncWebServerResponse* response = request->beginResponse_P(200, "application/javascript", settingscoreJs, settingscoreJs_length);
+    response->addHeader(FPSTR(s_content_enc), "gzip");
+    setStaticContentCacheHeaders(response);
+    request->send(response);
+  });
+
   // Usermod settings pages (auto-discovered) - catch /settings_xxx URLs
   // Use wildcard /settings* to match /settings_xxx
   server.on("/settings*", HTTP_GET, [](AsyncWebServerRequest *request){