matterbridge 3.4.5-dev-20251224-1bb63cb → 3.4.5-dev-20251224-ea793b4

package/CHANGELOG.md

@@ -34,9 +34,11 @@ Advantages:
 
 - [DevContainer]: Refactored Dev Container setup. The Matterbridge instance can now be paired on native Linux hosts or WSL 2 with Docker engine CLI integration. On Docker Desktop on Windows or macOS is not possible cause Docker Desktop runs inside a VM and not directly on the host so mDNS is not supported.
 - [DevContainer]: Since is now possible to pair from Dev Container, named volumes have been added to persist storage and plugins across rebuilds.
-- [mb_mdns]: Add query and advertise interval. Improved help for easy mDNS testing.
+- [mb_mdns]: Added query and advertise interval. Improved help for easy mDNS testing.
 - [mb_mdns]: Advertise full DNS-SD record set (PTR/SRV/TXT/A/AAAA) for matterbridge.\_http.\_tcp.local on port 8283.
 - [mdns]: Added TXT/SRV/A/AAAA encoders into the Mdns class.
+- [mb_mdns]: Added broadcast parameter to allow advertising when multicast is not available.
+- [mb_mdns]: Added \_matterbridge.\_tcp.local to query and advertise.
 
 ### Changed
 

package/dist/dgram/mb_mdns.js

@@ -1,5 +1,4 @@
 import { getIntParameter, getParameter, getStringArrayParameter, hasParameter } from '../utils/commandLine.js';
-import { getIpv4InterfaceAddress, getIpv6InterfaceAddress } from '../utils/network.js';
 import { MDNS_MULTICAST_IPV4_ADDRESS, MDNS_MULTICAST_IPV6_ADDRESS, MDNS_MULTICAST_PORT } from './multicast.js';
 import { Mdns } from './mdns.js';
 {
@@ -60,119 +59,109 @@ Examples:
         mdnsIpv4.filters.push(...filters);
         mdnsIpv6.filters.push(...filters);
     }
-    function cleanupAndLogAndExit() {
+    async function cleanupAndLogAndExit() {
+        if (hasParameter('advertise')) {
+            advertise(mdnsIpv4, 0);
+            advertise(mdnsIpv6, 0);
+        }
+        await new Promise((resolve) => setTimeout(resolve, 250));
         mdnsIpv4.stop();
         mdnsIpv6.stop();
+        await new Promise((resolve) => setTimeout(resolve, 250));
         mdnsIpv4.logDevices();
         mdnsIpv6.logDevices();
         process.exit(0);
     }
-    const queryUdp4 = () => {
-        mdnsIpv4.log.info('Sending mDNS query for services...');
-        mdnsIpv4.sendQuery([
-            { name: '_matterc._udp.local', type: 12, class: 1, unicastResponse: false },
-            { name: '_matter._tcp.local', type: 12, class: 1, unicastResponse: false },
-            { name: '_shelly._tcp.local', type: 12, class: 1, unicastResponse: false },
-            { name: '_http._tcp.local', type: 12, class: 1, unicastResponse: false },
-            { name: '_services._dns-sd._udp.local', type: 12, class: 1, unicastResponse: false },
-        ]);
-    };
-    const advertiseUdp4 = () => {
-        mdnsIpv4.log.info('Sending mDNS advertisement for matterbridge service...');
-        const serviceType = '_http._tcp.local';
-        const instanceName = 'matterbridge._http._tcp.local';
-        const hostName = 'matterbridge.local';
-        const port = 8283;
-        const ttl = 120;
-        const ptrInstanceRdata = mdnsIpv4.encodeDnsName(instanceName);
-        const ptrServiceTypeRdata = mdnsIpv4.encodeDnsName(serviceType);
-        const srvRdata = mdnsIpv4.encodeSrvRdata(0, 0, port, hostName);
-        const txtRdata = mdnsIpv4.encodeTxtRdata([`version=${pkg.version}`, 'path=/']);
-        const answers = [
-            { name: '_services._dns-sd._udp.local', rtype: 12, rclass: 1, ttl, rdata: ptrServiceTypeRdata },
-            { name: serviceType, rtype: 12, rclass: 1, ttl, rdata: ptrInstanceRdata },
-            { name: instanceName, rtype: 33, rclass: 1 | 32768, ttl, rdata: srvRdata },
-            { name: instanceName, rtype: 16, rclass: 1 | 32768, ttl, rdata: txtRdata },
-        ];
-        try {
-            const ipv4 = getIpv4InterfaceAddress();
-            if (ipv4 && ipv4 !== '0.0.0.0') {
-                answers.push({ name: hostName, rtype: 1, rclass: 1 | 32768, ttl, rdata: mdnsIpv4.encodeA(ipv4) });
-            }
-        }
-        catch {
-        }
-        try {
-            const ipv6 = getIpv6InterfaceAddress();
-            if (ipv6 && ipv6 !== '::') {
-                answers.push({ name: hostName, rtype: 28, rclass: 1 | 32768, ttl, rdata: mdnsIpv4.encodeAAAA(ipv6) });
-            }
-        }
-        catch {
-        }
-        mdnsIpv4.sendResponse(answers);
-    };
-    const queryUdp6 = () => {
-        mdnsIpv6.log.info('Sending mDNS query for services...');
-        mdnsIpv6.sendQuery([
+    const query = (mdns) => {
+        mdns.log.info('Sending mDNS query for services...');
+        mdns.sendQuery([
             { name: '_matterc._udp.local', type: 12, class: 1, unicastResponse: true },
             { name: '_matter._tcp.local', type: 12, class: 1, unicastResponse: true },
+            { name: '_matterbridge._tcp.local', type: 12, class: 1, unicastResponse: true },
             { name: '_shelly._tcp.local', type: 12, class: 1, unicastResponse: true },
             { name: '_http._tcp.local', type: 12, class: 1, unicastResponse: true },
             { name: '_services._dns-sd._udp.local', type: 12, class: 1, unicastResponse: true },
         ]);
     };
-    const advertiseUdp6 = () => {
-        mdnsIpv6.log.info('Sending mDNS advertisement for matterbridge service...');
-        const serviceType = '_http._tcp.local';
-        const instanceName = 'matterbridge._http._tcp.local';
+    const advertise = (mdns, ttl = 120) => {
+        mdns.log.info(`Sending mDNS advertisement for matterbridge service with TTL ${ttl ? ttl.toString() : 'goodbye'}...`);
+        const httpServiceType = '_http._tcp.local';
+        const matterbridgeServiceType = '_matterbridge._tcp.local';
+        const httpInstanceName = 'matterbridge._http._tcp.local';
+        const matterbridgeInstanceName = 'matterbridge._matterbridge._tcp.local';
         const hostName = 'matterbridge.local';
         const port = 8283;
-        const ttl = 120;
-        const ptrInstanceRdata = mdnsIpv6.encodeDnsName(instanceName);
-        const ptrServiceTypeRdata = mdnsIpv6.encodeDnsName(serviceType);
-        const srvRdata = mdnsIpv6.encodeSrvRdata(0, 0, port, hostName);
-        const txtRdata = mdnsIpv6.encodeTxtRdata([`version=${pkg.version}`, 'path=/']);
+        const ptrHttpServiceTypeRdata = mdns.encodeDnsName(httpServiceType);
+        const ptrMatterbridgeServiceTypeRdata = mdns.encodeDnsName(matterbridgeServiceType);
+        const ptrHttpInstanceRdata = mdns.encodeDnsName(httpInstanceName);
+        const ptrMatterbridgeInstanceRdata = mdns.encodeDnsName(matterbridgeInstanceName);
+        const srvRdata = mdns.encodeSrvRdata(0, 0, port, hostName);
+        const txtRdata = mdns.encodeTxtRdata([`version=${pkg.version}`, 'path=/']);
         const answers = [
-            { name: '_services._dns-sd._udp.local', rtype: 12, rclass: 1, ttl, rdata: ptrServiceTypeRdata },
-            { name: serviceType, rtype: 12, rclass: 1, ttl, rdata: ptrInstanceRdata },
-            { name: instanceName, rtype: 33, rclass: 1 | 32768, ttl, rdata: srvRdata },
-            { name: instanceName, rtype: 16, rclass: 1 | 32768, ttl, rdata: txtRdata },
+            { name: '_services._dns-sd._udp.local', rtype: 12, rclass: 1, ttl, rdata: ptrHttpServiceTypeRdata },
+            { name: httpServiceType, rtype: 12, rclass: 1, ttl, rdata: ptrHttpInstanceRdata },
+            { name: '_services._dns-sd._udp.local', rtype: 12, rclass: 1, ttl, rdata: ptrMatterbridgeServiceTypeRdata },
+            { name: matterbridgeServiceType, rtype: 12, rclass: 1, ttl, rdata: ptrMatterbridgeInstanceRdata },
+            { name: httpInstanceName, rtype: 33, rclass: 1 | 32768, ttl, rdata: srvRdata },
+            { name: matterbridgeInstanceName, rtype: 33, rclass: 1 | 32768, ttl, rdata: srvRdata },
+            { name: httpInstanceName, rtype: 16, rclass: 1 | 32768, ttl, rdata: txtRdata },
+            { name: matterbridgeInstanceName, rtype: 16, rclass: 1 | 32768, ttl, rdata: txtRdata },
         ];
         try {
-            const ipv4 = getIpv4InterfaceAddress();
+            const ipv4 = mdns.getIpv4InterfaceAddress(mdns.interfaceName);
             if (ipv4) {
-                answers.push({ name: hostName, rtype: 1, rclass: 1 | 32768, ttl, rdata: mdnsIpv6.encodeA(ipv4) });
+                answers.push({ name: hostName, rtype: 1, rclass: 1 | 32768, ttl, rdata: mdns.encodeA(ipv4) });
             }
         }
-        catch {
+        catch (error) {
+            mdns.log.warn(`Error sending mDNS advertisement for matterbridge service A record: ${error.message}`);
         }
         try {
-            const ipv6 = getIpv6InterfaceAddress();
+            const ipv6 = mdns.getIpv6InterfaceAddress(mdns.interfaceName);
             if (ipv6) {
-                answers.push({ name: hostName, rtype: 28, rclass: 1 | 32768, ttl, rdata: mdnsIpv6.encodeAAAA(ipv6) });
+                answers.push({ name: hostName, rtype: 28, rclass: 1 | 32768, ttl, rdata: mdns.encodeAAAA(ipv6) });
             }
         }
-        catch {
+        catch (error) {
+            mdns.log.warn(`Error sending mDNS advertisement for matterbridge service AAAA record: ${error.message}`);
+        }
+        const response = mdns.sendResponse(answers);
+        if (hasParameter('broadcast')) {
+            try {
+                const address = mdns.socketType === 'udp4' ? mdns.getIpv4InterfaceAddress(mdns.interfaceName) : mdns.getIpv6InterfaceAddress(mdns.interfaceName);
+                const mask = mdns.socketType === 'udp4' ? mdns.getNetmask(address) : undefined;
+                const broadcastAddress = mdns.socketType === 'udp4' ? mdns.getIpv4BroadcastAddress(address, mask) : mdns.getIpv6BroadcastAddress();
+                mdns.log.info(`Broadcasting mDNS advertisement for matterbridge service to ${broadcastAddress}...`);
+                mdns.socket.send(response, 0, response.length, mdns.multicastPort, broadcastAddress, (error) => {
+                    if (error) {
+                        mdns.log.error(`Error broadcasting mDNS advertisement: ${error.message}`);
+                    }
+                    else {
+                        mdns.log.info(`mDNS advertisement broadcasted successfully to ${broadcastAddress}`);
+                    }
+                });
+            }
+            catch (error) {
+                mdns.log.error(`Error broadcasting mDNS advertisement: ${error.message}`);
+            }
         }
-        mdnsIpv6.sendResponse(answers);
     };
-    process.on('SIGINT', () => {
-        cleanupAndLogAndExit();
+    process.on('SIGINT', async () => {
+        await cleanupAndLogAndExit();
     });
     mdnsIpv4.start();
     mdnsIpv4.on('ready', (address) => {
         mdnsIpv4.log.info(`mdnsIpv4 server ready on ${address.family} ${address.address}:${address.port}`);
         if (hasParameter('advertise')) {
-            advertiseUdp4();
+            advertise(mdnsIpv4);
             setInterval(() => {
-                advertiseUdp4();
+                advertise(mdnsIpv4);
             }, getIntParameter('advertise') || 10000).unref();
         }
         if (hasParameter('query')) {
-            queryUdp4();
+            query(mdnsIpv4);
             setInterval(() => {
-                queryUdp4();
+                query(mdnsIpv4);
             }, getIntParameter('query') || 10000).unref();
         }
     });
@@ -180,19 +169,19 @@ Examples:
     mdnsIpv6.on('ready', (address) => {
         mdnsIpv6.log.info(`mdnsIpv6 server ready on ${address.family} ${address.address}:${address.port}`);
         if (hasParameter('advertise')) {
-            advertiseUdp6();
+            advertise(mdnsIpv6);
             setInterval(() => {
-                advertiseUdp6();
+                advertise(mdnsIpv6);
             }, getIntParameter('advertise') || 10000).unref();
         }
         if (hasParameter('query')) {
-            queryUdp6();
+            query(mdnsIpv6);
             setInterval(() => {
-                queryUdp6();
+                query(mdnsIpv6);
             }, getIntParameter('query') || 10000).unref();
         }
     });
-    setTimeout(() => {
-        cleanupAndLogAndExit();
+    setTimeout(async () => {
+        await cleanupAndLogAndExit();
     }, 600000);
 }

package/dist/dgram/mdns.js

@@ -1,4 +1,5 @@
 import { BLUE, CYAN, db, er, GREEN, idn, MAGENTA, nf, rs } from 'node-ansi-logger';
+import { hasParameter } from '../utils/commandLine.js';
 import { Multicast } from './multicast.js';
 export var DnsRecordType;
 (function (DnsRecordType) {
@@ -433,8 +434,10 @@ export class Mdns extends Multicast {
             return Buffer.concat([qname, qfields]);
         });
         const query = Buffer.concat([header, ...questionBuffers]);
-        const decoded = this.decodeMdnsMessage(query);
-        this.logMdnsMessage(decoded);
+        if (hasParameter('v') || hasParameter('verbose')) {
+            const decoded = this.decodeMdnsMessage(query);
+            this.logMdnsMessage(decoded);
+        }
         this.socket.send(query, 0, query.length, this.multicastPort, this.multicastAddress, (error) => {
             if (error) {
                 this.log.error(`Dgram mDNS server failed to send query message: ${error.message}`);
@@ -448,6 +451,7 @@ export class Mdns extends Multicast {
                 this.emit('sent', query, this.multicastAddress, this.multicastPort);
             }
         });
+        return query;
     }
     sendResponse(answers) {
         if (!Array.isArray(answers) || answers.length === 0) {
@@ -470,6 +474,10 @@ export class Mdns extends Multicast {
             return Buffer.concat([aname, answerFixed, rdata]);
         });
         const response = Buffer.concat([header, ...answerBuffers]);
+        if (hasParameter('v') || hasParameter('verbose')) {
+            const decoded = this.decodeMdnsMessage(response);
+            this.logMdnsMessage(decoded);
+        }
         this.socket.send(response, 0, response.length, this.multicastPort, this.multicastAddress, (error) => {
             if (error) {
                 const items = answers.map((a) => `- name ${MAGENTA}${a.name}${er} type ${MAGENTA}${this.dnsTypeToString(a.rtype)}${er} class ${MAGENTA}${this.dnsResponseClassToString(a.rclass)}${er} ttl ${MAGENTA}${a.ttl}${er}`).join('\n');
@@ -482,6 +490,7 @@ export class Mdns extends Multicast {
                 this.emit('sent', response, this.multicastAddress, this.multicastPort);
             }
         });
+        return response;
     }
     dnsTypeToString(type) {
         const typeMap = {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "3.4.5-dev-20251224-1bb63cb",
+  "version": "3.4.5-dev-20251224-ea793b4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "3.4.5-dev-20251224-1bb63cb",
+      "version": "3.4.5-dev-20251224-ea793b4",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.15.6",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "3.4.5-dev-20251224-1bb63cb",
+  "version": "3.4.5-dev-20251224-ea793b4",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",