+
+
diff --git a/main.go b/main.go
index ba98954..5f0c0d3 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,7 @@
package main
import (
+ "embed"
"flag"
"fmt"
"log"
@@ -12,7 +13,7 @@ import (
type Broker struct {
sockets map[*websocket.Conn]struct{}
- mutex sync.Mutex
+ sync.Mutex
}
var upgrader = websocket.Upgrader{
@@ -22,6 +23,9 @@ var upgrader = websocket.Upgrader{
var broker Broker
+//go:embed index.html
+var static embed.FS
+
func actionBroker(w http.ResponseWriter, r *http.Request) {
conn, err := upgrader.Upgrade(w, r, nil)
if err != nil {
@@ -29,10 +33,10 @@ func actionBroker(w http.ResponseWriter, r *http.Request) {
return
}
- broker.mutex.Lock()
+ broker.Lock()
broker.sockets[conn] = struct{}{}
log.Printf("broker currently handles %d clients", len(broker.sockets))
- broker.mutex.Unlock()
+ broker.Unlock()
for {
messageType, p, err := conn.ReadMessage()
@@ -67,12 +71,10 @@ func main() {
log.Fatal("stream file is undefined")
}
broker.sockets = make(map[*websocket.Conn]struct{})
- http.HandleFunc("/stream", func(w http.ResponseWriter, r *http.Request) {
- http.ServeFile(w, r, streamFile)
- })
+ http.Handle("/stream/", http.StripPrefix("/stream/", http.FileServer(http.Dir(streamFile))))
http.HandleFunc("/broker", actionBroker)
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
- http.ServeFile(w, r, "index.html")
+ http.ServeFileFS(w, r, static, "index.html")
})
panic(http.ListenAndServe(fmt.Sprintf(":%d", *listenPort), nil))