@ya-modbus/mqtt-bridge 0.6.1 → 0.7.0

package/CHANGELOG.md

@@ -3,9 +3,11 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.6.1](https://github.com/groupsky/ya-modbus/compare/@ya-modbus/mqtt-bridge@0.6.0...@ya-modbus/mqtt-bridge@0.6.1) (2026-01-08)
+# [0.7.0](https://github.com/groupsky/ya-modbus/compare/@ya-modbus/mqtt-bridge@0.6.0...@ya-modbus/mqtt-bridge@0.7.0) (2026-01-11)
 
-**Note:** Version bump only for package @ya-modbus/mqtt-bridge
+### Features
+
+- **build:** add dual CommonJS/ESM package support ([#187](https://github.com/groupsky/ya-modbus/issues/187)) ([3d78130](https://github.com/groupsky/ya-modbus/commit/3d781304d42edba335cdc320ba25275f3b4ea6c9))
 
 # 0.6.0 (2026-01-04)
 

package/dist/cjs/bin/ya-modbus-bridge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ya-modbus-bridge.d.ts","sourceRoot":"","sources":["../../../bin/ya-modbus-bridge.ts"],"names":[],"mappings":";AAEA;;;;;GAKG"}

package/dist/cjs/bin/ya-modbus-bridge.js

@@ -0,0 +1,12 @@
+#!/usr/bin/env node
+"use strict";
+/**
+ * CLI entry point
+ *
+ * This file is the executable entry point that parses command-line arguments.
+ * The actual CLI implementation is in src/cli.ts
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const cli_js_1 = require("../src/cli.js");
+cli_js_1.program.parse();
+//# sourceMappingURL=ya-modbus-bridge.js.map

package/dist/cjs/bin/ya-modbus-bridge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ya-modbus-bridge.js","sourceRoot":"","sources":["../../../bin/ya-modbus-bridge.ts"],"names":[],"mappings":";;AAEA;;;;;GAKG;;AAEH,0CAAuC;AAEvC,gBAAO,CAAC,KAAK,EAAE,CAAA"}

package/dist/cjs/package.json

@@ -0,0 +1 @@
+{"type":"commonjs"}

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

@@ -0,0 +1 @@
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../../src/cli.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAUnC,eAAO,MAAM,OAAO,SAAgB,CAAA"}

package/dist/cjs/src/cli.js

@@ -0,0 +1,113 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.program = void 0;
+const tslib_1 = require("tslib");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const commander_1 = require("commander");
+const config_validator_js_1 = require("./utils/config-validator.js");
+const config_js_1 = require("./utils/config.js");
+const package_info_js_1 = require("./utils/package-info.js");
+const process_js_1 = require("./utils/process.js");
+const index_js_1 = require("./index.js");
+exports.program = new commander_1.Command();
+const packageInfo = (0, package_info_js_1.getPackageInfo)();
+exports.program.name('ya-modbus-bridge').description(packageInfo.description).version(packageInfo.version);
+// Error handler for command execution
+exports.program.exitOverride(); // Prevent automatic exit, let us handle errors
+exports.program.configureOutput({
+    /* istanbul ignore next - commander internal error output */
+    writeErr: (str) => process.stderr.write(str),
+});
+exports.program
+    .command('run')
+    .description('Run the MQTT bridge')
+    .option('-c, --config <path>', 'Path to configuration file')
+    .option('--mqtt-url <url>', 'MQTT broker URL (mqtt://, mqtts://, ws://, wss://)')
+    .option('--mqtt-client-id <id>', 'MQTT client identifier')
+    .option('--mqtt-username <username>', 'MQTT authentication username')
+    .option('--mqtt-password <password>', 'MQTT authentication password')
+    .option('--mqtt-reconnect-period <ms>', 'Reconnection interval in milliseconds', parseInt)
+    .option('--topic-prefix <prefix>', 'Topic prefix for all MQTT topics (default: modbus)')
+    .option('--state-dir <path>', 'Directory path for state persistence')
+    .action(async (options) => {
+    try {
+        await runCommand(options);
+    }
+    catch (error) {
+        console.error(chalk_1.default.red('Error:'), error instanceof Error ? error.message : String(error));
+        process_js_1.processUtils.exit(1);
+    }
+});
+async function runCommand(options) {
+    console.log(chalk_1.default.blue('Loading configuration...'));
+    let config;
+    if (options.config) {
+        // Load from file
+        config = await (0, config_js_1.loadConfig)(options.config);
+        // Override with CLI options if provided
+        if (options.mqttUrl)
+            config.mqtt.url = options.mqttUrl;
+        if (options.mqttClientId)
+            config.mqtt.clientId = options.mqttClientId;
+        if (options.mqttUsername)
+            config.mqtt.username = options.mqttUsername;
+        if (options.mqttPassword)
+            config.mqtt.password = options.mqttPassword;
+        if (options.mqttReconnectPeriod)
+            config.mqtt.reconnectPeriod = options.mqttReconnectPeriod;
+        if (options.topicPrefix)
+            config.topicPrefix = options.topicPrefix;
+        if (options.stateDir)
+            config.stateDir = options.stateDir;
+    }
+    else {
+        // Build from CLI options only
+        if (!options.mqttUrl) {
+            throw new Error('Either --config or --mqtt-url must be provided');
+        }
+        config = {
+            mqtt: {
+                url: options.mqttUrl,
+                ...(options.mqttClientId && { clientId: options.mqttClientId }),
+                ...(options.mqttUsername && { username: options.mqttUsername }),
+                ...(options.mqttPassword && { password: options.mqttPassword }),
+                ...(options.mqttReconnectPeriod && { reconnectPeriod: options.mqttReconnectPeriod }),
+            },
+            ...(options.topicPrefix && { topicPrefix: options.topicPrefix }),
+            ...(options.stateDir && { stateDir: options.stateDir }),
+        };
+    }
+    // Validate configuration after merging CLI options
+    (0, config_validator_js_1.validateConfig)(config);
+    // Sanitize URL to hide credentials
+    const sanitizedUrl = config.mqtt.url.replace(/:\/\/([^:]+):([^@]+)@/, '://$1:****@');
+    console.log(chalk_1.default.blue(`Starting MQTT bridge - connecting to ${sanitizedUrl}...`));
+    const bridge = (0, index_js_1.createBridge)(config);
+    await bridge.start();
+    console.log(chalk_1.default.green('Bridge started successfully'));
+    let isShuttingDown = false;
+    const handleShutdown = async (signal) => {
+        if (isShuttingDown) {
+            return;
+        }
+        isShuttingDown = true;
+        console.log(chalk_1.default.yellow(`\nReceived ${signal}, shutting down...`));
+        await bridge.stop();
+        console.log(chalk_1.default.green('Bridge stopped'));
+        process_js_1.processUtils.exit(0);
+    };
+    process_js_1.processUtils.onSignal('SIGINT', () => {
+        handleShutdown('SIGINT').catch((err) => {
+            console.error(chalk_1.default.red('Shutdown error:'), err);
+            process_js_1.processUtils.exit(1);
+        });
+    });
+    process_js_1.processUtils.onSignal('SIGTERM', () => {
+        handleShutdown('SIGTERM').catch((err) => {
+            console.error(chalk_1.default.red('Shutdown error:'), err);
+            process_js_1.processUtils.exit(1);
+        });
+    });
+}
+//# sourceMappingURL=cli.js.map

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"device-manager.d.ts","sourceRoot":"","sources":["../../../src/device-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAG5D,qBAAa,aAAa;IAIZ,OAAO,CAAC,YAAY;IAHhC,OAAO,CAAC,OAAO,CAAkC;IACjD,OAAO,CAAC,OAAO,CAAkC;gBAE7B,YAAY,EAAE,YAAY;IAExC,SAAS,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAsC9C,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUnD,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIrD,WAAW,IAAI,YAAY,EAAE;IAI7B,cAAc,IAAI,MAAM;IAIxB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,GAAG,IAAI;IAYrF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAO5B,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;CAG5D"}

package/dist/cjs/src/device-manager.js

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeviceManager = void 0;
+const device_validation_js_1 = require("./utils/device-validation.js");
+class DeviceManager {
+    constructor(driverLoader) {
+        this.driverLoader = driverLoader;
+        this.devices = new Map();
+        this.configs = new Map();
+    }
+    async addDevice(config) {
+        (0, device_validation_js_1.validateDeviceConfig)(config);
+        if (this.devices.has(config.deviceId)) {
+            throw new Error(`Device ${config.deviceId} already exists`);
+        }
+        const enabled = config.enabled ?? true;
+        const status = {
+            deviceId: config.deviceId,
+            state: 'disconnected',
+            enabled,
+            connected: false,
+        };
+        this.devices.set(config.deviceId, status);
+        this.configs.set(config.deviceId, config);
+        // Load driver if enabled
+        if (enabled) {
+            try {
+                this.updateDeviceState(config.deviceId, { state: 'connecting' });
+                await this.driverLoader.loadDriver(config.driver, config.connection, config.deviceId);
+                this.updateDeviceState(config.deviceId, {
+                    state: 'connected',
+                    connected: true,
+                    lastUpdate: Date.now(),
+                });
+            }
+            catch (error) {
+                // Clean up device state to allow retry (make operation atomic)
+                this.devices.delete(config.deviceId);
+                this.configs.delete(config.deviceId);
+                throw error;
+            }
+        }
+    }
+    async removeDevice(deviceId) {
+        if (!this.devices.has(deviceId)) {
+            throw new Error(`Device ${deviceId} not found`);
+        }
+        await this.driverLoader.unloadDriver(deviceId);
+        this.devices.delete(deviceId);
+        this.configs.delete(deviceId);
+    }
+    getDevice(deviceId) {
+        return this.devices.get(deviceId);
+    }
+    listDevices() {
+        return Array.from(this.devices.values());
+    }
+    getDeviceCount() {
+        return this.devices.size;
+    }
+    updateDeviceState(deviceId, updates) {
+        const device = this.devices.get(deviceId);
+        if (!device) {
+            throw new Error(`Device ${deviceId} not found`);
+        }
+        this.devices.set(deviceId, {
+            ...device,
+            ...updates,
+        });
+    }
+    async clear() {
+        const deviceIds = Array.from(this.devices.keys());
+        await Promise.all(deviceIds.map((id) => this.driverLoader.unloadDriver(id)));
+        this.devices.clear();
+        this.configs.clear();
+    }
+    getDeviceConfig(deviceId) {
+        return this.configs.get(deviceId);
+    }
+}
+exports.DeviceManager = DeviceManager;
+//# sourceMappingURL=device-manager.js.map

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

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

package/dist/cjs/src/driver-loader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"driver-loader.d.ts","sourceRoot":"","sources":["../../../src/driver-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC1E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,EAAE,gBAAgB,EAAwB,MAAM,sBAAsB,CAAA;AAE7E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAElD,KAAK,kBAAkB,GAAG,OAAO,iBAAiB,CAAA;AAElD;;;GAGG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkC;IAClE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA4B;IAC3D,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAoB;IACjD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkB;gBAEvC,YAAY,CAAC,EAAE,kBAAkB,EAAE,gBAAgB,CAAC,EAAE,gBAAgB;IAKlF;;;;;;;OAOG;IACG,UAAU,CACd,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,gBAAgB,EAC5B,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,CAAC;IA2CxB;;;;;OAKG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBnD;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIrD;;;OAGG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIzC;;;;;OAKG;IACH,OAAO,CAAC,2BAA2B;CAkBpC"}

package/dist/cjs/src/driver-loader.js

@@ -0,0 +1,122 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DriverLoader = void 0;
+const driver_loader_1 = require("@ya-modbus/driver-loader");
+const transport_1 = require("@ya-modbus/transport");
+/**
+ * Manages dynamic loading and lifecycle of device drivers
+ * Uses TransportManager to pool RTU transports and prevent bus collisions
+ */
+class DriverLoader {
+    constructor(loadDriverFn, transportManager) {
+        this.driverInstances = new Map();
+        this.devicePackages = new Map();
+        this.loadDriverFn = loadDriverFn ?? driver_loader_1.loadDriver;
+        this.transportManager = transportManager ?? new transport_1.TransportManager();
+    }
+    /**
+     * Load a driver package and create an instance for a device
+     *
+     * @param packageName - NPM package name (e.g., '@ya-modbus/driver-xymd1' or 'ya-modbus-driver-test')
+     * @param connection - Device connection configuration
+     * @param deviceId - Unique device identifier for tracking the instance
+     * @returns Driver instance
+     */
+    async loadDriver(packageName, connection, deviceId) {
+        // Security validation: prevent path traversal and code injection
+        // Accept both scoped (@ya-modbus/driver-*) and unscoped (ya-modbus-driver-*) packages
+        const isValidScopedDriver = packageName.startsWith('@ya-modbus/driver-');
+        const isValidUnscopedDriver = packageName.startsWith('ya-modbus-driver-');
+        if (!isValidScopedDriver && !isValidUnscopedDriver) {
+            throw new Error(`Invalid driver package name: must be @ya-modbus/driver-<name> or ya-modbus-driver-<name>`);
+        }
+        if (packageName.includes('..') || packageName.includes('\\')) {
+            throw new Error('Invalid driver package name: path traversal not allowed');
+        }
+        // Load driver package using driver-loader
+        const loadedDriver = await this.loadDriverFn({ driverPackage: packageName });
+        // Get transport from manager (shared for RTU, unique for TCP)
+        const config = this.connectionToTransportConfig(connection);
+        const transport = await this.transportManager.getTransport(config);
+        // Create driver instance
+        const driver = await loadedDriver.createDriver({
+            transport,
+            slaveId: connection.slaveId,
+        });
+        // Call initialize if available
+        if (driver.initialize) {
+            await driver.initialize();
+        }
+        // Cache instance if deviceId provided
+        if (deviceId) {
+            this.driverInstances.set(deviceId, driver);
+            this.devicePackages.set(deviceId, packageName);
+        }
+        // Note: Don't close transport on failure - it may be shared by other devices
+        // The transport manager will handle cleanup when closeAll() is called
+        return driver;
+    }
+    /**
+     * Unload a driver instance and clean up resources
+     * Note: Transport is managed by TransportManager and not closed here
+     *
+     * @param deviceId - Device identifier
+     */
+    async unloadDriver(deviceId) {
+        const driver = this.driverInstances.get(deviceId);
+        try {
+            if (driver?.destroy) {
+                await driver.destroy();
+            }
+        }
+        finally {
+            // Always remove from cache, even if destroy fails
+            this.driverInstances.delete(deviceId);
+            this.devicePackages.delete(deviceId);
+        }
+        // Note: Transport is managed by TransportManager and shared across devices
+        // It will be closed when the entire bridge shuts down via closeAll()
+    }
+    /**
+     * Get a loaded driver instance
+     *
+     * @param deviceId - Device identifier
+     * @returns Driver instance or undefined if not loaded
+     */
+    getDriver(deviceId) {
+        return this.driverInstances.get(deviceId);
+    }
+    /**
+     * Close all managed transports
+     * Should be called when shutting down the bridge
+     */
+    async closeAllTransports() {
+        await this.transportManager.closeAll();
+    }
+    /**
+     * Convert DeviceConnection to TransportConfig
+     *
+     * @param connection - Device connection configuration
+     * @returns Transport configuration
+     */
+    connectionToTransportConfig(connection) {
+        return connection.type === 'rtu'
+            ? {
+                port: connection.port,
+                baudRate: connection.baudRate,
+                dataBits: connection.dataBits,
+                parity: connection.parity,
+                stopBits: connection.stopBits,
+                slaveId: connection.slaveId,
+                timeout: connection.timeout,
+            }
+            : {
+                host: connection.host,
+                port: connection.port,
+                slaveId: connection.slaveId,
+                timeout: connection.timeout,
+            };
+    }
+}
+exports.DriverLoader = DriverLoader;
+//# sourceMappingURL=driver-loader.js.map

package/dist/cjs/src/driver-loader.js.map

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,KAAK,EACV,gBAAgB,EAChB,UAAU,EAMX,MAAM,YAAY,CAAA;AAQnB,YAAY,EACV,gBAAgB,EAChB,YAAY,EACZ,UAAU,EACV,cAAc,EACd,gBAAgB,EAChB,cAAc,EACd,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,gBAAgB,EAChB,aAAa,EACb,aAAa,GACd,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAG9C,UAAU,kBAAkB;IAC1B,YAAY,CAAC,EAAE,YAAY,CAAA;IAC3B,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;CACpC;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,gBAAgB,EACxB,YAAY,CAAC,EAAE,kBAAkB,GAChC,UAAU,CA0UZ"}