node-red-contrib-i3x 0.0.2 → 0.0.4

package/nodes/i3x-history.html

@@ -11,6 +11,9 @@
         <label for="node-input-elementIds"><i class="fa fa-list"></i> Element IDs</label>
         <input type="text" id="node-input-elementIds" placeholder="comma-separated element IDs">
     </div>
+    <div class="form-row">
+        <div id="i3x-history-browser"></div>
+    </div>
     <div class="form-row">
         <label for="node-input-startTime"><i class="fa fa-clock-o"></i> Start Time</label>
         <input type="text" id="node-input-startTime" placeholder="ISO 8601 or relative (e.g. -1h, -7d)">
@@ -50,6 +53,7 @@
     <p>Uses <code>POST /objects/history</code>. Time values support both ISO 8601 and
     relative notation: <code>-30s</code> (seconds), <code>-5m</code> (minutes), <code>-1h</code> (hours),
     <code>-7d</code> (days), <code>-1w</code> (weeks).</p>
+    <p>Use the <b>Browse</b> button to visually select elements from the server.</p>
 </script>
 
 <script type="text/javascript">
@@ -71,5 +75,15 @@
         label: function () {
             return this.name || this.elementIds || "i3x history";
         },
+        oneditprepare: function () {
+            if (window.I3XBrowser) {
+                this._browser = I3XBrowser.create({
+                    container: "#i3x-history-browser",
+                    serverField: "#node-input-server",
+                    targetField: "#node-input-elementIds",
+                    mode: "multi",
+                });
+            }
+        },
     });
 </script>

package/nodes/i3x-history.js

@@ -3,7 +3,7 @@
  */
 "use strict";
 
-const { bindServer, parseIds, safeSend } = require("../lib/node-utils");
+const { bindServer, parseIds, safeSend, statusError, clampMaxDepth } = require("../lib/node-utils");
 
 /**
  * Resolve relative time strings like "-1h", "-7d", "-30m" to ISO 8601.
@@ -28,8 +28,7 @@ module.exports = function (RED) {
         node.elementIds = config.elementIds || "";
         node.startTime = config.startTime || "";
         node.endTime = config.endTime || "";
-        node.maxDepth = parseInt(config.maxDepth, 10);
-        if (isNaN(node.maxDepth)) node.maxDepth = 1;
+        node.maxDepth = clampMaxDepth(config.maxDepth);
 
         if (!bindServer(node, RED, config.server)) return;
 
@@ -46,18 +45,19 @@ module.exports = function (RED) {
 
             const startTime = resolveTime(msg.startTime || node.startTime);
             const endTime = resolveTime(msg.endTime || node.endTime);
-            const maxDepth = msg.maxDepth !== undefined ? parseInt(msg.maxDepth, 10) : node.maxDepth;
+            const maxDepth = msg.maxDepth !== undefined ? clampMaxDepth(msg.maxDepth) : node.maxDepth;
 
             node.status({ fill: "blue", shape: "dot", text: "querying..." });
 
             try {
                 const result = await client.readHistory(ids, { startTime, endTime, maxDepth });
                 msg.payload = result;
-                node.status({ fill: "green", shape: "dot", text: "ok" });
+                const count = Array.isArray(result) ? result.length : 1;
+                node.status({ fill: "green", shape: "dot", text: count + " record" + (count !== 1 ? "s" : "") });
                 send(msg);
                 if (done) done();
             } catch (err) {
-                node.status({ fill: "red", shape: "ring", text: err.message.substring(0, 32) });
+                node.status({ fill: "red", shape: "ring", text: statusError(err.message) });
                 if (done) done(err); else node.error(err, msg);
             }
         });

package/nodes/i3x-read.html

@@ -11,6 +11,9 @@
         <label for="node-input-elementIds"><i class="fa fa-list"></i> Element IDs</label>
         <input type="text" id="node-input-elementIds" placeholder="comma-separated element IDs">
     </div>
+    <div class="form-row">
+        <div id="i3x-read-browser"></div>
+    </div>
     <div class="form-row">
         <label for="node-input-maxDepth"><i class="fa fa-level-down"></i> Max Depth</label>
         <input type="number" id="node-input-maxDepth" placeholder="1" min="0" step="1">
@@ -37,6 +40,8 @@
     <h3>Details</h3>
     <p>Uses <code>POST /objects/value</code>. The <code>maxDepth</code> parameter controls whether
     child component values are included recursively.</p>
+    <p>Use the <b>Browse</b> button to visually select elements from the server,
+    or provide element IDs via <code>msg.elementIds</code> at runtime.</p>
 </script>
 
 <script type="text/javascript">
@@ -56,5 +61,15 @@
         label: function () {
             return this.name || this.elementIds || "i3x read";
         },
+        oneditprepare: function () {
+            if (window.I3XBrowser) {
+                this._browser = I3XBrowser.create({
+                    container: "#i3x-read-browser",
+                    serverField: "#node-input-server",
+                    targetField: "#node-input-elementIds",
+                    mode: "multi",
+                });
+            }
+        },
     });
 </script>

package/nodes/i3x-read.js

@@ -3,7 +3,7 @@
  */
 "use strict";
 
-const { bindServer, parseIds, safeSend } = require("../lib/node-utils");
+const { bindServer, parseIds, safeSend, statusError, clampMaxDepth } = require("../lib/node-utils");
 
 module.exports = function (RED) {
     function I3XReadNode(config) {
@@ -11,8 +11,7 @@ module.exports = function (RED) {
         const node = this;
 
         node.elementIds = config.elementIds || "";
-        node.maxDepth = parseInt(config.maxDepth, 10);
-        if (isNaN(node.maxDepth)) node.maxDepth = 1;
+        node.maxDepth = clampMaxDepth(config.maxDepth);
 
         if (!bindServer(node, RED, config.server)) return;
 
@@ -27,18 +26,19 @@ module.exports = function (RED) {
                 return;
             }
 
-            const maxDepth = msg.maxDepth !== undefined ? parseInt(msg.maxDepth, 10) : node.maxDepth;
+            const maxDepth = msg.maxDepth !== undefined ? clampMaxDepth(msg.maxDepth) : node.maxDepth;
 
             node.status({ fill: "blue", shape: "dot", text: "requesting..." });
 
             try {
                 const result = await client.readValues(ids, { maxDepth });
                 msg.payload = result;
-                node.status({ fill: "green", shape: "dot", text: "ok" });
+                const count = Array.isArray(result) ? result.length : 1;
+                node.status({ fill: "green", shape: "dot", text: count + " value" + (count !== 1 ? "s" : "") });
                 send(msg);
                 if (done) done();
             } catch (err) {
-                node.status({ fill: "red", shape: "ring", text: err.message.substring(0, 32) });
+                node.status({ fill: "red", shape: "ring", text: statusError(err.message) });
                 if (done) done(err); else node.error(err, msg);
             }
         });