node-red-contrib-3dm-space 2.1.0 → 2.2.1

package/3dm-cloud-in.js

@@ -1,5 +1,7 @@
 module.exports = function (RED) {
-    "use strict";
+    "use strict";
+
+    var roundPayload = require("./payload-precision");
 
     /*
      * Hidden cloud subscribe settings.
@@ -53,7 +55,7 @@ module.exports = function (RED) {
                 return;
             }
 
-            var data = parsePayload(payload);
+            var data = roundPayload(parsePayload(payload));
 
             if (node.keyFilter) {
                 if (typeof data !== "object" || data === null || Array.isArray(data)) {

package/3dm-cloud-join.js

@@ -1,6 +1,8 @@
 module.exports = function (RED) {
     "use strict";
 
+    var roundPayload = require("./payload-precision");
+
     function isPlainObject(value) {
         return value &&
             typeof value === "object" &&
@@ -79,7 +81,7 @@ module.exports = function (RED) {
             }
 
             var outMsg = node.firstMsg || {};
-            outMsg.payload = clonePayloadObject(node.buffer);
+            outMsg.payload = roundPayload(clonePayloadObject(node.buffer));
 
             node.send(outMsg);
 

package/3dm-cloud-out.js

@@ -1,5 +1,7 @@
 module.exports = function (RED) {
-    "use strict";
+    "use strict";
+
+    var roundPayload = require("./payload-precision");
 
     var fs = require("fs");
     var path = require("path");
@@ -234,7 +236,7 @@ module.exports = function (RED) {
 
             return {
                 ts: ts,
-                values: payload
+                values: roundPayload(payload)
             };
         }
 
@@ -253,6 +255,8 @@ module.exports = function (RED) {
                 return;
             }
 
+            packet = Object.assign({}, packet, { values: roundPayload(packet.values) });
+
             node.server.publish(
                 TELEMETRY_TOPIC,
                 packet,
@@ -283,6 +287,15 @@ module.exports = function (RED) {
         }
 
         function sendResult(msg, send, done) {
+            if (typeof msg.payload === "string") {
+                try {
+                    msg.payload = JSON.stringify(roundPayload(JSON.parse(msg.payload)));
+                } catch (err) {
+                    // Preserve non-JSON text on rejected messages.
+                }
+            } else {
+                msg.payload = roundPayload(msg.payload);
+            }
             send(msg);
 
             if (done) {

package/3dm-config-store.js

@@ -1,5 +1,7 @@
 module.exports = function (RED) {
-    "use strict";
+    "use strict";
+
+    var roundPayload = require("./payload-precision");
 
     var fs = require("fs");
     var path = require("path");
@@ -694,9 +696,9 @@ module.exports = function (RED) {
                 topic: "configStore",
                 event: eventName || "configStore",
                 payload: {
-                    configStore: latestStore
+                    configStore: roundPayload(latestStore)
                 },
-                configStore: latestStore
+                configStore: roundPayload(latestStore)
             };
 
             node.send(outputs);

package/CHANGELOG.md

@@ -0,0 +1,8 @@
+# Changelog
+
+## 2.2.1 — 2026-10-01
+
+- Round numeric output payload values to a maximum of five decimal places, including nested objects and arrays.
+- Apply consistent precision to cloud telemetry, queue replay, local telemetry results, incoming attributes, joined messages, and config snapshots.
+- Preserve numeric types, integers, text, stored configuration precision, and internal control comparisons.
+- Include the shared precision helper in the npm package and exclude old release archives.

package/README.md

@@ -1,5 +1,18 @@
 
+
+
+
+
+
+
 ![This is an alt text.](https://github.com/smithtekIOT/ArtWork/blob/master/3dm%20github.png?raw=true")
+
+
+
+
+
+
+
 # node-red-contrib-3dm-space
 
 Node-RED nodes for connecting Smithtek PassPort gateways to **3DM.space SCADA Cloud**.
@@ -10,6 +23,13 @@ The package is intended for Smithtek PassPort gateway projects using 3DM.space,
 
 ---
 
+
+## Numeric output precision
+
+From version 2.2.1, numeric output payload values are rounded to a maximum of five decimal places. This applies recursively to nested objects and arrays in telemetry, incoming attributes, joined payloads, and config snapshots. For example, `12.12345678` becomes `12.12346`.
+
+Values remain numbers; trailing zeros are not added. Integers, strings (including numeric strings), booleans, and null are unchanged. JSON telemetry strings are parsed and their numeric values are rounded before publishing; the local result payload remains a JSON string. Live and queued telemetry use the same precision, including older packets replayed from the queue. Stored configuration and internal control comparisons retain their original precision.
+
 ## Requirements
 
 To use these nodes, you need:
@@ -40,13 +60,15 @@ The credentials are copied from 3DM.space into Node-RED in this order:
 
 ## Nodes Included
 
-This package includes four nodes:
+This package includes five nodes:
 
 - **3DM Cloud Login**
 - **3DM Out**
 - **3DM In**
 - **3DM Config Store**
-![This is an alt text.](https://github.com/smithtekIOT/ArtWork/blob/master/3dm%20nodes.jpg?raw=true")
+- **3DM Join**
+
+![This is an alt text.](https://github.com/smithtekIOT/ArtWork/blob/master/3dm%204%20nodes.jpg?raw=true)
 
 ---
 
@@ -1343,8 +1365,231 @@ output2 skipped - output disabled
 
 Increase Active Outputs or change the item to `output1`.
 
+---
+---
+
+# 3DM Join
+![This is an alt text.](https://github.com/smithtekIOT/ArtWork/blob/master/3DM%20join%20nodes.jpg?raw=true)
+The **3DM Join** node collects multiple JSON payloads, merges them into one payload, then sends one combined message after a configurable timeout.
+
+It is useful when data arrives from multiple sources at slightly different times, but the user wants one clean telemetry update sent to 3DM.space.
+
+Typical use:
+
+```text
+Mako RF Station 1
+Mako RF Station 2
+Mako RF Station 3
+        ↓
+3DM Join
+        ↓
+3DM Out
+        ↓
+3DM.space
+```
+
+---
+
+## Why Use 3DM Join
+
+The 3DM Join node simplifies flows where telemetry is collected from more than one source.
+
+Instead of sending each small payload separately to 3DM.space, the Join node can collect the values first and send them as one larger JSON object.
+
+This is ideal for RF systems where each remote station may respond a few seconds apart, but the user is happy with one complete site update every minute.
+
+Example:
+
+```text
+Bore 1 data arrives
+Bore 2 data arrives
+Tank data arrives
+Weather data arrives
+        ↓
+3DM Join waits for the timeout
+        ↓
+One combined payload is sent to 3DM Out
+```
+
+---
+
+## Input Data Type
+
+The 3DM Join node expects `msg.payload` to be a JSON object.
+
+Correct:
+
+```json
+{
+  "b1 dc": 24.3
+}
+```
+
+Correct:
+
+```json
+{
+  "b2 flow": 88.5
+}
+```
+
+Incorrect:
+
+```json
+24.3
+```
+
+Incorrect:
+
+```text
+b1 dc
+```
+
+Invalid payloads are ignored.
+
+---
+
+## Timeout
+
+The timeout starts when the first valid message arrives.
+
+The timer does not restart when more messages arrive.
+
+Example:
+
+```text
+Timeout: 10 seconds
+```
+
+If the first message arrives at 12:00:00, the joined output is sent at 12:00:10.
+
+Any valid JSON payloads received during that 10 second window are merged together.
+
 ---
 
+## Duplicate Keys
+
+If the same key arrives more than once during the timeout window, the latest value is used.
+
+Example:
+
+```json
+{
+  "b1 dc": 24.1
+}
+```
+
+then:
+
+```json
+{
+  "b1 dc": 24.4
+}
+```
+
+Final joined output:
+
+```json
+{
+  "b1 dc": 24.4
+}
+```
+
+---
+
+## Example Joined Output
+
+Incoming message 1:
+
+```json
+{
+  "b1 dc": 24.3,
+  "b1 fb": 1
+}
+```
+
+Incoming message 2:
+
+```json
+{
+  "b2 dc": 24.1,
+  "b2 fb": 0
+}
+```
+
+Incoming message 3:
+
+```json
+{
+  "tank level": 76.5
+}
+```
+
+Output after timeout:
+
+```json
+{
+  "b1 dc": 24.3,
+  "b1 fb": 1,
+  "b2 dc": 24.1,
+  "b2 fb": 0,
+  "tank level": 76.5
+}
+```
+
+---
+
+## Recommended Use With 3DM Out
+
+The 3DM Join node is normally placed before the **3DM Out** node.
+
+```text
+RF / PLC / Sensor Inputs
+        ↓
+3DM Join
+        ↓
+3DM Out
+```
+
+This keeps telemetry updates cleaner and helps reduce the number of separate cloud messages.
+
+For example, an RF system may poll several stations over 30 to 45 seconds, then send one complete site update to 3DM.space every minute.
+
+---
+
+## 3DM Join Status Messages
+
+### waiting
+
+The node is waiting for the first valid JSON payload.
+
+### collecting
+
+The node has received at least one valid payload and is collecting keys until the timeout expires.
+
+### sent
+
+The timeout expired and the combined payload was sent.
+
+### bad payload
+
+The incoming `msg.payload` was not a JSON object.
+
+Check the payload going into the 3DM Join node.
+
+---
+
+## Notes
+
+- Use 3DM Join to combine multiple telemetry payloads before 3DM Out.
+- The timeout starts from the first valid message.
+- The timer does not reset when more messages arrive.
+- Payloads must be JSON objects.
+- Duplicate keys are overwritten by the latest value.
+- The output is one combined `msg.payload` object.
+- This is useful for RF polling systems, multi-device sites, PLC data blocks and grouped telemetry updates.
+
+---
 # 3DM SCADA Canvas Smart Control Integration
 
 ![This is an alt text.](https://github.com/smithtekIOT/ArtWork/blob/master/Canvas%20SCADA%203dm.jpg?raw=true)

package/package.json

@@ -1,34 +1,43 @@
-{
-  "name": "node-red-contrib-3dm-space",
-  "version": "2.1.0",
-  "description": "Node-RED nodes for 3DM.space SCADA Cloud telemetry, attributes, and local config storage",
-  "main": "3dm-cloud-config.js",
-  "license": "GPL-3.0-or-later",
-  "keywords": [
-    "node-red",
-    "node-red-contrib",
-    "3dm",
-    "3dm.space",
-    "smithtek",
-    "scada",
-    "telemetry",
-    "store-and-forward",
-    "config-store",
-    "scheduler"
-  ],
-  "node-red": {
-    "nodes": {
-      "3dm-cloud-config": "3dm-cloud-config.js",
-      "3dm-cloud-out": "3dm-cloud-out.js",
-      "3dm-cloud-in": "3dm-cloud-in.js",
-      "3dm-config-store": "3dm-config-store.js",
-      "3dm-cloud-join": "3dm-cloud-join.js"
-    }
-  },
-  "dependencies": {
-    "mqtt": "~4.3.7"
-  },
-  "optionalDependencies": {
-    "node-persistent-queue": "^0.3.1"
-  }
-}
+{
+  "name": "node-red-contrib-3dm-space",
+  "version": "2.2.1",
+  "description": "Node-RED nodes for 3DM.space SCADA Cloud telemetry, attributes, and local config storage",
+  "main": "3dm-cloud-config.js",
+  "license": "GPL-3.0-or-later",
+  "keywords": [
+    "node-red",
+    "node-red-contrib",
+    "3dm",
+    "3dm.space",
+    "smithtek",
+    "scada",
+    "telemetry",
+    "store-and-forward",
+    "config-store",
+    "scheduler"
+  ],
+  "node-red": {
+    "nodes": {
+      "3dm-cloud-config": "3dm-cloud-config.js",
+      "3dm-cloud-out": "3dm-cloud-out.js",
+      "3dm-cloud-in": "3dm-cloud-in.js",
+      "3dm-config-store": "3dm-config-store.js",
+      "3dm-cloud-join": "3dm-cloud-join.js"
+    }
+  },
+  "dependencies": {
+    "mqtt": "~4.3.7"
+  },
+  "optionalDependencies": {
+    "node-persistent-queue": "^0.3.1"
+  },
+  "files": [
+    "3dm-*.js",
+    "3dm-*.html",
+    "payload-precision.js",
+    "icons/",
+    "icon.png",
+    "README.md",
+    "CHANGELOG.md"
+  ]
+}

package/payload-precision.js

@@ -0,0 +1,38 @@
+"use strict";
+
+// Round numeric payload values without changing strings or the source objects.
+function roundPayload(value, seen) {
+    if (typeof value === "number") {
+        return Number.isFinite(value) && !Number.isInteger(value)
+            ? Number(value.toFixed(5))
+            : value;
+    }
+
+    if (!value || typeof value !== "object") {
+        return value;
+    }
+
+    var prototype = Object.getPrototypeOf(value);
+    if (!Array.isArray(value) && prototype !== Object.prototype && prototype !== null) {
+        return value;
+    }
+
+    seen = seen || new WeakMap();
+    if (seen.has(value)) {
+        return seen.get(value);
+    }
+
+    var output = Array.isArray(value) ? new Array(value.length) : Object.create(prototype);
+    seen.set(value, output);
+    Object.keys(value).forEach(function (key) {
+        Object.defineProperty(output, key, {
+            value: roundPayload(value[key], seen),
+            enumerable: true,
+            writable: true,
+            configurable: true
+        });
+    });
+    return output;
+}
+
+module.exports = roundPayload;