@blokcert/node-red-contrib-ocpp 1.0.0 → 1.0.2

package/lib/ocpp-normalizer.js

@@ -20,32 +20,56 @@ const MessageType = {
  * @returns {object} Parsed message with metadata
  */
 function parseStreamMessage(streamData) {
-    const { messageId, tenant, deviceId, action, payload, protocol, timestamp } = streamData;
+    const { tenant, deviceId, timestamp } = streamData;
 
-    // Determine OCPP version from protocol
-    const version = protocol === 'ocpp2.0.1' ? '2.0.1' : '1.6';
+    // Parse metadata (contains action, version, serverID)
+    let metadata = {};
+    if (streamData.metadata) {
+        try {
+            metadata = typeof streamData.metadata === 'string'
+                ? JSON.parse(streamData.metadata)
+                : streamData.metadata;
+        } catch (e) {
+            // Ignore parse errors
+        }
+    }
 
-    // Parse payload if it's a string
-    let parsedPayload = payload;
-    if (typeof payload === 'string') {
+    // Parse payload (contains the full OCPP message with uniqueID)
+    let parsedPayload = streamData.payload;
+    if (typeof parsedPayload === 'string') {
         try {
-            parsedPayload = JSON.parse(payload);
+            parsedPayload = JSON.parse(parsedPayload);
         } catch (e) {
             // Keep as string if not valid JSON
         }
     }
 
+    // Extract messageId from payload.uniqueID or streamData.id
+    const messageId = parsedPayload?.uniqueID || streamData.id;
+
+    // Extract action from metadata or payload
+    const action = metadata.action || parsedPayload?.action;
+
+    // Extract actual payload content
+    const actualPayload = parsedPayload?.payload || parsedPayload;
+
+    // Determine OCPP version from metadata
+    const version = metadata.version === '2.0.1' ? '2.0.1' : '1.6';
+    const protocol = version === '2.0.1' ? 'ocpp2.0.1' : 'ocpp1.6';
+
     return {
         messageId,
         tenant,
         deviceId,
         action,
-        payload: parsedPayload,
+        payload: actualPayload,
         version,
         protocol,
         timestamp: timestamp || Date.now(),
         // Identity string for routing
         identity: `${tenant}:${deviceId}`,
+        // Keep original for reference
+        _rawPayload: parsedPayload,
     };
 }
 

package/nodes/ocpp-command.js

@@ -71,8 +71,8 @@ module.exports = function (RED) {
                     outboundKey,
                     'MAXLEN', '~', node.streamMaxLen,
                     '*',
-                    'messageId', messageId,
-                    'data', callMessage,
+                    'id', messageId,
+                    'payload', callMessage,
                     'timestamp', Date.now().toString()
                 );
 

package/nodes/ocpp-out.html

@@ -33,18 +33,18 @@
         <input type="text" id="node-input-server">
     </div>
     <div class="form-row">
-        <label for="node-input-denormalizePayload"><i class="fa fa-exchange"></i> Denormalize</label>
-        <input type="checkbox" id="node-input-denormalizePayload" style="width: auto; margin-left: 0;">
-        <span style="margin-left: 10px;">Convert unified format back to OCPP version</span>
+        <label for="node-input-streamMaxLen"><i class="fa fa-list-ol"></i> Stream Max Len</label>
+        <input type="number" id="node-input-streamMaxLen" placeholder="1000">
     </div>
     <div class="form-row">
-        <label for="node-input-autoAck"><i class="fa fa-check"></i> Auto ACK</label>
+        <label for="node-input-autoAck"><i class="fa fa-check"></i> Auto Acknowledge</label>
         <input type="checkbox" id="node-input-autoAck" style="width: auto; margin-left: 0;">
         <span style="margin-left: 10px;">Acknowledge inbound message after response</span>
     </div>
     <div class="form-row">
-        <label for="node-input-streamMaxLen"><i class="fa fa-list-ol"></i> Stream Max Len</label>
-        <input type="number" id="node-input-streamMaxLen" placeholder="1000">
+        <label for="node-input-denormalizePayload"><i class="fa fa-exchange"></i> Denormalize</label>
+        <input type="checkbox" id="node-input-denormalizePayload" style="width: auto; margin-left: 0;">
+        <span style="margin-left: 10px;">Convert unified format back to OCPP version</span>
     </div>
 </script>
 

package/nodes/ocpp-out.js

@@ -122,12 +122,13 @@ module.exports = function (RED) {
             const outboundKey = Keys.outbound(tenant, deviceId);
 
             // XADD with MAXLEN to prevent unbounded growth
+            // Use 'payload' field to match WS Server's expected format
             await redis.xadd(
                 outboundKey,
                 'MAXLEN', '~', node.streamMaxLen,
                 '*',
-                'messageId', messageId,
-                'data', response,
+                'id', messageId,
+                'payload', response,
                 'timestamp', Date.now().toString()
             );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blokcert/node-red-contrib-ocpp",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Node-RED nodes for OCPP (Open Charge Point Protocol) message handling via Redis Streams",
   "keywords": [
     "node-red",