node-red-contrib-modbus-modpackqt 3.3.25 → 3.3.27

package/CHANGELOG.md

@@ -4,6 +4,44 @@ All notable changes to **node-red-contrib-modbus-modpackqt** are documented
 here. This project follows [Semantic Versioning](https://semver.org/) — pin a
 major version (`^2.0.0`) in production.
 
+## [3.3.26] — 2026-05-23
+
+### Added
+
+- **Cloud profile pickers — no more typing IPs manually.**
+  Paste your **Cloud Gateway Key** (generate one at
+  modpackqt.com → Settings → Cloud Gateways) into the runtime config node and
+  a **My Connections** dropdown instantly loads all your saved Modbus devices,
+  auto-filling Host, Port, Unit ID, and transport mode. The slave-server and
+  slave-probe nodes gain a matching **My Slaves** picker that auto-fills Port
+  and Unit ID from your saved slave configs.
+
+- **Server-side proxy — key never reaches the browser.**
+  `modpackqt-config.js` registers two Node-RED admin endpoints
+  (`GET /modpackqt/connections` and `GET /modpackqt/slaves`) that look up the
+  stored credential on the config/probe node and proxy the request to
+  modpackqt.com with the `X-Tunnel-Key` header. The browser only sees the
+  JSON result — credentials stay in the Node-RED process.
+
+- **Reuses existing auth — no new mechanism.**
+  Uses the same `X-Tunnel-Key` header the Electron gateway already sends to
+  modpackqt.com. The cloud server now accepts this header on
+  `GET /api/connections` and `GET /api/slaves`, so no new endpoints or tokens
+  were introduced.
+
+### Fixed
+
+- **slave-probe node relabelled "Account Key" → "Cloud Gateway Key"** in
+  both the editor dialog and the help panel, consistent with the master-probe
+  and slave-server nodes (fixed in v3.3.24 for those nodes; now consistent
+  everywhere).
+
+### Unchanged
+
+- Manual host/port entry is always available as a fallback — no Cloud Gateway
+  Key is required for any Modbus master/slave operation. All Modbus traffic
+  remains 100% local regardless of whether a key is set.
+
 ## [3.3.25] — 2026-05-10
 
 ### Changed

package/nodes/lib/probe-runtime.js

@@ -18,7 +18,7 @@
 const http = require('http');
 const { URL } = require('url');
 
-const PALETTE_VERSION = '3.3.25';
+const PALETTE_VERSION = '3.3.26';
 const DEFAULT_PORT = parseInt(process.env.MODPACKQT_PROBE_PORT, 10) || 8502;
 const BIND_HOST    = process.env.MODPACKQT_PROBE_HOST || '127.0.0.1';
 const PORT_RETRY   = 5;

package/nodes/modpackqt-config.html

@@ -17,6 +17,9 @@
       slaveHost:    { value: '0.0.0.0' },
       slavePort:    { value: 1502, validate: RED.validators.number() }
     },
+    credentials: {
+      apiKey: { type: 'password' }
+    },
     label: function () {
       const t = this.masterMode === 'rtu'
         ? `RTU ${this.serialPort || '?'} #${this.unitId || 1}`
@@ -25,6 +28,9 @@
       return this.name && this.name !== 'ModPackQT Device' ? `${this.name} (${t})` : `${t}${s}`;
     },
     oneditprepare: function () {
+      const node = this;
+
+      // ── Transport toggle
       const toggleRtu = () => {
         const isRtu = $('#node-config-input-masterMode').val() === 'rtu';
         $('.modpackqt-rtu-only').toggle(isRtu);
@@ -32,6 +38,60 @@
       };
       $('#node-config-input-masterMode').on('change', toggleRtu);
       toggleRtu();
+
+      // ── My Connections picker — uses this config node's own Cloud Gateway Key
+      const $sel  = $('#node-config-input-modpackqt-conn-picker');
+      const $hint = $('#modpackqt-config-conn-picker-hint');
+      const reload = () => {
+        $sel.empty().append('<option value="">— Loading… —</option>');
+        if (!node.id) {
+          $sel.empty().append('<option value="">— Save this node first, then reopen —</option>');
+          $hint.text('Click Done once to save the node, then reopen to load your connections.');
+          return;
+        }
+        $.getJSON('modpackqt/connections?config=' + encodeURIComponent(node.id))
+          .done((rows) => {
+            $sel.empty().append('<option value="">— Manual entry —</option>');
+            (rows || []).forEach((c) => {
+              const label = (c.name || '(unnamed)') + (c.connectionType === 'rtu'
+                ? ' — RTU'
+                : ' — ' + (c.host || '?') + ':' + (c.port || 502) + ' #' + (c.unitId || 1));
+              $('<option>').val(c.id).text(label).data('conn', c).appendTo($sel);
+            });
+            $hint.text(
+              (rows && rows.length)
+                ? 'Pick a saved connection to auto-fill the fields below.'
+                : 'No saved connections yet — add one at modpackqt.com → Connections.'
+            );
+            // Pre-select if the current host/port matches a saved connection
+            (rows || []).some((c) => {
+              if (c.host === (node.targetHost || '') &&
+                  Number(c.port) === Number(node.targetPort || 0)) {
+                $sel.val(c.id); return true;
+              }
+              return false;
+            });
+          })
+          .fail((xhr) => {
+            const msg = (xhr.responseJSON && xhr.responseJSON.error) || ('HTTP ' + xhr.status);
+            $sel.empty().append($('<option>').val('').text('— ' + msg + ' —'));
+            $hint.text('Check the Cloud Gateway Key above.');
+          });
+      };
+      $('#modpackqt-config-conn-picker-refresh').on('click', (e) => { e.preventDefault(); reload(); });
+      $sel.on('change', function () {
+        const c = $(this).find('option:selected').data('conn');
+        if (!c) return;
+        if (c.host)                      $('#node-config-input-targetHost').val(c.host);
+        if (c.port)                      $('#node-config-input-targetPort').val(c.port);
+        if (c.unitId)                    $('#node-config-input-unitId').val(c.unitId);
+        if (c.connectionType === 'rtu')  $('#node-config-input-masterMode').val('rtu').trigger('change');
+        else                             $('#node-config-input-masterMode').val('tcp').trigger('change');
+        if (!$('#node-config-input-name').val() || $('#node-config-input-name').val() === 'ModPackQT Device') {
+          if (c.name) $('#node-config-input-name').val(c.name);
+        }
+      });
+      reload();
     }
   });
 </script>
@@ -42,6 +102,24 @@
     <input type="text" id="node-config-input-name" placeholder="e.g. Inverter A">
   </div>
 
+  <div class="form-row">
+    <label for="node-config-input-apiKey"><i class="fa fa-key"></i> Cloud Gateway Key</label>
+    <input type="password" id="node-config-input-apiKey" placeholder="Paste your ModPackQT tunnel key (optional)">
+  </div>
+  <div class="form-tips" style="font-size:11px;color:#6b7280;margin:-8px 0 12px 105px">
+    Optional. Generate at <a href="https://modpackqt.com/settings" target="_blank" rel="noopener">modpackqt.com → Settings → Cloud Gateways</a>.
+    Lets you pick a saved connection from the dropdown below instead of typing host/port manually.
+  </div>
+
+  <div class="form-row">
+    <label for="node-config-input-modpackqt-conn-picker"><i class="fa fa-cloud-download"></i> My Connections</label>
+    <select id="node-config-input-modpackqt-conn-picker" style="width:65%"></select>
+    <button type="button" id="modpackqt-config-conn-picker-refresh" class="red-ui-button" title="Reload" style="margin-left:4px"><i class="fa fa-refresh"></i></button>
+  </div>
+  <div id="modpackqt-config-conn-picker-hint" class="form-tips" style="font-size:11px;color:#6b7280;margin:-8px 0 12px 105px">
+    Pick a saved connection to auto-fill the fields below, or leave on Manual entry and type them yourself.
+  </div>
+
   <h4 style="margin-top:18px">Target Device</h4>
   <div class="form-row modpackqt-tcp-only">
     <label for="node-config-input-targetHost"><i class="fa fa-plug"></i> IP Address</label>
@@ -138,6 +216,16 @@
     only need to know the function code, address, and quantity.
   </p>
 
+  <h3>Cloud Gateway Key + My Connections</h3>
+  <p>
+    Paste your ModPackQT tunnel key (generate one at
+    <a href="https://modpackqt.com/settings" target="_blank" rel="noopener">modpackqt.com → Settings → Cloud Gateways</a>)
+    to unlock the <b>My Connections</b> picker. Selecting a saved connection auto-fills
+    the IP address, port, unit ID, and transport mode — no manual typing needed.
+    The key is stored as a Node-RED credential (never sent to the browser).
+    Leave the key blank to enter host/port manually as before.
+  </p>
+
   <h3>Master mode</h3>
   <ul>
     <li><b>Modbus TCP</b> — connects to the configured Host/Port.</li>

package/nodes/modpackqt-config.js

@@ -19,12 +19,13 @@ module.exports = function (RED) {
     RED._modpackqtAdminRoutesRegistered = true;
     function makeProxy(fetchFn) {
       return function (req, res) {
-        const probeId = req.query && req.query.probe;
-        if (!probeId) return res.status(400).json({ error: 'probe query param required' });
-        const probe = RED.nodes.getNode(probeId);
-        if (!probe) return res.status(404).json({ error: 'Probe node not found (deploy first?)' });
-        const key = probe.credentials && probe.credentials.apiKey;
-        if (!key) return res.status(400).json({ error: 'No Account Key set on this probe node.' });
+        // Accept ?config=<id> (config node) or ?probe=<id> (probe node) — same key field.
+        const nodeId = (req.query && (req.query.config || req.query.probe)) || '';
+        if (!nodeId) return res.status(400).json({ error: 'config or probe query param required' });
+        const node = RED.nodes.getNode(nodeId);
+        if (!node) return res.status(404).json({ error: 'Node not found (deploy first?)' });
+        const key = node.credentials && node.credentials.apiKey;
+        if (!key) return res.status(400).json({ error: 'No Cloud Gateway Key set on this node.' });
         fetchFn(key, function (err, data) {
           if (err) return res.status(502).json({ error: err.message });
           res.json(data);

package/nodes/modpackqt-slave-probe.html

@@ -97,12 +97,12 @@
   </div>
 
   <div class="form-row">
-    <label for="node-input-apiKey"><i class="fa fa-key"></i> Account Key</label>
+    <label for="node-input-apiKey"><i class="fa fa-key"></i> Cloud Gateway Key</label>
     <input type="password" id="node-input-apiKey" placeholder="Paste your ModPackQT tunnel key">
   </div>
   <div class="form-tips" style="font-size:11px;color:#6b7280;margin:-8px 0 12px 105px">
     Generate at <a href="https://modpackqt.com/settings" target="_blank" rel="noopener">modpackqt.com → Settings → Cloud Gateways</a>.
-    Used only by the modpackqt.com web console to sync with this probe.
+    Loads your saved slave configs in the picker below and lets the web console authenticate to this probe.
   </div>
 
   <div class="form-row">
@@ -138,11 +138,11 @@
 </script>
 
 <script type="text/html" data-help-name="modpackqt-slave-probe">
-  <p>Live simulator probe for a single Modbus TCP slave. Set your Account Key,
-     optionally pick a saved slave config from modpackqt.com, then click
+  <p>Live simulator probe for a single Modbus TCP slave. Paste your Cloud Gateway Key,
+     optionally pick a saved slave config from the <b>My Slaves</b> dropdown, then click
      <b>Open in ModPackQT Console</b> to launch the web register editor.</p>
 
-  <h3>Account Key</h3>
+  <h3>Cloud Gateway Key</h3>
   <p>Paste your ModPackQT tunnel key here — generate one at
      <a href="https://modpackqt.com/settings" target="_blank" rel="noopener">modpackqt.com → Settings → Cloud Gateways</a>.
      The key lets the web console authenticate to this probe and loads your saved slave configs

package/nodes/modpackqt-slave-server.html

@@ -38,9 +38,14 @@
           .done(function (rows) {
             $sel.empty().append('<option value="">— Manual entry —</option>');
             (rows || [])
-              .filter(function (s) { return s && (s.protocol === 'tcp' || !s.protocol); })
+              .filter(function (s) { return !!s; })
               .forEach(function (s) {
-                const label = (s.name || '(unnamed)') + ' — :' + (s.port || 1502) + ' #' + (s.unitId || 1);
+                const isRtu = s.protocol === 'rtu';
+                const proto = isRtu ? ' [RTU]' : ' [TCP]';
+                const conn  = isRtu
+                  ? ' — unit #' + (s.unitId || 1)
+                  : ' — :' + (s.port || 1502) + ' #' + (s.unitId || 1);
+                const label = (s.name || '(unnamed)') + conn + proto;
                 $('<option>').val(s.id).text(label).data('row', s).appendTo($sel);
               });
           })
@@ -54,8 +59,9 @@
         const row = $(this).find('option:selected').data('row');
         if (!row) return;
         if (!node.name) $('#node-input-name').val(row.name || '');
-        $('#node-input-bindPort').val(row.port   || 1502);
-        $('#node-input-unitId').val(row.unitId  || 1);
+        // RTU slaves have no port — keep whatever TCP port is already set
+        if (row.protocol !== 'rtu' && row.port) $('#node-input-bindPort').val(row.port);
+        $('#node-input-unitId').val(row.unitId || 1);
         buildLink();
       });
       reload();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-modbus-modpackqt",
-  "version": "3.3.25",
+  "version": "3.3.27",
   "description": "Modbus commissioning, testing & analysis tools for Node-RED. Embedded Modbus TCP/RTU master + slave server, FC1/FC2/FC3/FC4 reads, FC5/FC6/FC15/FC16 writes, built-in slave register store, and a passive traffic monitor for debugging. 100% free, MIT, no usage limits. By ModPackQT — open the matching web console at modpackqt.com for register decoding, simulation and AI assistance.",
   "keywords": [
     "node-red",