avahi: better connection timeout handling

This doesn't rely on private members

Author: dlech

src/dnssd/avahi.ts

@@ -5,6 +5,7 @@ import * as dbus from 'dbus-next';
 import * as events from 'events';
 
 import * as dnssd from '../dnssd';
+import { time } from 'console';
 
 const PROTO_INET = 0;
 const PROTO_INET6 = 1;
@@ -56,13 +57,15 @@ async function getServer(): Promise<Server> {
         // dbus-next will queue messages and wait forever for a connection
         // so we have to hack in a timeout, otherwise we end up with a deadlock
         // on systems without D-Bus.
-        await new Promise((resolve, reject) => setTimeout(() => {
-            if ((bus as any)._connection.state === 'connected') {
-                resolve();
-            } else {
+        await new Promise((resolve, reject) => {
+            const timeout = setTimeout(() => {
                 reject(Error("Timeout while connecting to D-Bus"));
-            }
-        }, 100));
+            }, 100);
+            (bus as any).on('connect', () => {
+                clearTimeout(timeout);
+                resolve();
+            });
+        });
         const proxy = await bus.getProxyObject('org.freedesktop.Avahi', '/');
         const server = proxy.getInterface<Server>('org.freedesktop.Avahi.Server');
         const version = await server.GetAPIVersion();