Merge pull request #1544 from proddy/dev

small changes, but many
emsesp · Jan 6, 2024 · 2b03d01 · 2b03d01
2 parents efa4f80 + 2366f6b
commit 2b03d01
Show file tree

Hide file tree

Showing 108 changed files with 268 additions and 354 deletions.
diff --git a/interface/progmem-generator.js b/interface/progmem-generator.js
@@ -12,6 +12,7 @@ var totalSize = 0;
 
 const generateWWWClass = () =>
   `typedef std::function<void(const String& uri, const String& contentType, const uint8_t * content, size_t len)> RouteRegistrationHandler;
+// Total size is ${totalSize} bytes
 
 class WWWData {
 ${indent}public:

diff --git a/interface/src/i18n/en/index.ts b/interface/src/i18n/en/index.ts
@@ -63,7 +63,7 @@ const en: Translation = {
   FREQ: 'Frequency',
   DUTY_CYCLE: 'Duty Cycle',
   UNIT: 'UoM',
-  STARTVALUE: 'Start value',
+  STARTVALUE: 'Start Value',
   WARN_GPIO: 'Warning: be careful when assigning a GPIO!',
   EDIT: 'Edit',
   SENSOR: 'Sensor',

diff --git a/interface/src/project/DashboardDevicesDialog.tsx b/interface/src/project/DashboardDevicesDialog.tsx
@@ -103,7 +103,7 @@ const DashboardDevicesDialog = ({
   return (
     <Dialog sx={dialogStyle} open={open} onClose={close}>
       <DialogTitle>
-        {selectedItem.v === '' && selectedItem.c ? LL.RUN_COMMAND() : writeable ? LL.CHANGE_VALUE() : LL.VALUE(0)}
+        {selectedItem.v === '' && selectedItem.c ? LL.RUN_COMMAND() : writeable ? LL.CHANGE_VALUE() : LL.VALUE(1)}
       </DialogTitle>
       <DialogContent dividers>
         <Box color="warning.main" p={0} pl={0} pr={0} mt={0} mb={2}>

diff --git a/interface/src/project/DashboardSensorsAnalogDialog.tsx b/interface/src/project/DashboardSensorsAnalogDialog.tsx
@@ -182,7 +182,7 @@ const DashboardSensorsAnalogDialog = ({
             <Grid item xs={4}>
               <TextField
                 name="o"
-                label={LL.VALUE(0)}
+                label={LL.VALUE(1)}
                 value={numberValue(editItem.o)}
                 fullWidth
                 type="number"
@@ -197,7 +197,7 @@ const DashboardSensorsAnalogDialog = ({
               <Grid item xs={4}>
                 <TextField
                   name="o"
-                  label={LL.VALUE(0)}
+                  label={LL.VALUE(1)}
                   value={numberValue(editItem.o)}
                   fullWidth
                   select

diff --git a/interface/src/project/SettingsSchedulerDialog.tsx b/interface/src/project/SettingsSchedulerDialog.tsx
@@ -210,7 +210,7 @@ const SettingsSchedulerDialog = ({
         />
         <TextField
           name="value"
-          label={LL.VALUE(0)}
+          label={LL.VALUE(1)}
           multiline
           margin="normal"
           fullWidth

diff --git a/interface/src/project/types.ts b/interface/src/project/types.ts
@@ -223,12 +223,12 @@ export enum AnalogType {
 
 export const AnalogTypeNames = [
   '(disabled)',
-  'Digital in',
+  'Digital In',
   'Counter',
   'ADC',
   'Timer',
   'Rate',
-  'Digital out',
+  'Digital Out',
   'PWM 0',
   'PWM 1',
   'PWM 2'

diff --git a/interface/src/utils/useWs.ts b/interface/src/utils/useWs.ts
diff --git a/lib/framework/APSettingsService.h b/lib/framework/APSettingsService.h
@@ -75,7 +75,7 @@ class APSettings {
                && subnetMask == settings.subnetMask;
     }
 
-    static void read(APSettings & settings, JsonObject & root) {
+    static void read(APSettings & settings, JsonObject root) {
         root["provision_mode"] = settings.provisionMode;
         root["ssid"]           = settings.ssid;
         root["password"]       = settings.password;
@@ -87,7 +87,7 @@ class APSettings {
         root["subnet_mask"]    = settings.subnetMask.toString();
     }
 
-    static StateUpdateResult update(JsonObject & root, APSettings & settings) {
+    static StateUpdateResult update(JsonObject root, APSettings & settings) {
         APSettings newSettings    = {};
         newSettings.provisionMode = root["provision_mode"] | FACTORY_AP_PROVISION_MODE;
         switch (settings.provisionMode) {

diff --git a/lib/framework/ArduinoJsonJWT.cpp b/lib/framework/ArduinoJsonJWT.cpp
@@ -34,7 +34,7 @@ String ArduinoJsonJWT::sign(String & payload) {
     return encode((char *)hmacResult, 32);
 }
 
-String ArduinoJsonJWT::buildJWT(JsonObject & payload) {
+String ArduinoJsonJWT::buildJWT(JsonObject payload) {
     // serialize, then encode payload
     String jwt;
     serializeJson(payload, jwt);

diff --git a/lib/framework/ArduinoJsonJWT.h b/lib/framework/ArduinoJsonJWT.h
@@ -25,7 +25,7 @@ class ArduinoJsonJWT {
     void   setSecret(String secret);
     String getSecret();
 
-    String buildJWT(JsonObject & payload);
+    String buildJWT(JsonObject payload);
     void   parseJWT(String jwt, JsonDocument & jsonDocument);
 };
 

diff --git a/lib/framework/ESP8266React.cpp b/lib/framework/ESP8266React.cpp
@@ -25,6 +25,7 @@ ESP8266React::ESP8266React(AsyncWebServer * server, FS * fs)
         ArRequestHandlerFunction requestHandler = [contentType, content, len](AsyncWebServerRequest * request) {
             AsyncWebServerResponse * response = request->beginResponse_P(200, contentType, content, len);
             response->addHeader("Content-Encoding", "gzip");
+            response->addHeader("Cache-Control", "public, immutable, max-age=31536000");
             // response->addHeader("Content-Encoding", "br"); // only works over HTTPS
             request->send(response);
         };
@@ -53,6 +54,7 @@ void ESP8266React::begin() {
             DefaultHeaders::Instance().addHeader("Access-Control-Allow-Headers", "Accept, Content-Type, Authorization");
             DefaultHeaders::Instance().addHeader("Access-Control-Allow-Credentials", "true");
         }
+        DefaultHeaders::Instance().addHeader("Server", networkSettings.hostname); // TODO use hostname
     });
     _apSettingsService.begin();
     _ntpSettingsService.begin();

diff --git a/lib/framework/JsonUtils.h b/lib/framework/JsonUtils.h
@@ -8,19 +8,19 @@
 
 class JsonUtils {
   public:
-    static void readIP(JsonObject & root, const String & key, IPAddress & ip, const String & def) {
+    static void readIP(JsonObject root, const String & key, IPAddress & ip, const String & def) {
         IPAddress defaultIp = {};
         if (!defaultIp.fromString(def)) {
             defaultIp = INADDR_NONE;
         }
         readIP(root, key, ip, defaultIp);
     }
-    static void readIP(JsonObject & root, const String & key, IPAddress & ip, const IPAddress & defaultIp = INADDR_NONE) {
+    static void readIP(JsonObject root, const String & key, IPAddress & ip, const IPAddress & defaultIp = INADDR_NONE) {
         if (!root[key].is<String>() || !ip.fromString(root[key].as<String>())) {
             ip = defaultIp;
         }
     }
-    static void writeIP(JsonObject & root, const String & key, const IPAddress & ip) {
+    static void writeIP(JsonObject root, const String & key, const IPAddress & ip) {
         if (IPUtils::isSet(ip)) {
             root[key] = ip.toString();
         }

diff --git a/lib/framework/MqttSettingsService.cpp b/lib/framework/MqttSettingsService.cpp
@@ -216,7 +216,7 @@ bool MqttSettingsService::configureMqtt() {
     return false;
 }
 
-void MqttSettings::read(MqttSettings & settings, JsonObject & root) {
+void MqttSettings::read(MqttSettings & settings, JsonObject root) {
 #if CONFIG_IDF_TARGET_ESP32S3
 #ifndef TASMOTA_SDK
     root["enableTLS"] = settings.enableTLS;
@@ -252,7 +252,7 @@ void MqttSettings::read(MqttSettings & settings, JsonObject & root) {
     root["send_response"]           = settings.send_response;
 }
 
-StateUpdateResult MqttSettings::update(JsonObject & root, MqttSettings & settings) {
+StateUpdateResult MqttSettings::update(JsonObject root, MqttSettings & settings) {
     MqttSettings newSettings = {};
     bool         changed     = false;
 

diff --git a/lib/framework/MqttSettingsService.h b/lib/framework/MqttSettingsService.h
@@ -97,8 +97,8 @@ class MqttSettings {
     bool     send_response;
     uint8_t  entity_format;
 
-    static void              read(MqttSettings & settings, JsonObject & root);
-    static StateUpdateResult update(JsonObject & root, MqttSettings & settings);
+    static void              read(MqttSettings & settings, JsonObject root);
+    static StateUpdateResult update(JsonObject root, MqttSettings & settings);
 };
 
 class MqttSettingsService : public StatefulService<MqttSettings> {

diff --git a/lib/framework/NTPSettingsService.h b/lib/framework/NTPSettingsService.h
@@ -36,14 +36,14 @@ class NTPSettings {
     String tzFormat;
     String server;
 
-    static void read(NTPSettings & settings, JsonObject & root) {
+    static void read(NTPSettings & settings, JsonObject root) {
         root["enabled"]   = settings.enabled;
         root["server"]    = settings.server;
         root["tz_label"]  = settings.tzLabel;
         root["tz_format"] = settings.tzFormat;
     }
 
-    static StateUpdateResult update(JsonObject & root, NTPSettings & settings) {
+    static StateUpdateResult update(JsonObject root, NTPSettings & settings) {
         settings.enabled  = root["enabled"] | FACTORY_NTP_ENABLED;
         settings.server   = root["server"] | FACTORY_NTP_SERVER;
         settings.tzLabel  = root["tz_label"] | FACTORY_NTP_TIME_ZONE_LABEL;

diff --git a/lib/framework/NetworkSettingsService.h b/lib/framework/NetworkSettingsService.h
@@ -50,7 +50,7 @@ class NetworkSettings {
     IPAddress dnsIP1;
     IPAddress dnsIP2;
 
-    static void read(NetworkSettings & settings, JsonObject & root) {
+    static void read(NetworkSettings & settings, JsonObject root) {
         // connection settings
         root["ssid"]             = settings.ssid;
         root["bssid"]            = settings.bssid;
@@ -73,7 +73,7 @@ class NetworkSettings {
         JsonUtils::writeIP(root, "dns_ip_2", settings.dnsIP2);
     }
 
-    static StateUpdateResult update(JsonObject & root, NetworkSettings & settings) {
+    static StateUpdateResult update(JsonObject root, NetworkSettings & settings) {
         auto enableCORS         = settings.enableCORS;
         auto CORSOrigin         = settings.CORSOrigin;
         auto ssid               = settings.ssid;

diff --git a/lib/framework/OTASettingsService.h b/lib/framework/OTASettingsService.h
@@ -28,13 +28,13 @@ class OTASettings {
     int    port;
     String password;
 
-    static void read(OTASettings & settings, JsonObject & root) {
+    static void read(OTASettings & settings, JsonObject root) {
         root["enabled"]  = settings.enabled;
         root["port"]     = settings.port;
         root["password"] = settings.password;
     }
 
-    static StateUpdateResult update(JsonObject & root, OTASettings & settings) {
+    static StateUpdateResult update(JsonObject root, OTASettings & settings) {
         settings.enabled  = root["enabled"] | FACTORY_OTA_ENABLED;
         settings.port     = root["port"] | FACTORY_OTA_PORT;
         settings.password = root["password"] | FACTORY_OTA_PASSWORD;

diff --git a/lib/framework/SecuritySettingsService.cpp b/lib/framework/SecuritySettingsService.cpp
@@ -63,12 +63,12 @@ Authentication SecuritySettingsService::authenticate(const String & username, co
     return Authentication();
 }
 
-inline void populateJWTPayload(JsonObject & payload, User * user) {
+inline void populateJWTPayload(JsonObject payload, User * user) {
     payload["username"] = user->username;
     payload["admin"]    = user->admin;
 }
 
-boolean SecuritySettingsService::validatePayload(JsonObject & parsedPayload, User * user) {
+boolean SecuritySettingsService::validatePayload(JsonObject parsedPayload, User * user) {
     JsonDocument jsonDocument;
     JsonObject   payload = jsonDocument.to<JsonObject>();
     populateJWTPayload(payload, user);

diff --git a/lib/framework/SecuritySettingsService.h b/lib/framework/SecuritySettingsService.h
@@ -35,7 +35,7 @@ class SecuritySettings {
     String          jwtSecret;
     std::list<User> users;
 
-    static void read(SecuritySettings & settings, JsonObject & root) {
+    static void read(SecuritySettings & settings, JsonObject root) {
         // secret
         root["jwt_secret"] = settings.jwtSecret;
 
@@ -49,7 +49,7 @@ class SecuritySettings {
         }
     }
 
-    static StateUpdateResult update(JsonObject & root, SecuritySettings & settings) {
+    static StateUpdateResult update(JsonObject root, SecuritySettings & settings) {
         // secret
         settings.jwtSecret = root["jwt_secret"] | FACTORY_JWT_SECRET;
 
@@ -98,7 +98,7 @@ class SecuritySettingsService : public StatefulService<SecuritySettings>, public
     /*
    * Verify the payload is correct
    */
-    boolean validatePayload(JsonObject & parsedPayload, User * user);
+    boolean validatePayload(JsonObject parsedPayload, User * user);
 };
 
 #else

diff --git a/lib/framework/StatefulService.h b/lib/framework/StatefulService.h
@@ -17,10 +17,10 @@ enum class StateUpdateResult {
 };
 
 template <typename T>
-using JsonStateUpdater = std::function<StateUpdateResult(JsonObject & root, T & settings)>;
+using JsonStateUpdater = std::function<StateUpdateResult(JsonObject root, T & settings)>;
 
 template <typename T>
-using JsonStateReader = std::function<void(T & settings, JsonObject & root)>;
+using JsonStateReader = std::function<void(T & settings, JsonObject root)>;
 
 typedef size_t                                       update_handler_id_t;
 typedef std::function<void(const String & originId)> StateUpdateCallback;
@@ -81,7 +81,7 @@ class StatefulService {
         return result;
     }
 
-    StateUpdateResult update(JsonObject & jsonObject, JsonStateUpdater<T> stateUpdater, const String & originId) {
+    StateUpdateResult update(JsonObject jsonObject, JsonStateUpdater<T> stateUpdater, const String & originId) {
         beginTransaction();
         StateUpdateResult result = stateUpdater(jsonObject, _state);
         endTransaction();
@@ -91,7 +91,7 @@ class StatefulService {
         return result;
     }
 
-    StateUpdateResult updateWithoutPropagation(JsonObject & jsonObject, JsonStateUpdater<T> stateUpdater) {
+    StateUpdateResult updateWithoutPropagation(JsonObject jsonObject, JsonStateUpdater<T> stateUpdater) {
         beginTransaction();
         StateUpdateResult result = stateUpdater(jsonObject, _state);
         endTransaction();
@@ -104,7 +104,7 @@ class StatefulService {
         endTransaction();
     }
 
-    void read(JsonObject & jsonObject, JsonStateReader<T> stateReader) {
+    void read(JsonObject jsonObject, JsonStateReader<T> stateReader) {
         beginTransaction();
         stateReader(_state, jsonObject);
         endTransaction();