node-red-contrib-event-calc 2.0.3 → 3.3.6

package/nodes/event-flatten.html

@@ -0,0 +1,53 @@
+<style>
+    .event-calc-white-text { fill: #ffffff !important; }
+    .red-ui-palette-node[data-palette-type="event-flatten"] .red-ui-palette-label { color: #ffffff !important; }
+</style>
+
+<script type="text/javascript">
+    RED.nodes.registerType('event-flatten', {
+        category: 'event calc',
+        color: '#758467',
+        defaults: {
+            name: { value: "" }
+        },
+        inputs: 1,
+        outputs: 1,
+        icon: "font-awesome/fa-expand",
+        label: function() {
+            return this.name || "event flatten";
+        },
+        paletteLabel: "event flatten",
+        labelStyle: function() { return (this.name ? "node_label_italic" : "") + " event-calc-white-text"; }
+    });
+</script>
+
+<script type="text/html" data-template-name="event-flatten">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
+</script>
+
+<script type="text/html" data-help-name="event-flatten">
+    <p>Flattens <code>msg.payload</code> into the top-level message object.</p>
+
+    <h3>Behavior</h3>
+    <p>Takes all properties from <code>msg.payload</code> (must be a plain object) and assigns them
+    directly onto <code>msg</code>, then removes <code>msg.payload</code>.</p>
+
+    <h3>Example</h3>
+    <pre>
+Input:
+  msg.payload = { topic: "sensor/temp", value: 25.5, timestamp: "2026-02-06T..." }
+
+Output:
+  msg.topic     = "sensor/temp"
+  msg.value     = 25.5
+  msg.timestamp = "2026-02-06T..."</pre>
+
+    <h3>Status</h3>
+    <ul>
+        <li><b>Green</b> - Successfully flattened, shows number of fields merged</li>
+        <li><b>Yellow</b> - Payload was not a plain object, message passed through unchanged</li>
+    </ul>
+</script>

package/nodes/event-flatten.js

@@ -0,0 +1,25 @@
+module.exports = function(RED) {
+    function EventFlattenNode(config) {
+        RED.nodes.createNode(this, config);
+        const node = this;
+
+        node.on('input', function(msg, send, done) {
+            send = send || function() { node.send.apply(node, arguments); };
+            done = done || function(err) { if (err) node.error(err, msg); };
+
+            const payload = msg.payload;
+            if (payload && typeof payload === 'object' && !Array.isArray(payload)) {
+                delete msg.payload;
+                Object.assign(msg, payload);
+                node.status({ fill: "green", shape: "dot", text: `${Object.keys(payload).length} fields` });
+            } else {
+                node.status({ fill: "yellow", shape: "ring", text: "payload not an object" });
+            }
+
+            send(msg);
+            done();
+        });
+    }
+
+    RED.nodes.registerType("event-flatten", EventFlattenNode);
+};

package/nodes/event-preview.html

@@ -0,0 +1,264 @@
+<style>
+    .event-preview-white-text { fill: #ffffff !important; }
+    .red-ui-palette-node[data-palette-type="event-preview"] .red-ui-palette-label { color: #ffffff !important; }
+    .event-preview-display {
+        background: #2d2d2d;
+        border: 1px solid #555;
+        border-radius: 4px;
+        padding: 10px;
+        font-family: monospace;
+        font-size: 12px;
+        color: #eee;
+        margin-top: 10px;
+        max-height: 400px;
+        overflow-y: auto;
+    }
+    .event-preview-display .field {
+        margin-bottom: 8px;
+        border-bottom: 1px solid #444;
+        padding-bottom: 8px;
+    }
+    .event-preview-display .field:last-child {
+        border-bottom: none;
+        margin-bottom: 0;
+        padding-bottom: 0;
+    }
+    .event-preview-display .label {
+        color: #888;
+        font-size: 11px;
+        text-transform: uppercase;
+        margin-bottom: 2px;
+    }
+    .event-preview-display .value {
+        color: #4fc3f7;
+        word-break: break-all;
+        white-space: pre-wrap;
+        max-height: 150px;
+        overflow-y: auto;
+    }
+    .event-preview-display .value.field-topic {
+        color: #81c784;
+    }
+    .event-preview-display .value.field-timestamp {
+        color: #ffb74d;
+    }
+    .event-preview-display .value.field-payload {
+        color: #4fc3f7;
+    }
+    .event-preview-display .no-message {
+        color: #888;
+        font-style: italic;
+    }
+    .event-preview-controls {
+        margin-bottom: 10px;
+        display: flex;
+        gap: 10px;
+        align-items: center;
+    }
+    .event-preview-controls button {
+        padding: 5px 15px;
+        border-radius: 3px;
+        border: 1px solid #666;
+        cursor: pointer;
+        font-size: 12px;
+    }
+    .event-preview-controls button.play {
+        background: #4caf50;
+        color: white;
+        border-color: #388e3c;
+    }
+    .event-preview-controls button.pause {
+        background: #ff9800;
+        color: white;
+        border-color: #f57c00;
+    }
+    .event-preview-controls .status {
+        font-size: 11px;
+        color: #888;
+    }
+    .event-preview-controls .status.active {
+        color: #4caf50;
+    }
+    .event-preview-controls .status.paused {
+        color: #ff9800;
+    }
+</style>
+
+<script type="text/javascript">
+    RED.nodes.registerType('event-preview', {
+        category: 'event calc',
+        color: '#758467',
+        defaults: {
+            name: { value: "" }
+        },
+        inputs: 1,
+        outputs: 1,
+        icon: "font-awesome/fa-eye",
+        label: function() {
+            return this.name || "event preview";
+        },
+        paletteLabel: "event preview",
+        labelStyle: function() { return (this.name ? "node_label_italic" : "") + " event-preview-white-text"; },
+        oneditprepare: function() {
+            const node = this;
+            let isActive = true;
+
+            function formatValue(key, value) {
+                if (value === null) return 'null';
+                if (value === undefined) return 'undefined';
+                if (key === 'timestamp' && typeof value === 'number') {
+                    const d = new Date(value);
+                    return d.toLocaleString() + ' (' + value + ')';
+                }
+                if (typeof value === 'object') {
+                    return JSON.stringify(value, null, 2);
+                }
+                return String(value);
+            }
+
+            function updateDisplay(data) {
+                const container = $('#event-preview-fields');
+                container.empty();
+
+                if (data && Object.keys(data).length > 0) {
+                    // Define preferred order for common fields
+                    const preferredOrder = ['topic', 'timestamp', 'payload'];
+                    const keys = Object.keys(data);
+
+                    // Sort keys: preferred first, then alphabetical
+                    keys.sort((a, b) => {
+                        const aIndex = preferredOrder.indexOf(a);
+                        const bIndex = preferredOrder.indexOf(b);
+                        if (aIndex !== -1 && bIndex !== -1) return aIndex - bIndex;
+                        if (aIndex !== -1) return -1;
+                        if (bIndex !== -1) return 1;
+                        return a.localeCompare(b);
+                    });
+
+                    keys.forEach(key => {
+                        const fieldDiv = $('<div class="field"></div>');
+                        const labelDiv = $('<div class="label"></div>').text(key);
+                        const valueDiv = $('<div class="value"></div>')
+                            .addClass('field-' + key)
+                            .text(formatValue(key, data[key]));
+                        fieldDiv.append(labelDiv).append(valueDiv);
+                        container.append(fieldDiv);
+                    });
+
+                    $('#event-preview-no-message').hide();
+                    container.show();
+                } else {
+                    $('#event-preview-no-message').show();
+                    container.hide();
+                }
+            }
+
+            function updateButtonState(active) {
+                isActive = active;
+                if (active) {
+                    $('#event-preview-play-btn').hide();
+                    $('#event-preview-pause-btn').show();
+                    $('#event-preview-status').text('Live').removeClass('paused').addClass('active');
+                } else {
+                    $('#event-preview-play-btn').show();
+                    $('#event-preview-pause-btn').hide();
+                    $('#event-preview-status').text('Paused').removeClass('active').addClass('paused');
+                }
+            }
+
+            // Get initial state
+            $.getJSON('event-preview/' + node.id + '/latest', updateDisplay);
+            $.getJSON('event-preview/' + node.id + '/active', function(data) {
+                if (data) updateButtonState(data.active);
+            });
+
+            // Subscribe to real-time updates
+            RED.comms.subscribe("event-preview:" + node.id, function(topic, data) {
+                if (isActive) {
+                    updateDisplay(data);
+                }
+            });
+
+            // Play button
+            $('#event-preview-play-btn').on('click', function() {
+                $.post('event-preview/' + node.id + '/active/true', function(data) {
+                    updateButtonState(data.active);
+                });
+            });
+
+            // Pause button
+            $('#event-preview-pause-btn').on('click', function() {
+                $.post('event-preview/' + node.id + '/active/false', function(data) {
+                    updateButtonState(data.active);
+                });
+            });
+
+            // Cleanup on dialog close
+            $('#dialog-form').on('dialogclose', function() {
+                RED.comms.unsubscribe("event-preview:" + node.id);
+            });
+        },
+        oneditcancel: function() {
+            RED.comms.unsubscribe("event-preview:" + this.id);
+        },
+        oneditsave: function() {
+            RED.comms.unsubscribe("event-preview:" + this.id);
+        }
+    });
+</script>
+
+<script type="text/html" data-template-name="event-preview">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
+    <div class="form-row">
+        <label><i class="fa fa-eye"></i> Live Preview</label>
+        <div class="event-preview-controls">
+            <button id="event-preview-play-btn" class="play" style="display:none;"><i class="fa fa-play"></i> Play</button>
+            <button id="event-preview-pause-btn" class="pause"><i class="fa fa-pause"></i> Pause</button>
+            <span id="event-preview-status" class="status active">Live</span>
+        </div>
+        <div class="event-preview-display">
+            <div id="event-preview-no-message" class="no-message">No message received yet</div>
+            <div id="event-preview-fields" style="display:none;"></div>
+        </div>
+    </div>
+</script>
+
+<script type="text/html" data-help-name="event-preview">
+    <p>Displays ALL fields of the latest message with real-time updates.</p>
+
+    <h3>Features</h3>
+    <ul>
+        <li><b>Shows all msg fields</b> - Not just topic/payload, but everything</li>
+        <li><b>Real-time updates</b> - Display updates instantly when messages arrive</li>
+        <li><b>Play/Pause control</b> - Pause updates to inspect a message</li>
+        <li>Passes message through for chaining</li>
+    </ul>
+
+    <h3>Field Display</h3>
+    <ul>
+        <li><b>topic</b> - Green</li>
+        <li><b>timestamp</b> - Orange (formatted as date + Unix timestamp)</li>
+        <li><b>payload</b> - Blue</li>
+        <li>Other fields shown in alphabetical order</li>
+    </ul>
+
+    <h3>Status Display</h3>
+    <p>The node status shows: <code>topic | payload | time</code></p>
+    <ul>
+        <li><b>Green</b> - Active (receiving updates)</li>
+        <li><b>Grey</b> - Paused</li>
+    </ul>
+
+    <h3>Edit Dialog</h3>
+    <p>Open the node's edit dialog to see a live-updating formatted view:</p>
+    <ul>
+        <li><b>Play</b> - Resume receiving updates</li>
+        <li><b>Pause</b> - Freeze the display to inspect current message</li>
+    </ul>
+
+    <h3>Outputs</h3>
+    <p>The original message is passed through unchanged.</p>
+</script>

package/nodes/event-preview.js

@@ -0,0 +1,125 @@
+/**
+ * event-preview - Message preview node with live updates
+ *
+ * Displays topic, timestamp, and payload of the latest message
+ * Real-time updates via WebSocket with play/pause control
+ */
+module.exports = function(RED) {
+    function EventPreviewNode(config) {
+        RED.nodes.createNode(this, config);
+        const node = this;
+
+        node.name = config.name || '';
+        node.latestMessage = null;
+        node.active = true; // Whether to send updates
+
+        node.on('input', function(msg, send, done) {
+            send = send || function() { node.send.apply(node, arguments); };
+            done = done || function(err) { if (err) node.error(err, msg); };
+
+            // Store the entire message (clone to avoid reference issues)
+            const msgCopy = {};
+            for (const key of Object.keys(msg)) {
+                if (key !== '_msgid') { // Skip internal Node-RED field
+                    msgCopy[key] = msg[key];
+                }
+            }
+            // Ensure timestamp exists
+            if (!msgCopy.timestamp) {
+                msgCopy.timestamp = Date.now();
+            }
+            node.latestMessage = msgCopy;
+
+            // Format timestamp for display
+            const ts = new Date(node.latestMessage.timestamp);
+            const timeStr = ts.toLocaleTimeString();
+
+            // Format payload for status (truncate if needed)
+            let payloadStr;
+            if (typeof msg.payload === 'object') {
+                payloadStr = JSON.stringify(msg.payload);
+            } else {
+                payloadStr = String(msg.payload);
+            }
+            if (payloadStr.length > 30) {
+                payloadStr = payloadStr.substring(0, 27) + '...';
+            }
+
+            // Update node status with preview
+            node.status({
+                fill: node.active ? "green" : "grey",
+                shape: "dot",
+                text: `${msg.topic || '-'} | ${payloadStr} | ${timeStr}`
+            });
+
+            // Send real-time update to editor if active
+            if (node.active) {
+                RED.comms.publish("event-preview:" + node.id, node.latestMessage);
+            }
+
+            // Send message through to allow chaining
+            send(msg);
+            done();
+        });
+
+        // Handle pause/play commands from editor
+        node.on('close', function(done) {
+            node.latestMessage = null;
+            done();
+        });
+    }
+
+    RED.nodes.registerType("event-preview", EventPreviewNode);
+
+    // HTTP endpoint to get latest message data
+    RED.httpAdmin.get("/event-preview/:id/latest", function(req, res) {
+        const node = RED.nodes.getNode(req.params.id);
+        if (node && node.latestMessage) {
+            res.json(node.latestMessage);
+        } else {
+            res.json(null);
+        }
+    });
+
+    // HTTP endpoint to toggle active state
+    RED.httpAdmin.post("/event-preview/:id/toggle", function(req, res) {
+        const node = RED.nodes.getNode(req.params.id);
+        if (node) {
+            node.active = !node.active;
+            node.status({
+                fill: node.active ? "green" : "grey",
+                shape: "dot",
+                text: node.active ? "active" : "paused"
+            });
+            res.json({ active: node.active });
+        } else {
+            res.sendStatus(404);
+        }
+    });
+
+    // HTTP endpoint to set active state
+    RED.httpAdmin.post("/event-preview/:id/active/:state", function(req, res) {
+        const node = RED.nodes.getNode(req.params.id);
+        if (node) {
+            node.active = req.params.state === 'true';
+            node.status({
+                fill: node.active ? "green" : "grey",
+                shape: "dot",
+                text: node.active ? "active" : "paused"
+            });
+            res.json({ active: node.active });
+        } else {
+            res.sendStatus(404);
+        }
+    });
+
+    // HTTP endpoint to get active state
+    RED.httpAdmin.get("/event-preview/:id/active", function(req, res) {
+        const node = RED.nodes.getNode(req.params.id);
+        if (node) {
+            res.json({ active: node.active });
+        } else {
+            res.sendStatus(404);
+        }
+    });
+};

package/nodes/event-simulator.js

@@ -87,7 +87,7 @@ module.exports = function(RED) {
                 const msg = {
                     topic: topic,
                     payload: value,
-                    timestamp: now,
+                    timestamp: new Date(now).toISOString(),
                     _simulator: {
                         waveform: node.waveform,
                         frequency: node.frequency,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-event-calc",
-  "version": "2.0.3",
+  "version": "3.3.6",
   "description": "Node-RED nodes for event caching and calculations",
   "author": {
     "name": "Holger Amort"
@@ -29,7 +29,8 @@
       "event-in": "nodes/event-in.js",
       "event-topic": "nodes/event-topic.js",
       "event-calc": "nodes/event-calc.js",
-      "event-json": "nodes/event-json.js",
+      "event-flatten": "nodes/event-flatten.js",
+      "event-preview": "nodes/event-preview.js",
       "event-simulator": "nodes/event-simulator.js",
       "event-chart": "nodes/event-chart.js"
     }

package/nodes/event-json.html

@@ -1,64 +0,0 @@
-<style>
-    .event-json-white-text { fill: #ffffff !important; }
-    .red-ui-palette-node[data-palette-type="event-json"] .red-ui-palette-label { color: #ffffff !important; }
-</style>
-
-<script type="text/javascript">
-    RED.nodes.registerType('event-json', {
-        category: 'event calc',
-        color: '#758467',
-        defaults: {
-            name: { value: "" }
-        },
-        inputs: 1,
-        outputs: 1,
-        icon: "font-awesome/fa-exchange",
-        label: function() {
-            return this.name || "event json";
-        },
-        paletteLabel: "event json",
-        labelStyle: function() { return (this.name ? "node_label_italic" : "") + " event-json-white-text"; }
-    });
-</script>
-
-<script type="text/html" data-template-name="event-json">
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
-</script>
-
-<script type="text/html" data-help-name="event-json">
-    <p>Bidirectional JSON envelope converter. Automatically detects direction.</p>
-
-    <h3>Behavior</h3>
-    <dl class="message-properties">
-        <dt>Unwrap (JSON to Message)</dt>
-        <dd>If payload is <code>{value, topic?, timestamp?}</code>, extracts value to <code>msg.payload</code> and copies topic/timestamp to msg.</dd>
-        <dt>Wrap (Message to JSON)</dt>
-        <dd>If payload is any other value, wraps it as <code>{timestamp, topic, value}</code>.</dd>
-    </dl>
-
-    <h3>Examples</h3>
-    <h4>Wrap (before MQTT publish)</h4>
-    <pre>
-Input:  msg.topic = "sensor/temp", msg.payload = 25.5
-Output: msg.payload = {
-    timestamp: 1704900000000,
-    topic: "sensor/temp",
-    value: 25.5
-}</pre>
-
-    <h4>Unwrap (after MQTT subscribe)</h4>
-    <pre>
-Input:  msg.payload = '{"timestamp":1704900000000,"topic":"sensor/temp","value":25.5}'
-Output: msg.topic = "sensor/temp"
-        msg.payload = 25.5
-        msg.timestamp = 1704900000000</pre>
-
-    <h3>Status</h3>
-    <ul>
-        <li><b>Green "wrapped"</b> - Created JSON envelope</li>
-        <li><b>Blue "unwrapped"</b> - Extracted from JSON envelope</li>
-    </ul>
-</script>

package/nodes/event-json.js

@@ -1,69 +0,0 @@
-/**
- * event-json - Bidirectional JSON envelope converter
- *
- * Automatically detects direction:
- * - Object with {value, topic?, timestamp?} -> extracts to msg
- * - Any other payload -> wraps in {timestamp, topic, value}
- */
-module.exports = function(RED) {
-    function EventJsonNode(config) {
-        RED.nodes.createNode(this, config);
-        const node = this;
-
-        node.on('input', function(msg, send, done) {
-            send = send || function() { node.send.apply(node, arguments); };
-            done = done || function(err) { if (err) node.error(err, msg); };
-
-            try {
-                let data = msg.payload;
-
-                // If string, try to parse as JSON
-                if (typeof data === 'string') {
-                    try {
-                        data = JSON.parse(data);
-                    } catch (e) {
-                        // Not JSON string - wrap it
-                        msg.payload = {
-                            timestamp: Date.now(),
-                            topic: msg.topic,
-                            value: msg.payload
-                        };
-                        node.status({ fill: "green", shape: "dot", text: "wrapped" });
-                        send(msg);
-                        done();
-                        return;
-                    }
-                }
-
-                // Check if it's an envelope object (has 'value' property)
-                if (typeof data === 'object' && data !== null && 'value' in data) {
-                    // Unwrap: extract from envelope
-                    if (data.topic) {
-                        msg.topic = data.topic;
-                    }
-                    if (data.timestamp) {
-                        msg.timestamp = data.timestamp;
-                    }
-                    msg.payload = data.value;
-                    node.status({ fill: "blue", shape: "dot", text: "unwrapped" });
-                } else {
-                    // Wrap: create envelope
-                    msg.payload = {
-                        timestamp: Date.now(),
-                        topic: msg.topic,
-                        value: data
-                    };
-                    node.status({ fill: "green", shape: "dot", text: "wrapped" });
-                }
-
-                send(msg);
-                done();
-            } catch (err) {
-                node.status({ fill: "red", shape: "ring", text: "error" });
-                done(err);
-            }
-        });
-    }
-
-    RED.nodes.registerType("event-json", EventJsonNode);
-};

package/playwright.config.js

@@ -1,22 +0,0 @@
-// @ts-check
-const { defineConfig } = require('@playwright/test');
-
-module.exports = defineConfig({
-  testDir: './tests',
-  fullyParallel: false,
-  forbidOnly: !!process.env.CI,
-  retries: process.env.CI ? 2 : 0,
-  workers: 1,
-  reporter: 'html',
-  use: {
-    baseURL: 'http://localhost:1880',
-    trace: 'on-first-retry',
-    screenshot: 'only-on-failure',
-  },
-  projects: [
-    {
-      name: 'chromium',
-      use: { browserName: 'chromium' },
-    },
-  ],
-});