node-red-contrib-modbus-modpackqt 3.3.18 → 3.3.19

package/CHANGELOG.md

@@ -4,6 +4,18 @@ 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.19] — 2026-05-10
+
+### Changed
+
+- **Master-probe is now standalone — no Target Device picker.** The
+  dialog has just three fields: **Name**, **Account Key**, and
+  **My Connections**. The Account Key loads your saved connections
+  from modpackqt.com directly into the picker; choosing one fills
+  in host / port / unit ID behind the scenes. No more probe-config
+  middleman, no duplicate field, no "Save first then reopen the
+  config to enter your key" detour.
+
 ## [3.3.18] — 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.18';
+const PALETTE_VERSION = '3.3.19';
 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-master-probe.html

@@ -3,13 +3,14 @@
     category: 'ModPackQT',
     color: '#f97316',
     defaults: {
-      name:        { value: '' },
-      server:      { value: '', type: 'modpackqt-probe-config', required: true },
-      // Legacy per-node fields — kept hidden so old flows keep working.
-      targetHost:  { value: '' },
-      targetPort:  { value: 0,    validate: function (v) { return v === '' || v === 0 || RED.validators.number()(v); } },
-      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); } }
+      name:       { value: '' },
+      targetHost: { value: '' },
+      targetPort: { value: 502, validate: RED.validators.number() },
+      unitId:     { value: 1,   validate: RED.validators.number() },
+      timeoutMs:  { value: 3000, validate: RED.validators.number() }
+    },
+    credentials: {
+      apiKey: { type: 'password' }
     },
     inputs: 0,
     outputs: 0,
@@ -22,22 +23,12 @@
       const node = this;
       let runtimeInfo = {};
 
-      const getCfgTarget = () => {
-        const cfgId = $('#node-input-server').val();
-        const cfg   = cfgId ? RED.nodes.node(cfgId) : null;
-        return {
-          host:   (cfg && cfg.targetHost) || '',
-          port:   (cfg && cfg.targetPort) || 502,
-          unitId: (cfg && cfg.unitId)     || 1
-        };
-      };
-
       const buildLink = () => {
         const probeHost = runtimeInfo.host || '127.0.0.1';
         const probePort = runtimeInfo.port || 8502;
-        const tHost = $('#node-input-targetHost').val() || node.targetHost || getCfgTarget().host;
-        const tPort = $('#node-input-targetPort').val() || node.targetPort || getCfgTarget().port;
-        const tUnit = $('#node-input-unitId').val()     || node.unitId     || getCfgTarget().unitId;
+        const tHost = $('#node-input-targetHost').val() || node.targetHost || '';
+        const tPort = $('#node-input-targetPort').val() || node.targetPort || 502;
+        const tUnit = $('#node-input-unitId').val()     || node.unitId     || 1;
         const name  = $('#node-input-name').val() || node.name || '';
         const url = 'https://modpackqt.com/master'
           + '?probe='     + encodeURIComponent(node.id)
@@ -55,18 +46,17 @@
         .done((info) => { runtimeInfo = info || {}; buildLink(); })
         .fail(() => buildLink());
 
-      // ── My Connections picker — uses the selected Target Device's Account Key
+      // ── My Connections picker — uses this node's own Account Key
       const $sel = $('#node-input-modpackqt-conn-picker');
       const $hint = $('#modpackqt-conn-picker-hint');
       const reload = () => {
         $sel.empty().append('<option value="">— Loading… —</option>');
-        const cfgId = $('#node-input-server').val();
-        if (!cfgId) {
-          $sel.empty().append('<option value="">— Pick a Target Device below first —</option>');
-          $hint.text('Pick a Target Device first — its Account Key is used to load your saved connections.');
+        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?probe=' + encodeURIComponent(cfgId))
+        $.getJSON('modpackqt/connections?probe=' + encodeURIComponent(node.id))
           .done((rows) => {
             $sel.empty().append('<option value="">— Manual entry —</option>');
             (rows || []).forEach((c) => {
@@ -87,7 +77,7 @@
           .fail((xhr) => {
             const msg = (xhr.responseJSON && xhr.responseJSON.error) || ('HTTP ' + xhr.status);
             $sel.empty().append($('<option>').val('').text('— ' + msg + ' —'));
-            $hint.text('Could not load connections — check the Account Key on the Target Device.');
+            $hint.text('Could not load connections — check the Account Key above.');
           });
       };
       $('#modpackqt-conn-picker-refresh').on('click', (e) => { e.preventDefault(); reload(); });
@@ -100,7 +90,6 @@
         if (!$('#node-input-name').val() && c.name) $('#node-input-name').val(c.name);
         buildLink();
       });
-      $('#node-input-server').on('change', () => { reload(); buildLink(); });
       reload();
     }
   });
@@ -111,6 +100,16 @@
     <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
     <input type="text" id="node-input-name" placeholder="(optional, e.g. Inverter A)">
   </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>.
+    Loads your saved connections in the picker below.
+  </div>
+
   <div class="form-row">
     <label for="node-input-modpackqt-conn-picker"><i class="fa fa-cloud-download"></i> My Connections</label>
     <select id="node-input-modpackqt-conn-picker" style="width:65%"></select>
@@ -120,14 +119,6 @@
     Picks one of your saved connections from modpackqt.com — auto-fills host, port, and unit ID.
   </div>
 
-  <div class="form-row">
-    <label for="node-input-server"><i class="fa fa-plug"></i> Target Device</label>
-    <input type="text" id="node-input-server">
-  </div>
-  <div class="form-tips" style="font-size:11px;color:#6b7280;margin:-8px 0 12px 105px">
-    Runtime config that holds your <b>Account Key</b>. The key powers the picker above and lets the web console attach to this probe.
-  </div>
-
   <input type="hidden" id="node-input-targetHost">
   <input type="hidden" id="node-input-targetPort">
   <input type="hidden" id="node-input-unitId">
@@ -139,7 +130,7 @@
   </div>
   <div class="form-row" style="margin-top:18px;padding-top:14px;border-top:1px solid #e5e7eb;text-align:center;">
     <a id="modpackqt-probe-link" href="https://modpackqt.com" target="_blank" rel="noopener noreferrer"
-       style="display:inline-block;padding:10px 24px;background:#7c3aed;color:#fff;
+       style="display:inline-block;padding:10px 24px;background:#f97316;color:#fff;
               text-decoration:none;border-radius:6px;font-weight:600;font-size:14px;
               box-shadow:0 1px 2px rgba(0,0,0,0.08);">
       Open in ModPackQT Console <i class="fa fa-external-link" style="margin-left:6px;"></i>
@@ -149,7 +140,7 @@
     </div>
     <div style="margin-top:10px;font-size:12px;">
       <a href="https://modpackqt.com/settings#connections" target="_blank" rel="noopener noreferrer"
-         style="color:#7c3aed;text-decoration:none;font-weight:500;">
+         style="color:#f97316;text-decoration:none;font-weight:500;">
         <i class="fa fa-pencil" style="margin-right:4px;"></i>Edit IP / port / unit ID on modpackqt.com →
       </a>
     </div>
@@ -157,19 +148,20 @@
 </script>
 
 <script type="text/html" data-help-name="modpackqt-master-probe">
-  <p>Live tester / commissioning probe for the Modbus device defined by the
-     chosen runtime config. Click <b>Open in ModPackQT Console</b> to launch
-     the web tester live-attached to that device.</p>
+  <p>Live tester / commissioning probe for a single Modbus device.
+     Click <b>Open in ModPackQT Console</b> to launch the web tester
+     live-attached to it.</p>
 
   <h3>Account Key</h3>
-  <p>Paste your ModPackQT tunnel key here — generate one at
+  <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>.
-     The key lets the web console authenticate to this probe. All Modbus traffic stays local.</p>
+     The key loads your saved connections into the picker AND 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
-     instance into a single sidebar — switch between devices with one click.</p>
+  <p>Drop one master-probe per device. The web console aggregates all probes
+     from this Node-RED instance into a single sidebar — switch between
+     devices with one click.</p>
 
   <h3>Network access</h3>
   <p>The runtime binds to <code>127.0.0.1</code> by default — only browsers on

package/package.json

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