Bridge events

app/services/bridges.go

@@ -0,0 +1,50 @@
+package services
+
+import (
+	"context"
+	"git.aiterp.net/lucifer/new-server/app/config"
+	"log"
+	"time"
+)
+
+var cancelMap = make(map[int]context.CancelFunc, 8)
+
+func ConnectToBridges() {
+	go func() {
+		for {
+			err := runConnectToBridges()
+			if err != nil {
+				log.Println("Bridge connection error: ", err.Error())
+			}
+
+			time.Sleep(15 * time.Second)
+		}
+	}()
+}
+
+func runConnectToBridges() error {
+	bridges, err := config.BridgeRepository().FetchAll(context.Background())
+	if err != nil {
+		return err
+	}
+
+	for _, bridge := range bridges {
+		if cancelMap[bridge.ID] != nil {
+			continue
+		}
+
+		driver, err := config.DriverProvider().Provide(bridge.Driver)
+		if err != nil {
+			return err
+		}
+
+		ctx, cancel := context.WithCancel(context.Background())
+		err = driver.Run(ctx, bridge, config.EventChannel)
+
+		cancelMap[bridge.ID] = cancel
+
+		log.Printf("Connected to bridge \"%s\" (%d)", bridge.Name, bridge.ID)
+	}
+
+	return nil
+}

app/services/events.go

@@ -5,6 +5,7 @@ import (
 	"git.aiterp.net/lucifer/new-server/app/config"
 	"git.aiterp.net/lucifer/new-server/models"
 	"log"
+	"strconv"
 	"time"
 )
 
@@ -40,6 +41,12 @@ func handleEvent(event models.Event) {
 		event.AddPayload("minute", time.Now().In(loc).Format("04"))
 	}
 
+	err := handleSpecial(event)
+	if err != nil {
+		log.Printf("Special event handler error (%s): %v", event.Name, err)
+		return
+	}
+
 	if !X {
 		log.Println("Unhandled event: " + event.Name)
 		return
@@ -64,3 +71,28 @@ func handleEvent(event models.Event) {
 
 	}
 }
+
+func handleSpecial(event models.Event) error {
+	switch event.Name {
+	case models.ENBridgeConnected:
+		bridgeId, _ := strconv.Atoi(event.Payload["bridgeId"])
+		bridge, err := config.BridgeRepository().Find(ctx, bridgeId)
+		if err != nil {
+			return err
+		}
+
+		devices, err := config.DeviceRepository().FetchByReference(ctx, models.RKBridgeID, event.Payload["bridgeId"])
+		if err != nil {
+			return err
+		}
+
+		driver, err := config.DriverProvider().Provide(bridge.Driver)
+		if err != nil {
+			return err
+		}
+
+		return driver.Publish(ctx, bridge, devices)
+	default:
+		return nil
+	}
+}

internal/drivers/nanoleaf/bridge.go

@@ -195,9 +195,9 @@ func (b *bridge) Run(ctx context.Context, info models.Bridge, ch chan<- models.E
 	defer conn.Close()
 
 	// Notify connections and disconnections
-	ch <- models.Event{Name: "BridgeConnected", Payload: map[string]string{"bridgeId": strconv.Itoa(info.ID)}}
+	ch <- models.BridgeConnectedEvent(info)
 	defer func() {
-		ch <- models.Event{Name: "BridgeDisconnected", Payload: map[string]string{"bridgeId": strconv.Itoa(info.ID)}}
+		ch <- models.BridgeDisconnectedEvent(info)
 	}()
 
 	// Start touch listener. This one should go down together with this one, though, so it needs a new context.

models/event.go

@@ -19,9 +19,21 @@ func (e *Event) HasPayload(key string) bool {
 	return e.Payload != nil && e.Payload[key] != ""
 }
 
+var (
+	ENBridgeConnected    = "BridgeConnected"
+	ENBridgeDisconnected = "BridgeDisconnected"
+)
+
 func BridgeConnectedEvent(bridge Bridge) Event {
-	e := Event{Name: "BridgeConnected"}
+	e := Event{Name: ENBridgeConnected}
-	e.AddPayload("id", strconv.Itoa(bridge.ID))
+	e.AddPayload("bridgeId", strconv.Itoa(bridge.ID))
+
+	return e
+}
+
+func BridgeDisconnectedEvent(bridge Bridge) Event {
+	e := Event{Name: ENBridgeDisconnected}
+	e.AddPayload("bridgeId", strconv.Itoa(bridge.ID))
 
 	return e
 }

models/shared.go

@@ -3,9 +3,9 @@ package models
 type ReferenceKind string
 
 var (
-	RTDeviceID ReferenceKind = "DeviceID"
+	RKDeviceID ReferenceKind = "DeviceID"
-	RTBridgeID ReferenceKind = "BridgeID"
+	RKBridgeID ReferenceKind = "BridgeID"
-	RTTag      ReferenceKind = "Tag"
+	RKTag      ReferenceKind = "Tag"
 )
 
 

webui/src/primitives/Forms.tsx

@@ -1,4 +1,4 @@
-import React, {useLayoutEffect, useState} from 'react';
+import React, {useLayoutEffect, useMemo} from 'react';
 // @ts-ignore
 import iro from "@jaames/iro";
 
@@ -11,7 +11,7 @@ interface ColorPickerProps {
 const randomId = () => Math.floor(Math.random() * 100000);
 
 export const HSColorPicker: React.FC<ColorPickerProps> = ({h, s, onChange}) => {
-  const [random] = useState(() => `color-picker-${randomId()}`);
+  const random = useMemo(() => `color-picker-${randomId()}`, []);
 
   useLayoutEffect(() => {
     // @ts-ignore

webui/src/setupProxy.js

@@ -0,0 +1,8 @@
+const proxy = require("http-proxy-middleware");
+
+let config = {url: "http://127.0.0.1:9000/"};
+
+module.exports = function(app) {
+    app.use(proxy('/api/ws', { target: config.url, ws: true }));
+    app.use(proxy('/api', { target: config.url, ws: false }));
+};