node-red-contrib-event-calc 0.1.2 → 0.1.4

package/nodes/event-simulator.html

@@ -0,0 +1,156 @@
+<style>
+    .event-calc-white-text { fill: #ffffff !important; }
+    .red-ui-palette-node[data-palette-type="event-simulator"] .red-ui-palette-label { color: #ffffff !important; }
+</style>
+
+<script type="text/javascript">
+    RED.nodes.registerType('event-simulator', {
+        category: 'event calc',
+        color: '#758467',
+        defaults: {
+            name: { value: "" },
+            waveform: { value: "sinusoid" },
+            amplitude: { value: 1, validate: RED.validators.number() },
+            frequency: { value: 1, validate: RED.validators.number() },
+            offset: { value: 0, validate: RED.validators.number() },
+            interval: { value: 100, validate: RED.validators.number() },
+            startOnDeploy: { value: true },
+            noiseLevel: { value: 0, validate: RED.validators.number() },
+            topicCount: { value: 1, validate: RED.validators.number() },
+            phaseSpread: { value: true }
+        },
+        inputs: 1,
+        outputs: 1,
+        icon: "font-awesome/fa-signal",
+        label: function() {
+            return this.name || this.waveform || "simulator";
+        },
+        paletteLabel: "simulator",
+        labelStyle: function() {
+            return (this.name ? "node_label_italic" : "") + " event-calc-white-text";
+        }
+    });
+</script>
+
+<script type="text/html" data-template-name="event-simulator">
+    <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 (used as topic base)">
+    </div>
+    <div class="form-row">
+        <label for="node-input-topicCount"><i class="fa fa-clone"></i> Topic Count</label>
+        <input type="number" id="node-input-topicCount" min="1" max="100" value="1">
+        <div class="form-tips">Number of topics to generate (Name1, Name2, ... if count > 1)</div>
+    </div>
+    <div class="form-row">
+        <label for="node-input-waveform"><i class="fa fa-signal"></i> Waveform</label>
+        <select id="node-input-waveform">
+            <option value="sinusoid">Sinusoid</option>
+            <option value="cosine">Cosine</option>
+            <option value="sawtooth">Sawtooth</option>
+            <option value="triangle">Triangle</option>
+            <option value="rectangle">Rectangle (Square)</option>
+            <option value="pulse">Pulse</option>
+            <option value="random">Random</option>
+            <option value="randomWalk">Random Walk</option>
+        </select>
+    </div>
+    <div class="form-row">
+        <label for="node-input-amplitude"><i class="fa fa-arrows-v"></i> Amplitude</label>
+        <input type="number" id="node-input-amplitude" step="0.1" value="1">
+    </div>
+    <div class="form-row">
+        <label for="node-input-frequency"><i class="fa fa-tachometer"></i> Frequency (Hz)</label>
+        <input type="number" id="node-input-frequency" step="0.1" min="0.001" value="1">
+    </div>
+    <div class="form-row">
+        <label for="node-input-offset"><i class="fa fa-arrows-h"></i> Offset</label>
+        <input type="number" id="node-input-offset" step="0.1" value="0">
+    </div>
+    <div class="form-row">
+        <label for="node-input-interval"><i class="fa fa-clock-o"></i> Interval (ms)</label>
+        <input type="number" id="node-input-interval" min="10" value="100">
+    </div>
+    <div class="form-row">
+        <label for="node-input-noiseLevel"><i class="fa fa-random"></i> Noise Level</label>
+        <input type="number" id="node-input-noiseLevel" step="0.01" min="0" max="1" value="0">
+        <div class="form-tips">Noise as fraction of amplitude (0-1)</div>
+    </div>
+    <div class="form-row">
+        <label for="node-input-phaseSpread">
+            <input type="checkbox" id="node-input-phaseSpread" style="width:auto; margin-left:0;" checked>
+            Phase spread (offset each topic's phase when count > 1)
+        </label>
+    </div>
+    <div class="form-row">
+        <label for="node-input-startOnDeploy">
+            <input type="checkbox" id="node-input-startOnDeploy" style="width:auto; margin-left:0;" checked>
+            Start on deploy
+        </label>
+    </div>
+</script>
+
+<script type="text/html" data-help-name="event-simulator">
+    <p>Generates simulated time-series data with various waveforms.</p>
+
+    <h3>Outputs</h3>
+    <dl class="message-properties">
+        <dt>payload <span class="property-type">number</span></dt>
+        <dd>Generated value</dd>
+        <dt>topic <span class="property-type">string</span></dt>
+        <dd>Topic name. If count=1: uses Name. If count>1: uses Name1, Name2, etc.</dd>
+        <dt>timestamp <span class="property-type">number</span></dt>
+        <dd>Unix timestamp in ms</dd>
+    </dl>
+
+    <h3>Multiple Topics</h3>
+    <p>Set <b>Topic Count</b> > 1 to generate multiple messages per interval:</p>
+    <ul>
+        <li>Name="Sensor", Count=3 → topics: Sensor1, Sensor2, Sensor3</li>
+        <li><b>Phase Spread</b>: Each topic gets an evenly-distributed phase offset</li>
+        <li>Useful for simulating multiple related sensors</li>
+    </ul>
+
+    <h3>Waveforms</h3>
+    <ul>
+        <li><b>Sinusoid</b> - Smooth sine wave</li>
+        <li><b>Cosine</b> - Cosine wave (90° phase shift)</li>
+        <li><b>Sawtooth</b> - Linear ramp up, instant drop</li>
+        <li><b>Triangle</b> - Linear ramp up and down</li>
+        <li><b>Rectangle</b> - Square wave (±amplitude)</li>
+        <li><b>Pulse</b> - Short pulse (10% duty cycle)</li>
+        <li><b>Random</b> - Random values each sample</li>
+        <li><b>Random Walk</b> - Brownian motion with mean reversion</li>
+    </ul>
+
+    <h3>Parameters</h3>
+    <ul>
+        <li><b>Topic Count</b> - Number of topics to generate (1-100)</li>
+        <li><b>Amplitude</b> - Peak value (signal swings ±amplitude around offset)</li>
+        <li><b>Frequency</b> - Cycles per second (Hz)</li>
+        <li><b>Offset</b> - DC offset (center value)</li>
+        <li><b>Interval</b> - Sample rate in milliseconds</li>
+        <li><b>Noise Level</b> - Random noise as fraction of amplitude</li>
+        <li><b>Phase Spread</b> - Distribute phase offsets across topics</li>
+    </ul>
+
+    <h3>Control</h3>
+    <p>Send messages to control the simulator:</p>
+    <ul>
+        <li><code>msg.payload = "start"</code> - Start generating</li>
+        <li><code>msg.payload = "stop"</code> - Stop generating</li>
+        <li><code>msg.payload = "reset"</code> - Reset time and restart</li>
+    </ul>
+
+    <h3>Dynamic Parameters</h3>
+    <p>Update parameters via message properties:</p>
+    <ul>
+        <li><code>msg.amplitude</code></li>
+        <li><code>msg.frequency</code></li>
+        <li><code>msg.offset</code></li>
+        <li><code>msg.interval</code></li>
+        <li><code>msg.waveform</code></li>
+        <li><code>msg.topicCount</code></li>
+        <li><code>msg.phaseSpread</code></li>
+    </ul>
+</script>

package/nodes/event-simulator.js

@@ -0,0 +1,185 @@
+module.exports = function(RED) {
+    function EventSimulatorNode(config) {
+        RED.nodes.createNode(this, config);
+        const node = this;
+
+        node.waveform = config.waveform || "sinusoid";
+        node.amplitude = parseFloat(config.amplitude) || 1;
+        node.frequency = parseFloat(config.frequency) || 1; // Hz
+        node.offset = parseFloat(config.offset) || 0;
+        node.interval = parseInt(config.interval) || 100; // ms
+        node.startOnDeploy = config.startOnDeploy !== false;
+        node.noiseLevel = parseFloat(config.noiseLevel) || 0;
+        node.topicCount = parseInt(config.topicCount) || 1;
+        node.phaseSpread = config.phaseSpread !== false; // Add phase offset between topics
+
+        const baseName = config.name || "simulator";
+
+        let timer = null;
+        let startTime = Date.now();
+        let sampleCount = 0;
+
+        // Waveform generators
+        const waveforms = {
+            sinusoid: (t, freq, amp, offset) => {
+                return amp * Math.sin(2 * Math.PI * freq * t) + offset;
+            },
+            cosine: (t, freq, amp, offset) => {
+                return amp * Math.cos(2 * Math.PI * freq * t) + offset;
+            },
+            sawtooth: (t, freq, amp, offset) => {
+                const period = 1 / freq;
+                const phase = (t % period) / period;
+                return amp * (2 * phase - 1) + offset;
+            },
+            triangle: (t, freq, amp, offset) => {
+                const period = 1 / freq;
+                const phase = (t % period) / period;
+                return amp * (4 * Math.abs(phase - 0.5) - 1) + offset;
+            },
+            rectangle: (t, freq, amp, offset) => {
+                const period = 1 / freq;
+                const phase = (t % period) / period;
+                return amp * (phase < 0.5 ? 1 : -1) + offset;
+            },
+            pulse: (t, freq, amp, offset) => {
+                const period = 1 / freq;
+                const phase = (t % period) / period;
+                return amp * (phase < 0.1 ? 1 : 0) + offset;
+            },
+            random: (t, freq, amp, offset) => {
+                return amp * (Math.random() * 2 - 1) + offset;
+            },
+            randomWalk: (t, freq, amp, offset, topicIndex) => {
+                // Random walk with mean reversion (per-topic state)
+                if (!node._lastValues) node._lastValues = {};
+                if (node._lastValues[topicIndex] === undefined) node._lastValues[topicIndex] = offset;
+                const step = (Math.random() * 2 - 1) * amp * 0.1;
+                const reversion = (offset - node._lastValues[topicIndex]) * 0.05;
+                node._lastValues[topicIndex] = Math.max(offset - amp, Math.min(offset + amp, node._lastValues[topicIndex] + step + reversion));
+                return node._lastValues[topicIndex];
+            }
+        };
+
+        function generateSample() {
+            const now = Date.now();
+            const t = (now - startTime) / 1000; // time in seconds
+            sampleCount++;
+
+            const generator = waveforms[node.waveform] || waveforms.sinusoid;
+
+            // Generate message for each topic
+            for (let i = 0; i < node.topicCount; i++) {
+                // Calculate phase offset for this topic (spread evenly across one period)
+                const phaseOffset = node.phaseSpread ? (i / node.topicCount) / node.frequency : 0;
+                const tWithPhase = t + phaseOffset;
+
+                let value = generator(tWithPhase, node.frequency, node.amplitude, node.offset, i);
+
+                // Add noise if configured
+                if (node.noiseLevel > 0) {
+                    value += (Math.random() * 2 - 1) * node.noiseLevel * node.amplitude;
+                }
+
+                // Topic name: baseName for count=1, baseName1/baseName2/... for count>1
+                const topic = node.topicCount === 1 ? baseName : `${baseName}${i + 1}`;
+
+                const msg = {
+                    topic: topic,
+                    payload: value,
+                    timestamp: now,
+                    _simulator: {
+                        waveform: node.waveform,
+                        frequency: node.frequency,
+                        amplitude: node.amplitude,
+                        sample: sampleCount,
+                        time: tWithPhase,
+                        topicIndex: i + 1
+                    }
+                };
+
+                node.send(msg);
+            }
+
+            // Status shows count and first value
+            const firstValue = generator(t, node.frequency, node.amplitude, node.offset, 0);
+            const statusText = node.topicCount > 1
+                ? `${sampleCount}: ${node.topicCount} topics`
+                : `${sampleCount}: ${firstValue.toFixed(3)}`;
+            node.status({ fill: "green", shape: "dot", text: statusText });
+        }
+
+        function start() {
+            if (timer) return;
+            startTime = Date.now();
+            sampleCount = 0;
+            node._lastValues = {}; // Reset random walk state
+            timer = setInterval(generateSample, node.interval);
+            const statusText = node.topicCount > 1 ? `running (${node.topicCount} topics)` : "running";
+            node.status({ fill: "green", shape: "dot", text: statusText });
+        }
+
+        function stop() {
+            if (timer) {
+                clearInterval(timer);
+                timer = null;
+            }
+            node.status({ fill: "grey", shape: "ring", text: "stopped" });
+        }
+
+        function reset() {
+            stop();
+            start();
+        }
+
+        // Start on deploy if configured
+        if (node.startOnDeploy) {
+            start();
+        } else {
+            node.status({ fill: "grey", shape: "ring", text: "stopped" });
+        }
+
+        node.on('input', function(msg, send, done) {
+            const command = (msg.payload || "").toString().toLowerCase();
+
+            switch (command) {
+                case 'start':
+                    start();
+                    break;
+                case 'stop':
+                    stop();
+                    break;
+                case 'reset':
+                    reset();
+                    break;
+                default:
+                    // Update parameters if provided
+                    if (typeof msg.amplitude === 'number') node.amplitude = msg.amplitude;
+                    if (typeof msg.frequency === 'number') node.frequency = msg.frequency;
+                    if (typeof msg.offset === 'number') node.offset = msg.offset;
+                    if (typeof msg.interval === 'number') {
+                        node.interval = msg.interval;
+                        if (timer) reset();
+                    }
+                    if (typeof msg.topicCount === 'number' && msg.topicCount >= 1) {
+                        node.topicCount = Math.floor(msg.topicCount);
+                    }
+                    if (typeof msg.phaseSpread === 'boolean') {
+                        node.phaseSpread = msg.phaseSpread;
+                    }
+                    if (msg.waveform && waveforms[msg.waveform]) {
+                        node.waveform = msg.waveform;
+                    }
+            }
+
+            if (done) done();
+        });
+
+        node.on('close', function(done) {
+            stop();
+            done();
+        });
+    }
+
+    RED.nodes.registerType("event-simulator", EventSimulatorNode);
+};

package/nodes/event-topic.html

@@ -10,7 +10,7 @@
         defaults: {
             name: { value: "" },
             cache: { value: "", type: "event-cache", required: true },
-            pattern: { value: "*" },
+            topic: { value: "" },
             outputFormat: { value: "value" },
             outputOnStart: { value: false }
         },
@@ -18,7 +18,7 @@
         outputs: 1,
         icon: "font-awesome/fa-filter",
         label: function() {
-            return this.name || this.pattern || "event topic";
+            return this.name || this.topic || "event topic";
         },
         paletteLabel: "event topic",
         labelStyle: function() { return (this.name ? "node_label_italic" : "") + " event-calc-white-text"; },
@@ -30,18 +30,18 @@
                 const cacheId = $("#node-input-cache").val();
                 if (cacheId) {
                     $.getJSON("event-cache/" + cacheId + "/topics", function(topics) {
-                        $("#node-input-pattern").autocomplete("option", "source", topics || []);
+                        $("#node-input-topic").autocomplete("option", "source", topics || []);
                     });
                 }
             }
 
-            // Setup autocomplete on pattern input
-            $("#node-input-pattern").autocomplete({
+            // Setup autocomplete on topic input
+            $("#node-input-topic").autocomplete({
                 source: [],
                 minLength: 0,
                 delay: 0
             }).on("focus", function() {
-                if (!$(this).val() || $(this).val() === "*") {
+                if (!$(this).val()) {
                     $(this).autocomplete("search", "");
                 }
             });
@@ -65,19 +65,14 @@
         <input type="text" id="node-input-cache">
     </div>
     <div class="form-row">
-        <label for="node-input-pattern"><i class="fa fa-bookmark"></i> Topic Pattern</label>
-        <input type="text" id="node-input-pattern" placeholder="*">
-        <div class="form-tips">
-            Wildcards: <code>?</code> = exactly one character, <code>*</code> = one or more characters.<br>
-            Examples: <code>sensor?</code> matches sensor1, <code>sensors/*</code> matches sensors/temp
-        </div>
+        <label for="node-input-topic"><i class="fa fa-bookmark"></i> Topic</label>
+        <input type="text" id="node-input-topic" placeholder="sensors/room1/temp">
     </div>
     <div class="form-row">
         <label for="node-input-outputFormat"><i class="fa fa-sign-out"></i> Output Format</label>
         <select id="node-input-outputFormat" style="width:70%;">
             <option value="value">Value only (msg.payload = value)</option>
             <option value="full">Full entry (msg.payload = {value, ts, metadata})</option>
-            <option value="all">All matching (msg.payload = {topic: value, ...})</option>
         </select>
     </div>
     <div class="form-row">
@@ -88,32 +83,31 @@
 </script>
 
 <script type="text/html" data-help-name="event-topic">
-    <p>Subscribes to a topic pattern and outputs when matching topics update in the cache.</p>
+    <p>Subscribes to a topic and outputs when that topic updates in the cache.</p>
 
     <h3>Properties</h3>
     <dl class="message-properties">
         <dt>Cache</dt>
         <dd>The event-cache config node to use</dd>
-        <dt>Topic Pattern</dt>
-        <dd>Pattern with wildcards. <code>?</code> = exactly one character, <code>*</code> = one or more characters.</dd>
+        <dt>Topic</dt>
+        <dd>The exact topic to subscribe to</dd>
         <dt>Output Format</dt>
         <dd>
             <ul>
                 <li><b>Value only</b>: <code>msg.payload</code> contains just the value</li>
                 <li><b>Full entry</b>: <code>msg.payload</code> contains <code>{value, ts, metadata}</code></li>
-                <li><b>All matching</b>: <code>msg.payload</code> contains all cached values matching the pattern</li>
             </ul>
         </dd>
         <dt>Output on deploy</dt>
-        <dd>If checked, outputs all currently cached values matching the pattern when the flow starts</dd>
+        <dd>If checked, outputs the current cached value when the flow starts</dd>
     </dl>
 
     <h3>Inputs</h3>
     <dl class="message-properties">
-        <dt class="optional">pattern <span class="property-type">string</span></dt>
-        <dd>Dynamically change the subscription pattern</dd>
-        <dt class="optional">payload/topic = "refresh"</dt>
-        <dd>Output all currently cached values matching the pattern</dd>
+        <dt class="optional">topic + payload="subscribe"</dt>
+        <dd>Dynamically change the subscription to a new topic</dd>
+        <dt class="optional">payload = "refresh"</dt>
+        <dd>Output the current cached value</dd>
     </dl>
 
     <h3>Outputs</h3>
@@ -125,12 +119,4 @@
         <dt>timestamp <span class="property-type">number</span></dt>
         <dd>Unix timestamp when the value was cached</dd>
     </dl>
-
-    <h3>Wildcard Examples</h3>
-    <ul>
-        <li><code>sensor?</code> - matches sensor1, sensorA (exactly one char)</li>
-        <li><code>sensors/*</code> - matches sensors/temp, sensors/room1 (one or more chars after /)</li>
-        <li><code>*/temp</code> - matches room1/temp, sensors/temp</li>
-        <li><code>*</code> - matches any topic with one or more characters</li>
-    </ul>
 </script>

package/nodes/event-topic.js

@@ -1,12 +1,12 @@
 /**
- * event-topic - Subscription node for topic patterns
+ * event-topic - Subscription node for exact topics
  *
  * Features:
- * - Subscribes to cache using MQTT-style topic patterns
- * - Outputs when matching topics update
- * - Multiple output formats: value only, full entry, or all matching
- * - Optional output of existing values on start
- * - Dynamic pattern change via input message
+ * - Subscribes to cache for a specific topic
+ * - Outputs when the topic updates
+ * - Multiple output formats: value only or full entry
+ * - Optional output of existing value on start
+ * - Dynamic topic change via input message
  */
 module.exports = function(RED) {
     function EventTopicNode(config) {
@@ -14,7 +14,8 @@ module.exports = function(RED) {
         const node = this;
 
         node.cacheConfig = RED.nodes.getNode(config.cache);
-        node.pattern = config.pattern || '#';
+        // Support both old 'pattern' and new 'topic' config
+        node.topic = config.topic || config.pattern || '';
         node.outputFormat = config.outputFormat || 'value';
         node.outputOnStart = config.outputOnStart || false;
 
@@ -25,6 +26,11 @@ module.exports = function(RED) {
             return;
         }
 
+        if (!node.topic) {
+            node.status({ fill: "yellow", shape: "ring", text: "no topic" });
+            return;
+        }
+
         /**
          * Build output message based on configured format
          */
@@ -45,21 +51,6 @@ module.exports = function(RED) {
                             metadata: entry.metadata
                         }
                     };
-                case 'all':
-                    const all = node.cacheConfig.getMatching(node.pattern);
-                    const values = {};
-                    for (const [t, e] of all) {
-                        values[t] = e.value;
-                    }
-                    return {
-                        topic: topic,
-                        payload: values,
-                        trigger: {
-                            topic: topic,
-                            value: entry.value
-                        },
-                        timestamp: entry.ts
-                    };
                 default:
                     return {
                         topic: topic,
@@ -69,10 +60,10 @@ module.exports = function(RED) {
         }
 
         /**
-         * Subscribe to the current pattern
+         * Subscribe to the current topic
          */
         function subscribe() {
-            subscriptionId = node.cacheConfig.subscribe(node.pattern, (topic, entry) => {
+            subscriptionId = node.cacheConfig.subscribe(node.topic, (topic, entry) => {
                 const msg = buildOutputMessage(topic, entry);
                 node.send(msg);
 
@@ -84,43 +75,45 @@ module.exports = function(RED) {
 
         // Initial subscription
         subscribe();
-        node.status({ fill: "green", shape: "dot", text: node.pattern });
+        const displayTopic = node.topic.length > 20 ? node.topic.substring(0, 17) + '...' : node.topic;
+        node.status({ fill: "green", shape: "dot", text: displayTopic });
 
-        // Output existing values on start if configured
+        // Output existing value on start if configured
         if (node.outputOnStart) {
             setImmediate(() => {
-                const matching = node.cacheConfig.getMatching(node.pattern);
-                for (const [topic, entry] of matching) {
-                    const msg = buildOutputMessage(topic, entry);
+                const entry = node.cacheConfig.getValue(node.topic);
+                if (entry) {
+                    const msg = buildOutputMessage(node.topic, entry);
                     node.send(msg);
                 }
             });
         }
 
-        // Handle input messages for dynamic pattern change
+        // Handle input messages for dynamic topic change
         node.on('input', function(msg, send, done) {
             // For Node-RED 0.x compatibility
             send = send || function() { node.send.apply(node, arguments); };
             done = done || function(err) { if (err) node.error(err, msg); };
 
-            if (msg.pattern && typeof msg.pattern === 'string') {
-                // Unsubscribe from old pattern
+            if (msg.topic && typeof msg.topic === 'string' && msg.payload === 'subscribe') {
+                // Unsubscribe from old topic
                 if (subscriptionId && node.cacheConfig) {
                     node.cacheConfig.unsubscribe(subscriptionId);
                 }
 
-                // Update pattern and resubscribe
-                node.pattern = msg.pattern;
+                // Update topic and resubscribe
+                node.topic = msg.topic;
                 subscribe();
 
-                node.status({ fill: "blue", shape: "dot", text: node.pattern });
+                const dt = node.topic.length > 20 ? node.topic.substring(0, 17) + '...' : node.topic;
+                node.status({ fill: "blue", shape: "dot", text: dt });
             }
 
-            // Allow manual trigger to output all current values
-            if (msg.topic === 'refresh' || msg.payload === 'refresh') {
-                const matching = node.cacheConfig.getMatching(node.pattern);
-                for (const [topic, entry] of matching) {
-                    const outMsg = buildOutputMessage(topic, entry);
+            // Allow manual trigger to output current value
+            if (msg.payload === 'refresh') {
+                const entry = node.cacheConfig.getValue(node.topic);
+                if (entry) {
+                    const outMsg = buildOutputMessage(node.topic, entry);
                     send(outMsg);
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-event-calc",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Node-RED nodes for event caching and calculations with topic wildcard patterns",
   "author": {
     "name": "Holger Amort"
@@ -29,7 +29,9 @@
       "event-cache": "nodes/event-cache.js",
       "event-in": "nodes/event-in.js",
       "event-topic": "nodes/event-topic.js",
-      "event-calc": "nodes/event-calc.js"
+      "event-calc": "nodes/event-calc.js",
+      "event-simulator": "nodes/event-simulator.js",
+      "event-chart": "nodes/event-chart.js"
     }
   },
   "engines": {