Merge pull request #5 from Kattjakt/broadcast-to-everyone

feat: broadcast to everyone, let OS decide client UDP port, add icon

Author: Kattjakt

build/icon.icns

@@ -1,7 +1,7 @@
 {
   "name": "pa2ui",
-  "version": "1.0.0",
-  "description": "An Electron application with React and TypeScript",
+  "version": "1.1.0",
+  "description": "A highly opinionated UI for the DBX DriveRack PA2",
   "main": "./out/main/index.js",
   "author": "Leo Sandström <leo@sandstrom.party>",
   "homepage": "https://electron-vite.org",

build/icon.ico

@@ -15,7 +15,7 @@ function createWindow(): void {
     height: 670,
     show: false,
     autoHideMenuBar: true,
-    ...(process.platform === 'linux' ? { icon } : {}),
+    icon,
     webPreferences: {
       preload: join(__dirname, '../preload/index.js'),
       sandbox: false

build/icon.png

@@ -1,4 +1,5 @@
 import udp from 'dgram'
+import os from 'os'
 
 export type Device = {
   ip: string
@@ -9,9 +10,32 @@ export type Device = {
 type Callback = (devices: Device[]) => void
 
 const DBX_UDP_PORT = 19272
-const CLIENT_UDP_PORT = 52990
+const CLIENT_UDP_PORT = 0 // Leave it to OS
+
+const getBroadcastAddresses = (): string[] => {
+  const interfaces = os.networkInterfaces()
+  const addrs: string[] = []
+
+  for (const name in interfaces) {
+    const iface = interfaces[name]
+    if (!iface) continue
+
+    for (const addr of iface) {
+      if (addr.family === 'IPv4' && !addr.internal && !addr.address.startsWith('169.254.')) {
+        const ip = addr.address.split('.').map(Number)
+        const netmask = addr.netmask.split('.').map(Number)
+        const broadcast = ip.map((byte, i) => byte | (~netmask[i] & 255)).join('.')
+        addrs.push(broadcast)
+      }
+    }
+  }
+
+  if (addrs.length === 0) {
+    return ['255.255.255.255']
+  }
 
-const BROADCAST_IP = '192.168.1.255'
+  return addrs
+}
 const BROADCAST_PACKET = `
   delay 100
   get \\\\Node\\AT\\Class_Name
@@ -42,7 +66,10 @@ export class Discovery {
       server.setBroadcast(true)
 
       const timer = setInterval(() => {
-        server.send(Buffer.from(BROADCAST_PACKET), DBX_UDP_PORT, BROADCAST_IP)
+
+        for (const ip of getBroadcastAddresses()) {
+          server.send(Buffer.from(BROADCAST_PACKET), DBX_UDP_PORT, ip)
+        }
 
         this.devices = this.devices.filter((device) => {
           if (Date.now() - device.lastSeen > 5000) {