@halsystems/red-bacnet 2.2.0-alpha.1 → 2.2.0-alpha2

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [2.2.0-alpha.2]
+### Changed
+- all `nodes` retained original `msg` properties
+- `writePoint` emit `payload` with failed points after completion
+
 ## [2.2.0-alpha.1]
 ### Changed
 - `ConcorrentTasksWithNetworkAwareness` added `invoke-id` generator and tracking

package/common/bacnet.js

@@ -402,7 +402,12 @@ module.exports = {
                             getNextInvokeId
                         );
                     } catch (err) {
-                        eventEmitter.emit(EVENT_ERROR, { id: id, error: getErrMsg(err) });
+                        eventEmitter.emit(EVENT_ERROR, {
+                            point: {
+                                [point.id]: point.value
+                            },
+                            error: getErrMsg(err)
+                        });
                     }
                     return
                 }

package/common/job/discover_device.js

@@ -89,9 +89,6 @@ module.exports = {
                             }
 
                             this.msg.payload = validatedDevices;
-                            delete this.msg.network;
-                            delete this.msg.lowLimit;
-                            delete this.msg.highLimit;
                             this.eventEmitter.emit(EVENT_OUTPUT, this.msg);
                             this.#updateProgress(100)
                             resolve();

package/common/job/discover_point.js

@@ -249,7 +249,6 @@ module.exports = {
 
             this.msg.payload = exportPointsList;
             this.msg.device = device;
-            delete this.msg.devices;
             this.eventEmitter.emit(EVENT_OUTPUT, this.msg);
         }
     }

package/common/job/read_point.js

@@ -313,8 +313,6 @@ module.exports = {
             }
 
             this.msg.payload = exportPoints;
-            delete this.msg.devices;
-            delete this.msg.points;
             this.eventEmitter.emit(EVENT_OUTPUT, this.msg);
         }
     }

package/common/job/write_point.js

@@ -20,6 +20,7 @@ const {
 module.exports = {
     WritePointJob: class WritePointJob extends BaseJob {
         writePointDetails = {}
+        failedPoints = {}
         devicePointSeparator = '.';
 
         constructor(
@@ -176,14 +177,7 @@ module.exports = {
                 }
 
                 // add point details
-                pointDetails[id] = {
-                    deviceName: p.deviceName,
-                    bacType: p.bacType,
-                    bacInstance: p.bacInstance,
-                    bacProp: p.bacProp,
-                    valueType: p.valueType,
-                    priority: p.priority
-                }
+                pointDetails[id] = { ...p };
             });
 
             if (pointSchemaErrList.length > 0) {
@@ -307,6 +301,7 @@ module.exports = {
             });
 
             smartWriteEvent.on(EVENT_ERROR, (data) => {
+                Object.assign(this.failedPoints, data.point);
                 this.eventEmitter.emit(EVENT_ERROR, errMsg(
                     this.name, ERR_WRITING_POINT, data
                 ));
@@ -319,34 +314,8 @@ module.exports = {
         }
 
         #exportWriteResults() {
-            // Separate successful and failed points
-            const failedPoints = {};
-            let totalPoints = 0;
-            let successfulPoints = 0;
-
-            Object.entries(this.writePointDetails).forEach(([key, value]) => {
-                totalPoints++;
-                // Check if point has an error property (would be set if write failed)
-                if (value.error) {
-                    failedPoints[key] = value;
-                } else {
-                    successfulPoints++;
-                }
-            });
-
             // Update msg with results
-            this.msg.payload = failedPoints;
-            this.msg.result = {
-                written: successfulPoints,
-                failed: Object.keys(failedPoints).length,
-                total: totalPoints
-            };
-
-            // Remove input properties from msg
-            delete this.msg.devices;
-            delete this.msg.points;
-            delete this.msg.writePoints;
-
+            this.msg.payload = this.failedPoints;
             this.eventEmitter.emit(EVENT_OUTPUT, this.msg);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@halsystems/red-bacnet",
-  "version": "2.2.0-alpha.1",
+  "version": "2.2.0-alpha2",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"

package/red-bacnet/discover_point.html

@@ -95,7 +95,7 @@
             <dt class="optional">msg.id <span class="property-type">string | number</span></dt>
                 <dd> Job ID. Default to <code>discoverPoints</code> if not provided.</dd>
             <dt class="optional">msg.priority <span class="property-type">number</span></dt>
-                <dd> Job priority in queue. Default to <code>5</code> if not provided.</dd>
+            <dd> Job priority in queue. Default to <code>5</code> if not provided.</dd>
         </dl>
 
     <h3>Outputs</h3>

package/red-bacnet/read_point.html

@@ -91,7 +91,7 @@
             <dd> Job ID. Default to <code>readPoints</code> if not provided.</dd>
 
             <dt class="optional">msg.priority <span class="property-type">number</span></dt>
-            <dd> Job priority in queue. Default to <code>2</code> if not provided.</dd>
+            <dd> Job priority in queue. Default to <code>3</code> if not provided.</dd>
         </dl>
 
     <h3>Outputs</h3>

package/red-bacnet/write_point.html

@@ -82,6 +82,12 @@
             <dd> Job priority in queue. Default to <code>2</code> if not provided.</dd>
         </dl>
 
+    <h3>Outputs</h3>
+    <dl class="message-properties">
+        <dt>msg.payload <span class="property-type">object</span></dt>
+        <dd>Failed to write points.</dd>
+    </dl>
+
     <h3>Details</h3>
         <p>If node is triggered while existing job is running, new job will be coalesced if <code>msg.id</code> are identical, else new job will be put in queue until current job is completed.</p>
 </script>