@bldgblocks/node-red-contrib-control 0.1.36 → 0.1.37

package/nodes/history-buffer.js

@@ -33,7 +33,8 @@ module.exports = function(RED) {
         let liveBuffer = [];                    // Accumulate points since last commit to BUFFER_FILE
         let commitTimer = null;
         let pruneTimer = null;
-        let messageCount = 0;
+        let messageCount = 0;                   // Total messages received
+        let activeBufferCount = 0;              // Messages in current buffer file (resets on rotate)
         let cachedChunkCount = 0;               // Cached count of historical files
         let isInitializing = true;              // Flag: initialization in progress
         let queuedMessages = [];                // Queue messages during initialization
@@ -361,6 +362,7 @@ module.exports = function(RED) {
                 await fs.promises.access(BUFFER_FILE);
                 await fs.promises.rename(BUFFER_FILE, newName);
                 cachedChunkCount++;
+                activeBufferCount = 0;  // Reset active buffer count after rotation
             } catch (err) {
                 // BUFFER_FILE doesn't exist - no data to rotate
             }
@@ -421,9 +423,10 @@ module.exports = function(RED) {
             });
 
             messageCount++;
+            activeBufferCount++;  // Increment count of messages in current buffer file
             
             // Status update (throttled internally to 1s)
-            updateStatus(`${messageCount} msgs, ${cachedChunkCount} chunks, buf: ${liveBuffer.length}`, messageCount === 1);
+            updateStatus(`${messageCount} processed, ${activeBufferCount} active, ${cachedChunkCount} chunks`, messageCount === 1);
 
             if (done) done();
         });

package/nodes/history-collector.js

@@ -106,6 +106,15 @@ module.exports = function(RED) {
             // Set initial status
             utils.setStatusOK(node, "configuration received");
 
+            // Emit event for history-service relay (InfluxDB batch format)
+            const eventName = `bldgblocks:history:${node.historyConfig.id}`;
+            RED.events.emit(eventName, {
+                measurement: escapedMeasurementName,
+                fields: { value: formattedValue },
+                tags: tagsObj,
+                timestamp: timestamp
+            });
+
             // Handle storage type
             if (node.storageType === 'memory') {
                 const contextKey = `history_data_${node.historyConfig.name}`;

package/nodes/history-service.js

@@ -15,6 +15,18 @@ module.exports = function(RED) {
         // Generate matching event name based on history-config ID
         const eventName = `bldgblocks:history:${node.historyConfig.id}`;
 
+        // Status throttling - prevent rapid status updates from fast-streaming histories
+        let lastRelayedName = null;
+        let statusDirty = false;
+        let statusInterval = null;
+
+        statusInterval = setInterval(() => {
+            if (statusDirty && lastRelayedName) {
+                utils.setStatusChanged(node, `relayed: ${lastRelayedName}`);
+                statusDirty = false;
+            }
+        }, 2000);
+
         // Listen for events from history-collector nodes with this config
         const eventListener = (eventData) => {
             // Guard against invalid event data
@@ -24,17 +36,14 @@ module.exports = function(RED) {
                 return;
             }
 
-            // Create output message with the event data as payload
-            // Preserve topic if it exists in the event data
+            // Send event data directly as payload (already in InfluxDB batch format)
             const msg = { 
-                payload: eventData,
-                topic: eventData.topic
+                payload: eventData
             };
             
             node.send(msg);
-            
-            // Update status
-            utils.setStatusChanged(node, `relayed: ${eventData.seriesName || 'data'}`);
+            lastRelayedName = eventData.measurement || 'data';
+            statusDirty = true;
         };
 
         // Subscribe to events
@@ -42,6 +51,11 @@ module.exports = function(RED) {
         utils.setStatusOK(node, `listening on ${node.historyConfig.name}`);
 
         node.on("close", function(done) {
+            // Clear status interval
+            if (statusInterval) {
+                clearInterval(statusInterval);
+                statusInterval = null;
+            }
             // Unsubscribe from events on close
             RED.events.off(eventName, eventListener);
             done();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bldgblocks/node-red-contrib-control",
-  "version": "0.1.36",
+  "version": "0.1.37",
   "description": "Sedona-inspired control nodes for Node-RED",
   "keywords": [ "node-red", "sedona", "control", "hvac" ],
   "files": ["nodes/*.js", "nodes/*.html"],