Merge pull request #15 from nolze/update/bssid

Use BSSID

Author: nolze

tests/test_series.py

@@ -1,13 +1,9 @@
-import types
-
 import tiny_wifi_analyzer.series as series
 
 
-def make_net(ssid: str, rssi: int, band: int, ch: int, width: int):
-    ch_obj = types.SimpleNamespace(
-        channel_band=band, channel_number=ch, channel_width=width
-    )
-    return types.SimpleNamespace(ssid=ssid, rssi=rssi, channel=ch_obj)
+def make_net(ssid: str, bssid: str, rssi: int, band: int, ch: int, width: int):
+    ch_obj = series._Chan(channel_band=band, channel_number=ch, channel_width=width)
+    return series._Net(ssid=ssid, bssid=bssid, rssi=rssi, channel=ch_obj)
 
 
 def test_channel_half_span_for_width():
@@ -20,20 +16,20 @@ def test_channel_half_span_for_width():
 
 
 def test_to_series_24ghz_basic_triangle():
-    nw = make_net("Test", -50, series.CHANNEL_BAND_24, 6, 20)
+    nw = make_net("Test", "ff:ff:ff:ff", -50, series.CHANNEL_BAND_24, 6, 20)
     s = series.to_series([nw])
     assert len(s) == 1
     name = s[0]["name"]
     pts = s[0]["data"]
-    assert name == "Test"
+    assert name == "ff:ff:ff:ff"
     # left, apex, right
     assert pts[0] == [4, -100]
     assert pts[1] == [6, -50]
     assert pts[2] == [8, -100]
 
 
 def test_to_series_24ghz_clamped():
-    nw = make_net("Edge", -40, series.CHANNEL_BAND_24, 1, 40)
+    nw = make_net("Edge", "ff:ff:ff:ff", -40, series.CHANNEL_BAND_24, 1, 40)
     s = series.to_series([nw])
     pts = s[0]["data"]
     # 40 MHz => half span 4, but left clamps to 1
@@ -43,7 +39,7 @@ def test_to_series_24ghz_clamped():
 
 
 def test_to_series_5ghz_width_mapping():
-    nw = make_net("W80", -60, series.CHANNEL_BAND_5, 100, 80)
+    nw = make_net("W80", "ff:ff:ff:ff", -60, series.CHANNEL_BAND_5, 100, 80)
     s = series.to_series([nw])
     pts = s[0]["data"]
     # 80 MHz => half span 8
@@ -53,7 +49,7 @@ def test_to_series_5ghz_width_mapping():
 
 
 def test_to_series_6ghz_clamped_right():
-    nw = make_net("Big", -55, series.CHANNEL_BAND_6, 230, 160)
+    nw = make_net("Big", "ff:ff:ff:ff", -55, series.CHANNEL_BAND_6, 230, 160)
     s = series.to_series([nw])
     pts = s[0]["data"]
     # 160 MHz => half 16; right clamps to max (233)

tiny_wifi_analyzer/__main__.py

@@ -141,21 +141,26 @@ def update(window, supported_bands):
             nws24 = sorted(nws24, key=lambda x: x.channel.channel_number)
             series24 = to_series(nws24)
             series_json24 = json.dumps(series24)
-            window.evaluate_js("window.chart24.updateSeries({})".format(series_json24))
+            # window.evaluate_js("window.chart24.updateSeries({})".format(series_json24))
+            window.evaluate_js(
+                "window.updateChart('{}',{})".format("24", series_json24)
+            )
 
         if supported_bands["5"]:
             nws5 = filter(lambda x: x.channel.channel_band == CHANNEL_BAND_5, nws)
             nws5 = sorted(nws5, key=lambda x: x.channel.channel_number)
             series5 = to_series(nws5)
             series_json5 = json.dumps(series5)
-            window.evaluate_js("window.chart5.updateSeries({})".format(series_json5))
+            # window.evaluate_js("window.chart5.updateSeries({})".format(series_json5))
+            window.evaluate_js("window.updateChart('{}',{})".format("5", series_json5))
 
         if supported_bands["6"]:
             nws6 = filter(lambda x: x.channel.channel_band == CHANNEL_BAND_6, nws)
             nws6 = sorted(nws6, key=lambda x: x.channel.channel_number)
             series6 = to_series(nws6)
             series_json6 = json.dumps(series6)
-            window.evaluate_js("window.chart6.updateSeries({})".format(series_json6))
+            # window.evaluate_js("window.chart6.updateSeries({})".format(series_json6))
+            window.evaluate_js("window.updateChart('{}',{})".format("6", series_json6))
 
     except queue.Empty:
         # nothing to do this tick

tiny_wifi_analyzer/series.py

@@ -52,15 +52,17 @@ class _Chan:
 @dataclass
 class _Net:
     ssid: str
+    bssid: str
     rssi: int
     channel: _Chan
 
 
-def to_series(nws: List[object]) -> List[dict]:
+def to_series(nws: List[_Net]) -> List[dict]:
     """Convert networks to ApexCharts series data with correct spans.
 
     Expects items resembling PyNetwork:
       - .ssid: str
+      _ .bssid: str
       - .rssi: int
       - .channel.channel_band: int
       - .channel.channel_number: int
@@ -77,7 +79,10 @@ def to_series(nws: List[object]) -> List[dict]:
             right = _clamp_channel(center + half, band)
             series.append(
                 {
-                    "name": nw.ssid,
+                    # "name": nw.ssid,
+                    # "bssid": nw.bssid,
+                    "name": nw.bssid,
+                    "ssid": nw.ssid,
                     "data": [[left, -100], [center, int(nw.rssi)], [right, -100]],
                 }
             )

view-src/index.html

@@ -30,6 +30,21 @@
       .annotation {
         font-family: sans-serif;
       }
+
+      rect.legend-mouseover-inactive,
+      .legend-mouseover-inactive rect,
+      .legend-mouseover-inactive path,
+      .legend-mouseover-inactive circle,
+      .legend-mouseover-inactive line,
+      .legend-mouseover-inactive text.apexcharts-yaxis-title-text,
+      .legend-mouseover-inactive text.apexcharts-yaxis-label {
+        transition: 0.15s ease all;
+        opacity: 0.1 !important;
+      }
+
+      .legend-mouseover-inactive .apexcharts-data-labels {
+        opacity: 0 !important;
+      }
     </style>
   </head>
 
@@ -46,9 +61,10 @@
       const CHANNEL_NUMBER_MAX_5 = 170;
       const CHANNEL_NUMBER_MAX_6 = 233;
 
+      let rawSeriesData = {};
       let lastZoom = {};
 
-      function makeOptions(bandName, channels) {
+      function makeOptions(bandId, bandName, channels) {
         const options = {
           series: [],
           chart: {
@@ -161,10 +177,17 @@
             formatter: (seriesName, { seriesIndex, w }) => {
               const yValue = w.config.series[seriesIndex].data[1][1];
               const xValue = w.config.series[seriesIndex].data[1][0];
+              let ssid = rawSeriesData[bandId][seriesIndex].ssid;
+              if (ssid === null) ssid = "n/a";
+              const bssid = rawSeriesData[bandId][seriesIndex].name;
               return [
                 `Channel: ${xValue} RSSI: ${yValue}dBm`,
                 "<br>",
-                `<b>${seriesName}</b>`,
+                ssid != "n/a"
+                  ? `<b>${ssid}</b>`
+                  : `<b style="color:#888;">${ssid}</b>`,
+                "<br>",
+                `<span style="font-size:0.9em;color:#888;">${bssid}</span>`,
               ];
             },
           },
@@ -211,9 +234,11 @@
             enabled: true,
             formatter: (val, { seriesIndex, dataPointIndex, w }) => {
               if (val === -100) return "";
-              const name = w.config.series[seriesIndex].name;
+              // const ssid = w.config.series[seriesIndex].ssid;
+              const ssid = rawSeriesData[bandId][seriesIndex].ssid;
               const ch = w.config.series[seriesIndex].data[1][0];
-              return `${ch} ${name}`;
+              if (ssid === null) return `${ch} n/a`;
+              return `${ch} ${ssid}`;
             },
           },
           markers: {
@@ -274,6 +299,7 @@
 
         if (bands["24"]) {
           const options24 = makeOptions(
+            "24",
             "2.4GHz",
             [...Array(CHANNEL_NUMBER_MAX_24).keys()].map((v) => v + 1),
           );
@@ -287,6 +313,7 @@
 
         if (bands["5"]) {
           const options5 = makeOptions(
+            "5",
             "5GHz",
             [...Array(CHANNEL_NUMBER_MAX_5).keys()].map((v) => v + 1),
           );
@@ -300,6 +327,7 @@
 
         if (bands["6"]) {
           const options6 = makeOptions(
+            "6",
             "6GHz",
             [...Array(CHANNEL_NUMBER_MAX_6).keys()].map((v) => v + 1),
           );
@@ -311,6 +339,17 @@
           chart6.render();
         }
       };
+
+      window.updateChart = (bandId, series) => {
+        if (window[`chart${bandId}`]) {
+          rawSeriesData[bandId] = series;
+          try {
+            window[`chart${bandId}`].updateSeries(series);
+          } catch (e) {
+            console.error("Failed to update series", e);
+          }
+        }
+      };
     </script>
   </body>
 </html>