f

Author: sonnyp

lib/network.js

@@ -47,6 +47,8 @@ export class NetworkManager {
   }
 
   async scan() {
+    const { DeviceWireless_Properties, DeviceWireless } = this
+
     const deferred = Promise.withResolvers()
 
     // > To know when the scan is finished, use the "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" to listen to changes to the "LastScan" property.
@@ -62,16 +64,15 @@ export class NetworkManager {
       })
       if (!LastScan) return
 
-      this.DeviceWireless_Properties.unsubscribe(
-        "PropertiesChanged",
-        handler,
-      ).then(deferred.resolve, deferred.reject)
+      deferred.resolve()
+      DeviceWireless_Properties.unsubscribe("PropertiesChanged", handler).catch(
+        () => {},
+      )
     }
-    await this.DeviceWireless_Properties.subscribe("PropertiesChanged", handler)
-
-    await this.DeviceWireless.RequestScan({})
+    await DeviceWireless_Properties.subscribe("PropertiesChanged", handler)
 
-    return deferred.promise
+    await DeviceWireless.RequestScan({})
+    await deferred.promise
   }
 
   async getWifis() {

lib/network.test.js

@@ -1,8 +1,9 @@
 import { describe, test, before, after } from "node:test"
+import { readFile } from "node:fs/promises"
+
 import { NetworkManager } from "./network.js"
 
 let networkmanager = null
-// const service = "mediamtx"
 
 before(async () => {
   networkmanager = new NetworkManager()
@@ -15,8 +16,12 @@ test("scan", async () => {
 
 describe("getWifis", async () => {
   test("returns PlanktoScope own wifi", async (t) => {
+    const machine_name = await readFile("/var/run/machine-name", "utf8")
+
     const wifis = await networkmanager.getWifis()
-    const wifi = wifis.find((wifi) => wifi.ssid == "PlanktoScope fork-wave")
+    const wifi = wifis.find(
+      (wifi) => wifi.ssid == `PlanktoScope ${machine_name}`,
+    )
     t.assert.ok(wifi)
   })
 })