@bharper/atv-js 0.2.6 → 0.3.4

package/src/mdns.ts

@@ -4,6 +4,32 @@
  */
 
 import mdns from 'multicast-dns';
+import * as os from 'os';
+
+/**
+ * Returns the list of mdns constructor option objects to use for scanning.
+ * On Windows, multicast must be joined on a specific interface address rather
+ * than 0.0.0.0, so we create one entry per non-internal IPv4 address.
+ * On macOS/Linux the default (no interface option) works correctly, so we
+ * return a single entry with no options.
+ */
+function getMdnsOptions(): Array<object | undefined> {
+  if (process.platform !== 'win32') {
+    return [undefined];
+  }
+  const interfaces = os.networkInterfaces();
+  const addresses: string[] = [];
+  for (const iface of Object.values(interfaces)) {
+    if (!iface) continue;
+    for (const addr of iface) {
+      if (addr.family === 'IPv4' && !addr.internal) {
+        addresses.push(addr.address);
+      }
+    }
+  }
+  if (addresses.length === 0) return [undefined];
+  return addresses.map((iface) => ({ interface: iface }));
+}
 
 export interface AppleTVDevice {
   name: string;
@@ -42,15 +68,27 @@ function isAppleTvModel(model: string): boolean {
   return APPLE_TV_MODELS.has(model);
 }
 
+function getPropertyIgnoreCase(properties: Record<string, string>, key: string): string | undefined {
+  const expected = key.toLowerCase();
+  for (const [property, value] of Object.entries(properties)) {
+    if (property.toLowerCase() === expected) return value;
+  }
+  return undefined;
+}
+
 export async function scan(timeout = 5000, onlyAppleTV = true): Promise<AppleTVDevice[]> {
   return new Promise((resolve) => {
-    const browser = mdns();
+    // On macOS/Linux a single mdns() with no options works correctly.
+    // On Windows we need one instance per interface so the multicast group is
+    // joined explicitly on each adapter (0.0.0.0 binding is silently ignored).
+    const browsers = getMdnsOptions().map((opts) => opts ? mdns(opts) : mdns());
+
     const companionServices = new Map<string, DiscoveredService>();
     const airplayServices = new Map<string, DiscoveredService>();
     const deviceInfoModels = new Map<string, string>(); // device name → model from _device-info
     const addressMap = new Map<string, string>();
 
-    browser.on('response', (response: any) => {
+    const handleResponse = (response: any) => {
       // Collect A/AAAA records for hostname→IP resolution
       for (const answer of [...(response.answers || []), ...(response.additionals || [])]) {
         if (answer.type === 'A') {
@@ -129,15 +167,22 @@ export async function scan(timeout = 5000, onlyAppleTV = true): Promise<AppleTVD
           }
         }
       }
-    });
+    };
+
+    // Attach the shared response handler to every per-interface browser
+    for (const browser of browsers) {
+      browser.on('response', handleResponse);
+    }
 
     // Send queries for companion, airplay, and device-info services
     const queryServices = () => {
-      browser.query([
-        { name: '_companion-link._tcp.local', type: 'PTR' },
-        { name: '_airplay._tcp.local', type: 'PTR' },
-        { name: '_device-info._tcp.local', type: 'PTR' },
-      ]);
+      for (const browser of browsers) {
+        browser.query([
+          { name: '_companion-link._tcp.local', type: 'PTR' },
+          { name: '_airplay._tcp.local', type: 'PTR' },
+          { name: '_device-info._tcp.local', type: 'PTR' },
+        ]);
+      }
     };
 
     // Send initial query
@@ -147,7 +192,7 @@ export async function scan(timeout = 5000, onlyAppleTV = true): Promise<AppleTVD
     setTimeout(queryServices, timeout / 2);
 
     setTimeout(() => {
-      browser.destroy();
+      for (const browser of browsers) browser.destroy();
 
       // Merge companion and airplay services by device name
       const devices: AppleTVDevice[] = [];
@@ -177,16 +222,24 @@ export async function scan(timeout = 5000, onlyAppleTV = true): Promise<AppleTVD
         const allProps = { ...companion.properties, ...airplay?.properties };
 
         // Model comes from _device-info._tcp.local service, not companion/airplay
-        const model = deviceInfoModels.get(name) || allProps['model'] || allProps['rpmd'] || '';
+        const model = deviceInfoModels.get(name)
+          || getPropertyIgnoreCase(allProps, 'model')
+          || getPropertyIgnoreCase(allProps, 'rpmd')
+          || '';
 
         if (onlyAppleTV && !isAppleTvModel(model)) continue;
 
+        const identifier = getPropertyIgnoreCase(allProps, 'rpmrtid')
+          || getPropertyIgnoreCase(allProps, 'deviceid')
+          || getPropertyIgnoreCase(allProps, 'macaddress')
+          || name;
+
         devices.push({
           name,
           address,
           port: companion.port,
           airplayPort: airplay?.port || 7000,
-          identifier: allProps['deviceid'] || allProps['MACAddress'] || name,
+          identifier,
           model,
           properties: allProps,
         });