node-red-contrib-modbus-modpackqt 3.3.1 → 3.3.2

package/CHANGELOG.md

@@ -4,6 +4,20 @@ 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.2] — 2026-05-10
+
+### Changed
+
+- **Account Key moved to probe nodes.** It is now a field on
+  `modpackqt-master-probe` and `modpackqt-slave-probe` — the only
+  nodes that talk to modpackqt.com. The runtime config (`modpackqt-config`)
+  is now purely local device settings with no cloud fields at all.
+- **My Profiles picker removed from runtime config.** The slave-probe's
+  **My Slaves** picker now reads the key from its own node credential
+  (`?probe=<nodeId>`) instead of the runtime config.
+- Runtime config dialog is now clean: Name, Device, Transport, and the
+  optional embedded slave server section. Nothing cloud-related.
+
 ## [3.3.1] — 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.1';
+const PALETTE_VERSION = '3.3.2';
 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

@@ -3,12 +3,9 @@
     category: 'config',
     defaults: {
       name:         { value: 'ModPackQT Device' },
-      // ── Device target (NEW in v3.3.0) — one runtime = one Modbus device.
-      // Master/probe nodes inherit these fields from the runtime config.
       targetHost:   { value: 'localhost' },
       targetPort:   { value: 502, validate: RED.validators.number() },
       unitId:       { value: 1,   validate: RED.validators.number() },
-      // ── Master transport
       masterMode:   { value: 'tcp', required: true },
       serialPort:   { value: '' },
       baudRate:     { value: 9600 },
@@ -16,14 +13,10 @@
       dataBits:     { value: 8 },
       stopBits:     { value: 1 },
       timeoutMs:    { value: 3000, validate: RED.validators.number() },
-      // ── Optional embedded Modbus TCP slave server
       slaveEnabled: { value: false },
       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}`
@@ -32,8 +25,6 @@
       return this.name && this.name !== 'ModPackQT Device' ? `${this.name} (${t})` : `${t}${s}`;
     },
     oneditprepare: function () {
-      const node = this;
-
       const toggleRtu = () => {
         const isRtu = $('#node-config-input-masterMode').val() === 'rtu';
         $('.modpackqt-rtu-only').toggle(isRtu);
@@ -48,47 +39,6 @@
       toggleRtu();
       toggleSlave();
 
-      // ── My Profiles picker — auto-fills targetHost/targetPort/unitId
-      const $sel = $('#node-config-modpackqt-picker');
-      const reload = function () {
-        $sel.empty().append('<option value="">— Loading… —</option>');
-        const key = $('#node-config-input-apiKey').val();
-        // The admin proxy needs the saved config ID. On a brand-new config the
-        // user hasn't saved yet — show a friendly message instead.
-        if (!node.id) {
-          $sel.empty().append('<option value="">— Save the config first, then reopen to load profiles —</option>');
-          return;
-        }
-        if (!key) {
-          $sel.empty().append('<option value="">— Paste your Account Key below to load profiles —</option>');
-          return;
-        }
-        $.getJSON('modpackqt/connections?config=' + encodeURIComponent(node.id))
-          .done(function (rows) {
-            $sel.empty().append('<option value="">— Manual entry —</option>');
-            (rows || [])
-              .filter(function (c) { return c && (c.connectionType === 'tcp' || !c.connectionType); })
-              .forEach(function (c) {
-                const label = (c.name || '(unnamed)') + ' — ' + (c.host || '?') + ':' + (c.port || 502) + ' #' + (c.unitId || 1);
-                $('<option>').val(c.id).text(label).data('row', c).appendTo($sel);
-              });
-          })
-          .fail(function (xhr) {
-            const msg = (xhr.responseJSON && xhr.responseJSON.error) || ('HTTP ' + xhr.status);
-            $sel.empty().append($('<option>').val('').text('— ' + msg + ' —'));
-          });
-      };
-      $('#modpackqt-config-picker-refresh').on('click', function (e) { e.preventDefault(); reload(); });
-      $sel.on('change', function () {
-        const row = $(this).find('option:selected').data('row');
-        if (!row) return;
-        if (!node.name || node.name === 'ModPackQT Device') $('#node-config-input-name').val(row.name || '');
-        $('#node-config-input-targetHost').val(row.host || '');
-        $('#node-config-input-targetPort').val(row.port || 502);
-        $('#node-config-input-unitId').val(row.unitId || 1);
-      });
-      reload();
-
       // ── Embedded slave server section (collapsed by default)
       const $slaveSection = $('.modpackqt-slave-section');
       const $slaveToggle  = $('.modpackqt-slave-section-toggle');
@@ -103,23 +53,6 @@
         e.preventDefault();
         setSlaveOpen($slaveSection.is(':hidden'));
       });
-
-      // ── Account Key section (collapsed by default — only relevant for the
-      // My Profiles picker and for probe nodes that deep-link the cloud).
-      const $keySection = $('.modpackqt-key-section');
-      const $keyToggle  = $('.modpackqt-key-section-toggle');
-      const setKeyOpen = (open) => {
-        $keySection.toggle(open);
-        $keyToggle.html(open
-          ? '▾ Hide ModPackQT Account Key'
-          : '▸ ModPackQT Account Key (only for probe nodes &amp; cloud profile sync)');
-      };
-      const hasKey = !!(this.credentials && this.credentials.has && this.credentials.has.apiKey);
-      setKeyOpen(hasKey);
-      $keyToggle.off('click.modpackqt').on('click.modpackqt', (e) => {
-        e.preventDefault();
-        setKeyOpen($keySection.is(':hidden'));
-      });
     }
   });
 </script>
@@ -131,14 +64,6 @@
   </div>
 
   <h4 style="margin-top:18px">Device</h4>
-  <div class="form-row">
-    <label for="node-config-modpackqt-picker"><i class="fa fa-cloud-download"></i> My Profiles</label>
-    <select id="node-config-modpackqt-picker" style="width:65%"></select>
-    <button type="button" id="modpackqt-config-picker-refresh" class="red-ui-button" title="Reload from modpackqt.com" style="margin-left:4px"><i class="fa fa-refresh"></i></button>
-  </div>
-  <div class="form-tips" style="font-size:11px;color:#6b7280;margin:-8px 0 12px 105px">
-    Picks a saved Modbus profile from your modpackqt.com account — auto-fills the fields below.
-  </div>
   <div class="form-row modpackqt-tcp-only">
     <label for="node-config-input-targetHost"><i class="fa fa-plug"></i> Host</label>
     <input type="text" id="node-config-input-targetHost" placeholder="Modbus device IP/hostname">
@@ -193,20 +118,6 @@
     <input type="number" id="node-config-input-timeoutMs" placeholder="3000">
   </div>
 
-  <div class="form-row" style="margin:14px 0 4px 0;border-top:1px solid #e5e7eb;padding-top:10px">
-    <a href="#" class="modpackqt-key-section-toggle" style="font-size:12px;color:#6b7280;text-decoration:none;cursor:pointer">▸ ModPackQT Account Key (only for probe nodes &amp; cloud profile sync)</a>
-  </div>
-  <div class="modpackqt-key-section" style="display:none">
-    <div class="form-row">
-      <label for="node-config-input-apiKey"><i class="fa fa-key"></i> Account Key</label>
-      <input type="password" id="node-config-input-apiKey" placeholder="Optional — paste your tunnel key for the profile picker">
-    </div>
-    <div class="form-tips" style="font-size:11px;color:#6b7280;margin-top:-6px">
-      Generate at <a href="https://modpackqt.com/settings" target="_blank" rel="noopener">modpackqt.com → Settings → Cloud Gateways</a>.
-      All Modbus traffic stays local — the key is only used for read-only profile sync.
-    </div>
-  </div>
-
   <div class="form-row" style="margin:14px 0 4px 0;border-top:1px solid #e5e7eb;padding-top:10px">
     <a href="#" class="modpackqt-slave-section-toggle" style="font-size:12px;color:#6b7280;text-decoration:none;cursor:pointer">▸ Embedded slave server (only for modpackqt-slave-read / -write nodes)</a>
   </div>
@@ -251,8 +162,8 @@
   <h3>One runtime = one device</h3>
   <p>
     For each remote Modbus device you want to read/write, create a separate runtime config.
-    Each carries its own Host / Port / Unit ID (and optional Account Key). Read and write
-    nodes inherit those — they only need to know the function code, address, and quantity.
+    Each carries its own Host / Port / Unit ID. Read and write nodes inherit those — they
+    only need to know the function code, address, and quantity.
   </p>
 
   <h3>Master mode</h3>
@@ -267,12 +178,4 @@
     <code>1502</code>). Use the <code>modpackqt-slave-write</code> node to push values into
     its register store; external Modbus masters read whatever you last wrote.
   </p>
-
-  <h3>ModPackQT Account Key (optional)</h3>
-  <p>
-    Same tunnel key the Electron gateway uses — generate one at
-    <a href="https://modpackqt.com/settings" target="_blank" rel="noopener">modpackqt.com → Settings → Cloud Gateways</a>.
-    With a key set, the <b>My Profiles</b> picker above auto-fills Host / Port / Unit from
-    your saved Modbus profiles.
-  </p>
 </script>

package/nodes/modpackqt-config.js

@@ -19,12 +19,12 @@ module.exports = function (RED) {
     RED._modpackqtAdminRoutesRegistered = true;
     function makeProxy(fetchFn) {
       return function (req, res) {
-        const configId = req.query && req.query.config;
-        if (!configId) return res.status(400).json({ error: 'config query param required' });
-        const cfg = RED.nodes.getNode(configId);
-        if (!cfg) return res.status(404).json({ error: 'Runtime config not found (deploy first?)' });
-        const key = cfg.credentials && cfg.credentials.apiKey;
-        if (!key) return res.status(400).json({ error: 'No Account Key set on this runtime config.' });
+        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.' });
         fetchFn(key, function (err, data) {
           if (err) return res.status(502).json({ error: err.message });
           res.json(data);
@@ -64,8 +64,6 @@ module.exports = function (RED) {
     node.slavePort    = parseInt(config.slavePort, 10) || 1502;
     node.slaveHost    = config.slaveHost || '0.0.0.0';
 
-    node.apiKey = (node.credentials && node.credentials.apiKey) || '';
-
     const today = () => new Date().toISOString().slice(0, 10);
     node._opsDay   = today();
     node._opsCount = 0;
@@ -337,7 +335,5 @@ module.exports = function (RED) {
     });
   }
 
-  RED.nodes.registerType('modpackqt-config', ModPackQTConfigNode, {
-    credentials: { apiKey: { type: 'password' } }
-  });
+  RED.nodes.registerType('modpackqt-config', ModPackQTConfigNode);
 };

package/nodes/modpackqt-master-probe.html

@@ -11,6 +11,9 @@
       unitId:      { value: 0,    validate: function (v) { return v === '' || v === 0 || RED.validators.number()(v); } },
       timeoutMs:   { value: 0,    validate: function (v) { return v === '' || v === 0 || RED.validators.number()(v); } }
     },
+    credentials: {
+      apiKey: { type: 'password' }
+    },
     inputs: 0,
     outputs: 0,
     icon: 'font-awesome/fa-rocket',
@@ -57,7 +60,16 @@
     <input type="text" id="node-input-server">
   </div>
   <div class="form-tips" style="font-size:11px;color:#6b7280;margin:-8px 0 12px 105px">
-    The runtime config carries the device target — the probe deep-links the web tester to it. To probe a different device, create another runtime config (pencil → +).
+    The runtime config carries the device target — the probe deep-links the web tester to it.
+  </div>
+
+  <div class="form-row">
+    <label for="node-input-apiKey"><i class="fa fa-key"></i> Account 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.
   </div>
 
   <input type="hidden" id="node-input-targetHost">
@@ -87,6 +99,11 @@
      chosen runtime config. Click <b>Open in ModPackQT Console</b> to launch
      the web tester live-attached to that device.</p>
 
+  <h3>Account 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. All Modbus traffic stays local.</p>
+
   <h3>Multiple devices</h3>
   <p>Create one runtime config per device, then drop one master-probe per
      runtime. The web console aggregates all probe nodes from this Node-RED

package/nodes/modpackqt-master-probe.js

@@ -112,5 +112,7 @@ module.exports = function (RED) {
     });
   }
 
-  RED.nodes.registerType('modpackqt-master-probe', MasterProbeNode);
+  RED.nodes.registerType('modpackqt-master-probe', MasterProbeNode, {
+    credentials: { apiKey: { type: 'password' } }
+  });
 };

package/nodes/modpackqt-slave-probe.html

@@ -9,6 +9,9 @@
       bindPort: { value: 1502, validate: RED.validators.number() },
       unitId:   { value: 1, validate: RED.validators.number() }
     },
+    credentials: {
+      apiKey: { type: 'password' }
+    },
     inputs: 0,
     outputs: 0,
     icon: 'font-awesome/fa-server',
@@ -50,13 +53,12 @@
         const $sel = $('#node-input-modpackqt-slave-picker');
         if (!$sel.length) return;
         const reload = function () {
-          const cfgId = $('#node-input-server').val();
           $sel.empty().append('<option value="">— Loading… —</option>');
-          if (!cfgId || cfgId === '_ADD_') {
-            $sel.empty().append('<option value="">— Set up runtime &amp; Account Key first —</option>');
+          if (!node.id) {
+            $sel.empty().append('<option value="">— Save the node first, then reopen to load slaves —</option>');
             return;
           }
-          $.getJSON('modpackqt/slaves?config=' + encodeURIComponent(cfgId))
+          $.getJSON('modpackqt/slaves?probe=' + encodeURIComponent(node.id))
             .done(function (rows) {
               $sel.empty().append('<option value="">— None —</option>');
               (rows || [])
@@ -71,7 +73,6 @@
               $sel.empty().append($('<option>').val('').text('— ' + msg + ' —'));
             });
         };
-        $('#node-input-server').on('change', reload);
         $('#modpackqt-slave-picker-refresh').on('click', function (e) { e.preventDefault(); reload(); });
         $sel.on('change', function () {
           const row = $(this).find('option:selected').data('row');
@@ -94,13 +95,23 @@
     <label for="node-input-server"><i class="fa fa-cog"></i> Runtime</label>
     <input type="text" id="node-input-server">
   </div>
+
+  <div class="form-row">
+    <label for="node-input-apiKey"><i class="fa fa-key"></i> Account 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.
+  </div>
+
   <div class="form-row">
     <label for="node-input-modpackqt-slave-picker"><i class="fa fa-cloud-download"></i> My Slaves</label>
     <select id="node-input-modpackqt-slave-picker" style="width:65%"></select>
     <button type="button" id="modpackqt-slave-picker-refresh" class="red-ui-button" title="Reload from modpackqt.com" style="margin-left:4px"><i class="fa fa-refresh"></i></button>
   </div>
   <div class="form-tips" style="font-size:11px;color:#6b7280;margin:-8px 0 12px 105px">
-    Pick a saved slave config from your modpackqt.com account — the probe deep-links the web register editor to that slave. Set up your Account Key on the runtime config (pencil icon).
+    Pick a saved slave config from your modpackqt.com account — auto-fills the port and unit below.
   </div>
 
   <!-- Hidden state — populated by the picker, used to build the probe URL. -->
@@ -127,9 +138,15 @@
 </script>
 
 <script type="text/html" data-help-name="modpackqt-slave-probe">
-  <p>Live simulator probe for a single Modbus TCP slave. Pick a saved slave
-     config from your modpackqt.com account, then click <b>Open in ModPackQT
-     Console</b> to launch the web register editor.</p>
+  <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
+     <b>Open in ModPackQT Console</b> to launch the web register editor.</p>
+
+  <h3>Account 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
+     in the <b>My Slaves</b> picker. All Modbus traffic stays local.</p>
 
   <h3>How it works</h3>
   <p>Each slave-probe owns a 65 536-register store per type (coils, discrete,

package/nodes/modpackqt-slave-probe.js

@@ -107,5 +107,7 @@ module.exports = function (RED) {
     });
   }
 
-  RED.nodes.registerType('modpackqt-slave-probe', SlaveProbeNode);
+  RED.nodes.registerType('modpackqt-slave-probe', SlaveProbeNode, {
+    credentials: { apiKey: { type: 'password' } }
+  });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-modbus-modpackqt",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "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",