matterbridge 3.1.6-dev-20250721-75fab6b → 3.1.7-dev-20250723-aab81fe

package/dist/dgram/multicast.js

@@ -0,0 +1,113 @@
+import os from 'node:os';
+import { BLUE, CYAN, db, RED, YELLOW } from 'node-ansi-logger';
+import { Dgram } from './dgram.js';
+export const MDNS_MULTICAST_IPV4_ADDRESS = '224.0.0.251';
+export const MDNS_MULTICAST_IPV6_ADDRESS = 'ff02::fb';
+export const MDNS_MULTICAST_PORT = 5353;
+export const COAP_MULTICAST_IPV4_ADDRESS = '224.0.1.187';
+export const COAP_MULTICAST_IPV6_ADDRESS = 'ff02::fd';
+export const COAP_MULTICAST_PORT = 5683;
+export class Multicast extends Dgram {
+    multicastAddress;
+    multicastPort;
+    joinedInterfaces = [];
+    constructor(name, multicastAddress, multicastPort, socketType, reuseAddr = true, interfaceName, interfaceAddress) {
+        super(name, socketType, reuseAddr, interfaceName, interfaceAddress);
+        this.multicastAddress = multicastAddress;
+        this.multicastPort = multicastPort;
+    }
+    start() {
+        if (this.socketType === 'udp4') {
+            this.log.debug(`Starting ipv4 dgram multicast socket...`);
+            this.interfaceAddress = this.interfaceAddress ?? this.getIpv4InterfaceAddress(this.interfaceName);
+        }
+        else {
+            this.log.debug(`Starting ipv6 dgram multicast socket...`);
+            this.interfaceAddress = this.interfaceAddress ?? this.getIpv6InterfaceAddress(this.interfaceName);
+        }
+        this.log.debug(`Binding dgram multicast socket to ${BLUE}${this.interfaceAddress}${db}:${BLUE}${this.multicastPort}${db} on interface ${CYAN}${this.interfaceName}${db}`);
+        this.socket.bind(this.multicastPort, this.interfaceAddress, () => {
+            const address = this.socket.address();
+            this.log.debug(`Dgram multicast socket bound to ${BLUE}${address.family}${db} ${BLUE}${address.address}${db}:${BLUE}${address.port}${db}`);
+            this.emit('bound', address);
+        });
+    }
+    onListening(address) {
+        this.log.debug(`Dgram multicast socket listening on ${BLUE}${address.family}${db} ${BLUE}${address.address}${db}:${BLUE}${address.port}${db}`);
+        this.socket.setBroadcast(true);
+        this.log.debug(`Dgram multicast socket broadcast enabled`);
+        this.socket.setTTL(255);
+        this.log.debug(`Dgram multicast socket TTL set to 255`);
+        this.socket.setMulticastTTL(255);
+        this.log.debug(`Dgram multicast socket multicast TTL set to 255`);
+        this.socket.setMulticastLoopback(true);
+        this.log.debug(`Dgram multicast socket multicast loopback enabled`);
+        Object.entries(os.networkInterfaces()).forEach(([name, interfaces]) => {
+            this.log.debug(`Dgram multicast socket processing interface ${CYAN}${name}${db}`);
+            if (!interfaces)
+                return;
+            if (this.interfaceName && name !== this.interfaceName)
+                return;
+            let iface;
+            let membershipInterface;
+            const ifaceIpv4 = interfaces.find((iface) => iface.family === 'IPv4' && this.socketType === 'udp4');
+            if (ifaceIpv4) {
+                iface = ifaceIpv4;
+                membershipInterface = ifaceIpv4.address;
+            }
+            const ifaceIpv6 = interfaces.find((iface) => iface.family === 'IPv6' && this.socketType === 'udp6');
+            if (ifaceIpv6) {
+                iface = ifaceIpv6;
+                membershipInterface = ifaceIpv6.address + (ifaceIpv6.scopeid !== undefined ? (process.platform === 'win32' ? '%' + String(ifaceIpv6.scopeid) : '%' + name) : '');
+            }
+            const ifaceUla = interfaces.find((iface) => iface.family === 'IPv6' && this.socketType === 'udp6' && iface.address.startsWith('fd'));
+            if (ifaceUla) {
+                iface = ifaceUla;
+                membershipInterface = ifaceUla.address + (ifaceUla.scopeid !== undefined ? (process.platform === 'win32' ? '%' + String(ifaceUla.scopeid) : '%' + name) : '');
+            }
+            const ifaceUla64 = interfaces.find((iface) => iface.family === 'IPv6' && this.socketType === 'udp6' && iface.address.startsWith('fd') && iface.netmask === 'ffff:ffff:ffff:ffff::');
+            if (ifaceUla64) {
+                iface = ifaceUla64;
+                membershipInterface = ifaceUla64.address + (ifaceUla64.scopeid !== undefined ? (process.platform === 'win32' ? '%' + String(ifaceUla64.scopeid) : '%' + name) : '');
+            }
+            const ifaceLinkLocal = interfaces.find((iface) => iface.family === 'IPv6' && this.socketType === 'udp6' && iface.address.startsWith('fe80'));
+            if (ifaceLinkLocal) {
+                iface = ifaceLinkLocal;
+                membershipInterface = ifaceLinkLocal.address + (ifaceLinkLocal.scopeid !== undefined ? (process.platform === 'win32' ? '%' + String(ifaceLinkLocal.scopeid) : '%' + name) : '');
+            }
+            if (iface && membershipInterface) {
+                try {
+                    this.socket.addMembership(this.multicastAddress, membershipInterface);
+                    this.joinedInterfaces.push(membershipInterface);
+                    this.log.debug(`Dgram multicast socket joined multicast group ${BLUE}${this.multicastAddress}${db} on interface ${CYAN}${name}${db} ${BLUE}${iface.family}${db} ${BLUE}${iface.address}${db} ${BLUE}${iface.scopeid}${db} >>> ${YELLOW}${membershipInterface}${db}`);
+                }
+                catch (error) {
+                    this.log.debug(`Dgram multicast socket failed to join multicast group ${BLUE}${this.multicastAddress}${db} on interface ${CYAN}${name}${db} ${BLUE}${iface.family}${db} ${BLUE}${iface.address}${db} ${BLUE}${iface.scopeid}${db} >>> ${RED}${membershipInterface}${db}: ${error instanceof Error ? error.message : error}`);
+                }
+            }
+        });
+        let interfaceAddress = this.interfaceAddress;
+        if (this.socketType === 'udp6' && this.interfaceAddress === '::') {
+            interfaceAddress = '::' + this.getIpv6ScopeIdForAllInterfacesAddress();
+        }
+        this.log.debug(`Dgram multicast socket setting multicastInterface to ${BLUE}${interfaceAddress}${db} for ${BLUE}${address.family}${db} ${BLUE}${address.address}${db}:${BLUE}${address.port}${db}`);
+        this.socket.setMulticastInterface(interfaceAddress);
+        this.log.debug(`Dgram multicast socket multicastInterface set to ${BLUE}${interfaceAddress}${db}`);
+        this.emit('ready', address);
+    }
+    stop() {
+        this.log.debug('Stopping dgram multicast socket...');
+        this.joinedInterfaces.forEach((membershipInterface) => {
+            try {
+                this.socket.dropMembership(this.multicastAddress, membershipInterface);
+                this.log.debug(`Dgram multicast socket dropped multicast group ${BLUE}${this.multicastAddress}${db} on interface ${YELLOW}${membershipInterface}${db}`);
+            }
+            catch (error) {
+                this.log.debug(`Dgram multicast socket failed to drop multicast group ${BLUE}${this.multicastAddress}${db} on interface ${RED}${membershipInterface}${db}: ${error}`);
+            }
+        });
+        this.joinedInterfaces = [];
+        this.socket.close();
+        this.log.debug('Stopped dgram multicast socket.');
+    }
+}

package/dist/dgram/unicast.js

@@ -0,0 +1,37 @@
+import { BLUE, db } from 'node-ansi-logger';
+import { Dgram } from './dgram.js';
+export class Unicast extends Dgram {
+    port;
+    constructor(name, socketType, reuseAddr = true, interfaceName, interfaceAddress, port) {
+        super(name, socketType, reuseAddr, interfaceName, interfaceAddress);
+        this.port = port;
+    }
+    start() {
+        if (this.socketType === 'udp4') {
+            this.log.debug(`Starting ipv4 dgram unicast socket...`);
+            this.interfaceAddress = this.interfaceAddress ?? (this.interfaceName ? this.getIpv4InterfaceAddress(this.interfaceName) : undefined);
+        }
+        else {
+            this.log.debug(`Starting ipv6 dgram unicast socket...`);
+            this.interfaceAddress = this.interfaceAddress ?? (this.interfaceName ? this.getIpv6InterfaceAddress(this.interfaceName) : undefined);
+        }
+        this.interfaceNetmask = this.interfaceAddress ? this.getNetmask(this.interfaceAddress) : undefined;
+        this.socket.bind(this.port, this.interfaceAddress, () => {
+            const address = this.socket.address();
+            this.log.debug(`Dgram unicast socket bound to ${BLUE}${address.family}${db} ${BLUE}${address.address}${db}:${BLUE}${address.port}${db}`);
+            this.emit('bound', address);
+        });
+    }
+    onListening(address) {
+        this.log.debug(`Dgram unicast socket listening on ${BLUE}${address.family}${db} ${BLUE}${address.address}${db}:${BLUE}${address.port}${db}`);
+        this.socket.setBroadcast(true);
+        this.log.debug(`Dgram unicast socket broadcast enabled`);
+        this.emit('ready', address);
+        this.onReady(address);
+    }
+    stop() {
+        this.log.debug('Stopping dgram unicast socket...');
+        this.socket.close();
+        this.log.debug('Stopped dgram unicast socket.');
+    }
+}

package/dist/matterbridge.js

@@ -93,7 +93,6 @@ export class Matterbridge extends EventEmitter {
     restartMode = '';
     profile = getParameter('profile');
     shutdown = false;
-    edge = true;
     failCountLimit = hasParameter('shelly') ? 600 : 120;
     log = new AnsiLogger({ logName: 'Matterbridge', logTimestampFormat: 4, logLevel: hasParameter('debug') ? "debug" : "info" });
     matterbridgeLoggerFile = 'matterbridge' + (getParameter('profile') ? '.' + getParameter('profile') : '') + '.log';
@@ -108,6 +107,7 @@ export class Matterbridge extends EventEmitter {
     initialized = false;
     execRunningCount = 0;
     startMatterInterval;
+    startMatterIntervalMs = 1000;
     checkUpdateInterval;
     checkUpdateTimeout;
     configureTimeout;
@@ -985,7 +985,11 @@ export class Matterbridge extends EventEmitter {
         for (const plugin of this.plugins.array()) {
             if (plugin.error || !plugin.enabled)
                 continue;
+            const registeredDevices = plugin.registeredDevices;
+            const addedDevices = plugin.addedDevices;
             await this.plugins.shutdown(plugin, 'unregistering all devices and shutting down...', false, true);
+            plugin.registeredDevices = registeredDevices;
+            plugin.addedDevices = addedDevices;
             await this.removeAllBridgedEndpoints(plugin.name, 100);
         }
         this.log.debug('Waiting for the MessageExchange to finish...');
@@ -1274,7 +1278,7 @@ export class Matterbridge extends EventEmitter {
             }, 60 * 1000).unref();
             this.emit('bridge_started');
             this.log.notice('Matterbridge bridge started successfully');
-        }, 1000);
+        }, this.startMatterIntervalMs);
     }
     async startChildbridge(delay = 1000) {
         if (!this.matterStorageManager)
@@ -1367,7 +1371,7 @@ export class Matterbridge extends EventEmitter {
             }
             this.emit('childbridge_started');
             this.log.notice('Matterbridge childbridge started successfully');
-        }, 1000);
+        }, this.startMatterIntervalMs);
     }
     async startController() {
     }

package/dist/matterbridgeEndpoint.js

@@ -822,6 +822,15 @@ export class MatterbridgeEndpoint extends Endpoint {
         });
         return this;
     }
+    createBaseFanControlClusterServer(fanMode = FanControl.FanMode.Off, fanModeSequence = FanControl.FanModeSequence.OffLowMedHigh, percentSetting = 0, percentCurrent = 0) {
+        this.behaviors.require(FanControlServer, {
+            fanMode,
+            fanModeSequence,
+            percentSetting,
+            percentCurrent,
+        });
+        return this;
+    }
     createMultiSpeedFanControlClusterServer(fanMode = FanControl.FanMode.Off, fanModeSequence = FanControl.FanModeSequence.OffLowMedHighAuto, percentSetting = 0, percentCurrent = 0, speedMax = 10, speedSetting = 0, speedCurrent = 0) {
         this.behaviors.require(MatterbridgeFanControlServer.with(FanControl.Feature.MultiSpeed, FanControl.Feature.Auto, FanControl.Feature.Step), {
             fanMode,
@@ -851,15 +860,6 @@ export class MatterbridgeEndpoint extends Endpoint {
         });
         return this;
     }
-    createBaseFanControlClusterServer(fanMode = FanControl.FanMode.Off, fanModeSequence = FanControl.FanModeSequence.OffLowMedHigh, percentSetting = 0, percentCurrent = 0) {
-        this.behaviors.require(FanControlServer, {
-            fanMode,
-            fanModeSequence,
-            percentSetting,
-            percentCurrent,
-        });
-        return this;
-    }
     createDefaultHepaFilterMonitoringClusterServer(condition = 100, changeIndication = ResourceMonitoring.ChangeIndication.Ok, inPlaceIndicator = true, lastChangedTime = null, replacementProductList = []) {
         this.behaviors.require(MatterbridgeHepaFilterMonitoringServer.with(ResourceMonitoring.Feature.Condition, ResourceMonitoring.Feature.Warning, ResourceMonitoring.Feature.ReplacementProductList), {
             condition,

package/dist/matterbridgeEndpointHelpers.js

@@ -536,6 +536,7 @@ export function getDefaultOperationalStateClusterServer(operationalState = Opera
     return optionsFor(MatterbridgeOperationalStateServer, {
         phaseList: [],
         currentPhase: null,
+        countdownTime: null,
         operationalStateList: [
             { operationalStateId: OperationalState.OperationalStateEnum.Stopped, operationalStateLabel: 'Stopped' },
             { operationalStateId: OperationalState.OperationalStateEnum.Running, operationalStateLabel: 'Running' },

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "3.1.6-dev-20250721-75fab6b",
+  "version": "3.1.7-dev-20250723-aab81fe",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "3.1.6-dev-20250721-75fab6b",
+      "version": "3.1.7-dev-20250723-aab81fe",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.15.1",
@@ -19,7 +19,9 @@
         "ws": "8.18.3"
       },
       "bin": {
-        "matterbridge": "bin/matterbridge.js"
+        "matterbridge": "bin/matterbridge.js",
+        "mb_coap": "bin/mb_coap.js",
+        "mb_mdns": "bin/mb_mdns.js"
       },
       "engines": {
         "node": ">=18.0.0 <19.0.0 || >=20.0.0 <21.0.0 || >=22.0.0 <23.0.0 || >=24.0.0 <25.0.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "3.1.6-dev-20250721-75fab6b",
+  "version": "3.1.7-dev-20250723-aab81fe",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",
@@ -42,7 +42,9 @@
   "type": "module",
   "main": "dist/index.js",
   "bin": {
-    "matterbridge": "bin/matterbridge.js"
+    "matterbridge": "bin/matterbridge.js",
+    "mb_mdns": "bin/mb_mdns.js",
+    "mb_coap": "bin/mb_coap.js"
   },
   "engines": {
     "node": ">=18.0.0 <19.0.0 || >=20.0.0 <21.0.0 || >=22.0.0 <23.0.0 || >=24.0.0 <25.0.0"