+feat: expire date to certs.h

+fix: statistics bar title

Author: mlauke

fetch_certs.sh

@@ -0,0 +1,53 @@
+#!/bin/bash
+# Fetch root CA certs for SmartSwitch TLS validation.
+# Run this to renew certs.h when root CAs change.
+# Usage: ./fetch_certs.sh  (from workspace root)
+
+set -e
+
+OUT="smartswitch.espxx/include/certs.h"
+
+get_root_ca() {
+  local host=$1
+  local port=${2:-443}
+  openssl s_client -connect "$host:$port" -showcerts </dev/null 2>/dev/null \
+    | awk '/-----BEGIN CERTIFICATE-----/{cert=""} {cert=cert $0 "\n"} /-----END CERTIFICATE-----/{last=cert} END{printf "%s", last}'
+}
+
+echo "Fetching root CA for api.github.com ..."
+GITHUB_CA=$(get_root_ca api.github.com)
+
+echo "Fetching root CA for api.forecast.solar ..."
+FORECAST_CA=$(get_root_ca api.forecast.solar)
+
+GITHUB_CN=$(echo "$GITHUB_CA"   | openssl x509 -noout -subject 2>/dev/null | sed 's/.*CN\s*=\s*//' | sed 's/,.*//')
+GITHUB_EXP=$(echo "$GITHUB_CA"  | openssl x509 -noout -enddate 2>/dev/null | sed 's/notAfter=//')
+
+FORECAST_CN=$(echo "$FORECAST_CA"  | openssl x509 -noout -subject 2>/dev/null | sed 's/.*CN\s*=\s*//' | sed 's/,.*//')
+FORECAST_EXP=$(echo "$FORECAST_CA" | openssl x509 -noout -enddate 2>/dev/null | sed 's/notAfter=//')
+
+{
+  cat << 'HEADER'
+#pragma once
+// Auto-generated by fetch_certs.sh — do not edit manually.
+// Re-run fetch_certs.sh to renew when root CAs expire.
+#ifdef ESP32
+static const char ROOT_CA_BUNDLE[] PROGMEM =
+HEADER
+
+  printf '  // %s — expires %s\n' "$GITHUB_CN" "$GITHUB_EXP"
+  echo "$GITHUB_CA" | sed 's/\(.*\)/  "\1\\n"/'
+
+  printf '  // %s — expires %s\n' "$FORECAST_CN" "$FORECAST_EXP"
+  echo "$FORECAST_CA" | sed 's/\(.*\)/  "\1\\n"/'
+
+  cat << 'FOOTER'
+  ;
+#endif // ESP32
+FOOTER
+} > "$OUT"
+
+echo ""
+echo "${OUT} updated."
+echo "  api.github.com:    CN=${GITHUB_CN}, expires ${GITHUB_EXP}"
+echo "  api.forecast.solar: CN=${FORECAST_CN}, expires ${FORECAST_EXP}"

nginx/app.js

@@ -112,7 +112,7 @@ function renderLog(el, ls, nm) {
   });
 }
 
-function batteryInfo(){
+function batteryInfo() {
   const overlay = document.getElementById("batInfoOverlay");
   overlay.classList.add("active");
 }
@@ -145,8 +145,8 @@ function renderConsStats(dayIdx) {
   const yAxis = document.getElementById("statsYAxis");
   if (yAxis) {
     yAxis.innerHTML = "";
-    [maxVal + " Wh", Math.round(maxVal / 2) + " Wh", "0 Wh"].forEach(v => {
-      const s = document.createElement("span"); s.textContent = v; yAxis.appendChild(s);
+    [maxVal, Math.round(maxVal / 2), 0].forEach(v => {
+      const s = document.createElement("span"); s.textContent = (v + " Wh"); yAxis.appendChild(s);
     });
   }
   const bars = document.getElementById("statsBars");
@@ -157,7 +157,7 @@ function renderConsStats(dayIdx) {
     const bar = document.createElement("div");
     bar.className = "bar" + (h === new Date().getHours() && dayIdx === new Date().getDay() ? " bar-now" : "");
     bar.style.height = Math.round(v / maxVal * 100) + "%";
-    bar.title = h + ":00 — " + v + " W";
+    bar.title = h + ":00 — " + v + " Wh";
     col.appendChild(bar);
     bars.appendChild(col);
   });
@@ -172,7 +172,7 @@ function renderConsStats(dayIdx) {
   }
 }
 
-function sendUpdate(payload){
+function sendUpdate(payload) {
   fetch("/api/update", {
     method: "POST",
     headers: {
@@ -182,18 +182,18 @@ function sendUpdate(payload){
   });
 }
 
-function toggleLoadPowerFields(isLoading){
+function toggleLoadPowerFields(isLoading) {
   document.getElementById("sn_loadpower").disabled = isLoading;
   const btn = document.getElementById("calibrateBtn");
   btn.disabled = isLoading;
-  if(isLoading){
+  if (isLoading) {
     btn.classList.add("loading");
-  }else{
+  } else {
     btn.classList.remove("loading");
   }
 }
 
-function triggerCalibrate(){
+function triggerCalibrate() {
   toggleLoadPowerFields(true);
   sendUpdate("calibrate");
 }

smartswitch.espxx/include/certs.h

@@ -1,8 +1,9 @@
 #pragma once
 // Auto-generated by fetch_certs.sh — do not edit manually.
-// Re-run fetch_certs.sh to renew when root CAs change.
+// Re-run fetch_certs.sh to renew when root CAs expire.
 #ifdef ESP32
 static const char ROOT_CA_BUNDLE[] PROGMEM =
+  // Sectigo Public Server Authentication Root E46 — expires Jan 18 23:59:59 2038 GMT
   "-----BEGIN CERTIFICATE-----\n"
   "MIIDRjCCAsugAwIBAgIQGp6v7G3o4ZtcGTFBto2Q3TAKBggqhkjOPQQDAzCBiDEL\n"
   "MAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNl\n"
@@ -23,6 +24,7 @@ static const char ROOT_CA_BUNDLE[] PROGMEM =
   "PKpqGGuZ61JZryjFsp+DFpEclCVy4noCMQCwvZDXD/m2Ko1HA5Bkmz7YQOFAiNDD\n"
   "49IWa2wdT7R3DtODaSXH/BiXv8fwB9su4tU=\n"
   "-----END CERTIFICATE-----\n"
+  // R12 — expires Mar 12 23:59:59 2027 GMT
   "-----BEGIN CERTIFICATE-----\n"
   "MIIFBjCCAu6gAwIBAgIRAMISMktwqbSRcdxA9+KFJjwwDQYJKoZIhvcNAQELBQAw\n"
   "TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh\n"