add scene list subcommand.

app/api/devices.go

@@ -7,6 +7,7 @@ import (
 	"git.aiterp.net/lucifer/new-server/models"
 	"github.com/gin-gonic/gin"
 	"log"
+	"strconv"
 	"time"
 )
 
@@ -265,6 +266,46 @@ func Devices(r gin.IRoutes) {
 
 		return withSceneState(devices), nil
 	}))
+
+	r.DELETE("/:fetch", handler(func(c *gin.Context) (interface{}, error) {
+		id, err := strconv.Atoi(c.Param("fetch"))
+		if err != nil {
+			return nil, err
+		}
+
+		device, err := config.DeviceRepository().Find(ctxOf(c), id)
+		if err != nil {
+			return nil, err
+		}
+
+		if c.Query("forgetmenot") != "true" {
+			bridge, err := config.BridgeRepository().Find(ctxOf(c), device.BridgeID)
+			if err != nil {
+				return nil, err
+			}
+
+			driver, err := config.DriverProvider().Provide(bridge.Driver)
+			if err != nil {
+				return nil, err
+			}
+
+			forgettableDriver, ok := driver.(models.ForgettableDriver)
+			if !ok {
+				return nil, models.ErrCannotForget
+			}
+			err = forgettableDriver.ForgetDevice(ctxOf(c), bridge, *device)
+			if err != nil {
+				return nil, err
+			}
+		}
+
+		err = config.DeviceRepository().Delete(ctxOf(c), device)
+		if err != nil {
+			return nil, err
+		}
+
+		return device, nil
+	}))
 }
 
 func withSceneState(devices []models.Device) []models.Device {

cmd/lucy/info.go

@@ -0,0 +1,157 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"git.aiterp.net/lucifer/new-server/models"
+	"io"
+	"sort"
+	"strings"
+	"time"
+)
+
+func WriteDeviceInfo(w io.Writer, devices []models.Device, fields []string) {
+	if len(fields) == 1 && fields[0] == "all" {
+		fields = allFields
+	} else {
+		fields = append(fields[:0:0], fields...)
+		for i, field := range fields {
+			if aliased, ok := fieldAliases[field]; ok {
+				fields[i] = aliased
+			}
+		}
+	}
+
+	length := 0
+	for _, field := range fields {
+		if mlFields[field] {
+			continue
+		}
+
+		if len(field) > length {
+			length = len(field)
+		}
+	}
+
+	for i, device := range devices {
+		if i > 0 {
+			fmt.Println()
+		}
+
+		for _, field := range fields {
+			if formatter, ok := fieldFormatters[field]; ok {
+				_, _ = fmt.Fprintf(w, "%-*s %s\n", length+1, field+":", formatter(&device))
+			} else {
+				_, _ = fmt.Fprintf(w, "%-*s (unknown field)\n", length+1, field+":")
+			}
+		}
+	}
+}
+
+var allFields = []string{
+	"id", "name", "icon", "bridgeId", "tags", "buttonNames",
+	"power", "color", "intensity", "temperature",
+	"internalId", "sceneAssignment", "userProperties", "driverProperties",
+}
+
+var mlFields = map[string]bool{
+	"sceneAssignment":  true,
+	"userProperties":   true,
+	"driverProperties": true,
+}
+
+var fieldFormatters = map[string]func(d *models.Device) string{
+	"id":          func(d *models.Device) string { return fmt.Sprint(d.ID) },
+	"internalId":  func(d *models.Device) string { return d.InternalID },
+	"name":        func(d *models.Device) string { return d.Name },
+	"icon":        func(d *models.Device) string { return d.Icon },
+	"bridgeId":    func(d *models.Device) string { return fmt.Sprint(d.BridgeID) },
+	"tags":        func(d *models.Device) string { return strings.Join(d.Tags, ", ") },
+	"buttonNames": func(d *models.Device) string { return strings.Join(d.ButtonNames, ", ") },
+	"power":       func(d *models.Device) string { return fmt.Sprint(d.State.Power) },
+	"color":       func(d *models.Device) string { return d.State.Color.String() },
+	"intensity":   func(d *models.Device) string { return fmt.Sprint(d.State.Intensity) },
+	"temperature": func(d *models.Device) string { return fmt.Sprint(d.State.Temperature) },
+
+	"sceneAssignment": func(d *models.Device) string {
+		str := &strings.Builder{}
+		str.Grow(64)
+		for _, scene := range d.SceneAssignments {
+			_, _ = fmt.Fprintf(str, "\n  - id: %d\n", scene.SceneID)
+			_, _ = fmt.Fprintf(str, "    duration: %d\n", scene.DurationMS)
+			_, _ = fmt.Fprintf(str, "    group: %s\n", scene.Group)
+			_, _ = fmt.Fprintf(str, "    startTime: %s", scene.StartTime.Format(time.RFC3339))
+		}
+		if len(d.SceneAssignments) == 0 {
+			str.Reset()
+			str.WriteString("(none)")
+		}
+
+		return str.String()
+	},
+
+	"userProperties": func(d *models.Device) string {
+		str := &strings.Builder{}
+		str.Grow(64)
+		str.WriteString("\n")
+		keys := make([]string, 0, len(d.UserProperties))
+		for key := range d.UserProperties {
+			keys = append(keys, key)
+		}
+		sort.Strings(keys)
+		for _, key := range keys {
+			_, _ = fmt.Fprintf(str, "  %s: %s\n", key, d.UserProperties[key])
+		}
+		if len(d.UserProperties) == 0 {
+			str.Reset()
+			str.WriteString("(none)")
+		}
+
+		return str.String()
+	},
+
+	"driverProperties": func(d *models.Device) string {
+		str := &strings.Builder{}
+		str.Grow(256)
+		str.WriteString("\n")
+		keys := make([]string, 0, len(d.DriverProperties))
+		for key := range d.DriverProperties {
+			keys = append(keys, key)
+		}
+		sort.Strings(keys)
+		for _, key := range keys {
+			j, _ := json.Marshal(d.DriverProperties[key])
+			_, _ = fmt.Fprintf(str, "  %s: %s\n", key, string(j))
+		}
+		if len(d.DriverProperties) == 0 {
+			str.Reset()
+			str.WriteString("(none)")
+		}
+
+		return str.String()
+	},
+
+	"capabilities": func(d *models.Device) string {
+		capStr := make([]string, len(d.Capabilities))
+		for i := range d.Capabilities {
+			capStr[i] = string(d.Capabilities[i])
+		}
+		return strings.Join(capStr, ", ")
+	},
+}
+
+var fieldAliases = map[string]string{
+	"bridge":      "bridgeId",
+	"buttons":     "buttonNames",
+	"internal":    "internalId",
+	"caps":        "capabilities",
+	"cap":         "capabilities",
+	"userprops":   "userProperties",
+	"uprops":      "userProperties",
+	"driverprops": "driverProperties",
+	"dprops":      "driverProperties",
+	"internalid":  "internalId",
+	"bridgeid":    "bridgeId",
+	"buttonnames": "buttonNames",
+	"scene":       "sceneAssignment",
+}

cmd/lucy/main.go

@@ -37,8 +37,8 @@ func main() {
 				log.Fatalln(err)
 			}
 
-			if cmd.Params.Get("info").StringOr("false") == "true" {
-				WriteDeviceInfoTable(os.Stdout, devices)
+			if info := cmd.Params.Get("info").String(); info != nil {
+				WriteDeviceInfo(os.Stdout, devices, strings.Split(*info, ","))
 			} else {
 				WriteDeviceStateTable(os.Stdout, devices)
 			}

cmd/lucy/scenecmd.go

@@ -19,6 +19,16 @@ func sceneCmd(
 	cmd := parseCommand(os.Args[2:])
 
 	switch cmd.Name {
+	case "list":
+		{
+			scenes, err := c.GetScenes(ctx)
+			if err != nil {
+				log.Fatalln("Failed to load scenes:", err)
+			}
+
+			WriteSceneTable(os.Stdout, scenes)
+		}
+
 	case "create", "update":
 		{
 			fileName := cmd.Params.Get(0).String()

cmd/lucy/tables.go

@@ -94,6 +94,24 @@ func WriteDeviceInfoTable(w io.Writer, devices []models.Device) {
 	table.Render()
 }
 
+func WriteSceneTable(w io.Writer, scenes []models.Scene) {
+	table := tablewriter.NewWriter(w)
+	table.SetHeader([]string{"ID", "NAME", "ROLES", "INTERVAL"})
+
+	table.SetReflowDuringAutoWrap(false)
+
+	for _, v := range scenes {
+		table.Append([]string{
+			fmt.Sprint(v.ID),
+			v.Name,
+			fmt.Sprint(len(v.Roles)),
+			fmt.Sprint(v.IntervalMS),
+		})
+	}
+
+	table.Render()
+}
+
 func WriteHandlerInfoTable(w io.Writer, handlers []models.EventHandler) {
 	table := tablewriter.NewWriter(w)
 	table.SetHeader([]string{"ID", "EVENT NAME", "PRIORITY", "CONDITIONS", "TARGET", "ACTION"})

internal/drivers/hue/bridge.go

@@ -6,8 +6,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"git.aiterp.net/lucifer/new-server/models"
+	"golang.org/x/sync/errgroup"
 	"io"
-	"log"
 	"net"
 	"net/http"
 	"strconv"
@@ -23,6 +23,7 @@ type Bridge struct {
 	externalID     int
 	lightStates    []*hueLightState
 	sensorStates   []*hueSensorState
+	quarantine     map[string]time.Time
 	syncingPublish uint32
 }
 
@@ -34,6 +35,10 @@ func (b *Bridge) Refresh(ctx context.Context) error {
 
 	b.mu.Lock()
 	for index, light := range lightMap {
+		if time.Now().Before(b.quarantine[light.Uniqueid]) {
+			continue
+		}
+
 		var state *hueLightState
 		for _, existingState := range b.lightStates {
 			if existingState.index == index {
@@ -68,6 +73,10 @@ func (b *Bridge) Refresh(ctx context.Context) error {
 
 	b.mu.Lock()
 	for index, sensor := range sensorMap {
+		if time.Now().Before(b.quarantine[sensor.UniqueID]) {
+			continue
+		}
+
 		var state *hueSensorState
 		for _, existingState := range b.sensorStates {
 			if existingState.index == index {
@@ -98,17 +107,17 @@ func (b *Bridge) Refresh(ctx context.Context) error {
 
 func (b *Bridge) SyncStale(ctx context.Context) error {
 	indices := make([]int, 0, 4)
-	arrayIndices := make([]int, 0, 4)
 	inputs := make([]LightStateInput, 0, 4)
 
+	eg, ctx := errgroup.WithContext(ctx)
+
 	b.mu.Lock()
-	for i, state := range b.lightStates {
+	for _, state := range b.lightStates {
 		if !state.stale {
 			continue
 		}
 
 		indices = append(indices, state.index)
-		arrayIndices = append(arrayIndices, i)
 		inputs = append(inputs, state.input)
 	}
 	b.mu.Unlock()
@@ -117,83 +126,60 @@ func (b *Bridge) SyncStale(ctx context.Context) error {
 		return nil
 	}
 
-	groups := make([]*syncGroup, 0, 4)
-	for i := range inputs {
-		input := inputs[i]
+	for i, input := range inputs {
+		iCopy := i
+		index := indices[i]
+		inputCopy := input
 
-		found := false
-		for _, group := range groups {
-			if group.State.Equal(input) {
-				group.Indexes = append(group.Indexes, indices[i])
-				group.ArrayIndexes = append(group.ArrayIndexes, arrayIndices[i])
-				found = true
+		eg.Go(func() error {
+			err := b.putLightState(ctx, index, inputCopy)
+			if err != nil {
+				return err
 			}
-		}
-		if !found {
-			groups = append(groups, &syncGroup{
-				GroupIndex:   -1,
-				State:        input,
-				Indexes:      []int{indices[i]},
-				ArrayIndexes: []int{arrayIndices[i]},
+
+			b.lightStates[iCopy].stale = false
+
+			return nil
 		})
 	}
+
+	return eg.Wait()
 }
 
-	groupMap, err := b.getGroups(ctx)
-	if err != nil {
-		return err
-	}
-
-	for id, data := range groupMap {
-		for _, group := range groups {
-			if group.Matches(&data) {
-				group.GroupIndex = id
-				break
-			}
-		}
-	}
-
-	for _, group := range groups {
-		if group.GroupIndex == -1 {
-			data := GroupData{
-				Name:   "lucifer_auto_group",
-				Lights: []string{},
-			}
-
-			for _, idx := range group.Indexes {
-				data.Lights = append(data.Lights, strconv.Itoa(idx))
-			}
-
-			id, err := b.postGroup(ctx, data)
-			if err != nil {
-				return err
-			}
-
-			group.GroupIndex = id
-		}
-	}
-
-	log.Println("Updating", len(inputs), "lights on Hue bridge", b.externalID, "in", len(groups), "groups")
-
-	for _, group := range groups {
-		err := b.putGroupLightState(ctx, group.GroupIndex, group.State)
-		if err != nil {
-			return err
-		}
-
+func (b *Bridge) ForgetDevice(ctx context.Context, device models.Device) error {
+	// Find index
 	b.mu.Lock()
-		for _, arrayIndex := range group.ArrayIndexes {
-			b.lightStates[arrayIndex].stale = false
+	found := false
+	index := -1
+	for i, ls := range b.lightStates {
+		if ls.uniqueID == device.InternalID {
+			found = true
+			index = i
+		}
 	}
 	b.mu.Unlock()
+	if !found {
+		return models.ErrNotFound
+	}
 
-		if groupMap[group.GroupIndex].Name == "lucifer_auto_group" {
-			err := b.deleteGroup(ctx, group.GroupIndex)
+	// Delete light from bridge
+	err := b.deleteLight(ctx, index)
 	if err != nil {
-				log.Println("Could not delete temporary group", err)
+		return err
+	}
+
+	// Remove light state from local list. I don't know if the quarantine is necessary, but let's have it anyway.
+	b.mu.Lock()
+	for i, ls := range b.lightStates {
+		if ls.uniqueID == device.InternalID {
+			b.lightStates = append(b.lightStates[:i], b.lightStates[i+1:]...)
 		}
 	}
+	if b.quarantine == nil {
+		b.quarantine = make(map[string]time.Time, 1)
 	}
+	b.quarantine[device.InternalID] = time.Now().Add(time.Second * 30)
+	b.mu.Unlock()
 
 	return nil
 }
@@ -236,6 +222,10 @@ func (b *Bridge) putGroupLightState(ctx context.Context, index int, input LightS
 	return b.put(ctx, fmt.Sprintf("groups/%d/action", index), input, nil)
 }
 
+func (b *Bridge) deleteLight(ctx context.Context, index int) error {
+	return b.delete(ctx, fmt.Sprintf("lights/%d", index), nil)
+}
+
 func (b *Bridge) getToken(ctx context.Context) (string, error) {
 	result := make([]CreateUserResponse, 0, 1)
 	err := b.post(ctx, "", CreateUserInput{DeviceType: "git.aiterp.net/lucifer"}, &result)
@@ -296,7 +286,6 @@ func (b *Bridge) postGroup(ctx context.Context, input GroupData) (int, error) {
 	return id, err
 }
 
-
 func (b *Bridge) deleteGroup(ctx context.Context, index int) error {
 	return b.delete(ctx, "groups/"+strconv.Itoa(index), nil)
 }
@@ -343,7 +332,6 @@ func (b *Bridge) delete(ctx context.Context, resource string, target interface{}
 	return json.NewDecoder(res.Body).Decode(target)
 }
 
-
 func (b *Bridge) post(ctx context.Context, resource string, body interface{}, target interface{}) error {
 	rb, err := reqBody(body)
 	if err != nil {

internal/drivers/hue/driver.go

@@ -372,6 +372,15 @@ func (d *Driver) Run(ctx context.Context, bridge models.Bridge, ch chan<- models
 	}
 }
 
+func (d *Driver) ForgetDevice(ctx context.Context, bridge models.Bridge, device models.Device) error {
+	b, err := d.ensureBridge(ctx, bridge)
+	if err != nil {
+		return err
+	}
+
+	return b.ForgetDevice(ctx, device)
+}
+
 func (d *Driver) ensureBridge(ctx context.Context, info models.Bridge) (*Bridge, error) {
 	d.mu.Lock()
 	for _, bridge := range d.bridges {

models/driver.go

@@ -16,3 +16,7 @@ type Driver interface {
 	Publish(ctx context.Context, bridge Bridge, devices []Device) error
 	Run(ctx context.Context, bridge Bridge, ch chan<- Event) error
 }
+
+type ForgettableDriver interface {
+	ForgetDevice(ctx context.Context, bridge Bridge, device Device) error
+}

models/errors.go

@@ -16,6 +16,7 @@ var ErrUnexpectedResponse = errors.New("driver api returned unexpected response
 var ErrBridgeSearchFailed = errors.New("bridge search failed")
 var ErrAddressOnlyDryRunnable = errors.New("this address may only be used for a dry run")
 var ErrCannotForwardRequest = errors.New("driver is not able to forward requests")
+var ErrCannotForget = errors.New("forget not supported on this bridge type")
 
 var ErrInvalidAddress = errors.New("invalid mac address")
 var ErrPayloadTooShort = errors.New("payload too short")