node-red-contrib-senec-cloud-v2 0.2.0 → 0.2.2

package/dist/lib/weather-client.js

@@ -0,0 +1,234 @@
+"use strict";
+/**
+ * Weather Client
+ *
+ * Fetches current weather + a short forecast from the free Open-Meteo API
+ * (https://open-meteo.com) which requires no API key, and maps the raw
+ * response onto the normalized {@link WeatherData} structure consumed by
+ * the dashboard renderer.
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WeatherClient = void 0;
+const axios_1 = __importDefault(require("axios"));
+const WEATHER_CODES = {
+    0: { icon: '☀️', de: 'Klar', en: 'Clear sky' },
+    1: { icon: '🌤️', de: 'Überwiegend klar', en: 'Mainly clear' },
+    2: { icon: '⛅', de: 'Teilweise bewölkt', en: 'Partly cloudy' },
+    3: { icon: '☁️', de: 'Bewölkt', en: 'Overcast' },
+    45: { icon: '🌫️', de: 'Nebel', en: 'Fog' },
+    48: { icon: '🌫️', de: 'Reifnebel', en: 'Depositing rime fog' },
+    51: { icon: '🌦️', de: 'Leichter Nieselregen', en: 'Light drizzle' },
+    53: { icon: '🌦️', de: 'Nieselregen', en: 'Moderate drizzle' },
+    55: { icon: '🌧️', de: 'Starker Nieselregen', en: 'Dense drizzle' },
+    56: { icon: '🌧️', de: 'Gefrierender Nieselregen', en: 'Freezing drizzle' },
+    57: { icon: '🌧️', de: 'Gefrierender Nieselregen', en: 'Freezing drizzle' },
+    61: { icon: '🌧️', de: 'Leichter Regen', en: 'Slight rain' },
+    63: { icon: '🌧️', de: 'Regen', en: 'Moderate rain' },
+    65: { icon: '🌧️', de: 'Starker Regen', en: 'Heavy rain' },
+    66: { icon: '🌧️', de: 'Gefrierender Regen', en: 'Freezing rain' },
+    67: { icon: '🌧️', de: 'Gefrierender Regen', en: 'Freezing rain' },
+    71: { icon: '🌨️', de: 'Leichter Schneefall', en: 'Slight snow' },
+    73: { icon: '🌨️', de: 'Schneefall', en: 'Moderate snow' },
+    75: { icon: '❄️', de: 'Starker Schneefall', en: 'Heavy snow' },
+    77: { icon: '🌨️', de: 'Schneegriesel', en: 'Snow grains' },
+    80: { icon: '🌦️', de: 'Leichte Schauer', en: 'Slight showers' },
+    81: { icon: '🌧️', de: 'Schauer', en: 'Moderate showers' },
+    82: { icon: '⛈️', de: 'Starke Schauer', en: 'Violent showers' },
+    85: { icon: '🌨️', de: 'Schneeschauer', en: 'Slight snow showers' },
+    86: { icon: '❄️', de: 'Starke Schneeschauer', en: 'Heavy snow showers' },
+    95: { icon: '⛈️', de: 'Gewitter', en: 'Thunderstorm' },
+    96: { icon: '⛈️', de: 'Gewitter mit Hagel', en: 'Thunderstorm with hail' },
+    99: { icon: '⛈️', de: 'Gewitter mit Hagel', en: 'Thunderstorm with hail' },
+};
+const DEFAULT_CODE = { icon: '❓', de: 'Unbekannt', en: 'Unknown' };
+/** Weekday short labels per language. Index 0 = Sunday (JS getDay()). */
+const WEEKDAYS = {
+    de: ['So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'],
+    en: ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'],
+};
+/** 16-point compass labels per language. */
+const COMPASS = {
+    de: [
+        'N', 'NNO', 'NO', 'ONO', 'O', 'OSO', 'SO', 'SSO',
+        'S', 'SSW', 'SW', 'WSW', 'W', 'WNW', 'NW', 'NNW',
+    ],
+    en: [
+        'N', 'NNE', 'NE', 'ENE', 'E', 'ESE', 'SE', 'SSE',
+        'S', 'SSW', 'SW', 'WSW', 'W', 'WNW', 'NW', 'NNW',
+    ],
+};
+class WeatherClient {
+    /**
+     * Fetch current weather + a 5-day forecast for the given coordinates.
+     */
+    async getWeather(options) {
+        // Validate coordinates defensively. The request URL host is a fixed
+        // constant (no SSRF), but we still guard against non-finite / out-of
+        // -range values being serialized into the query string.
+        const lat = Number(options.latitude);
+        const lon = Number(options.longitude);
+        if (!isFinite(lat) || lat < -90 || lat > 90) {
+            throw new Error('Invalid latitude (expected -90..90)');
+        }
+        if (!isFinite(lon) || lon < -180 || lon > 180) {
+            throw new Error('Invalid longitude (expected -180..180)');
+        }
+        const language = (options.language || 'de').toLowerCase();
+        const timeout = options.timeout ?? 10000;
+        const retries = Math.max(0, options.retries ?? 2);
+        const retryDelay = Math.max(0, options.retryDelay ?? 500);
+        const url = 'https://api.open-meteo.com/v1/forecast';
+        const params = {
+            latitude: options.latitude,
+            longitude: options.longitude,
+            current: 'temperature_2m,relative_humidity_2m,weather_code,wind_speed_10m,wind_direction_10m',
+            daily: 'weather_code,temperature_2m_max,temperature_2m_min',
+            timezone: 'auto',
+            forecast_days: 5,
+            wind_speed_unit: 'kmh',
+        };
+        const response = await WeatherClient.requestWithRetry(url, params, timeout, retries, retryDelay);
+        const mapped = WeatherClient.mapResponse(response.data, language);
+        mapped.latitude = options.latitude;
+        mapped.longitude = options.longitude;
+        mapped.location =
+            options.location && options.location.length > 0
+                ? options.location
+                : WeatherClient.formatCoords(options.latitude, options.longitude);
+        return mapped;
+    }
+    /**
+     * A deterministic sample weather payload, used ONLY as a fallback when
+     * the Open-Meteo server cannot be reached.
+     */
+    static sample(options) {
+        const lat = options?.latitude ?? 52.52;
+        const lon = options?.longitude ?? 13.405;
+        return {
+            temperature: 18,
+            condition: (options?.language || 'de') === 'en' ? 'Partly cloudy' : 'Leicht bewölkt',
+            icon: '🌤️',
+            tempMax: 20,
+            tempMin: 11,
+            humidity: 45,
+            windSpeed: 15,
+            windDirection: 'WSW',
+            forecast: [
+                { day: 'Di', icon: '🌤️', temp: 20 },
+                { day: 'Mi', icon: '☁️', temp: 19 },
+                { day: 'Do', icon: '🌧️', temp: 17 },
+                { day: 'Fr', icon: '⛅', temp: 21 },
+                { day: 'Sa', icon: '☀️', temp: 24 },
+            ],
+            latitude: lat,
+            longitude: lon,
+            location: options?.location && options.location.length > 0
+                ? options.location
+                : WeatherClient.formatCoords(lat, lon),
+        };
+    }
+    /**
+     * Perform the Open-Meteo GET request, retrying on transient failures
+     * (HTTP 5xx such as 503, 429 rate limiting, timeouts and low-level
+     * network errors) using exponential backoff. Non-transient errors
+     * (e.g. HTTP 4xx other than 429) fail immediately.
+     */
+    static async requestWithRetry(url, params, timeout, retries, retryDelay) {
+        let lastError;
+        for (let attempt = 0; attempt <= retries; attempt++) {
+            try {
+                return await axios_1.default.get(url, { params, timeout });
+            }
+            catch (error) {
+                lastError = error;
+                if (attempt >= retries || !WeatherClient.isTransientError(error)) {
+                    break;
+                }
+                // Exponential backoff: retryDelay * 2^attempt.
+                const wait = retryDelay * Math.pow(2, attempt);
+                await WeatherClient.delay(wait);
+            }
+        }
+        throw lastError;
+    }
+    /**
+     * Classify an axios error as transient (worth retrying) or not.
+     * Transient: no HTTP response (network/timeout), HTTP 429, or any 5xx.
+     */
+    static isTransientError(error) {
+        const status = error?.response?.status;
+        if (status === undefined) {
+            // No response at all -> network error or timeout.
+            return true;
+        }
+        return status === 429 || (status >= 500 && status <= 599);
+    }
+    static delay(ms) {
+        return new Promise((resolve) => setTimeout(resolve, ms));
+    }
+    static formatCoords(lat, lon) {
+        const fmt = (v) => (Math.round(v * 100) / 100).toFixed(2);
+        return `${fmt(lat)}, ${fmt(lon)}`;
+    }
+    /**
+     * Map a raw Open-Meteo forecast response to normalized WeatherData.
+     * Exposed statically so it can be unit-tested without network access.
+     */
+    static mapResponse(data, language = 'de') {
+        const lang = WEEKDAYS[language] ? language : 'en';
+        const current = data?.current ?? {};
+        const daily = data?.daily ?? {};
+        const currentCode = Number(current.weather_code ?? 0);
+        const info = WEATHER_CODES[currentCode] ?? DEFAULT_CODE;
+        const condition = lang === 'de' ? info.de : info.en;
+        const maxArr = Array.isArray(daily.temperature_2m_max)
+            ? daily.temperature_2m_max
+            : [];
+        const minArr = Array.isArray(daily.temperature_2m_min)
+            ? daily.temperature_2m_min
+            : [];
+        const codeArr = Array.isArray(daily.weather_code) ? daily.weather_code : [];
+        const timeArr = Array.isArray(daily.time) ? daily.time : [];
+        const forecast = [];
+        for (let i = 0; i < Math.min(5, timeArr.length || maxArr.length); i++) {
+            const dayCode = Number(codeArr[i] ?? currentCode);
+            const dayInfo = WEATHER_CODES[dayCode] ?? DEFAULT_CODE;
+            forecast.push({
+                day: WeatherClient.weekdayLabel(timeArr[i], lang),
+                icon: dayInfo.icon,
+                temp: Math.round(Number(maxArr[i] ?? current.temperature_2m ?? 0)),
+            });
+        }
+        return {
+            temperature: Math.round(Number(current.temperature_2m ?? 0)),
+            condition,
+            icon: info.icon,
+            tempMax: Math.round(Number(maxArr[0] ?? current.temperature_2m ?? 0)),
+            tempMin: Math.round(Number(minArr[0] ?? current.temperature_2m ?? 0)),
+            humidity: Math.round(Number(current.relative_humidity_2m ?? 0)),
+            windSpeed: Math.round(Number(current.wind_speed_10m ?? 0)),
+            windDirection: WeatherClient.compassLabel(Number(current.wind_direction_10m ?? 0), lang),
+            forecast,
+        };
+    }
+    static weekdayLabel(isoDate, lang) {
+        const labels = WEEKDAYS[lang] ?? WEEKDAYS.en;
+        if (!isoDate) {
+            return labels[0];
+        }
+        const d = new Date(`${isoDate}T00:00:00`);
+        const idx = isNaN(d.getTime()) ? 0 : d.getDay();
+        return labels[idx];
+    }
+    static compassLabel(degrees, lang) {
+        const labels = COMPASS[lang] ?? COMPASS.en;
+        const normalized = ((degrees % 360) + 360) % 360;
+        const idx = Math.round(normalized / 22.5) % 16;
+        return labels[idx];
+    }
+}
+exports.WeatherClient = WeatherClient;
+//# sourceMappingURL=weather-client.js.map

package/dist/lib/weather-client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"weather-client.js","sourceRoot":"","sources":["../../src/lib/weather-client.ts"],"names":[],"mappings":"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"}

package/dist/nodes/senec-data.js

@@ -31,18 +31,26 @@ module.exports = function (RED) {
         async function fetchData() {
             if (!node.apiClient)
                 return;
+            const timestamp = new Date().toISOString();
             try {
                 node.status({ fill: 'blue', shape: 'dot', text: 'fetching...' });
                 const parsedData = await node.apiClient.getData();
                 node.send({
                     payload: parsedData,
-                    topic: 'senec/data'
+                    topic: 'senec/data',
+                    status: { ok: true, timestamp, fallback: false }
                 });
-                node.status({ fill: 'green', shape: 'dot', text: 'success' });
+                node.status({ fill: 'green', shape: 'dot', text: `ok ${timestamp.slice(11, 16)}` });
             }
             catch (error) {
                 node.error('Failed to fetch data: ' + error.message);
                 node.status({ fill: 'red', shape: 'ring', text: 'error' });
+                // Report the failed status so downstream (image) can render it.
+                node.send({
+                    payload: null,
+                    topic: 'senec/status',
+                    status: { ok: false, timestamp, error: error.message, fallback: false }
+                });
             }
         }
         // Handle input messages

package/dist/nodes/senec-data.js.map

@@ -1 +1 @@
-{"version":3,"file":"senec-data.js","sourceRoot":"","sources":["../../src/nodes/senec-data.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"senec-data.js","sourceRoot":"","sources":["../../src/nodes/senec-data.ts"],"names":[],"mappings":";;AACA,8DAAyD;AAiBzD,MAAM,CAAC,OAAO,GAAG,UAAS,GAAQ;IAChC,SAAS,aAAa,CAAsB,MAAwB;QAClE,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAEnC,MAAM,IAAI,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QAEtB,kBAAkB;QAClB,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAQ,CAAC;QAE3D,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YAC1C,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;YAC/D,OAAO;QACT,CAAC;QAED,wBAAwB;QACxB,IAAI,CAAC;YACH,IAAI,CAAC,SAAS,GAAG,IAAI,iCAAc,CAAC;gBAClC,QAAQ,EAAE,UAAU,CAAC,QAAQ;gBAC7B,QAAQ,EAAE,UAAU,CAAC,WAAW,CAAC,QAAQ;aAC1C,CAAC,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QAC9D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,mCAAmC,GAAG,KAAK,CAAC,CAAC;YACxD,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;YAC3D,OAAO;QACT,CAAC;QAED,sBAAsB;QACtB,KAAK,UAAU,SAAS;YACtB,IAAI,CAAC,IAAI,CAAC,SAAS;gBAAE,OAAO;YAE5B,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YAE3C,IAAI,CAAC;gBACH,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;gBAEjE,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;gBAElD,IAAI,CAAC,IAAI,CAAC;oBACR,OAAO,EAAE,UAAU;oBACnB,KAAK,EAAE,YAAY;oBACnB,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE;iBACjD,CAAC,CAAC;gBAEH,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACtF,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBACpB,IAAI,CAAC,KAAK,CAAC,wBAAwB,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;gBACrD,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;gBAC3D,gEAAgE;gBAChE,IAAI,CAAC,IAAI,CAAC;oBACR,OAAO,EAAE,IAAI;oBACb,KAAK,EAAE,cAAc;oBACrB,MAAM,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE;iBACxE,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,wBAAwB;QACxB,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,WAAU,IAAS;YACvC,MAAM,SAAS,EAAE,CAAC;QACpB,CAAC,CAAC,CAAC;QAEH,mCAAmC;QACnC,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,GAAG,CAAC,EAAE,CAAC;YAC3C,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC;QAC9D,CAAC;QAED,mBAAmB;QACnB,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE;YACf,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACf,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC1B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YACpB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;AACtD,CAAC,CAAC"}

package/dist/nodes/senec-image.html

@@ -4,17 +4,21 @@
     color: '#00A0E3',
     defaults: {
       name: { value: '' },
-      width: { value: 800, validate: RED.validators.number() },
-      height: { value: 480, validate: RED.validators.number() },
-      layout: { value: 'default' }
+      width: { value: 1600, validate: RED.validators.number() },
+      height: { value: 0 },
+      layout: { value: 'dashboard' },
+      outputFormat: { value: 'buffer' },
+      filePath: { value: '' }
     },
-    inputs: 1,
-    outputs: 1,
+    inputs: 2,
+    outputs: 2,
+    inputLabels: ['SENEC', 'Weather'],
+    outputLabels: ['PNG', 'HTML'],
     icon: 'font-awesome/fa-image',
-    label: function() {
+    label: function () {
       return this.name || 'SENEC Image';
     },
-    labelStyle: function() {
+    labelStyle: function () {
       return this.name ? 'node_label_italic' : '';
     }
   });
@@ -27,68 +31,84 @@
   </div>
   <div class="form-row">
     <label for="node-input-width"><i class="fa fa-arrows-h"></i> Width</label>
-    <input type="number" id="node-input-width" placeholder="800" min="100">
+    <input type="number" id="node-input-width" placeholder="1600" min="200">
   </div>
   <div class="form-row">
     <label for="node-input-height"><i class="fa fa-arrows-v"></i> Height</label>
-    <input type="number" id="node-input-height" placeholder="480" min="100">
+    <input type="number" id="node-input-height" placeholder="0 = auto (16:9)" min="0">
   </div>
   <div class="form-row">
     <label for="node-input-layout"><i class="fa fa-th-large"></i> Layout</label>
     <select id="node-input-layout">
-      <option value="default">Default</option>
-      <option value="compact">Compact</option>
-      <option value="trmnl">TRMNL Display</option>
+      <option value="dashboard">Energy Dashboard (4 cards, 16:9)</option>
     </select>
   </div>
+  <div class="form-row">
+    <label for="node-input-outputFormat"><i class="fa fa-download"></i> PNG Output</label>
+    <select id="node-input-outputFormat">
+      <option value="buffer">Buffer (PNG)</option>
+      <option value="base64">Base64 Data URL</option>
+      <option value="file">File</option>
+    </select>
+  </div>
+  <div class="form-row" id="node-row-filePath">
+    <label for="node-input-filePath"><i class="fa fa-folder-open"></i> File Path</label>
+    <input type="text" id="node-input-filePath" placeholder="/path/to/dashboard.png">
+  </div>
 </script>
 
 <script type="text/html" data-help-name="senec-image">
-  <p>Generates a PNG image visualization of SENEC system data.</p>
-  
+  <p>Renders a 16:9 energy dashboard combining SENEC energy data and weather
+  data. Produces a PNG image on output 1 and a fully resizable HTML document
+  on output 2, in parallel.</p>
+
   <h3>Inputs</h3>
-  <dl class="message-properties">
-    <dt>payload <span class="property-type">object</span></dt>
-    <dd>SENEC data object (from senec-data node)</dd>
-  </dl>
-  
+  <ol class="node-ports">
+    <li>SENEC
+      <dl class="message-properties">
+        <dt>payload <span class="property-type">object</span></dt>
+        <dd>SENEC data object (from the <b>senec-data</b> node).</dd>
+      </dl>
+    </li>
+    <li>Weather
+      <dl class="message-properties">
+        <dt>payload <span class="property-type">object</span></dt>
+        <dd>Weather data object (from the <b>weather</b> node). Optional; the
+        weather card renders a placeholder until data arrives.</dd>
+      </dl>
+    </li>
+  </ol>
+
   <h3>Outputs</h3>
-  <dl class="message-properties">
-    <dt>payload <span class="property-type">buffer</span></dt>
-    <dd>PNG image as a Buffer</dd>
-    
-    <dt>contentType <span class="property-type">string</span></dt>
-    <dd>Set to "image/png"</dd>
-    
-    <dt>filename <span class="property-type">string</span></dt>
-    <dd>Suggested filename for the image</dd>
-  </dl>
-  
-  <h3>Configuration</h3>
-  <dl class="message-properties">
-    <dt>Width</dt>
-    <dd>Image width in pixels (default: 800)</dd>
-    
-    <dt>Height</dt>
-    <dd>Image height in pixels (default: 480)</dd>
-    
-    <dt>Layout</dt>
-    <dd>Image layout template:
-      <ul>
-        <li><b>Default</b> - Standard layout with all data</li>
-        <li><b>Compact</b> - Minimal layout for small displays</li>
-        <li><b>TRMNL Display</b> - Optimized for TRMNL e-ink display (800x480)</li>
-      </ul>
-    </dd>
-  </dl>
-  
+  <ol class="node-ports">
+    <li>PNG
+      <dl class="message-properties">
+        <dt>payload <span class="property-type">buffer | string</span></dt>
+        <dd>PNG image as a Buffer (or base64 data URL / file path depending
+        on the PNG Output setting).</dd>
+        <dt>contentType <span class="property-type">string</span></dt>
+        <dd>Set to "image/png".</dd>
+      </dl>
+    </li>
+    <li>HTML
+      <dl class="message-properties">
+        <dt>payload <span class="property-type">string</span></dt>
+        <dd>Self-contained, resizable HTML document of the dashboard.</dd>
+        <dt>contentType <span class="property-type">string</span></dt>
+        <dd>Set to "text/html".</dd>
+      </dl>
+    </li>
+  </ol>
+
   <h3>Details</h3>
-  <p>This node generates a PNG image visualization of your SENEC system data.</p>
-  <p>Connect it after a senec-data node to visualize the data graphically.</p>
-  <p>The generated image can be saved to file, sent via HTTP, or displayed on e-ink displays like TRMNL.</p>
-  
+  <p>The node caches the latest SENEC and weather messages and re-renders on
+  each input, so it can be driven from two independent sources. Rendering
+  begins once SENEC data has been received at least once.</p>
+
   <h3>Example Flow</h3>
   <pre>
-[senec-data] → [senec-image] → [file out]
+[senec-data] ──────────┐
+                       ├→ [senec-image] ─┬→ [file out]   (PNG)
+[weather] ─────────────┘                 └→ [http res]   (HTML)
   </pre>
 </script>