@blokcert/node-red-contrib-ocpp 1.2.0 → 1.2.1

package/README.md

@@ -89,7 +89,7 @@ msg.ocpp.errorDescription = "Action not supported";
 
 ### ocpp command
 
-Sends CSMS-initiated commands to charging stations.
+Sends CSMS-initiated commands to charging stations and receives responses.
 
 **Supported Commands:**
 - Reset
@@ -103,9 +103,29 @@ Sends CSMS-initiated commands to charging stations.
 - ClearCache
 - And more...
 
-**Outputs:**
-- Output 1: Command sent confirmation
-- Output 2: Device response or timeout error (when "Wait for Response" is enabled)
+**Output:**
+Single output that emits when the device responds (or when a timeout occurs).
+
+**Response Message:**
+```javascript
+{
+  payload: { /* device response payload */ },
+  ocpp: {
+    messageId: "abc123",
+    action: "GetConfiguration",  // Original command
+    tenant: "operator1",
+    deviceId: "charger001",
+    identity: "operator1:charger001",
+    response: true,
+    error: false,  // true for CALLERROR or timeout
+    errorCode: null,  // Set for errors
+    errorDescription: null,  // Set for errors
+    sentAt: 1699999999999,
+    receivedAt: 1699999999150,
+    latency: 150  // Round-trip time in ms
+  }
+}
+```
 
 **Example:**
 ```javascript
@@ -120,37 +140,6 @@ msg.payload = {
 return msg;
 ```
 
-### ocpp response
-
-Routes CALLRESULT/CALLERROR responses back to the originating ocpp-command nodes.
-
-**Features:**
-- Automatically matches responses to pending commands
-- Notifies ocpp-command nodes of responses
-- Calculates round-trip latency
-
-**Setup:**
-Connect this node to an `ocpp in` node (optionally filtered by `_Response`) to receive device responses:
-
-```
-[ocpp in (filter: _Response)] → [ocpp response] → [debug]
-```
-
-**Output:**
-```javascript
-{
-  payload: { /* device response */ },
-  ocpp: {
-    messageId: "abc123",
-    action: "GetConfiguration",  // Original command
-    response: true,
-    error: false,
-    latency: 150,  // Round-trip time in ms
-    handled: true  // Whether an ocpp-command node was notified
-  }
-}
-```
-
 ## Example Flow
 
 ```

package/nodes/ocpp-command.js

@@ -59,8 +59,13 @@ module.exports = function (RED) {
                 await subRedis.subscribe(respChannel);
                 node.log(`Subscribed to ${respChannel}`);
 
+                subRedis.on('subscribe', (channel, count) => {
+                    node.log(`Subscribe confirmed: ${channel} (total: ${count})`);
+                });
+
                 // Handle incoming messages
                 subRedis.on('message', (channel, message) => {
+                    node.log(`Pub/Sub message received on ${channel}`);
                     try {
                         const data = JSON.parse(message);
                         const messageId = data.messageId || data.uniqueID;
@@ -70,8 +75,10 @@ module.exports = function (RED) {
                             return;
                         }
 
+                        node.log(`Looking up pending for messageId: ${messageId}`);
                         const pending = pendingCommands.get(messageId);
                         if (!pending) {
+                            node.log(`No pending command found for ${messageId}, pendingCommands size: ${pendingCommands.size}`);
                             // Not our command, ignore
                             return;
                         }
@@ -94,6 +101,8 @@ module.exports = function (RED) {
                             text: `${pending.action}: ${isError ? 'error' : 'ok'}`,
                         });
 
+                        node.log(`Found pending command for ${messageId}, sending to output`);
+
                         // Build output message with device response
                         const responseMsg = {
                             payload: data.payload || data,

package/nodes/ocpp-in.html

@@ -10,6 +10,7 @@
             autoAck: { value: true },
             normalizePayload: { value: true },
             filterAction: { value: '' },
+            includeResponses: { value: false },
         },
         inputs: 0,
         outputs: 1,
@@ -58,6 +59,11 @@
         <label for="node-input-filterAction"><i class="fa fa-filter"></i> Filter Action</label>
         <input type="text" id="node-input-filterAction" placeholder="(all actions)">
     </div>
+    <div class="form-row">
+        <label for="node-input-includeResponses"><i class="fa fa-reply"></i> Include Responses</label>
+        <input type="checkbox" id="node-input-includeResponses" style="width: auto; margin-left: 0;">
+        <span style="margin-left: 10px;">Include CallResult/CallError (normally handled by ocpp-command)</span>
+    </div>
 </script>
 
 <script type="text/html" data-help-name="ocpp-in">
@@ -108,12 +114,21 @@
         <dt>Filter Action <span class="property-type">string</span></dt>
         <dd>Optional. Only output messages matching this filter.
         Leave empty to receive all messages.</dd>
+
+        <dt>Include Responses <span class="property-type">boolean</span></dt>
+        <dd>If enabled, includes CallResult (3) and CallError (4) messages.
+        By default, these are skipped because <code>ocpp-command</code> nodes handle responses via Pub/Sub.
+        Enable this only if you need to monitor or log all response traffic.</dd>
     </dl>
 
     <h3>Details</h3>
     <p>This node reads from the <code>ws:inbound</code> Redis Stream using consumer groups,
     allowing multiple Node-RED instances to share the message load.</p>
 
+    <p><strong>Note:</strong> By default, this node only outputs CALL messages (requests from charging stations).
+    Response messages (CallResult/CallError) are handled by <code>ocpp-command</code> nodes via Redis Pub/Sub.
+    Enable "Include Responses" only if you need to monitor or log all traffic.</p>
+
     <h3>Filter Options</h3>
     <p>The Filter Action field supports these values:</p>
     <ul>

package/nodes/ocpp-in.js

@@ -24,6 +24,7 @@ module.exports = function (RED) {
         node.autoAck = config.autoAck !== false; // Default true
         node.normalizePayload = config.normalizePayload !== false; // Default true
         node.filterAction = config.filterAction || ''; // Optional action filter
+        node.includeResponses = config.includeResponses === true; // Default false - skip CallResult/CallError
 
         // State
         let running = false;
@@ -111,6 +112,21 @@ module.exports = function (RED) {
                 let msg = parseStreamMessage(data);
                 msg.streamId = streamId;
 
+                // Skip CallResult (3) and CallError (4) messages by default
+                // These responses should be handled by ocpp-command nodes via Pub/Sub
+                // Only allow them through if explicitly configured with includeResponses option
+                // Check both: ocppMessageType (numeric: 3, 4) and messageType (string: 'result', 'error')
+                const isResponse = msg.ocppMessageType === 3 || msg.ocppMessageType === 4 ||
+                                   msg.messageType === 'result' || msg.messageType === 'error';
+
+                if (isResponse && !node.includeResponses) {
+                    // Auto-ack response messages silently
+                    if (node.autoAck) {
+                        await redis.xack(streamKey, consumerGroup, streamId);
+                    }
+                    return;
+                }
+
                 // Apply action filter if configured
                 // Special filter values:
                 //   - "_CallResult" - only CALLRESULT responses

package/package.json

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