@ya-modbus/transport 0.7.1 → 0.7.2

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.7.2](https://github.com/groupsky/ya-modbus/compare/@ya-modbus/transport@0.7.1...@ya-modbus/transport@0.7.2) (2026-02-11)
+
+### Bug Fixes
+
+- **transport:** multiple devices on same bus use correct slave ID ([#235](https://github.com/groupsky/ya-modbus/issues/235)) ([7259914](https://github.com/groupsky/ya-modbus/commit/7259914ca2583c5222c99f3306de87961975d2c4)), closes [#171](https://github.com/groupsky/ya-modbus/issues/171)
+
 ## [0.7.1](https://github.com/groupsky/ya-modbus/compare/@ya-modbus/transport@0.7.0...@ya-modbus/transport@0.7.1) (2026-02-06)
 
 **Note:** Version bump only for package @ya-modbus/transport

package/dist/cjs/src/index.d.ts

@@ -11,4 +11,5 @@ export { createModbusTransport } from './create-modbus-transport.js';
 export { withRetry, MAX_RETRIES, RETRY_DELAY_MS, type RetryLogger } from './retry.js';
 export { TransportManager, type TransportStats } from './manager.js';
 export { MutexTransport } from './mutex-transport.js';
+export { SlaveTransport } from './slave-transport.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/cjs/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,eAAe,EAAE,KAAK,eAAe,EAAE,MAAM,cAAc,CAAA;AACpE,OAAO,EAAE,kBAAkB,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACvE,OAAO,EAAE,kBAAkB,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,KAAK,WAAW,EAAE,MAAM,YAAY,CAAA;AACrF,OAAO,EAAE,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,cAAc,CAAA;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,eAAe,EAAE,KAAK,eAAe,EAAE,MAAM,cAAc,CAAA;AACpE,OAAO,EAAE,kBAAkB,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACvE,OAAO,EAAE,kBAAkB,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,KAAK,WAAW,EAAE,MAAM,YAAY,CAAA;AACrF,OAAO,EAAE,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,cAAc,CAAA;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA"}

package/dist/cjs/src/index.js

@@ -6,7 +6,7 @@
  * and transport pooling with mutex-based RTU bus serialization
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MutexTransport = exports.TransportManager = exports.RETRY_DELAY_MS = exports.MAX_RETRIES = exports.withRetry = exports.createModbusTransport = exports.createTCPTransport = exports.createRTUTransport = exports.createTransport = void 0;
+exports.SlaveTransport = exports.MutexTransport = exports.TransportManager = exports.RETRY_DELAY_MS = exports.MAX_RETRIES = exports.withRetry = exports.createModbusTransport = exports.createTCPTransport = exports.createRTUTransport = exports.createTransport = void 0;
 var factory_js_1 = require("./factory.js");
 Object.defineProperty(exports, "createTransport", { enumerable: true, get: function () { return factory_js_1.createTransport; } });
 var rtu_transport_js_1 = require("./rtu-transport.js");
@@ -23,4 +23,6 @@ var manager_js_1 = require("./manager.js");
 Object.defineProperty(exports, "TransportManager", { enumerable: true, get: function () { return manager_js_1.TransportManager; } });
 var mutex_transport_js_1 = require("./mutex-transport.js");
 Object.defineProperty(exports, "MutexTransport", { enumerable: true, get: function () { return mutex_transport_js_1.MutexTransport; } });
+var slave_transport_js_1 = require("./slave-transport.js");
+Object.defineProperty(exports, "SlaveTransport", { enumerable: true, get: function () { return slave_transport_js_1.SlaveTransport; } });
 //# sourceMappingURL=index.js.map

package/dist/cjs/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,2CAAoE;AAA3D,6GAAA,eAAe,OAAA;AACxB,uDAAuE;AAA9D,sHAAA,kBAAkB,OAAA;AAC3B,uDAAuE;AAA9D,sHAAA,kBAAkB,OAAA;AAC3B,2EAAoE;AAA3D,mIAAA,qBAAqB,OAAA;AAC9B,uCAAqF;AAA5E,qGAAA,SAAS,OAAA;AAAE,uGAAA,WAAW,OAAA;AAAE,0GAAA,cAAc,OAAA;AAC/C,2CAAoE;AAA3D,8GAAA,gBAAgB,OAAA;AACzB,2DAAqD;AAA5C,oHAAA,cAAc,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,2CAAoE;AAA3D,6GAAA,eAAe,OAAA;AACxB,uDAAuE;AAA9D,sHAAA,kBAAkB,OAAA;AAC3B,uDAAuE;AAA9D,sHAAA,kBAAkB,OAAA;AAC3B,2EAAoE;AAA3D,mIAAA,qBAAqB,OAAA;AAC9B,uCAAqF;AAA5E,qGAAA,SAAS,OAAA;AAAE,uGAAA,WAAW,OAAA;AAAE,0GAAA,cAAc,OAAA;AAC/C,2CAAoE;AAA3D,8GAAA,gBAAgB,OAAA;AACzB,2DAAqD;AAA5C,oHAAA,cAAc,OAAA;AACvB,2DAAqD;AAA5C,oHAAA,cAAc,OAAA"}

package/dist/cjs/src/manager.d.ts

@@ -1,5 +1,5 @@
 import type { Transport } from '@ya-modbus/driver-types';
-import { type TransportConfig } from './factory.js';
+import type { TransportConfig } from './factory.js';
 /**
  * Statistics about managed transports
  */
@@ -9,52 +9,77 @@ export interface TransportStats {
     tcpTransports: number;
 }
 /**
- * TransportManager pools transport instances and provides mutex-based
- * serialization for all transport operations to prevent concurrent access issues.
+ * TransportManager pools modbus-serial clients and provides slave-specific transports.
  *
  * Key behaviors:
- * - All transports (RTU and TCP) are pooled by connection configuration
- * - RTU transports are pooled by bus configuration (port, baud rate, parity, etc.)
- * - TCP transports are pooled by host and port
- * - Multiple devices on the same connection share a single transport instance
+ * - Pools modbus-serial clients by physical connection (excluding slave ID)
+ * - RTU clients are pooled by bus configuration (port, baud rate, parity, etc.)
+ * - TCP clients are pooled by host and port
+ * - Returns SlaveTransport instances that set the slave ID before each operation
+ * - Multiple devices on the same connection share a single client and mutex
  * - All operations are serialized using async-mutex to prevent race conditions
  *
- * Why TCP needs mutex protection:
- * - Many Modbus devices allow only one or a limited number of TCP connections
- * - Even with multiple connections, devices often process requests sequentially
- * - Concurrent requests can cause timeouts, dropped packets, or incorrect responses
- * - Serialization ensures reliable communication regardless of device limitations
+ * This architecture solves the multi-device problem:
+ * - Each device gets its own SlaveTransport with its own slave ID
+ * - All devices on the same bus share the same client and mutex
+ * - Slave ID is set dynamically before each operation
+ * - No more hardcoded slave IDs that affect all devices on a bus
+ *
+ * IMPORTANT: Shared Resource Ownership
+ * Multiple SlaveTransport instances share the same client and mutex. This is
+ * intentional and correct:
+ * - Shared client: Avoids port contention (can't open serial port twice)
+ * - Shared mutex: Ensures serialized access to the bus
+ * - SlaveTransport.close(): Does not close shared client (use closeAll() for cleanup)
  */
 export declare class TransportManager {
-    private readonly transports;
+    private readonly connections;
     /**
      * Get or create a transport for the given configuration.
-     * Returns mutex-wrapped shared transport if one exists for the same connection.
+     * Returns a new SlaveTransport instance bound to the slave ID in the config.
+     * Multiple devices on the same physical connection share the same client and mutex.
      *
      * @param config - RTU or TCP transport configuration
-     * @returns Transport instance wrapped with mutex for thread-safe operations
+     * @returns SlaveTransport instance for the specific slave device
      */
     getTransport(config: TransportConfig): Promise<Transport>;
     /**
-     * Get statistics about managed transports
+     * Get statistics about managed connections
      *
      * @returns Transport statistics
      */
     getStats(): TransportStats;
     /**
-     * Close all managed transports and clear the pool.
+     * Close all managed connections and clear the pool.
      * Errors during close are logged but do not stop the process.
      */
     closeAll(): Promise<void>;
     /**
-     * Generate a unique key for a transport configuration.
+     * Generate a unique key for a physical connection.
+     * Excludes slave ID so multiple devices on the same bus share a connection.
      * For RTU: Key includes all bus parameters (port, baud, parity, etc.)
      * For TCP: Key includes host and port
      *
      * @param config - Transport configuration
-     * @returns Connection key string
+     * @returns Physical connection key string
+     */
+    private getPhysicalConnectionKey;
+    /**
+     * Create and configure an RTU modbus-serial client.
+     * Does NOT set slave ID - that's handled by SlaveTransport.
+     *
+     * @param config - RTU configuration
+     * @returns Connected ModbusRTU client
+     */
+    private createRTUClient;
+    /**
+     * Create and configure a TCP modbus-serial client.
+     * Does NOT set slave ID - that's handled by SlaveTransport.
+     *
+     * @param config - TCP configuration
+     * @returns Connected ModbusRTU client
      */
-    private getConnectionKey;
+    private createTCPClient;
     /**
      * Type guard to check if config is RTU
      *

package/dist/cjs/src/manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../src/manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAGxD,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,cAAc,CAAA;AAepE;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,eAAe,EAAE,MAAM,CAAA;IACvB,aAAa,EAAE,MAAM,CAAA;IACrB,aAAa,EAAE,MAAM,CAAA;CACtB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAE/D;;;;;;OAMG;IACG,YAAY,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC;IAqD/D;;;;OAIG;IACH,QAAQ,IAAI,cAAc;IAS1B;;;OAGG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAc/B;;;;;;;OAOG;IACH,OAAO,CAAC,gBAAgB;IASxB;;;;;OAKG;IACH,OAAO,CAAC,WAAW;CAGpB"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../src/manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAIxD,OAAO,KAAK,EAAwB,eAAe,EAAE,MAAM,cAAc,CAAA;AAazE;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,eAAe,EAAE,MAAM,CAAA;IACvB,aAAa,EAAE,MAAM,CAAA;IACrB,aAAa,EAAE,MAAM,CAAA;CACtB;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqC;IAEjE;;;;;;;OAOG;IACG,YAAY,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC;IA6B/D;;;;OAIG;IACH,QAAQ,IAAI,cAAc;IAS1B;;;OAGG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB/B;;;;;;;;OAQG;IACH,OAAO,CAAC,wBAAwB;IAShC;;;;;;OAMG;YACW,eAAe;IAe7B;;;;;;OAMG;YACW,eAAe;IAU7B;;;;;OAKG;IACH,OAAO,CAAC,WAAW;CAGpB"}

package/dist/cjs/src/manager.js

@@ -1,89 +1,72 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransportManager = void 0;
+const tslib_1 = require("tslib");
 const async_mutex_1 = require("async-mutex");
-const factory_js_1 = require("./factory.js");
-const mutex_transport_js_1 = require("./mutex-transport.js");
+const modbus_serial_1 = tslib_1.__importDefault(require("modbus-serial"));
+const slave_transport_js_1 = require("./slave-transport.js");
 /**
- * TransportManager pools transport instances and provides mutex-based
- * serialization for all transport operations to prevent concurrent access issues.
+ * TransportManager pools modbus-serial clients and provides slave-specific transports.
  *
  * Key behaviors:
- * - All transports (RTU and TCP) are pooled by connection configuration
- * - RTU transports are pooled by bus configuration (port, baud rate, parity, etc.)
- * - TCP transports are pooled by host and port
- * - Multiple devices on the same connection share a single transport instance
+ * - Pools modbus-serial clients by physical connection (excluding slave ID)
+ * - RTU clients are pooled by bus configuration (port, baud rate, parity, etc.)
+ * - TCP clients are pooled by host and port
+ * - Returns SlaveTransport instances that set the slave ID before each operation
+ * - Multiple devices on the same connection share a single client and mutex
  * - All operations are serialized using async-mutex to prevent race conditions
  *
- * Why TCP needs mutex protection:
- * - Many Modbus devices allow only one or a limited number of TCP connections
- * - Even with multiple connections, devices often process requests sequentially
- * - Concurrent requests can cause timeouts, dropped packets, or incorrect responses
- * - Serialization ensures reliable communication regardless of device limitations
+ * This architecture solves the multi-device problem:
+ * - Each device gets its own SlaveTransport with its own slave ID
+ * - All devices on the same bus share the same client and mutex
+ * - Slave ID is set dynamically before each operation
+ * - No more hardcoded slave IDs that affect all devices on a bus
+ *
+ * IMPORTANT: Shared Resource Ownership
+ * Multiple SlaveTransport instances share the same client and mutex. This is
+ * intentional and correct:
+ * - Shared client: Avoids port contention (can't open serial port twice)
+ * - Shared mutex: Ensures serialized access to the bus
+ * - SlaveTransport.close(): Does not close shared client (use closeAll() for cleanup)
  */
 class TransportManager {
     constructor() {
-        this.transports = new Map();
+        this.connections = new Map();
     }
     /**
      * Get or create a transport for the given configuration.
-     * Returns mutex-wrapped shared transport if one exists for the same connection.
+     * Returns a new SlaveTransport instance bound to the slave ID in the config.
+     * Multiple devices on the same physical connection share the same client and mutex.
      *
      * @param config - RTU or TCP transport configuration
-     * @returns Transport instance wrapped with mutex for thread-safe operations
+     * @returns SlaveTransport instance for the specific slave device
      */
     async getTransport(config) {
-        const key = this.getConnectionKey(config);
+        const key = this.getPhysicalConnectionKey(config);
         const isRTU = this.isRTUConfig(config);
-        // For RTU, reuse existing transport if available
-        if (isRTU) {
-            const entry = this.transports.get(key);
-            if (entry) {
-                return entry.wrappedTransport;
-            }
-            // Create new RTU transport with mutex wrapper
-            const rawTransport = await (0, factory_js_1.createTransport)(config);
-            const mutex = new async_mutex_1.Mutex();
-            const wrappedTransport = new mutex_transport_js_1.MutexTransport(rawTransport, mutex);
-            const newEntry = {
-                rawTransport,
-                wrappedTransport,
-                mutex,
+        // Get or create the shared connection
+        let entry = this.connections.get(key);
+        if (!entry) {
+            // Create new client for this physical connection
+            const client = isRTU ? await this.createRTUClient(config) : await this.createTCPClient(config);
+            entry = {
+                client,
+                mutex: new async_mutex_1.Mutex(),
                 config,
-                isRTU: true,
+                isRTU,
             };
-            this.transports.set(key, newEntry);
-            return wrappedTransport;
+            this.connections.set(key, entry);
         }
-        // For TCP, reuse existing transport if available
-        // TCP is pooled like RTU because many devices support only one connection
-        // or process requests sequentially even with multiple connections
-        const entry = this.transports.get(key);
-        if (entry) {
-            return entry.wrappedTransport;
-        }
-        // Create new TCP transport with mutex wrapper
-        // Mutex prevents concurrent requests that could cause timeouts or errors
-        const rawTransport = await (0, factory_js_1.createTransport)(config);
-        const mutex = new async_mutex_1.Mutex();
-        const wrappedTransport = new mutex_transport_js_1.MutexTransport(rawTransport, mutex);
-        const newEntry = {
-            rawTransport,
-            wrappedTransport,
-            mutex,
-            config,
-            isRTU: false,
-        };
-        this.transports.set(key, newEntry);
-        return wrappedTransport;
+        // Return a new SlaveTransport for this specific slave
+        return new slave_transport_js_1.SlaveTransport(config.slaveId, entry.client, entry.mutex, config.maxRetries ?? 3, config.logger);
     }
     /**
-     * Get statistics about managed transports
+     * Get statistics about managed connections
      *
      * @returns Transport statistics
      */
     getStats() {
-        const entries = Array.from(this.transports.values());
+        const entries = Array.from(this.connections.values());
         return {
             totalTransports: entries.length,
             rtuTransports: entries.filter((e) => e.isRTU).length,
@@ -91,37 +74,71 @@ class TransportManager {
         };
     }
     /**
-     * Close all managed transports and clear the pool.
+     * Close all managed connections and clear the pool.
      * Errors during close are logged but do not stop the process.
      */
     async closeAll() {
-        const closePromises = Array.from(this.transports.values()).map(async (entry) => {
+        const closePromises = Array.from(this.connections.values()).map(async (entry) => {
             try {
-                await entry.rawTransport.close();
+                await new Promise((resolve) => {
+                    entry.client.close(resolve);
+                });
             }
             catch (error) {
-                // Log but don't throw - we want to close all transports
-                console.error('Error closing transport:', error);
+                // Log but don't throw - we want to close all connections
+                console.error('Error closing connection:', error);
             }
         });
         await Promise.all(closePromises);
-        this.transports.clear();
+        this.connections.clear();
     }
     /**
-     * Generate a unique key for a transport configuration.
+     * Generate a unique key for a physical connection.
+     * Excludes slave ID so multiple devices on the same bus share a connection.
      * For RTU: Key includes all bus parameters (port, baud, parity, etc.)
      * For TCP: Key includes host and port
      *
      * @param config - Transport configuration
-     * @returns Connection key string
+     * @returns Physical connection key string
      */
-    getConnectionKey(config) {
+    getPhysicalConnectionKey(config) {
         if (this.isRTUConfig(config)) {
             return `rtu:${config.port}:${config.baudRate}:${config.dataBits}:${config.parity}:${config.stopBits}`;
         }
         // TCP config - safe to access host/port because isRTUConfig returned false
         return `tcp:${config.host}:${config.port ?? 502}`;
     }
+    /**
+     * Create and configure an RTU modbus-serial client.
+     * Does NOT set slave ID - that's handled by SlaveTransport.
+     *
+     * @param config - RTU configuration
+     * @returns Connected ModbusRTU client
+     */
+    async createRTUClient(config) {
+        const client = new modbus_serial_1.default();
+        await client.connectRTUBuffered(config.port, {
+            baudRate: config.baudRate,
+            dataBits: config.dataBits,
+            parity: config.parity,
+            stopBits: config.stopBits,
+        });
+        client.setTimeout(config.timeout ?? 1000);
+        return client;
+    }
+    /**
+     * Create and configure a TCP modbus-serial client.
+     * Does NOT set slave ID - that's handled by SlaveTransport.
+     *
+     * @param config - TCP configuration
+     * @returns Connected ModbusRTU client
+     */
+    async createTCPClient(config) {
+        const client = new modbus_serial_1.default();
+        await client.connectTCP(config.host, { port: config.port ?? 502 });
+        client.setTimeout(config.timeout ?? 1000);
+        return client;
+    }
     /**
      * Type guard to check if config is RTU
      *

package/dist/cjs/src/manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/manager.ts"],"names":[],"mappings":"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"}

package/dist/cjs/src/slave-transport.d.ts

@@ -0,0 +1,61 @@
+import type { Transport } from '@ya-modbus/driver-types';
+import type { Mutex } from 'async-mutex';
+import type ModbusRTU from 'modbus-serial';
+import { type RetryLogger } from './retry.js';
+/**
+ * SlaveTransport wraps a shared ModbusRTU client with slave-specific addressing.
+ *
+ * Multiple SlaveTransport instances can share the same physical connection (serial port or TCP),
+ * each communicating with a different slave device. The slave ID is set before each operation
+ * to ensure requests are directed to the correct device.
+ *
+ * @example
+ * ```typescript
+ * const client = new ModbusRTU()
+ * await client.connectRTUBuffered('/dev/ttyUSB0', { baudRate: 9600 })
+ * const mutex = new Mutex()
+ *
+ * // Two devices on the same serial port
+ * const device1 = new SlaveTransport(1, client, mutex, 3)
+ * const device2 = new SlaveTransport(2, client, mutex, 3)
+ *
+ * // Each device talks to its own slave ID
+ * await device1.readHoldingRegisters(0, 10) // Reads from slave 1
+ * await device2.readHoldingRegisters(0, 10) // Reads from slave 2
+ * ```
+ */
+export declare class SlaveTransport implements Transport {
+    private readonly slaveId;
+    private readonly client;
+    private readonly mutex;
+    private readonly maxRetries;
+    private readonly logger?;
+    /**
+     * @param slaveId - Modbus slave/unit ID for this device
+     * @param client - Shared ModbusRTU client instance
+     * @param mutex - Shared mutex for serializing operations on the bus
+     * @param maxRetries - Maximum retry attempts for failed operations (default: 3)
+     * @param logger - Optional callback to log retry attempts
+     */
+    constructor(slaveId: number, client: ModbusRTU, mutex: Mutex, maxRetries?: number, logger?: RetryLogger | undefined);
+    readHoldingRegisters(address: number, count: number): Promise<Buffer>;
+    readInputRegisters(address: number, count: number): Promise<Buffer>;
+    readCoils(address: number, count: number): Promise<Buffer>;
+    readDiscreteInputs(address: number, count: number): Promise<Buffer>;
+    writeSingleRegister(address: number, value: number): Promise<void>;
+    writeMultipleRegisters(address: number, values: Buffer): Promise<void>;
+    writeSingleCoil(address: number, value: boolean): Promise<void>;
+    writeMultipleCoils(address: number, values: Buffer): Promise<void>;
+    /**
+     * Close the underlying client connection.
+     *
+     * IMPORTANT: This method does not use mutex protection and should only
+     * be called during shutdown via TransportManager.closeAll(). Calling
+     * this while operations are in progress may cause connection errors.
+     *
+     * Individual SlaveTransport instances should NOT call close() directly
+     * as the client is shared across multiple devices on the same bus.
+     */
+    close(): Promise<void>;
+}
+//# sourceMappingURL=slave-transport.d.ts.map

package/dist/cjs/src/slave-transport.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"slave-transport.d.ts","sourceRoot":"","sources":["../../../src/slave-transport.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,SAAS,MAAM,eAAe,CAAA;AAE1C,OAAO,EAAa,KAAK,WAAW,EAAE,MAAM,YAAY,CAAA;AAExD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,cAAe,YAAW,SAAS;IAS5C,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAZ1B;;;;;;OAMG;gBAEgB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,KAAK,EACZ,UAAU,GAAE,MAAU,EACtB,MAAM,CAAC,EAAE,WAAW,YAAA;IAGjC,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAcrE,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAcnE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAc1D,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAcnE,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAalE,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAatE,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAa/D,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBxE;;;;;;;;;OASG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAM7B"}

package/dist/cjs/src/slave-transport.js

@@ -0,0 +1,136 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SlaveTransport = void 0;
+const retry_js_1 = require("./retry.js");
+/**
+ * SlaveTransport wraps a shared ModbusRTU client with slave-specific addressing.
+ *
+ * Multiple SlaveTransport instances can share the same physical connection (serial port or TCP),
+ * each communicating with a different slave device. The slave ID is set before each operation
+ * to ensure requests are directed to the correct device.
+ *
+ * @example
+ * ```typescript
+ * const client = new ModbusRTU()
+ * await client.connectRTUBuffered('/dev/ttyUSB0', { baudRate: 9600 })
+ * const mutex = new Mutex()
+ *
+ * // Two devices on the same serial port
+ * const device1 = new SlaveTransport(1, client, mutex, 3)
+ * const device2 = new SlaveTransport(2, client, mutex, 3)
+ *
+ * // Each device talks to its own slave ID
+ * await device1.readHoldingRegisters(0, 10) // Reads from slave 1
+ * await device2.readHoldingRegisters(0, 10) // Reads from slave 2
+ * ```
+ */
+class SlaveTransport {
+    /**
+     * @param slaveId - Modbus slave/unit ID for this device
+     * @param client - Shared ModbusRTU client instance
+     * @param mutex - Shared mutex for serializing operations on the bus
+     * @param maxRetries - Maximum retry attempts for failed operations (default: 3)
+     * @param logger - Optional callback to log retry attempts
+     */
+    constructor(slaveId, client, mutex, maxRetries = 3, logger) {
+        this.slaveId = slaveId;
+        this.client = client;
+        this.mutex = mutex;
+        this.maxRetries = maxRetries;
+        this.logger = logger;
+    }
+    async readHoldingRegisters(address, count) {
+        return this.mutex.runExclusive(async () => {
+            return (0, retry_js_1.withRetry)(async () => {
+                this.client.setID(this.slaveId);
+                const result = await this.client.readHoldingRegisters(address, count);
+                return result.buffer;
+            }, this.maxRetries, this.logger);
+        });
+    }
+    async readInputRegisters(address, count) {
+        return this.mutex.runExclusive(async () => {
+            return (0, retry_js_1.withRetry)(async () => {
+                this.client.setID(this.slaveId);
+                const result = await this.client.readInputRegisters(address, count);
+                return result.buffer;
+            }, this.maxRetries, this.logger);
+        });
+    }
+    async readCoils(address, count) {
+        return this.mutex.runExclusive(async () => {
+            return (0, retry_js_1.withRetry)(async () => {
+                this.client.setID(this.slaveId);
+                const result = await this.client.readCoils(address, count);
+                return result.buffer;
+            }, this.maxRetries, this.logger);
+        });
+    }
+    async readDiscreteInputs(address, count) {
+        return this.mutex.runExclusive(async () => {
+            return (0, retry_js_1.withRetry)(async () => {
+                this.client.setID(this.slaveId);
+                const result = await this.client.readDiscreteInputs(address, count);
+                return result.buffer;
+            }, this.maxRetries, this.logger);
+        });
+    }
+    async writeSingleRegister(address, value) {
+        return this.mutex.runExclusive(async () => {
+            return (0, retry_js_1.withRetry)(async () => {
+                this.client.setID(this.slaveId);
+                await this.client.writeRegister(address, value);
+            }, this.maxRetries, this.logger);
+        });
+    }
+    async writeMultipleRegisters(address, values) {
+        return this.mutex.runExclusive(async () => {
+            return (0, retry_js_1.withRetry)(async () => {
+                this.client.setID(this.slaveId);
+                await this.client.writeRegisters(address, values);
+            }, this.maxRetries, this.logger);
+        });
+    }
+    async writeSingleCoil(address, value) {
+        return this.mutex.runExclusive(async () => {
+            return (0, retry_js_1.withRetry)(async () => {
+                this.client.setID(this.slaveId);
+                await this.client.writeCoil(address, value);
+            }, this.maxRetries, this.logger);
+        });
+    }
+    async writeMultipleCoils(address, values) {
+        return this.mutex.runExclusive(async () => {
+            return (0, retry_js_1.withRetry)(async () => {
+                this.client.setID(this.slaveId);
+                // Convert Buffer to boolean array
+                const bools = [];
+                for (let i = 0; i < values.length * 8; i++) {
+                    const byteIndex = Math.floor(i / 8);
+                    const bitIndex = i % 8;
+                    const byte = values[byteIndex];
+                    bools.push((byte & (1 << bitIndex)) !== 0);
+                }
+                await this.client.writeCoils(address, bools);
+            }, this.maxRetries, this.logger);
+        });
+    }
+    /**
+     * Close the underlying client connection.
+     *
+     * IMPORTANT: This method does not use mutex protection and should only
+     * be called during shutdown via TransportManager.closeAll(). Calling
+     * this while operations are in progress may cause connection errors.
+     *
+     * Individual SlaveTransport instances should NOT call close() directly
+     * as the client is shared across multiple devices on the same bus.
+     */
+    async close() {
+        // Don't use mutex for close operation
+        return new Promise((resolve) => {
+            this.client.close(resolve);
+        });
+    }
+}
+exports.SlaveTransport = SlaveTransport;
+//# sourceMappingURL=slave-transport.js.map

package/dist/cjs/src/slave-transport.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"slave-transport.js","sourceRoot":"","sources":["../../../src/slave-transport.ts"],"names":[],"mappings":"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"}