log connected devices

minor-industries · Oct 20, 2024 · 3bdf144 · 3bdf144
1 parent e79ccf0
commit 3bdf144
Show file tree

Hide file tree

Showing 12 changed files with 177 additions and 74 deletions.
diff --git a/app/bthandler.go b/app/bthandler.go
@@ -4,35 +4,39 @@ import (
 	"context"
 	"fmt"
 	"github.com/minor-industries/rtgraph"
+	"github.com/minor-industries/rtgraph/broker"
 	"github.com/minor-industries/rtgraph/database/sqlite"
 	"github.com/minor-industries/z2/lib/data"
 	"github.com/minor-industries/z2/lib/source"
 	"github.com/pkg/errors"
 	"time"
 )
 
+type BluetoothIsConnected struct {
+	DeviceInfo source.DeviceInfo
+}
+
+func (b *BluetoothIsConnected) Name() string {
+	return "BluetoothIsConnected"
+}
+
 type BTHandler struct {
 	graph     *rtgraph.Graph
+	broker    *broker.Broker
 	rawValues *sqlite.Backend
 	source    source.Source
 	cancel    context.CancelFunc
-	ctx       context.Context
 
+	ctx            context.Context
 	t0             time.Time
 	lastMsg        time.Time
 	writeRawValues bool
 }
 
-func NewBTHandler(
-	graph *rtgraph.Graph,
-	rawValues *sqlite.Backend,
-	source source.Source,
-	writeRawValues bool,
-	cancel context.CancelFunc,
-	ctx context.Context,
-) *BTHandler {
+func NewBTHandler(graph *rtgraph.Graph, br *broker.Broker, rawValues *sqlite.Backend, source source.Source, writeRawValues bool, cancel context.CancelFunc, ctx context.Context) *BTHandler {
 	return &BTHandler{
 		graph:          graph,
+		broker:         br,
 		rawValues:      rawValues,
 		source:         source,
 		cancel:         cancel,
@@ -69,6 +73,11 @@ func (h *BTHandler) Handle(
 		Msg:            msg,
 	})
 
+	if len(srs) > 0 {
+		m := &BluetoothIsConnected{DeviceInfo: info}
+		h.broker.Publish(m)
+	}
+
 	for _, s := range srs {
 		err := h.graph.CreateValue(s.Name, s.Timestamp, s.Value)
 		if err != nil {

diff --git a/frontend/src/env.ts b/frontend/src/env.ts
@@ -9,5 +9,5 @@ export interface Env {
 
     maybeStartFrontendBLE(): Promise<void>,
 
-    streamEvents(path: string, callback: (event: string) => void): void,
+    streamEvents(path: string, callbacks: { [key: string]: (data: string) => void }): void;
 }
diff --git a/frontend/src/stream_events.ts b/frontend/src/stream_events.ts
@@ -1,9 +1,14 @@
 export function streamEvents(
     path: string,
-    callback: (data: string) => void
+    callbacks: { [key: string]: (data: string) => void }
 ): void {
     const es = new EventSource(path);
-    es.addEventListener("play-sound", (event) => {
-        callback(event.data);
-    });
+
+    for (const eventType in callbacks) {
+        if (callbacks.hasOwnProperty(eventType)) {
+            es.addEventListener(eventType, (event: MessageEvent) => {
+                callbacks[eventType](event.data);
+            });
+        }
+    }
 }
diff --git a/frontend/templates/sound-events.html b/frontend/templates/sound-events.html
@@ -1,15 +1,40 @@
-{{ define "sound-events" }}
-
 <script type="module">
     import {getEnv} from "/z2/env.js";
 
+    const bluetoothConnectedHandler = (() => {
+        const seen = {};
+
+        return (data) => {
+            const msg = JSON.parse(data);
+            const key = msg.address;
+            if (key === "") {
+                return;
+            }
+            if (seen[key]) {
+                return;
+            }
+            seen[key] = true;
+
+            const kind = msg.kind;
+            const name = msg.name ? " " + msg.name : "";
+
+            const info = `${kind}${name} is connected`;
+            console.log(info);
+        };
+    })();
+
     document.addEventListener("DOMContentLoaded", async () => {
         const env = await getEnv();
-        env.streamEvents("/events", data => {
-            const audio = document.getElementById(`sound-${data}`);
-            audio.play();
+
+        // Use the `bluetoothConnectedHandler` in `streamEvents`
+        env.streamEvents("/events", {
+            "play-sound": (data) => {
+                const audio = document.getElementById(`sound-${data}`);
+                if (audio) {
+                    audio.play();
+                }
+            },
+            "bluetooth-is-connected": bluetoothConnectedHandler
         });
     });
 </script>
-
-{{ end }}
diff --git a/frontend/z2/pages/bike.html b/frontend/z2/pages/bike.html
@@ -89,9 +89,33 @@
 
     document.addEventListener("DOMContentLoaded", async () => {
         const env = await getEnv();
-        env.streamEvents("/events", data => {
-            const audio = document.getElementById(`sound-${data}`);
-            audio.play();
+
+        const seen = {};
+
+        env.streamEvents("/events", {
+            "play-sound": (data) => {
+                const audio = document.getElementById(`sound-${data}`);
+                if (audio) {
+                    audio.play();
+                }
+            },
+            "bluetooth-is-connected": (data) => {
+                const msg = JSON.parse(data);
+                const key = msg.address;
+                if (key === "") {
+                    return;
+                }
+                if (seen[key]) {
+                    return;
+                }
+                seen[key] = true;
+
+                const kind = msg.kind;
+                const name = msg.name ? " " + msg.name : "";
+
+                const info = `${kind}${name} is connected`;
+                console.log(info);
+            },
         });
     });
 </script>

diff --git a/frontend/z2/pages/rower.html b/frontend/z2/pages/rower.html
@@ -89,9 +89,33 @@
 
     document.addEventListener("DOMContentLoaded", async () => {
         const env = await getEnv();
-        env.streamEvents("/events", data => {
-            const audio = document.getElementById(`sound-${data}`);
-            audio.play();
+
+        const seen = {};
+
+        env.streamEvents("/events", {
+            "play-sound": (data) => {
+                const audio = document.getElementById(`sound-${data}`);
+                if (audio) {
+                    audio.play();
+                }
+            },
+            "bluetooth-is-connected": (data) => {
+                const msg = JSON.parse(data);
+                const key = msg.address;
+                if (key === "") {
+                    return;
+                }
+                if (seen[key]) {
+                    return;
+                }
+                seen[key] = true;
+
+                const kind = msg.kind;
+                const name = msg.name ? " " + msg.name : "";
+
+                const info = `${kind}${name} is connected`;
+                console.log(info);
+            },
         });
     });
 </script>

diff --git a/frontend/z2/z2-bundle.js b/frontend/z2/z2-bundle.js
diff --git a/frontend/z2/z2.wasm b/frontend/z2/z2.wasm
diff --git a/main.go b/main.go
@@ -115,6 +115,7 @@ func run() error {
 
 	btHandler := app.NewBTHandler(
 		graph,
+		br,
 		backends.RawValues,
 		multiSource,
 		opts.WriteRawValues,

diff --git a/main_wasm.go b/main_wasm.go
@@ -101,14 +101,7 @@ func run() error {
 		}
 	}
 
-	btHandler := app.NewBTHandler(
-		graph,
-		nil,
-		multiSource,
-		opts.WriteRawValues,
-		cancel,
-		ctx,
-	)
+	btHandler := app.NewBTHandler(graph, nil, nil, multiSource, opts.WriteRawValues, cancel, ctx)
 
 	br := broker.NewBroker()
 	go br.Start()

diff --git a/server/routes.go b/server/routes.go
@@ -4,6 +4,7 @@ package server
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/minor-industries/backup/restic"
@@ -147,6 +148,17 @@ func SetupRoutes(
 				switch msg := m.(type) {
 				case *app.PlaySound:
 					_ = send("play-sound", fmt.Sprintf("%s", msg.Sound))
+				case *app.BluetoothIsConnected:
+					info := msg.DeviceInfo
+					if info.Kind == "" || info.Address == "" {
+						continue
+					}
+					payload, _ := json.Marshal(map[string]string{
+						"kind":    info.Kind,
+						"address": info.Address,
+						"name":    info.Name,
+					})
+					_ = send("bluetooth-is-connected", string(payload))
 				}
 			}
 
@@ -220,38 +232,3 @@ func SetupRoutes(
 
 	return nil
 }
-
-func sse(
-	router *gin.Engine,
-	path string,
-	handler func(
-		c *gin.Context,
-		send func(eventName, data string) error,
-	),
-) {
-	router.GET(path, func(c *gin.Context) {
-		c.Writer.Header().Set("Content-Type", "text/event-stream")
-		c.Writer.Header().Set("Cache-Control", "no-cache")
-		c.Writer.Header().Set("Connection", "keep-alive")
-
-		send := func(eventName, data string) error {
-			if eventName != "" {
-				_, err := c.Writer.Write([]byte("event: " + eventName + "\n"))
-				if err != nil {
-					return errors.Wrap(err, "write event")
-				}
-			}
-
-			_, err := c.Writer.Write([]byte("data: " + data + "\n\n"))
-			if err != nil {
-				if err != nil {
-					return errors.Wrap(err, "write data")
-				}
-			}
-			c.Writer.Flush()
-			return nil
-		}
-
-		handler(c, send)
-	})
-}
diff --git a/server/sse.go b/server/sse.go
@@ -0,0 +1,41 @@
+package server
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/pkg/errors"
+)
+
+func sse(
+	router *gin.Engine,
+	path string,
+	handler func(
+		c *gin.Context,
+		send func(eventName, data string) error,
+	),
+) {
+	router.GET(path, func(c *gin.Context) {
+		c.Writer.Header().Set("Content-Type", "text/event-stream")
+		c.Writer.Header().Set("Cache-Control", "no-cache")
+		c.Writer.Header().Set("Connection", "keep-alive")
+
+		send := func(eventName, data string) error {
+			if eventName != "" {
+				_, err := c.Writer.Write([]byte("event: " + eventName + "\n"))
+				if err != nil {
+					return errors.Wrap(err, "write event")
+				}
+			}
+
+			_, err := c.Writer.Write([]byte("data: " + data + "\n\n"))
+			if err != nil {
+				if err != nil {
+					return errors.Wrap(err, "write data")
+				}
+			}
+			c.Writer.Flush()
+			return nil
+		}
+
+		handler(c, send)
+	})
+}