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

package/CHANGELOG.md

@@ -4,6 +4,45 @@ 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.3] — 2026-05-10
+
+### Added
+
+- **`modpackqt-slave-server` config node** — a dedicated Modbus TCP slave
+  server with its own register store (65 536 per type). This replaces the
+  confusing embedded slave hidden inside the runtime config. Drop one per
+  fake device; `slave-read` and `slave-write` nodes point at it directly.
+  - Account Key + **My Slaves** picker load saved slave configs from
+    modpackqt.com (pre-fills port and unit ID).
+  - Register layout and limits are managed from the modpackqt.com web
+    console — click **Open in ModPackQT Console** inside the config dialog.
+  - Registers with the probe runtime so the web console finds it automatically.
+
+### Changed
+
+- **`slave-read` and `slave-write`** now have a **Slave Server** picker
+  (type `modpackqt-slave-server`) as their primary config reference. The old
+  `server` field (pointing to `modpackqt-config`) is kept as a hidden fallback
+  so existing flows with the embedded slave keep working.
+- **Embedded slave section removed from runtime config dialog** — the
+  `modpackqt-config` dialog is now purely master/transport settings. The
+  embedded slave JS stays in the runtime for backward compat with old flows.
+- `modpackqt-slave-probe` kept as-is for full backward compatibility.
+
+## [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.3';
 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/nodes/modpackqt-slave-read.html

@@ -4,7 +4,8 @@
     color: '#15803d',
     defaults: {
       name:         { value: '' },
-      server:       { value: '', type: 'modpackqt-config', required: true },
+      slaveServer:  { value: '', type: 'modpackqt-slave-server' },
+      server:       { value: '' },   // legacy — modpackqt-config with embedded slave
       registerType: { value: 'holding', required: true },
       address:      { value: 0,  required: true, validate: RED.validators.number() },
       quantity:     { value: 1,  required: true, validate: RED.validators.number() },
@@ -26,8 +27,8 @@
     <input type="text" id="node-input-name" placeholder="Name">
   </div>
   <div class="form-row">
-    <label for="node-input-server"><i class="fa fa-cog"></i> Runtime</label>
-    <input type="text" id="node-input-server">
+    <label for="node-input-slaveServer"><i class="fa fa-server"></i> Slave Server</label>
+    <input type="text" id="node-input-slaveServer">
   </div>
   <div class="form-row">
     <label for="node-input-registerType"><i class="fa fa-list"></i> Register Type</label>
@@ -51,27 +52,29 @@
     <input type="number" id="node-input-pollInterval" min="0" placeholder="0 = trigger only">
   </div>
   <div class="form-tips">
-    <b>Reads from the local slave register store.</b> Enable the embedded slave server
-    in the runtime config first. Override at runtime via <code>msg.address</code>,
-    <code>msg.quantity</code>, or <code>msg.registerType</code>.
+    <b>Reads from a slave server's register store.</b> Point at a
+    <b>modpackqt-slave-server</b> node. Override at runtime via
+    <code>msg.address</code>, <code>msg.quantity</code>, or <code>msg.registerType</code>.
   </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>
+    <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-slave-read">
   <p>
-    Reads from the embedded slave's local register store. Useful for verifying what
-    external Modbus masters connecting to your slave port will see.
+    Reads registers from a <b>modpackqt-slave-server</b> node's local store.
+    Useful for seeing exactly what an external Modbus master connecting to that
+    slave port will read.
   </p>
-  <p>Enable the slave server in the <b>modpackqt-config</b> node first.</p>
+  <h3>Setup</h3>
+  <p>Set up a <b>Slave Server</b> config node first (pencil icon), then point this node at it.</p>
   <h3>Outputs</h3>
   <dl class="message-properties">
     <dt>payload <span class="property-type">array</span></dt>

package/nodes/modpackqt-slave-read.js

@@ -1,29 +1,33 @@
 /**
- * ModPackQT Slave Read — read from the embedded slave's local register store.
- * The slave server itself runs in the modpackqt-config node (when enabled).
- * Outputs raw register values.
+ * ModPackQT Slave Read — read from a slave server's local register store.
+ *
+ * Points at a modpackqt-slave-server config node (preferred) or falls back
+ * to the legacy modpackqt-config with an embedded slave (backward compat).
  */
 module.exports = function (RED) {
   function ModPackQTSlaveReadNode(config) {
     RED.nodes.createNode(this, config);
     const node = this;
-    const server = RED.nodes.getNode(config.server);
 
     node.registerType = config.registerType || 'holding';
     node.address      = parseInt(config.address,      10) || 0;
     node.quantity     = parseInt(config.quantity,     10) || 1;
     node.pollInterval = parseInt(config.pollInterval, 10) || 0;
 
+    // Prefer new slave-server config node; fall back to legacy modpackqt-config.
+    const slave = RED.nodes.getNode(config.slaveServer) || RED.nodes.getNode(config.server);
+
     let timer = null;
 
     function doRead(msg) {
-      if (!server) {
-        node.status({ fill: 'red', shape: 'ring', text: 'no config' });
+      if (!slave) {
+        node.status({ fill: 'red', shape: 'ring', text: 'no slave server configured' });
+        node.error('No Slave Server configured — add a modpackqt-slave-server node.', msg);
         return;
       }
-      if (!server.slaveEnabled) {
-        node.status({ fill: 'red', shape: 'ring', text: 'slave server disabled in config' });
-        node.error('Embedded slave is disabled — enable it in the modpackqt-config node.', msg);
+      if (!slave.slaveEnabled) {
+        node.status({ fill: 'red', shape: 'ring', text: 'slave server not running' });
+        node.error('Slave server is not running — check the slave-server config node.', msg);
         return;
       }
       try {
@@ -31,12 +35,9 @@ module.exports = function (RED) {
         const address  = (msg && msg.address  !== undefined) ? parseInt(msg.address,  10) : node.address;
         const quantity = (msg && msg.quantity !== undefined) ? parseInt(msg.quantity, 10) : node.quantity;
 
-        const values = server.slaveGet(registerType, address, quantity);
+        const values = slave.slaveGet(registerType, address, quantity);
         const now = new Date().toLocaleTimeString();
-        node.status({
-          fill: 'green', shape: 'dot',
-          text: server.brandStatus(`slave ${registerType} @${address} [${values.length}] · ${now}`)
-        });
+        node.status({ fill: 'green', shape: 'dot', text: `${registerType} @${address} [${values.length}] · ${now}` });
         node.send({
           payload: values,
           topic: `modpackqt/slave/${registerType}/${address}`,

package/nodes/modpackqt-slave-server.html

@@ -0,0 +1,160 @@
+<script type="text/javascript">
+  RED.nodes.registerType('modpackqt-slave-server', {
+    category: 'config',
+    defaults: {
+      name:     { value: '' },
+      bindHost: { value: '0.0.0.0' },
+      bindPort: { value: 1502, validate: RED.validators.number() },
+      unitId:   { value: 1,    validate: RED.validators.number() }
+    },
+    credentials: {
+      apiKey: { type: 'password' }
+    },
+    label: function () {
+      return this.name || `:${this.bindPort} #${this.unitId}`;
+    },
+    oneditprepare: function () {
+      const node = this;
+
+      // ── My Slaves picker — loads saved slave configs from modpackqt.com.
+      // Pre-fills port and unit ID. Register layout / limits are managed
+      // from the web console, not here.
+      const $sel = $('#node-config-modpackqt-slave-picker');
+      const reload = function () {
+        $sel.empty().append('<option value="">— Loading… —</option>');
+        if (!node.id) {
+          $sel.empty().append('<option value="">— Save this node first, then reopen —</option>');
+          return;
+        }
+        $.getJSON('modpackqt/slaves?probe=' + encodeURIComponent(node.id))
+          .done(function (rows) {
+            $sel.empty().append('<option value="">— Manual entry —</option>');
+            (rows || [])
+              .filter(function (s) { return s && (s.protocol === 'tcp' || !s.protocol); })
+              .forEach(function (s) {
+                const label = (s.name || '(unnamed)') + ' — :' + (s.port || 1502) + ' #' + (s.unitId || 1);
+                $('<option>').val(s.id).text(label).data('row', s).appendTo($sel);
+              });
+          })
+          .fail(function (xhr) {
+            const msg = (xhr.responseJSON && xhr.responseJSON.error) || ('HTTP ' + xhr.status);
+            $sel.empty().append($('<option>').val('').text('— ' + msg + ' —'));
+          });
+      };
+      $('#modpackqt-slave-server-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 === '') $('#node-config-input-name').val(row.name || '');
+        $('#node-config-input-bindPort').val(row.port   || 1502);
+        $('#node-config-input-unitId').val(row.unitId  || 1);
+        buildLink();
+      });
+      reload();
+
+      // ── Probe deep-link
+      const buildLink = function () {
+        $.getJSON('modpackqt-probe/info')
+          .done(function (info) { renderLink(info); })
+          .fail(function () { renderLink({}); });
+      };
+      const renderLink = function (info) {
+        const probeHost = (info && info.host) || '127.0.0.1';
+        const probePort = (info && info.port) || 8502;
+        const bindPort  = $('#node-config-input-bindPort').val() || node.bindPort || 1502;
+        const unitId    = $('#node-config-input-unitId').val()   || node.unitId   || 1;
+        const name      = $('#node-config-input-name').val()     || node.name     || '';
+        const url = 'https://modpackqt.com/slave'
+          + '?probe='     + encodeURIComponent(node.id || '')
+          + '&probeHost=' + encodeURIComponent(probeHost)
+          + '&probePort=' + probePort
+          + '&port='      + bindPort
+          + '&unitId='    + unitId
+          + (name ? '&name=' + encodeURIComponent(name) : '');
+        $('#modpackqt-slave-server-link').attr('href', url);
+        $('#modpackqt-slave-server-runtime').text(probeHost + ':' + probePort);
+        $('#modpackqt-slave-server-target').text(':' + bindPort + ' · unit ' + unitId);
+      };
+      buildLink();
+      $('#node-config-input-bindPort, #node-config-input-unitId').on('change input', buildLink);
+    }
+  });
+</script>
+
+<script type="text/html" data-template-name="modpackqt-slave-server">
+  <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. Fake Inverter">
+  </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 12px 105px">
+    Generate at <a href="https://modpackqt.com/settings" target="_blank" rel="noopener">modpackqt.com → Settings → Cloud Gateways</a>.
+    Loads your saved slave configs in the picker below.
+  </div>
+
+  <div class="form-row">
+    <label for="node-config-modpackqt-slave-picker"><i class="fa fa-cloud-download"></i> My Slaves</label>
+    <select id="node-config-modpackqt-slave-picker" style="width:65%"></select>
+    <button type="button" id="modpackqt-slave-server-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 from modpackqt.com — auto-fills port and unit below.
+    Register layout and limits are managed from the web console.
+  </div>
+
+  <div class="form-row">
+    <label for="node-config-input-bindPort"><i class="fa fa-hashtag"></i> Port</label>
+    <input type="number" id="node-config-input-bindPort" min="1024" max="65535" placeholder="1502">
+  </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">
+  </div>
+
+  <input type="hidden" id="node-config-input-bindHost">
+
+  <div class="form-row" style="margin-top:18px;padding-top:14px;border-top:1px solid #e5e7eb;text-align:center;">
+    <a id="modpackqt-slave-server-link" href="https://modpackqt.com" target="_blank" rel="noopener noreferrer"
+       style="display:inline-block;padding:10px 24px;background:#7c3aed;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>
+    </a>
+    <div style="margin-top:6px;font-size:11px;color:#6b7280;">
+      Target: <span id="modpackqt-slave-server-target">—</span> · runtime <span id="modpackqt-slave-server-runtime">starting…</span>
+    </div>
+  </div>
+</script>
+
+<script type="text/html" data-help-name="modpackqt-slave-server">
+  <p>
+    Runs a Modbus TCP slave server and owns the register store. Point
+    <b>slave-read</b> and <b>slave-write</b> nodes at it to read and write
+    registers from your flow. External Modbus masters can also connect directly
+    to the configured port and read whatever your flow has written.
+  </p>
+
+  <h3>How to set it up</h3>
+  <ol>
+    <li>Drop a <b>slave-read</b> or <b>slave-write</b> node and click its pencil icon next to "Slave Server" to create a new slave server.</li>
+    <li>Paste your Account Key and pick a saved slave from <b>My Slaves</b> — it pre-fills the port and unit ID.</li>
+    <li>The register layout and coil/register counts are managed from the modpackqt.com web console — click <b>Open in ModPackQT Console</b> to edit them.</li>
+  </ol>
+
+  <h3>Account Key</h3>
+  <p>Generate one at <a href="https://modpackqt.com/settings" target="_blank" rel="noopener">modpackqt.com → Settings → Cloud Gateways</a>.
+     Used to load your saved slave configs and to let the web console connect to this server.</p>
+
+  <h3>Multiple slave servers</h3>
+  <p>Create one slave-server config per port/unit combination. Slave-read and
+     slave-write nodes each pick which server to talk to.</p>
+
+  <h3>Port note</h3>
+  <p>Use ports above 1024 (e.g. 1502, 1503) to avoid needing root privileges.</p>
+</script>

package/nodes/modpackqt-slave-server.js

@@ -0,0 +1,137 @@
+/**
+ * ModPackQT Slave Server — Modbus TCP slave with a full register store.
+ *
+ * This is a config node. Drop one per fake device. Each server:
+ *   - Binds its own TCP port and listens for external Modbus masters
+ *   - Owns 65 536 registers per type (coils, discrete, holding, input)
+ *   - Exposes slaveGet() / slaveSet() so slave-read / slave-write can
+ *     push and pull values from the flow side
+ *   - Registers with the probe runtime so the modpackqt.com web console
+ *     can open a live register editor for it
+ *
+ * Register limits and layout are managed from the modpackqt.com web
+ * console (loaded via the My Slaves picker). Node-RED only needs the
+ * port and unit ID to bind the TCP listener.
+ */
+module.exports = function (RED) {
+  const ModbusRTU = require('modbus-serial');
+  const { getRuntime } = require('./lib/probe-runtime');
+
+  function SlaveServerNode(config) {
+    RED.nodes.createNode(this, config);
+    const node = this;
+
+    node.name     = config.name || '';
+    node.bindHost = config.bindHost || '0.0.0.0';
+    node.bindPort = parseInt(config.bindPort, 10) || 1502;
+    node.unitId   = parseInt(config.unitId, 10) || 1;
+
+    // ── Register store — full Modbus address space per type.
+    // Register limits / layout are defined by the modpackqt.com slave
+    // config and are managed via the web console, not here.
+    const store = {
+      coils:    new Array(65536).fill(false),
+      discrete: new Array(65536).fill(false),
+      holding:  new Array(65536).fill(0),
+      input:    new Array(65536).fill(0)
+    };
+
+    // ── Flow-side API — used by slave-read and slave-write nodes.
+    node.slaveEnabled = true;
+
+    node.slaveGet = function (type, address, quantity) {
+      const arr = store[type];
+      if (!arr) throw new Error(`Unknown register type: ${type}`);
+      return arr.slice(address, address + quantity);
+    };
+
+    node.slaveSet = function (type, address, values) {
+      const arr = store[type];
+      if (!arr) throw new Error(`Unknown register type: ${type}`);
+      const isBool = (type === 'coils' || type === 'discrete');
+      const stored = values.map((v) => isBool ? Boolean(v) : (parseInt(v, 10) & 0xFFFF));
+      stored.forEach((v, i) => { arr[address + i] = v; });
+    };
+
+    // ── Modbus TCP server
+    let server = null;
+    try {
+      const vector = {
+        getCoil:            (addr, _u, cb) => cb(null, store.coils[addr]),
+        getDiscreteInput:   (addr, _u, cb) => cb(null, store.discrete[addr]),
+        getHoldingRegister: (addr, _u, cb) => cb(null, store.holding[addr]),
+        getInputRegister:   (addr, _u, cb) => cb(null, store.input[addr]),
+        setCoil:            (addr, val, _u, cb) => { store.coils[addr] = !!val; cb(null); },
+        setRegister:        (addr, val, _u, cb) => { store.holding[addr] = val & 0xFFFF; cb(null); }
+      };
+      server = new ModbusRTU.ServerTCP(vector, {
+        host: node.bindHost,
+        port: node.bindPort,
+        debug: false,
+        unitID: node.unitId
+      });
+      server.on('socketError', (err) => node.warn(`[slave-server] socket: ${err.message}`));
+      server.on('serverError', (err) => node.error(`[slave-server] server: ${err.message}`));
+      node.log(`[modpackqt] slave server listening on ${node.bindHost}:${node.bindPort} #${node.unitId}`);
+    } catch (err) {
+      node.error(`Failed to start slave server: ${err.message}`);
+    }
+
+    // ── Probe runtime registration — lets the web console find this slave.
+    const probe = {
+      id: node.id,
+      kind: 'slave',
+      describe(_detailed = false) {
+        return {
+          id: node.id,
+          kind: 'slave',
+          name: node.name || `Slave :${node.bindPort} #${node.unitId}`,
+          target: {
+            mode: 'tcp',
+            host: node.bindHost,
+            port: node.bindPort,
+            unitId: node.unitId
+          },
+          status: server ? 'listening' : 'error'
+        };
+      },
+      async handleRead() { throw new Error('slave server — use GET /store to inspect registers'); },
+      async handleWrite() { throw new Error('slave server — use PUT /store to set registers'); },
+      async handleStoreGet(searchParams) {
+        const type = searchParams.get('type') || 'holding';
+        const addr = parseInt(searchParams.get('address') || '0', 10);
+        const qty  = parseInt(searchParams.get('quantity') || '10', 10);
+        if (!store[type]) throw new Error(`unknown register type: ${type}`);
+        return { type, address: addr, values: store[type].slice(addr, addr + qty) };
+      },
+      async handleStorePut(body) {
+        const type = body.type || 'holding';
+        const addr = parseInt(body.address, 10) || 0;
+        const values = body.values || [];
+        if (!store[type]) throw new Error(`unknown register type: ${type}`);
+        if (!Array.isArray(values)) throw new Error('values must be an array');
+        const isBool = (type === 'coils' || type === 'discrete');
+        const stored = values.map((v) => isBool ? Boolean(v) : (parseInt(v, 10) & 0xFFFF));
+        stored.forEach((v, i) => { store[type][addr + i] = v; });
+        return { ok: true, type, address: addr, written: stored.length };
+      }
+    };
+
+    const runtime = getRuntime();
+    runtime.ensureAdminRoutes(RED);
+    runtime.register(probe);
+
+    node.on('close', function (done) {
+      runtime.unregister(node.id);
+      if (server) {
+        try { server.close(() => done()); } catch (_) { done(); }
+      } else {
+        done();
+      }
+    });
+  }
+
+  RED.nodes.registerType('modpackqt-slave-server', SlaveServerNode, {
+    credentials: { apiKey: { type: 'password' } }
+  });
+};

package/nodes/modpackqt-slave-write.html

@@ -4,7 +4,8 @@
     color: '#15803d',
     defaults: {
       name:         { value: '' },
-      server:       { value: '', type: 'modpackqt-config', required: true },
+      slaveServer:  { value: '', type: 'modpackqt-slave-server' },
+      server:       { value: '' },   // legacy — modpackqt-config with embedded slave
       registerType: { value: 'holding', required: true },
       address:      { value: 0, required: true, validate: RED.validators.number() }
     },
@@ -24,8 +25,8 @@
     <input type="text" id="node-input-name" placeholder="Name">
   </div>
   <div class="form-row">
-    <label for="node-input-server"><i class="fa fa-cog"></i> Runtime</label>
-    <input type="text" id="node-input-server">
+    <label for="node-input-slaveServer"><i class="fa fa-server"></i> Slave Server</label>
+    <input type="text" id="node-input-slaveServer">
   </div>
   <div class="form-row">
     <label for="node-input-registerType"><i class="fa fa-list"></i> Register Type</label>
@@ -41,26 +42,32 @@
     <input type="number" id="node-input-address" min="0" max="65535" placeholder="0">
   </div>
   <div class="form-tips">
-    <b>Pushes values into the embedded slave register store.</b> Any Modbus master that
-    connects to your slave port will read whatever was last written here.
+    <b>Pushes values into a slave server's register store.</b> Any external Modbus master
+    connecting to that slave port will read whatever you last wrote.
     Send <code>msg.payload</code> as a number, array, or JSON string.
   </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>
+    <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-slave-write">
   <p>
-    Writes into the embedded slave's local register store. External Modbus masters
-    that connect to your configured slave port (default <code>1502</code>) will read
-    these values.
+    Writes values into a <b>modpackqt-slave-server</b> node's register store.
+    External Modbus masters connecting to that slave's port will read whatever
+    was last written here.
   </p>
-  <p>Enable the slave server in the <b>modpackqt-config</b> node first.</p>
+  <h3>Setup</h3>
+  <p>Set up a <b>Slave Server</b> config node first (pencil icon), then point this node at it.</p>
+  <h3>Input</h3>
+  <dl class="message-properties">
+    <dt>payload <span class="property-type">number | array | string</span></dt>
+    <dd>Value(s) to write. Arrays write multiple consecutive registers.</dd>
+  </dl>
 </script>

package/nodes/modpackqt-slave-write.js

@@ -1,25 +1,31 @@
 /**
- * ModPackQT Slave Write — write into the embedded slave's local register store.
- * External Modbus masters connecting to the slave port (configured in
- * modpackqt-config) will read whatever was last written here.
+ * ModPackQT Slave Write — write into a slave server's local register store.
+ *
+ * Points at a modpackqt-slave-server config node (preferred) or falls back
+ * to the legacy modpackqt-config with an embedded slave (backward compat).
+ * External Modbus masters connecting to the slave port will read whatever
+ * was last written here.
  */
 module.exports = function (RED) {
   function ModPackQTSlaveWriteNode(config) {
     RED.nodes.createNode(this, config);
     const node = this;
-    const server = RED.nodes.getNode(config.server);
 
     node.registerType = config.registerType || 'holding';
     node.address      = parseInt(config.address, 10) || 0;
 
+    // Prefer new slave-server config node; fall back to legacy modpackqt-config.
+    const slave = RED.nodes.getNode(config.slaveServer) || RED.nodes.getNode(config.server);
+
     node.on('input', function (msg) {
-      if (!server) {
-        node.status({ fill: 'red', shape: 'ring', text: 'no config' });
+      if (!slave) {
+        node.status({ fill: 'red', shape: 'ring', text: 'no slave server configured' });
+        node.error('No Slave Server configured — add a modpackqt-slave-server node.', msg);
         return;
       }
-      if (!server.slaveEnabled) {
-        node.status({ fill: 'red', shape: 'ring', text: 'slave server disabled in config' });
-        node.error('Embedded slave is disabled — enable it in the modpackqt-config node.', msg);
+      if (!slave.slaveEnabled) {
+        node.status({ fill: 'red', shape: 'ring', text: 'slave server not running' });
+        node.error('Slave server is not running — check the slave-server config node.', msg);
         return;
       }
       try {
@@ -37,12 +43,9 @@ module.exports = function (RED) {
         }
         const address = msg.address !== undefined ? parseInt(msg.address, 10) : node.address;
 
-        server.slaveSet(registerType, address, values);
+        slave.slaveSet(registerType, address, values);
         const now = new Date().toLocaleTimeString();
-        node.status({
-          fill: 'green', shape: 'dot',
-          text: server.brandStatus(`slave wrote ${values.length} @${address} · ${now}`)
-        });
+        node.status({ fill: 'green', shape: 'dot', text: `wrote ${values.length} → ${registerType} @${address} · ${now}` });
         msg.success = true;
         msg.valuesWritten = values;
         node.send(msg);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-modbus-modpackqt",
-  "version": "3.3.1",
+  "version": "3.3.3",
   "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",
@@ -51,7 +51,8 @@
       "modpackqt-slave-write": "nodes/modpackqt-slave-write.js",
       "modpackqt-traffic": "nodes/modpackqt-traffic.js",
       "modpackqt-master-probe": "nodes/modpackqt-master-probe.js",
-      "modpackqt-slave-probe": "nodes/modpackqt-slave-probe.js"
+      "modpackqt-slave-probe": "nodes/modpackqt-slave-probe.js",
+      "modpackqt-slave-server": "nodes/modpackqt-slave-server.js"
     }
   },
   "dependencies": {