node-red-contrib-i3x 0.0.2 → 0.0.4

package/nodes/i3x-server.js

@@ -45,6 +45,11 @@ module.exports = function (RED) {
         node.client = new I3XClient(clientConfig);
         node.setMaxListeners(0);
 
+        // Warn if credentials are sent over plain HTTP
+        if (node.client._httpsWarning) {
+            node.warn(node.client._httpsWarning);
+        }
+
         node.client.testConnection()
             .then(() => {
                 node.connected = true;
@@ -72,4 +77,121 @@ module.exports = function (RED) {
             apiKey: { type: "password" },
         },
     });
+
+    // ── Admin browse endpoints for editor treeview ─────────────────────
+
+    RED.httpAdmin.get("/i3x-server/:id/browse/objecttypes", async function (req, res) {
+        const node = RED.nodes.getNode(req.params.id);
+        if (!node || !node.client) {
+            return res.status(404).json({ error: "Server not found – please deploy first" });
+        }
+        try {
+            const result = await node.client.getObjectTypes({
+                namespaceUri: req.query.namespaceUri || undefined,
+            });
+            res.json(result);
+        } catch (err) {
+            res.status(500).json({ error: err.message });
+        }
+    });
+
+    RED.httpAdmin.get("/i3x-server/:id/browse/objects", async function (req, res) {
+        const node = RED.nodes.getNode(req.params.id);
+        if (!node || !node.client) {
+            return res.status(404).json({ error: "Server not found – please deploy first" });
+        }
+        try {
+            const opts = {};
+            if (req.query.typeId) opts.typeId = req.query.typeId;
+            if (req.query.includeMetadata === "true") opts.includeMetadata = true;
+            const result = await node.client.getObjects(opts);
+            res.json(result);
+        } catch (err) {
+            res.status(500).json({ error: err.message });
+        }
+    });
+
+    RED.httpAdmin.get("/i3x-server/:id/browse/related/:elementId", async function (req, res) {
+        const node = RED.nodes.getNode(req.params.id);
+        if (!node || !node.client) {
+            return res.status(404).json({ error: "Server not found – please deploy first" });
+        }
+        try {
+            const result = await node.client.getRelatedObjects(
+                [req.params.elementId],
+                { includeMetadata: true }
+            );
+            res.json(result);
+        } catch (err) {
+            res.status(500).json({ error: err.message });
+        }
+    });
+
+    // ── Server-side search across all objects ──────────────────────────
+    RED.httpAdmin.get("/i3x-server/:id/browse/search", async function (req, res) {
+        const node = RED.nodes.getNode(req.params.id);
+        if (!node || !node.client) {
+            return res.status(404).json({ error: "Server not found – please deploy first" });
+        }
+        try {
+            const q = (req.query.q || "").toLowerCase();
+            if (!q || q.length < 2) {
+                return res.json([]);
+            }
+            // Fetch all object types then all objects per type, filter by query
+            const types = await node.client.getObjectTypes({});
+            const results = [];
+            const MAX_RESULTS = 50;
+            for (const type of (Array.isArray(types) ? types : [])) {
+                const tid = type.elementId || type.id;
+                const objects = await node.client.getObjects({ typeId: tid });
+                for (const obj of (Array.isArray(objects) ? objects : [])) {
+                    const eid = obj.elementId || obj.id || "";
+                    const name = obj.displayName || "";
+                    if (name.toLowerCase().includes(q) || eid.toLowerCase().includes(q)) {
+                        results.push({
+                            elementId: eid,
+                            displayName: name,
+                            typeName: type.displayName || tid,
+                            typeId: tid,
+                        });
+                        if (results.length >= MAX_RESULTS) break;
+                    }
+                }
+                if (results.length >= MAX_RESULTS) break;
+            }
+            res.json(results);
+        } catch (err) {
+            res.status(500).json({ error: err.message });
+        }
+    });
+
+    // ── Read live values for browser widget ────────────────────────────
+    RED.httpAdmin.post("/i3x-server/:id/browse/values", async function (req, res) {
+        const node = RED.nodes.getNode(req.params.id);
+        if (!node || !node.client) {
+            return res.status(404).json({ error: "Server not found – please deploy first" });
+        }
+        try {
+            const elementIds = req.body && req.body.elementIds;
+            if (!Array.isArray(elementIds) || elementIds.length === 0) {
+                return res.json([]);
+            }
+            // Limit batch size to prevent abuse
+            const ids = elementIds.slice(0, 50);
+            const result = await node.client.readValues(ids, { maxDepth: 1 });
+            res.json(result);
+        } catch (err) {
+            res.status(500).json({ error: err.message });
+        }
+    });
+
+    // ── Connection status check ───────────────────────────────────────
+    RED.httpAdmin.get("/i3x-server/:id/status", function (req, res) {
+        const node = RED.nodes.getNode(req.params.id);
+        if (!node) {
+            return res.status(404).json({ connected: false, error: "Node not found" });
+        }
+        res.json({ connected: !!node.connected });
+    });
 };

package/nodes/i3x-subscribe.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 to monitor">
     </div>
+    <div class="form-row">
+        <div id="i3x-subscribe-browser"></div>
+    </div>
     <div class="form-row">
         <label for="node-input-mode"><i class="fa fa-exchange"></i> Mode</label>
         <select id="node-input-mode">
@@ -20,7 +23,7 @@
     </div>
     <div class="form-row i3x-sub-poll">
         <label for="node-input-pollingInterval"><i class="fa fa-clock-o"></i> Poll Interval (ms)</label>
-        <input type="number" id="node-input-pollingInterval" placeholder="5000" min="500" step="500">
+        <input type="number" id="node-input-pollingInterval" placeholder="5000" min="1000" step="1000">
     </div>
     <div class="form-row">
         <label for="node-input-maxDepth"><i class="fa fa-level-down"></i> Max Depth</label>
@@ -46,6 +49,7 @@
     <p><b>Polling mode</b> periodically calls <code>POST /subscriptions/{id}/sync</code> to retrieve and
     clear queued updates. If SSE setup fails, the node automatically falls back to polling.</p>
     <p>The subscription is automatically cleaned up (deleted from the server) when the node is stopped or re-deployed.</p>
+    <p>Use the <b>Browse</b> button to visually select elements from the server.</p>
 </script>
 
 <script type="text/javascript">
@@ -74,6 +78,15 @@
             }
             mode.on("change", togglePoll);
             togglePoll();
+
+            if (window.I3XBrowser) {
+                this._browser = I3XBrowser.create({
+                    container: "#i3x-subscribe-browser",
+                    serverField: "#node-input-server",
+                    targetField: "#node-input-elementIds",
+                    mode: "multi",
+                });
+            }
         },
     });
 </script>

package/nodes/i3x-subscribe.js

@@ -3,7 +3,7 @@
  */
 "use strict";
 
-const { bindServer, parseIds } = require("../lib/node-utils");
+const { bindServer, parseIds, statusError, clampMaxDepth } = require("../lib/node-utils");
 
 module.exports = function (RED) {
     function I3XSubscribeNode(config) {
@@ -12,9 +12,8 @@ module.exports = function (RED) {
 
         node.elementIds = config.elementIds || "";
         node.mode = config.mode || "sse";
-        node.pollingInterval = parseInt(config.pollingInterval, 10) || 5000;
-        node.maxDepth = parseInt(config.maxDepth, 10);
-        if (isNaN(node.maxDepth)) node.maxDepth = 1;
+        node.pollingInterval = Math.max(1000, parseInt(config.pollingInterval, 10) || 5000);
+        node.maxDepth = clampMaxDepth(config.maxDepth);
 
         node._subscriptionId = null;
         node._sseHandle = null;
@@ -44,7 +43,7 @@ module.exports = function (RED) {
                     startPolling(client);
                 }
             } catch (err) {
-                node.status({ fill: "red", shape: "ring", text: err.message.substring(0, 32) });
+                node.status({ fill: "red", shape: "ring", text: statusError(err.message) });
                 node.error("Subscription setup failed: " + err.message);
 
                 if (node.mode === "sse" && !node._closing) {
@@ -126,7 +125,7 @@ module.exports = function (RED) {
 
             if (node._subscriptionId && node.server && node.server.client) {
                 try {
-                    await node.server.client.deleteSubscription(node._subscriptionId);
+                    await node.server.client.deleteSubscriptions([node._subscriptionId]);
                 } catch (_) {
                     // best-effort cleanup
                 }
@@ -140,7 +139,11 @@ module.exports = function (RED) {
             setup();
         }
         node.server.on("connected", () => {
-            if (!node._subscriptionId && !node._closing) {
+            if (!node._closing) {
+                // Clean up stale state from a previous connection
+                if (node._pollTimer) { clearInterval(node._pollTimer); node._pollTimer = null; }
+                if (node._sseHandle) { node._sseHandle.close(); node._sseHandle = null; }
+                node._subscriptionId = null;
                 setup();
             }
         });

package/nodes/i3x-write.html

@@ -18,6 +18,9 @@
         <label for="node-input-elementId"><i class="fa fa-crosshairs"></i> Element ID</label>
         <input type="text" id="node-input-elementId" placeholder="target element ID">
     </div>
+    <div class="form-row">
+        <div id="i3x-write-browser"></div>
+    </div>
 </script>
 
 <script type="text/html" data-help-name="i3x-write">
@@ -46,8 +49,8 @@
     to update the current value of the object.</p>
     <p>When <b>Target</b> is set to <i>Historical Data</i>, uses <code>PUT /objects/{elementId}/history</code>
     to write historical time-series records.</p>
-    <p>The payload format must match the element's type schema (e.g. a plain number for
-    <code>measurement-value-type</code>, or a state object for <code>state-type</code>).</p>
+    <p>Use the <b>Browse</b> button to visually select the target element from the server,
+    or provide the element ID via <code>msg.elementId</code> at runtime.</p>
 </script>
 
 <script type="text/javascript">
@@ -68,5 +71,15 @@
             return this.name || this.elementId || "i3x write";
         },
         align: "right",
+        oneditprepare: function () {
+            if (window.I3XBrowser) {
+                this._browser = I3XBrowser.create({
+                    container: "#i3x-write-browser",
+                    serverField: "#node-input-server",
+                    targetField: "#node-input-elementId",
+                    mode: "single",
+                });
+            }
+        },
     });
 </script>

package/nodes/i3x-write.js

@@ -3,7 +3,7 @@
  */
 "use strict";
 
-const { bindServer, safeSend } = require("../lib/node-utils");
+const { bindServer, safeSend, statusError } = require("../lib/node-utils");
 
 module.exports = function (RED) {
     function I3XWriteNode(config) {
@@ -42,11 +42,11 @@ module.exports = function (RED) {
                     : await client.writeValue(elementId, value);
                 msg.payload = result;
                 msg.elementId = elementId;
-                node.status({ fill: "green", shape: "dot", text: "ok" });
+                node.status({ fill: "green", shape: "dot", text: "wrote " + elementId.substring(0, 20) });
                 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/icons/i3x-icon.svg

@@ -1,11 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 40" width="40" height="40">
   <rect width="40" height="40" rx="4" fill="#2E8B57"/>
-  <text x="20" y="16" text-anchor="middle" font-family="Arial, sans-serif" font-size="10" font-weight="bold" fill="white">i3X</text>
-  <line x1="8" y1="22" x2="32" y2="22" stroke="white" stroke-width="1.5" stroke-linecap="round"/>
-  <circle cx="12" cy="30" r="3" fill="none" stroke="white" stroke-width="1.5"/>
-  <circle cx="20" cy="30" r="3" fill="none" stroke="white" stroke-width="1.5"/>
-  <circle cx="28" cy="30" r="3" fill="none" stroke="white" stroke-width="1.5"/>
-  <line x1="12" y1="27" x2="12" y2="22" stroke="white" stroke-width="1.5"/>
-  <line x1="20" y1="27" x2="20" y2="22" stroke="white" stroke-width="1.5"/>
-  <line x1="28" y1="27" x2="28" y2="22" stroke="white" stroke-width="1.5"/>
+  <text x="20" y="26" text-anchor="middle" font-family="Arial, sans-serif" font-size="16" font-weight="bold" fill="white">i3X</text>
 </svg>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-i3x",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Node-RED nodes for the i3X (Industrial Information Interoperability eXchange) API by CESMII",
   "keywords": [
     "node-red",
@@ -27,13 +27,13 @@
     "test:docker": "docker compose run --rm test"
   },
   "dependencies": {
-    "axios": "^1.7.0"
+    "axios": "^1.15.0"
   },
   "devDependencies": {
-    "mocha": "^10.0.0",
+    "mocha": "^11.0.0",
     "chai": "^4.0.0",
-    "sinon": "^17.0.0",
-    "nock": "^13.0.0",
+    "sinon": "^21.0.0",
+    "nock": "^14.0.0",
     "node-red": "^3.0.0",
     "node-red-node-test-helper": "^0.3.0"
   },