feat: ValetudoWifiStatus may contain a bssid

Hypfer · Jan 24, 2022 · 86fe2f2 · 86fe2f2
1 parent 2bdcea4
commit 86fe2f2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/backend/lib/entities/core/ValetudoWifiStatus.js b/backend/lib/entities/core/ValetudoWifiStatus.js
@@ -1,12 +1,16 @@
 const SerializableEntity = require("../SerializableEntity");
 
+/*
+    Further expansion could include the Wi-Fi channel used
+ */
 
 class ValetudoWifiStatus extends SerializableEntity {
     /**
      * @param {object} options
      * @param {ValetudoWifiState} options.state
      * @param {object} options.details
      * @param {string} [options.details.ssid]
+     * @param {string} [options.details.bssid]
      * @param {number} [options.details.downspeed] unit: mbps
      * @param {number} [options.details.upspeed] unit: mbps
      * @param {number} [options.details.signal] unit: dBm
@@ -30,7 +34,7 @@ class ValetudoWifiStatus extends SerializableEntity {
  *
  */
 ValetudoWifiStatus.FREQUENCY_TYPE = Object.freeze({
-    W2_4Ghz: "2.4ghz", //cannot start with a number. therefore prefixed with w
+    W2_4Ghz: "2.4ghz", //Cannot start with a number. Therefore, prefixed with w
     W5Ghz: "5ghz"
 });
 

diff --git a/backend/lib/entities/core/doc/ValetudoWifiStatus.openapi.json b/backend/lib/entities/core/doc/ValetudoWifiStatus.openapi.json
@@ -19,6 +19,9 @@
                 "type": "string",
                 "description": "Wireless network name"
               },
+              "bssid": {
+                "type": "string"
+              },
               "downspeed": {
                 "type": "number"
               },

diff --git a/backend/lib/robots/common/linuxCapabilities/LinuxWifiConfigurationCapability.js b/backend/lib/robots/common/linuxCapabilities/LinuxWifiConfigurationCapability.js
@@ -78,6 +78,7 @@ class LinuxWifiConfigurationCapability extends WifiConfigurationCapability {
             output.details.upspeed = parseFloat(extractedWifiData.groups.txbitrate);
             output.details.signal = parseInt(extractedWifiData.groups.signal);
             output.details.ssid = extractedWifiData.groups.ssid.trim();
+            output.details.bssid = extractedWifiData.groups.bssid.trim();
             output.details.frequency = ValetudoWifiStatus.FREQUENCY_TYPE.W2_4Ghz;
         } else if (stdout.trim().match(WIFI_NOT_CONNECTED_IW_REGEX)) {
             output.state = ValetudoWifiStatus.STATE.NOT_CONNECTED;

diff --git a/backend/test/lib/robots/common/linuxCapabilities/res/iw_3.4_connected.json b/backend/test/lib/robots/common/linuxCapabilities/res/iw_3.4_connected.json
@@ -6,6 +6,7 @@
     "upspeed": 72.2,
     "signal": -48,
     "ssid": "Das IoT",
+    "bssid": "18:64:72:d6:d9:a3",
     "frequency": "2.4ghz"
   }
 }