@halsystems/red-bacnet 1.0.20 → 1.0.22

package/CHANGELOG.md

@@ -0,0 +1,13 @@
+# Changelog
+
+## [1.0.22]
+### Fixed
+- Read Point supports string reading
+
+## [1.0.21]
+### Fixed
+- Fixed discovering points failed when using BACnet router IP to ms/tp
+
+## [1.0.20]
+### Fixed
+- Fixed failure to parse bacnet result with multiple property ids

package/common/job/read_point.js

@@ -247,7 +247,7 @@ module.exports = {
 
                 // format point
                 const facetObj = facetsStrToObj(p.facets);
-
+                console.log(value)
                 if (facetObj.trueText != null || facetObj.falseText != null) { // boolean
                     fvalue = fvalue ? facetObj.trueText : facetObj.falseText
                 } else if (facetObj.range != null) { // enum
@@ -256,6 +256,7 @@ module.exports = {
                     else
                         fvalue = String(fvalue)
                 } else { // general
+                    // handle number
                     if (typeof value === 'number') {
                         value = (facetObj.precision != null) ? +value.toFixed(facetObj.precision) : +value.toFixed(1)
                         fvalue = value

package/common/schema.js

@@ -48,7 +48,10 @@ module.exports = {
     }),
 
     readPointSchema: Joi.object({
-        value: Joi.number().required(),
+        value: Joi.alternatives().try(
+            Joi.number(),
+            Joi.string()
+        ).required(),
         fvalue: Joi.string().allow('').required(),
         err: Joi.string().allow(''),
     }),

package/ext/node-bacstack/dist/lib/client.js

@@ -1428,7 +1428,7 @@ class Client extends events_1.EventEmitter {
         if (receiver && receiver.forwardedFrom) {
             // Remote node address given, forward to BBMD
             baBvlc.encode(buffer.buffer, baEnum.BvlcResultPurpose.FORWARDED_NPDU, buffer.offset, receiver.forwardedFrom);
-        } else if (receiver && receiver.address) {
+        } else if (receiver && receiver.address || (receiver && receiver.ip)) {
             // Specific address, unicast
             baBvlc.encode(buffer.buffer, baEnum.BvlcResultPurpose.ORIGINAL_UNICAST_NPDU, buffer.offset);
         } else {
@@ -1438,7 +1438,7 @@ class Client extends events_1.EventEmitter {
         this._transport.send(
             buffer.buffer,
             buffer.offset,
-            (receiver && receiver.address) || null
+            (receiver && receiver.address) || (receiver && receiver.ip) || null
         );
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@halsystems/red-bacnet",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "description": "NodeRED BACnet IP client",
   "email": "open_source@halsystems.com.au",
   "repository": {

package/red-bacnet/play.html

@@ -1,32 +0,0 @@
-<script type="text/javascript">
-    RED.nodes.registerType('play', {
-        category: 'redbacnet',
-        color: '#b5e6ff',
-        defaults: {
-            name: { value: "" },
-            //client: { type: "bacnet-client", required: true },
-        },
-        inputs: 1,
-        outputs: 1,
-        icon: "hal-systems.png",
-        label: function () {
-            return this.name || "play";
-        }
-    });
-</script>
-
-<script type="text/html" data-template-name="play">
-    <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">
-    </div>
-    <!--
-    <div class="form-row">
-        <label for="node-input-client"><i class="fa fa-tag"></i> Client</label>
-        <input type="text" id="node-input-client">
-    </div> -->
-</script>
-
-<script type="text/html" data-help-name="play">
-    <p>This is Jason playground</p>
-</script>

package/red-bacnet/play.js

@@ -1,49 +0,0 @@
-'use strict';
-require('./_alias.js');
-
-
-// ---------------------------- functions ----------------------------
-
-
-// ---------------------------- module ----------------------------
-module.exports = function (RED) {
-    class Play {
-        constructor(config) {
-            RED.nodes.createNode(this, config);
-
-            this.name = config.name;
-            this.client = RED.nodes.getNode(config.client);
-
-            // events
-            this.#subscribeListeners();
-        }
-
-        #subscribeListeners() {
-            /**
-             * @param {Object} msg - The message object.
-             * @param {any} msg.payload - The payload of the message.
-            */
-            // @ts-ignore
-            this.on('input', function (msg) {
-                // msg.payload = msg.payload.toUpperCase();
-                let count = 0
-                const loopWithTimeout = () => {
-                    if (count < 10) {
-                        this.status({ fill: "yellow", shape: "dot", text: `count: ${count}` });
-                        count++;
-                        setTimeout(loopWithTimeout, 1000); // Schedule the next iteration after 1 second
-                    } else {
-                        this.status({ fill: "green", shape: "dot", text: "completed" });
-                    }
-                    msg.payload = count;
-                    this.send(msg);
-                };
-
-                loopWithTimeout();
-            });
-        }
-    }
-
-    // ----- register node -----
-    RED.nodes.registerType("play", Play);
-}