node-red-contrib-modbus-modpackqt 3.3.11 → 3.3.13

package/CHANGELOG.md

@@ -4,6 +4,28 @@ 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.13] — 2026-05-10
+
+### Removed
+
+- **Embedded slave server section gone from the master config dialog.**
+  Redundant — the standalone `modpackqt-slave-server` canvas node already
+  owns its own port, register store, and My Slaves picker. Existing
+  legacy slave settings on a config node are preserved on disk so older
+  flows won't lose data, just hidden from the editor.
+
+## [3.3.12] — 2026-05-10
+
+### Changed
+
+- **Two separate config node types now.** Master-read and master-write
+  use the original `modpackqt-config` (full editable Target Device,
+  Transport, embedded slave server) — restored after v3.3.11.
+  Master-probe uses a new minimal `modpackqt-probe-config` —
+  Name + Account Key + My Connections only, no manual fields. Existing
+  flows that wired master-probe to a `modpackqt-config` need to pick
+  a probe-config instead (the dropdown will only show valid types).
+
 ## [3.3.11] — 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.11';
+const PALETTE_VERSION = '3.3.13';
 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

@@ -28,6 +28,14 @@
       return this.name && this.name !== 'ModPackQT Device' ? `${this.name} (${t})` : `${t}${s}`;
     },
     oneditprepare: function () {
+      const toggleRtu = () => {
+        const isRtu = $('#node-config-input-masterMode').val() === 'rtu';
+        $('.modpackqt-rtu-only').toggle(isRtu);
+        $('.modpackqt-tcp-only').toggle(!isRtu);
+      };
+      $('#node-config-input-masterMode').on('change', toggleRtu);
+      toggleRtu();
+
       // ── My Connections picker
       const nodeId = this.id;
       const $sel = $('#node-config-input-modpackqt-conn-picker');
@@ -65,7 +73,9 @@
         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);
-        $('#node-config-input-masterMode').val(c.connectionType === 'rtu' ? 'rtu' : 'tcp');
+        if (c.connectionType === 'rtu') {
+          $('#node-config-input-masterMode').val('rtu').trigger('change');
+        }
       });
       loadConnections();
     }
@@ -96,27 +106,76 @@
     Picks a saved connection from modpackqt.com — auto-fills Host, Port, and Unit ID below.
   </div>
 
-  <!-- All connection details (host/port/unit/mode/timeout/embedded-slave) are
-       set by the My Connections picker above. They live as hidden inputs so
-       the runtime still has them, but they are no longer hand-edited here. -->
-  <input type="hidden" id="node-config-input-targetHost">
-  <input type="hidden" id="node-config-input-targetPort">
-  <input type="hidden" id="node-config-input-unitId">
-  <input type="hidden" id="node-config-input-masterMode">
-  <input type="hidden" id="node-config-input-serialPort">
-  <input type="hidden" id="node-config-input-baudRate">
-  <input type="hidden" id="node-config-input-parity">
-  <input type="hidden" id="node-config-input-dataBits">
-  <input type="hidden" id="node-config-input-stopBits">
-  <input type="hidden" id="node-config-input-timeoutMs">
+  <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>
+    <input type="text" id="node-config-input-targetHost" placeholder="e.g. 192.168.1.10 — IP/hostname of the Modbus device">
+  </div>
+  <div class="form-tips modpackqt-tcp-only" style="font-size:11px;color:#6b7280;margin:-8px 0 12px 105px">
+    The IP address (or hostname) of the target Modbus device on your network.
+  </div>
+  <div class="form-row modpackqt-tcp-only">
+    <label for="node-config-input-targetPort"><i class="fa fa-hashtag"></i> Port</label>
+    <input type="number" id="node-config-input-targetPort" min="1" max="65535" placeholder="502 (Modbus TCP default)">
+  </div>
+  <div class="form-row">
+    <label for="node-config-input-unitId"><i class="fa fa-id-card"></i> Unit ID</label>
+    <input type="number" id="node-config-input-unitId" min="1" max="247" placeholder="1 (slave address on the bus)">
+  </div>
+
+  <h4 style="margin-top:18px">Transport</h4>
+  <div class="form-row">
+    <label for="node-config-input-masterMode"><i class="fa fa-cogs"></i> Mode</label>
+    <select id="node-config-input-masterMode">
+      <option value="tcp">Modbus TCP</option>
+      <option value="rtu">Modbus RTU (Serial)</option>
+    </select>
+  </div>
+  <div class="form-row modpackqt-rtu-only">
+    <label for="node-config-input-serialPort"><i class="fa fa-plug"></i> Serial Port</label>
+    <input type="text" id="node-config-input-serialPort" placeholder="/dev/ttyUSB0  or  COM3">
+  </div>
+  <div class="form-row modpackqt-rtu-only">
+    <label for="node-config-input-baudRate"><i class="fa fa-tachometer"></i> Baud</label>
+    <input type="number" id="node-config-input-baudRate" placeholder="9600">
+  </div>
+  <div class="form-row modpackqt-rtu-only">
+    <label for="node-config-input-parity"><i class="fa fa-list"></i> Parity</label>
+    <select id="node-config-input-parity">
+      <option value="none">None</option>
+      <option value="even">Even</option>
+      <option value="odd">Odd</option>
+    </select>
+  </div>
+  <div class="form-row modpackqt-rtu-only">
+    <label for="node-config-input-dataBits"><i class="fa fa-hashtag"></i> Data Bits</label>
+    <select id="node-config-input-dataBits">
+      <option value="8">8</option><option value="7">7</option>
+    </select>
+  </div>
+  <div class="form-row modpackqt-rtu-only">
+    <label for="node-config-input-stopBits"><i class="fa fa-hashtag"></i> Stop Bits</label>
+    <select id="node-config-input-stopBits">
+      <option value="1">1</option><option value="2">2</option>
+    </select>
+  </div>
+  <div class="form-row">
+    <label for="node-config-input-timeoutMs"><i class="fa fa-clock-o"></i> Timeout (ms)</label>
+    <input type="number" id="node-config-input-timeoutMs" placeholder="3000">
+  </div>
+
+  <!-- Embedded slave server lives on the standalone modpackqt-slave-server
+       canvas node now. These hidden inputs preserve any legacy values on
+       existing flows so re-saving doesn't wipe them. -->
   <input type="hidden" id="node-config-input-slaveEnabled">
   <input type="hidden" id="node-config-input-slaveHost">
   <input type="hidden" id="node-config-input-slavePort">
 
   <div class="form-tips" style="margin-top:14px">
-    <b>One device per config.</b> Use the picker above to choose which saved
-    Modbus device this config talks to. For more devices, create another
-    config and pick a different one.
+    <b>One runtime = one device.</b> For multiple devices, create one runtime
+    config per device — the read/write nodes then just pick which device to
+    talk to. To run an embedded slave server, drop a
+    <code>modpackqt-slave-server</code> node onto the canvas.
   </div>
   <div class="form-row" style="margin-top:18px;padding-top:14px;border-top:1px solid #e5e7eb;text-align:center;">
       <a href="https://modpackqt.com" target="_blank" rel="noopener noreferrer"
@@ -143,12 +202,16 @@
     only need to know the function code, address, and quantity.
   </p>
 
-  <h3>Where do the connection details come from?</h3>
+  <h3>Master mode</h3>
+  <ul>
+    <li><b>Modbus TCP</b> — connects to the configured Host/Port.</li>
+    <li><b>Modbus RTU</b> — opens the configured serial port. Host/Port are ignored; only Unit ID matters.</li>
+  </ul>
+
+  <h3>Want to run a slave?</h3>
   <p>
-    Paste your <b>Account Key</b>, then pick a saved device from <b>My
-    Connections</b>. The host, port, unit ID, and transport mode are all
-    pulled from your modpackqt.com profile — no hand-editing needed here.
-    To run an embedded Modbus TCP slave server, drop a
-    <code>modpackqt-slave-server</code> node onto the canvas instead.
+    Drop a <code>modpackqt-slave-server</code> node onto the canvas. It owns its
+    own port, its own register store, and its own My Slaves picker for loading
+    saved slave profiles from modpackqt.com.
   </p>
 </script>

package/nodes/modpackqt-master-probe.html

@@ -4,7 +4,7 @@
     color: '#7c3aed',
     defaults: {
       name:        { value: '' },
-      server:      { value: '', type: 'modpackqt-config', required: true },
+      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); } },

package/nodes/modpackqt-probe-config.html

@@ -0,0 +1,154 @@
+<script type="text/javascript">
+  RED.nodes.registerType('modpackqt-probe-config', {
+    category: 'config',
+    credentials: {
+      apiKey: { type: 'password' }
+    },
+    defaults: {
+      name:         { value: 'ModPackQT Device' },
+      targetHost:   { value: 'localhost' },
+      targetPort:   { value: 502, validate: RED.validators.number() },
+      unitId:       { value: 1,   validate: RED.validators.number() },
+      masterMode:   { value: 'tcp', required: true },
+      serialPort:   { value: '' },
+      baudRate:     { value: 9600 },
+      parity:       { value: 'none' },
+      dataBits:     { value: 8 },
+      stopBits:     { value: 1 },
+      timeoutMs:    { value: 3000, validate: RED.validators.number() },
+      slaveEnabled: { value: false },
+      slaveHost:    { value: '0.0.0.0' },
+      slavePort:    { value: 1502, validate: RED.validators.number() }
+    },
+    label: function () {
+      const t = this.masterMode === 'rtu'
+        ? `RTU ${this.serialPort || '?'} #${this.unitId || 1}`
+        : `${this.targetHost || 'localhost'}:${this.targetPort || 502} #${this.unitId || 1}`;
+      const s = this.slaveEnabled ? ` + slave :${this.slavePort}` : '';
+      return this.name && this.name !== 'ModPackQT Device' ? `${this.name} (${t})` : `${t}${s}`;
+    },
+    oneditprepare: function () {
+      // ── My Connections picker
+      const nodeId = this.id;
+      const $sel = $('#node-config-input-modpackqt-conn-picker');
+      const loadConnections = function () {
+        $sel.empty().append('<option value="">— Loading… —</option>');
+        if (!nodeId) {
+          $sel.empty().append('<option value="">— Save this config first, then reopen —</option>');
+          return;
+        }
+        $.getJSON('modpackqt/connections?probe=' + encodeURIComponent(nodeId))
+          .done(function (rows) {
+            $sel.empty().append('<option value="">— Manual entry —</option>');
+            (rows || []).forEach(function (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);
+            });
+          })
+          .fail(function (xhr) {
+            const msg = (xhr.responseJSON && xhr.responseJSON.error) || ('HTTP ' + xhr.status);
+            $sel.empty().append($('<option>').val('').text('— ' + msg + ' —'));
+          });
+      };
+      $('#modpackqt-conn-picker-refresh').on('click', function (e) {
+        e.preventDefault();
+        loadConnections();
+      });
+      $sel.on('change', function () {
+        const c = $(this).find('option:selected').data('conn');
+        if (!c) return;
+        if (!$('#node-config-input-name').val() || $('#node-config-input-name').val() === 'ModPackQT Device') {
+          $('#node-config-input-name').val(c.name || '');
+        }
+        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);
+        $('#node-config-input-masterMode').val(c.connectionType === 'rtu' ? 'rtu' : 'tcp');
+      });
+      loadConnections();
+    }
+  });
+</script>
+
+<script type="text/html" data-template-name="modpackqt-probe-config">
+  <div class="form-row">
+    <label for="node-config-input-name"><i class="fa fa-tag"></i> Name</label>
+    <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> Account Key</label>
+    <input type="password" id="node-config-input-apiKey" placeholder="Paste your ModPackQT tunnel key">
+  </div>
+  <div class="form-tips" style="font-size:11px;color:#6b7280;margin:-8px 0 4px 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-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-conn-picker-refresh" class="red-ui-button" title="Reload" 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 connection from modpackqt.com — auto-fills Host, Port, and Unit ID below.
+  </div>
+
+  <!-- All connection details (host/port/unit/mode/timeout/embedded-slave) are
+       set by the My Connections picker above. They live as hidden inputs so
+       the runtime still has them, but they are no longer hand-edited here. -->
+  <input type="hidden" id="node-config-input-targetHost">
+  <input type="hidden" id="node-config-input-targetPort">
+  <input type="hidden" id="node-config-input-unitId">
+  <input type="hidden" id="node-config-input-masterMode">
+  <input type="hidden" id="node-config-input-serialPort">
+  <input type="hidden" id="node-config-input-baudRate">
+  <input type="hidden" id="node-config-input-parity">
+  <input type="hidden" id="node-config-input-dataBits">
+  <input type="hidden" id="node-config-input-stopBits">
+  <input type="hidden" id="node-config-input-timeoutMs">
+  <input type="hidden" id="node-config-input-slaveEnabled">
+  <input type="hidden" id="node-config-input-slaveHost">
+  <input type="hidden" id="node-config-input-slavePort">
+
+  <div class="form-tips" style="margin-top:14px">
+    <b>One device per config.</b> Use the picker above to choose which saved
+    Modbus device this config talks to. For more devices, create another
+    config and pick a different one.
+  </div>
+  <div class="form-row" style="margin-top:18px;padding-top:14px;border-top:1px solid #e5e7eb;text-align:center;">
+      <a href="https://modpackqt.com" target="_blank" rel="noopener noreferrer"
+         style="display:inline-block;padding:8px 20px;background:#2563eb;color:#fff;
+                text-decoration:none;border-radius:6px;font-weight:600;font-size:13px;
+                box-shadow:0 1px 2px rgba(0,0,0,0.08);">
+        Premium Advanced Modbus Tester <i class="fa fa-external-link" style="margin-left:6px;"></i>
+      </a>
+      <div style="margin-top:6px;font-size:11px;color:#6b7280;">by ModPackQT &mdash; full-featured web tester, simulator &amp; AI helper</div>
+    </div>
+  </script>
+
+<script type="text/html" data-help-name="modpackqt-probe-config">
+  <p>
+    Defines <b>one Modbus device</b> plus the embedded runtime that talks to it. Master and
+    probe nodes simply pick which runtime config to use — no need to retype host/port/unit
+    on every node.
+  </p>
+
+  <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. Read and write nodes inherit those — they
+    only need to know the function code, address, and quantity.
+  </p>
+
+  <h3>Where do the connection details come from?</h3>
+  <p>
+    Paste your <b>Account Key</b>, then pick a saved device from <b>My
+    Connections</b>. The host, port, unit ID, and transport mode are all
+    pulled from your modpackqt.com profile — no hand-editing needed here.
+    To run an embedded Modbus TCP slave server, drop a
+    <code>modpackqt-slave-server</code> node onto the canvas instead.
+  </p>
+</script>

package/nodes/modpackqt-probe-config.js

@@ -0,0 +1,19 @@
+/**
+ * ModPackQT Probe Config — lightweight config node used by master-probe only.
+ *
+ * No embedded Modbus runtime, no slave server, no master client pool.
+ * Just stores: account key (credential) + a chosen device's host / port /
+ * unit ID, all populated by the My Connections picker. Master-probe reads
+ * those to build its deep-link URL into the modpackqt.com web console.
+ */
+module.exports = function (RED) {
+  function ModPackQTProbeConfigNode(config) {
+    RED.nodes.createNode(this, config);
+    this.targetHost = config.targetHost || '';
+    this.targetPort = parseInt(config.targetPort, 10) || 502;
+    this.unitId     = parseInt(config.unitId,     10) || 1;
+  }
+  RED.nodes.registerType('modpackqt-probe-config', ModPackQTProbeConfigNode, {
+    credentials: { apiKey: { type: 'password' } }
+  });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-modbus-modpackqt",
-  "version": "3.3.11",
+  "version": "3.3.13",
   "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",
@@ -45,6 +45,7 @@
     "version": ">=2.0.0",
     "nodes": {
       "modpackqt-config": "nodes/modpackqt-config.js",
+      "modpackqt-probe-config": "nodes/modpackqt-probe-config.js",
       "modpackqt-master-read": "nodes/modpackqt-master-read.js",
       "modpackqt-master-write": "nodes/modpackqt-master-write.js",
       "modpackqt-slave-read": "nodes/modpackqt-slave-read.js",