optimize Hue light updates by using temporary groups.

Co-authored-by: Gisle Aune <dev@gisle.me>
Reviewed-on: #1
Co-authored-by: gisle <gisle@hidden-email>
Co-committed-by: gisle <gisle@hidden-email>

app/api/devices.go

@@ -3,9 +3,9 @@ package api
 import (
 	"context"
 	"git.aiterp.net/lucifer/new-server/app/config"
+	"git.aiterp.net/lucifer/new-server/app/services/publisher"
 	"git.aiterp.net/lucifer/new-server/models"
 	"github.com/gin-gonic/gin"
-	"golang.org/x/sync/errgroup"
 	"log"
 	"time"
 )
@@ -17,11 +17,21 @@ func fetchDevices(ctx context.Context, fetchStr string) ([]models.Device, error)
 
 func Devices(r gin.IRoutes) {
 	r.GET("", handler(func(c *gin.Context) (interface{}, error) {
-		return config.DeviceRepository().FetchByReference(ctxOf(c), models.RKAll, "")
+		devices, err := config.DeviceRepository().FetchByReference(ctxOf(c), models.RKAll, "")
+		if err != nil {
+			return nil, err
+		}
+
+		return withSceneState(devices), nil
 	}))
 
 	r.GET("/:fetch", handler(func(c *gin.Context) (interface{}, error) {
-		return fetchDevices(ctxOf(c), c.Param("fetch"))
+		devices, err := fetchDevices(ctxOf(c), c.Param("fetch"))
+		if err != nil {
+			return nil, err
+		}
+
+		return withSceneState(devices), nil
 	}))
 
 	r.PUT("", handler(func(c *gin.Context) (interface{}, error) {
@@ -72,7 +82,7 @@ func Devices(r gin.IRoutes) {
 			}
 		}()
 
-		return changed, nil
+		return withSceneState(changed), nil
 	}))
 
 	r.PUT("/:fetch", handler(func(c *gin.Context) (interface{}, error) {
@@ -100,7 +110,7 @@ func Devices(r gin.IRoutes) {
 			}
 		}
 
-		return devices, nil
+		return withSceneState(devices), nil
 	}))
 
 	r.PUT("/:fetch/state", handler(func(c *gin.Context) (interface{}, error) {
@@ -127,17 +137,12 @@ func Devices(r gin.IRoutes) {
 
 		config.PublishChannel <- devices
 
-		go func() {
+		err = config.DeviceRepository().SaveMany(ctxOf(c), models.SMState, devices)
-			for _, device := range devices {
+		if err != nil {
-				err := config.DeviceRepository().Save(context.Background(), &device, models.SMState)
+			log.Println("Failed to save devices states")
-				if err != nil {
+		}
-					log.Println("Failed to save device for state:", err)
-					continue
-				}
-			}
-		}()
 
-		return devices, nil
+		return withSceneState(devices), nil
 	}))
 
 	r.PUT("/:fetch/tags", handler(func(c *gin.Context) (interface{}, error) {
@@ -194,7 +199,7 @@ func Devices(r gin.IRoutes) {
 			}
 		}
 
-		return devices, nil
+		return withSceneState(devices), nil
 	}))
 
 	r.PUT("/:fetch/scene", handler(func(c *gin.Context) (interface{}, error) {
@@ -221,25 +226,53 @@ func Devices(r gin.IRoutes) {
 		}
 		body.StartTime = time.Now()
 
+		pushMode := c.Query("push") == "true"
 		for i := range devices {
-			devices[i].SceneAssignments = []models.DeviceSceneAssignment{body}
+			if pushMode {
+				devices[i].SceneAssignments = append(devices[i].SceneAssignments, body)
+			} else {
+				devices[i].SceneAssignments = []models.DeviceSceneAssignment{body}
+			}
 		}
 		config.PublishChannel <- devices
 
-		eg := errgroup.Group{}
+		err = config.DeviceRepository().SaveMany(ctxOf(c), 0, devices)
-		for i := range devices {
-			device := devices[i]
-
-			eg.Go(func() error {
-				return config.DeviceRepository().Save(ctxOf(c), &device, 0)
-			})
-		}
-
-		err = eg.Wait()
 		if err != nil {
 			return nil, err
 		}
 
-		return devices, nil
+		return withSceneState(devices), nil
+	}))
+
+	r.DELETE("/:fetch/scene", handler(func(c *gin.Context) (interface{}, error) {
+		devices, err := fetchDevices(ctxOf(c), c.Param("fetch"))
+		if err != nil {
+			return nil, err
+		}
+		if len(devices) == 0 {
+			return []models.Device{}, nil
+		}
+
+		for i := range devices {
+			devices[i].SceneAssignments = []models.DeviceSceneAssignment{}
+		}
+		config.PublishChannel <- devices
+
+		err = config.DeviceRepository().SaveMany(ctxOf(c), 0, devices)
+		if err != nil {
+			return nil, err
+		}
+
+		return withSceneState(devices), nil
 	}))
 }
+
+func withSceneState(devices []models.Device) []models.Device {
+	res := make([]models.Device, 0, len(devices))
+	for _, device := range devices {
+		device.SceneState = publisher.Global().SceneState(device.ID)
+		res = append(res, device)
+	}
+
+	return res
+}

app/api/handlers.go

@@ -35,17 +35,28 @@ func EventHandlers(r gin.IRoutes) {
 	}))
 
 	r.PUT("/:id", handler(func(c *gin.Context) (interface{}, error) {
-		var body models.EventHandlerUpdate
+
-		err := parseBody(c, &body)
-		if err != nil {
-			return nil, err
-		}
 
 		handler, err := config.EventHandlerRepository().FindByID(ctxOf(c), intParam(c, "id"))
 		if err != nil {
 			return nil, err
 		}
-		handler.ApplyUpdate(body)
+
+		if c.Query("hard") == "true" {
+			var body models.EventHandler
+			err := parseBody(c, &body)
+			if err != nil || body.ID != intParam(c, "id") {
+				return nil, err
+			}
+			handler = &body
+		} else {
+			var body models.EventHandlerUpdate
+			err := parseBody(c, &body)
+			if err != nil {
+				return nil, err
+			}
+			handler.ApplyUpdate(body)
+		}
 
 		err = config.EventHandlerRepository().Save(ctxOf(c), handler)
 		if err != nil {

app/api/scenes.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"git.aiterp.net/lucifer/new-server/app/config"
+	"git.aiterp.net/lucifer/new-server/app/services/publisher"
 	"git.aiterp.net/lucifer/new-server/models"
 	"github.com/gin-gonic/gin"
 )
@@ -32,6 +33,36 @@ func Scenes(r gin.IRoutes) {
 			return nil, err
 		}
 
+		publisher.Global().UpdateScene(body)
+
 		return body, nil
 	}))
-}
+
+	r.PUT("/:id", handler(func(c *gin.Context) (interface{}, error) {
+		var body models.Scene
+		err := parseBody(c, &body)
+		if err != nil {
+			return nil, err
+		}
+
+		scene, err := config.SceneRepository().Find(ctxOf(c), intParam(c, "id"))
+		if err != nil {
+			return nil, err
+		}
+
+		body.ID = scene.ID
+		err = body.Validate()
+		if err != nil {
+			return nil, err
+		}
+
+		err = config.SceneRepository().Save(ctxOf(c), &body)
+		if err != nil {
+			return nil, err
+		}
+
+		publisher.Global().UpdateScene(body)
+
+		return body, nil
+	}))
+}

app/client/client.go

@@ -60,6 +60,31 @@ func (client *Client) PutDeviceTags(ctx context.Context, fetchStr string, addTag
 	return devices, nil
 }
 
+func (client *Client) AssignDevice(ctx context.Context, fetchStr string, push bool, assignment models.DeviceSceneAssignment) ([]models.Device, error) {
+	query := ""
+	if push {
+		query = "?push=true"
+	}
+
+	devices := make([]models.Device, 0, 16)
+	err := client.Fetch(ctx, "PUT", "/api/devices/"+fetchStr+"/scene"+query, &devices, assignment)
+	if err != nil {
+		return nil, err
+	}
+
+	return devices, nil
+}
+
+func (client *Client) ClearDevice(ctx context.Context, fetchStr string) ([]models.Device, error) {
+	devices := make([]models.Device, 0, 16)
+	err := client.Fetch(ctx, "DELETE", "/api/devices/"+fetchStr+"/scene", &devices, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	return devices, nil
+}
+
 func (client *Client) FireEvent(ctx context.Context, event models.Event) error {
 	err := client.Fetch(ctx, "POST", "/api/events", nil, event)
 	if err != nil {

app/client/handler.go

@@ -16,6 +16,26 @@ func (client *Client) GetHandlers(ctx context.Context) ([]models.EventHandler, e
 	return handlers, nil
 }
 
+func (client *Client) GetHandler(ctx context.Context, id int) (*models.EventHandler, error) {
+	var handler models.EventHandler
+	err := client.Fetch(ctx, "GET", fmt.Sprintf("/api/event-handlers/%d", id), &handler, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	return &handler, nil
+}
+
+func (client *Client) PutHandler(ctx context.Context, handler *models.EventHandler) (*models.EventHandler, error) {
+	var response models.EventHandler
+	err := client.Fetch(ctx, "PUT", fmt.Sprintf("/api/event-handlers/%d?hard=true", handler.ID), &response, handler)
+	if err != nil {
+		return nil, err
+	}
+
+	return &response, nil
+}
+
 func (client *Client) AddHandler(ctx context.Context, handler models.EventHandler) (*models.EventHandler, error) {
 	var result models.EventHandler
 	err := client.Fetch(ctx, "POST", "/api/event-handlers", &result, handler)

app/client/scene.go

@@ -0,0 +1,16 @@
+package client
+
+import (
+	"context"
+	"git.aiterp.net/lucifer/new-server/models"
+)
+
+func (client *Client) GetScenes(ctx context.Context) ([]models.Scene, error) {
+	scenes := make([]models.Scene, 0, 16)
+	err := client.Fetch(ctx, "GET", "/api/scenes", &scenes, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	return scenes, nil
+}

app/services/bridges.go

@@ -5,7 +5,6 @@ import (
 	"git.aiterp.net/lucifer/new-server/app/config"
 	"git.aiterp.net/lucifer/new-server/models"
 	"log"
-	"strconv"
 	"sync"
 	"time"
 )
@@ -53,15 +52,6 @@ func runConnectToBridges() error {
 		log.Printf("Running bridge \"%s\" (%d)", bridge.Name, bridge.ID)
 
 		go func(bridge models.Bridge, cancel func()) {
-			savedDevices, err := config.DeviceRepository().FetchByReference(ctx, models.RKBridgeID, strconv.Itoa(bridge.ID))
-			if err != nil {
-				log.Println("Failed to fetch devices from db for refresh:", err)
-			}
-			err = driver.Publish(ctx, bridge, savedDevices)
-			if err != nil {
-				log.Println("Failed to publish devices from db before run:", err)
-			}
-
 			err = driver.Run(ctx, bridge, config.EventChannel)
 			log.Printf("Bridge \"%s\" (%d) stopped: %s", bridge.Name, bridge.ID, err)
 

app/services/events.go

@@ -155,6 +155,15 @@ func handleEvent(event models.Event) (responses []models.Event) {
 		if err != nil {
 			log.Println("Error updating state for device", device.ID, "err:", err)
 		}
+
+		if action.SetScene != nil {
+			action.SetScene.StartTime = time.Now()
+			allDevices[i].SceneAssignments = []models.DeviceSceneAssignment{*action.SetScene}
+		}
+		if action.PushScene != nil {
+			action.PushScene.StartTime = time.Now()
+			allDevices[i].SceneAssignments = append(allDevices[i].SceneAssignments, *action.PushScene)
+		}
 	}
 
 	config.PublishChannel <- allDevices

app/services/publisher/publisher.go

@@ -19,6 +19,29 @@ type Publisher struct {
 	waiting         map[int]chan struct{}
 }
 
+func (p *Publisher) SceneState(deviceID int) *models.DeviceState {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+
+	if s := p.sceneAssignment[deviceID]; s != nil {
+		return s.LastState(deviceID)
+	}
+
+	return nil
+}
+
+func (p *Publisher) UpdateScene(data models.Scene) {
+	p.mu.Lock()
+	p.sceneData[data.ID] = &data
+
+	for _, scene := range p.scenes {
+		if scene.data.ID == data.ID {
+			scene.UpdateScene(data)
+		}
+	}
+	p.mu.Unlock()
+}
+
 func (p *Publisher) ReloadScenes(ctx context.Context) error {
 	scenes, err := config.SceneRepository().FetchAll(ctx)
 	if err != nil {
@@ -26,8 +49,12 @@ func (p *Publisher) ReloadScenes(ctx context.Context) error {
 	}
 
 	p.mu.Lock()
-	for _, scene := range scenes {
+	for i, scene := range scenes {
-		p.sceneData[scene.ID] = &scene
+		p.sceneData[scene.ID] = &scenes[i]
+	}
+
+	for _, scene := range p.scenes {
+		scene.UpdateScene(*p.sceneData[scene.data.ID])
 	}
 	p.mu.Unlock()
 
@@ -90,10 +117,12 @@ func (p *Publisher) Run() {
 
 		p.mu.Lock()
 		for i, scene := range p.scenes {
-			if !scene.endTime.IsZero() && time.Now().After(scene.endTime) {
+			if (!scene.endTime.IsZero() && time.Now().After(scene.endTime)) || scene.Empty() {
 				deleteList = append(deleteList, i-len(deleteList))
 				updatedList = append(updatedList, scene.AllDevices()...)
 
+				log.Printf("Removing scene instance for %s (%d)", scene.data.Name, scene.data.ID)
+
 				for _, device := range scene.AllDevices() {
 					p.sceneAssignment[device.ID] = nil
 				}
@@ -109,7 +138,7 @@ func (p *Publisher) Run() {
 		for _, i := range deleteList {
 			p.scenes = append(p.scenes[:i], p.scenes[i+1:]...)
 		}
-		
+
 		for _, device := range updatedList {
 			if !p.started[device.BridgeID] {
 				p.started[device.BridgeID] = true
@@ -148,6 +177,11 @@ func (p *Publisher) reassignDevice(device models.Device) bool {
 
 		// Stop here, no scene should be assigned.
 		return false
+	} else {
+		if p.sceneData[selectedAssignment.SceneID] == nil {
+			// Freeze until scene becomes available.
+			return false
+		}
 	}
 
 	if p.sceneAssignment[device.ID] != nil {
@@ -175,6 +209,7 @@ func (p *Publisher) reassignDevice(device models.Device) bool {
 		endTime:    selectedAssignment.StartTime.Add(time.Duration(selectedAssignment.DurationMS) * time.Millisecond),
 		roleMap:    make(map[int]int, 16),
 		roleList:   make(map[int][]models.Device, 16),
+		lastStates: make(map[int]models.DeviceState, 16),
 		due:        true,
 	}
 	p.sceneAssignment[device.ID] = newScene
@@ -258,8 +293,12 @@ var publisher = Publisher{
 	waiting:         make(map[int]chan struct{}),
 }
 
+func Global() *Publisher {
+	return &publisher
+}
+
 func Initialize(ctx context.Context) error {
-	err :=publisher.ReloadScenes(ctx)
+	err := publisher.ReloadScenes(ctx)
 	if err != nil {
 		return err
 	}
@@ -268,8 +307,9 @@ func Initialize(ctx context.Context) error {
 		return err
 	}
 
-	go publisher.PublishChannel(config.PublishChannel)
 	go publisher.Run()
+	time.Sleep(time.Millisecond * 50)
+	go publisher.PublishChannel(config.PublishChannel)
 
 	return nil
 }

app/services/publisher/scene.go

@@ -6,12 +6,13 @@ import (
 )
 
 type Scene struct {
-	data      *models.Scene
+	data       *models.Scene
-	group     string
+	group      string
-	startTime time.Time
+	startTime  time.Time
-	endTime   time.Time
+	endTime    time.Time
-	roleMap   map[int]int
+	roleMap    map[int]int
-	roleList  map[int][]models.Device
+	roleList   map[int][]models.Device
+	lastStates map[int]models.DeviceState
 
 	due          bool
 	lastInterval int64
@@ -84,6 +85,17 @@ func (s *Scene) RemoveDevice(device models.Device) {
 	s.due = true
 
 	delete(s.roleMap, device.ID)
+	delete(s.lastStates, device.ID)
+}
+
+func (s *Scene) Empty() bool {
+	for _, list := range s.roleList {
+		if len(list) > 0 {
+			return false
+		}
+	}
+
+	return true
 }
 
 func (s *Scene) Due() bool {
@@ -152,6 +164,8 @@ func (s *Scene) Run() []models.Device {
 				continue
 			}
 
+			s.lastStates[device.ID] = device.State
+
 			updatedDevices = append(updatedDevices, device)
 		}
 	}
@@ -161,3 +175,12 @@ func (s *Scene) Run() []models.Device {
 
 	return updatedDevices
 }
+
+func (s *Scene) LastState(id int) *models.DeviceState {
+	lastState, ok := s.lastStates[id]
+	if !ok {
+		return nil
+	}
+
+	return &lastState
+}

cmd/lucy/command.go

@@ -5,6 +5,7 @@ import (
 	"log"
 	"strconv"
 	"strings"
+	"time"
 )
 
 type Param struct {
@@ -221,6 +222,17 @@ func (p Params) DeviceState(prefix string) models.NewDeviceState {
 	}
 }
 
+func (p Params) SceneAssignment(prefix string) *models.DeviceSceneAssignment {
+	if p.Get(prefix+"scene") == nil {
+		return nil
+	}
+
+	return &models.DeviceSceneAssignment{
+		SceneID:    p.Get(prefix+"scene").IntOr(-1),
+		Group:      p.Get(prefix+"scene.group").StringOr(time.Now().Format(time.RFC3339)),
+		DurationMS: int64(p.Get(prefix+"scene.duration").IntOr(0)),
+	}
+}
 
 type Command struct {
 	Name   string

cmd/lucy/handlercmd.go

@@ -7,6 +7,7 @@ import (
 	"git.aiterp.net/lucifer/new-server/models"
 	"log"
 	"os"
+	"strings"
 )
 
 func handlerCmd(
@@ -38,47 +39,7 @@ func handlerCmd(
 			log.Fatalln("Search filter needed!")
 		}
 		model.TargetKind, model.TargetValue = models.ParseFetchString(*fetchStr)
-
+		model = applyCmdToHandler(model, cmd)
-		// From / To
-		model.From = cmd.Params.Get("from").TimeOfDayOr(models.Never)
-		model.To = cmd.Params.Get("to").TimeOfDayOr(models.Never)
-		if model.From.IsNever() != model.To.IsNever() {
-			log.Fatalln("from and to must be specified together!")
-		}
-
-		// One shot
-		model.OneShot = cmd.Params.Get("one-shot").StringOr("false") == "true"
-
-		// Priority
-		model.Priority = cmd.Params.Get("priority").IntOr(100)
-
-		// Conditions
-		model.Conditions = cmd.Params.Subset("conditions").EventConditions()
-
-		// Power, Color, Intensity, Temperature
-		nds := cmd.Params.DeviceState("set-")
-		model.Actions.SetPower = nds.Power
-		model.Actions.SetColor = nds.Color
-		model.Actions.SetIntensity = nds.Intensity
-
-		// Add intensity
-		model.Actions.AddIntensity = cmd.Params.Get("add-intensity").Float()
-
-		// Fire
-		fireParams := cmd.Params.Subset("fire")
-		fireName := fireParams.Get("name").String()
-		if fireName != nil {
-			firePayloadParams := fireParams.Subset("payload")
-
-			model.Actions.FireEvent = &models.Event{
-				Name:    *fireName,
-				Payload: make(map[string]string, len(firePayloadParams)),
-			}
-
-			for key, value := range firePayloadParams.StringMap() {
-				model.Actions.FireEvent.Payload[key] = value
-			}
-		}
 
 		newHandler, err := c.AddHandler(ctx, model)
 		if err != nil {
@@ -86,6 +47,34 @@ func handlerCmd(
 		}
 
 		WriteHandlerInfoTable(os.Stdout, []models.EventHandler{*newHandler})
+	case "edit":
+		id := cmd.Params.Get(0).IntOr(0)
+		if id == 0 {
+			log.Fatalln("ID missing")
+		}
+
+		model, err := c.GetHandler(ctx, id)
+		if err != nil {
+			log.Fatalln(err.Error())
+		}
+
+		eventStr := cmd.Params.Get("event").String()
+		if eventStr != nil {
+			model.EventName = *eventStr
+		}
+
+		fetchStr := cmd.Params.Get("search").String()
+		if fetchStr != nil {
+			model.TargetKind, model.TargetValue = models.ParseFetchString(*fetchStr)
+		}
+
+		modified := applyCmdToHandler(*model, cmd)
+		returned, err := c.PutHandler(ctx, &modified)
+		if err != nil {
+			log.Fatalln(err.Error())
+		}
+
+		WriteHandlerInfoTable(os.Stdout, []models.EventHandler{*returned})
 	case "delete":
 		id := cmd.Params.Get(0).Int()
 		if id == nil {
@@ -106,3 +95,91 @@ func handlerCmd(
 		_, _ = fmt.Fprintln(os.Stderr, helpString[1:])
 	}
 }
+
+func applyCmdToHandler(model models.EventHandler, cmd Command) models.EventHandler {
+	// Remove keys
+	for _, elem := range cmd.Params.Strings(1) {
+		if !strings.HasPrefix(elem, "-") {
+			continue
+		}
+		keyToRemove := elem[1:]
+
+		if strings.HasPrefix(keyToRemove, "conditions.") {
+			condKeyToRemove := keyToRemove[11:]
+			delete(model.Conditions, condKeyToRemove)
+		} else if strings.HasPrefix(keyToRemove, "fire.payload.") && model.Actions.FireEvent != nil {
+			firePayloadKeyToRemove := keyToRemove[13:]
+			delete(model.Actions.FireEvent.Payload, firePayloadKeyToRemove)
+		} else {
+			switch keyToRemove {
+			case "set-power":
+				model.Actions.SetPower = nil
+			case "set-color":
+				model.Actions.SetColor = nil
+			case "set-intensity":
+				model.Actions.SetIntensity = nil
+			case "add-intensity":
+				model.Actions.AddIntensity = nil
+			case "fire":
+				fallthrough
+			case "fire.name":
+				model.Actions.FireEvent = nil
+			case "from":
+				model.From = models.Never
+			case "to":
+				model.To = models.Never
+			case "set-scene":
+				model.Actions.SetScene = nil
+			case "push-scene":
+				model.Actions.PushScene = nil
+			}
+		}
+	}
+
+	// From / To
+	model.From = cmd.Params.Get("from").TimeOfDayOr(models.Never)
+	model.To = cmd.Params.Get("to").TimeOfDayOr(models.Never)
+	if model.From.IsNever() != model.To.IsNever() {
+		log.Fatalln("from and to must be specified together!")
+	}
+
+	// One shot
+	model.OneShot = cmd.Params.Get("one-shot").StringOr("false") == "true"
+
+	// Priority
+	model.Priority = cmd.Params.Get("priority").IntOr(100)
+
+	// Conditions
+	model.Conditions = cmd.Params.Subset("conditions").EventConditions()
+
+	// Power, Color, Intensity, Temperature
+	nds := cmd.Params.DeviceState("set-")
+	model.Actions.SetPower = nds.Power
+	model.Actions.SetColor = nds.Color
+	model.Actions.SetIntensity = nds.Intensity
+
+	// Add intensity
+	model.Actions.AddIntensity = cmd.Params.Get("add-intensity").Float()
+
+	// Fire
+	fireParams := cmd.Params.Subset("fire")
+	fireName := fireParams.Get("name").String()
+	if fireName != nil {
+		firePayloadParams := fireParams.Subset("payload")
+
+		model.Actions.FireEvent = &models.Event{
+			Name:    *fireName,
+			Payload: make(map[string]string, len(firePayloadParams)),
+		}
+
+		for key, value := range firePayloadParams.StringMap() {
+			model.Actions.FireEvent.Payload[key] = value
+		}
+	}
+
+	// Scenes
+	model.Actions.SetScene = cmd.Params.SceneAssignment("set-")
+	model.Actions.PushScene = cmd.Params.SceneAssignment("push-")
+
+	return model
+}

cmd/lucy/help.go

@@ -23,6 +23,13 @@ EVENT HANDLER COMMANDS
               <set-power=B> <set-color=C> <set-intensity=F> <set-temperature=N> \
               <add-intensity=F> \
               <fire.name=S> <fire.payload.*=S>
+  handler edit <id> \
+               (...all arguments from 'add', appending conditions and fire payload matchers...) \
+               <event=S> <search=S>
+               <-from> <-to> \
+               <-set-power> <-set-color> <-set-intensity> <-set-temperature> \
+               <-conditions.*> \
+               <-fire> <-fire.payload.*>
   handler delete <id>
 
 EVENT COMMANDS

cmd/lucy/main.go

@@ -96,6 +96,9 @@ func main() {
 	case "handler":
 		handlerCmd(ctx, c)
 
+	case "scene":
+		sceneCmd(ctx, c)
+
 	// EVENT
 	case "run":
 		{

cmd/lucy/scenecmd.go

@@ -0,0 +1,165 @@
+package main
+
+import (
+	"context"
+	"git.aiterp.net/lucifer/new-server/app/client"
+	"git.aiterp.net/lucifer/new-server/models"
+	"gopkg.in/yaml.v2"
+	"log"
+	"os"
+	"strconv"
+	"strings"
+	"unicode"
+)
+
+func sceneCmd(
+	ctx context.Context,
+	c client.Client,
+) {
+	cmd := parseCommand(os.Args[2:])
+
+	switch cmd.Name {
+	case "create", "update":
+		{
+			fileName := cmd.Params.Get(0).String()
+			if fileName == nil {
+				log.Fatalln("Missing filename")
+			}
+
+			file, err := os.Open(*fileName)
+			if err != nil {
+				log.Fatalln("Failed to open file:", err)
+			}
+			defer file.Close()
+
+			yamlData := make(map[string]interface{})
+			err = yaml.NewDecoder(file).Decode(yamlData)
+			if err != nil {
+				log.Fatalln("Failed to decode file:", err)
+				return
+			}
+
+			yamlData = camelCasify(yamlData)
+			name, nameOk := yamlData["name"]
+			if !nameOk {
+				log.Fatalln("Missing name in yaml data.")
+			}
+
+			var scene models.Scene
+			if cmd.Name == "create" {
+				err := c.Fetch(ctx, "POST", "/api/scenes", &scene, yamlData)
+				if err != nil {
+					log.Fatalln("Failed to create scene:", err)
+					return
+				}
+			} else {
+				scenes, err := c.GetScenes(ctx)
+				if err != nil {
+					log.Fatalln("Failed to fetch existing scenes:", err)
+					return
+				}
+
+				id := -1
+				for _, scene := range scenes {
+					if scene.Name == name {
+						id = scene.ID
+						break
+					}
+				}
+				if id == -1 {
+					log.Fatalln("Could not find scene with name", name)
+					return
+				}
+
+				err = c.Fetch(ctx, "PUT", "/api/scenes/"+strconv.Itoa(id), &scene, yamlData)
+				if err != nil {
+					log.Fatalln("Failed to update scene:", err)
+					return
+				}
+			}
+		}
+
+	case "push", "assign":
+		{
+			fetch := cmd.Params.Get(0).String()
+			id := cmd.Params.Get(1).Int()
+			if fetch == nil || id == nil {
+				log.Println("Usage: lucy scene assign <fetch> <id> <group=S> <duration=I>")
+			}
+
+			devices, err := c.AssignDevice(ctx, *fetch, cmd.Name == "push", models.DeviceSceneAssignment{
+				SceneID:    *id,
+				Group:      cmd.Params.Get("group").StringOr(*fetch),
+				DurationMS: int64(cmd.Params.Get("duration").IntOr(0)),
+			})
+			if err != nil {
+				log.Println("Could not assign devices:", err)
+				return
+			}
+
+			WriteDeviceInfoTable(os.Stdout, devices)
+		}
+
+	case "clear":
+		fetch := cmd.Params.Get(0).String()
+		if fetch == nil {
+			log.Println("Usage: lucy scene clear <fetch>")
+		}
+
+		devices, err := c.ClearDevice(ctx, *fetch)
+		if err != nil {
+			log.Println("Could not clear devices:", err)
+			return
+		}
+
+		WriteDeviceInfoTable(os.Stdout, devices)
+	}
+}
+
+func camelCasify(m map[string]interface{}) map[string]interface{} {
+	m2 := make(map[string]interface{}, len(m))
+	for key, value := range m {
+		b := strings.Builder{}
+		snake := false
+		for _, ch := range key {
+			if ch == '_' {
+				snake = true
+			} else if snake {
+				b.WriteRune(unicode.ToUpper(ch))
+				snake = false
+			} else {
+				b.WriteRune(ch)
+			}
+		}
+
+		switch value := value.(type) {
+		case []interface{}:
+			valueCopy := make([]interface{}, len(value))
+			for i, elem := range value {
+				switch elem := elem.(type) {
+				case map[interface{}]interface{}:
+					m3 := make(map[string]interface{})
+					for k, v := range elem {
+						if kStr, ok := k.(string); ok {
+							m3[kStr] = v
+						}
+					}
+
+					valueCopy[i] = camelCasify(m3)
+				case map[string]interface{}:
+					valueCopy[i] = camelCasify(elem)
+				default:
+					valueCopy[i] = elem
+				}
+			}
+
+			m2[b.String()] = valueCopy
+		case map[string]interface{}:
+			m2[b.String()] = camelCasify(value)
+		default:
+			m2[b.String()] = value
+		}
+	}
+
+	return m2
+}

cmd/lucy/tables.go

@@ -14,16 +14,32 @@ func WriteDeviceStateTable(w io.Writer, devices []models.Device) {
 	table.SetHeader([]string{"ID", "NAME", "POWER", "COLOR", "INTENSITY", "TEMPERATURE"})
 
 	table.SetReflowDuringAutoWrap(true)
+	table.SetColumnAlignment([]int{
+		tablewriter.ALIGN_RIGHT,
+		tablewriter.ALIGN_LEFT,
+		tablewriter.ALIGN_RIGHT,
+		tablewriter.ALIGN_LEFT,
+		tablewriter.ALIGN_RIGHT,
+		tablewriter.ALIGN_RIGHT,
+	})
 
 	for _, v := range devices {
 		powerStr := ""
 		if v.HasCapability(models.DCPower) {
-			powerStr = strconv.FormatBool(v.State.Power)
+			if v.SceneState != nil && v.SceneState.Power != v.State.Power {
+				powerStr = strconv.FormatBool(v.SceneState.Power) + "*"
+			} else {
+				powerStr = strconv.FormatBool(v.State.Power)
+			}
 		}
 
 		colorStr := ""
 		if v.HasCapability(models.DCColorHSK, models.DCColorHS, models.DCColorKelvin) {
-			colorStr = v.State.Color.String()
+			if v.SceneState != nil && v.SceneState.Color.String() != v.State.Color.String() {
+				colorStr = v.SceneState.Color.String() + "*"
+			} else {
+				colorStr = v.State.Color.String()
+			}
 		}
 
 		temperatureString := ""
@@ -33,7 +49,11 @@ func WriteDeviceStateTable(w io.Writer, devices []models.Device) {
 
 		intensityString := ""
 		if v.HasCapability(models.DCIntensity) {
-			intensityString = strconv.FormatFloat(v.State.Intensity, 'f', -1, 64)
+			if v.SceneState != nil && v.SceneState.Intensity != v.State.Intensity {
+				intensityString = strconv.FormatFloat(v.SceneState.Intensity, 'g', 2, 64) + "*"
+			} else {
+				intensityString = strconv.FormatFloat(v.State.Intensity, 'f', -1, 64)
+			}
 		}
 
 		table.Append([]string{
@@ -104,6 +124,17 @@ func WriteHandlerInfoTable(w io.Writer, handlers []models.EventHandler) {
 		if h.Actions.FireEvent != nil {
 			actionStr += fmt.Sprintf("fireEvent=%s ", (*h.Actions.FireEvent).Name)
 		}
+		if h.Actions.FireEvent != nil {
+			actionStr += fmt.Sprintf("fireEvent=%s ", (*h.Actions.FireEvent).Name)
+		}
+		if h.Actions.SetScene != nil {
+			s := h.Actions.SetScene
+			actionStr += fmt.Sprintf("setScene=(id=%d,group=\"%s\",duration=%d) ", s.SceneID, s.Group, s.DurationMS)
+		}
+		if h.Actions.PushScene != nil {
+			s := h.Actions.PushScene
+			actionStr += fmt.Sprintf("pushScene=(id=%d,group=\"%s\",duration=%d) ", s.SceneID, s.Group, s.DurationMS)
+		}
 
 		eventName := h.EventName
 		if h.OneShot {

internal/drivers/hue/bridge.go

@@ -6,10 +6,11 @@ import (
 	"encoding/json"
 	"fmt"
 	"git.aiterp.net/lucifer/new-server/models"
-	"golang.org/x/sync/errgroup"
 	"io"
+	"log"
 	"net"
 	"net/http"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -97,17 +98,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 _, state := range b.lightStates {
+	for i, 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()
@@ -116,24 +117,85 @@ func (b *Bridge) SyncStale(ctx context.Context) error {
 		return nil
 	}
 
-	for i, input := range inputs {
+	groups := make([]*syncGroup, 0, 4)
-		iCopy := i
+	for i := range inputs {
-		index := indices[i]
+		input := inputs[i]
-		inputCopy := input
 
-		eg.Go(func() error {
+		found := false
-			err := b.putLightState(ctx, index, inputCopy)
+		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
+			}
+		}
+		if !found {
+			groups = append(groups, &syncGroup{
+				GroupIndex:   -1,
+				State:        input,
+				Indexes:      []int{indices[i]},
+				ArrayIndexes: []int{arrayIndices[i]},
+			})
+		}
+	}
+
+	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
 			}
 
-			b.lightStates[iCopy].stale = false
+			group.GroupIndex = id
-
+		}
-			return nil
-		})
 	}
 
-	return eg.Wait()
+	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
+		}
+
+		b.mu.Lock()
+		for _, arrayIndex := range group.ArrayIndexes {
+			b.lightStates[arrayIndex].stale = false
+		}
+		b.mu.Unlock()
+
+		if groupMap[group.GroupIndex].Name == "lucifer_auto_group" {
+			err := b.deleteGroup(ctx, group.GroupIndex)
+			if err != nil {
+				log.Println("Could not delete temporary group", err)
+			}
+		}
+	}
+
+	return nil
 }
 
 func (b *Bridge) SyncSensors(ctx context.Context) ([]models.Event, error) {
@@ -170,6 +232,10 @@ func (b *Bridge) putLightState(ctx context.Context, index int, input LightStateI
 	return b.put(ctx, fmt.Sprintf("lights/%d/state", index), input, nil)
 }
 
+func (b *Bridge) putGroupLightState(ctx context.Context, index int, input LightStateInput) error {
+	return b.put(ctx, fmt.Sprintf("groups/%d/action", index), input, 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)
@@ -207,6 +273,34 @@ func (b *Bridge) getSensors(ctx context.Context) (map[int]SensorData, error) {
 	return result, nil
 }
 
+func (b *Bridge) getGroups(ctx context.Context) (map[int]GroupData, error) {
+	result := make(map[int]GroupData, 16)
+	err := b.get(ctx, "groups", &result)
+	if err != nil {
+		return nil, err
+	}
+
+	return result, nil
+}
+
+func (b *Bridge) postGroup(ctx context.Context, input GroupData) (int, error) {
+	var res []struct {
+		Success struct {
+			ID string `json:"id"`
+		} `json:"success"`
+	}
+	err := b.post(ctx, "groups", input, &res)
+
+	id, _ := strconv.Atoi(res[0].Success.ID)
+
+	return id, err
+}
+
+
+func (b *Bridge) deleteGroup(ctx context.Context, index int) error {
+	return b.delete(ctx, "groups/"+strconv.Itoa(index), nil)
+}
+
 func (b *Bridge) get(ctx context.Context, resource string, target interface{}) error {
 	if b.token != "" {
 		resource = b.token + "/" + resource
@@ -226,6 +320,30 @@ func (b *Bridge) get(ctx context.Context, resource string, target interface{}) e
 	return json.NewDecoder(res.Body).Decode(target)
 }
 
+func (b *Bridge) delete(ctx context.Context, resource string, target interface{}) error {
+	if b.token != "" {
+		resource = b.token + "/" + resource
+	}
+
+	req, err := http.NewRequest("DELETE", fmt.Sprintf("http://%s/api/%s", b.host, resource), nil)
+	if err != nil {
+		return err
+	}
+
+	res, err := httpClient.Do(req.WithContext(ctx))
+	if err != nil {
+		return err
+	}
+	defer res.Body.Close()
+
+	if target == nil {
+		return nil
+	}
+
+	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/data.go

@@ -3,8 +3,14 @@ package hue
 import (
 	"encoding/xml"
 	"errors"
+	"strconv"
 )
 
+type GroupData struct {
+	Name   string   `json:"name"`
+	Lights []string `json:"lights"`
+}
+
 type DiscoveryEntry struct {
 	Id                string `json:"id"`
 	InternalIPAddress string `json:"internalipaddress"`
@@ -83,6 +89,58 @@ type LightStateInput struct {
 	TransitionTime *int        `json:"transitiontime,omitempty"`
 }
 
+func (input *LightStateInput) Equal(other LightStateInput) bool {
+	if (input.On != nil) != (other.On != nil) {
+		return false
+	} else if input.On != nil && *input.On != *other.On {
+		return false
+	}
+
+	if (input.Bri != nil) != (other.Bri != nil) {
+		return false
+	} else if input.Bri != nil && *input.Bri != *other.Bri {
+		return false
+	}
+
+	if (input.Hue != nil) != (other.Hue != nil) {
+		return false
+	} else if input.Hue != nil && *input.Hue != *other.Hue {
+		return false
+	}
+
+	if (input.Sat != nil) != (other.Sat != nil) {
+		return false
+	} else if input.Sat != nil && *input.Sat != *other.Sat {
+		return false
+	}
+
+	if (input.Effect != nil) != (other.Effect != nil) {
+		return false
+	} else if input.Effect != nil && *input.Effect != *other.Effect {
+		return false
+	}
+
+	if (input.XY != nil) != (other.XY != nil) {
+		return false
+	} else if input.XY != nil && *input.XY != *other.XY {
+		return false
+	}
+
+	if (input.CT != nil) != (other.CT != nil) {
+		return false
+	} else if input.CT != nil && *input.CT != *other.CT {
+		return false
+	}
+
+	if (input.Alert != nil) != (other.Alert != nil) {
+		return false
+	} else if input.Alert != nil && *input.Alert != *other.Alert {
+		return false
+	}
+
+	return true
+}
+
 type LightData struct {
 	State            LightState `json:"state"`
 	Type             string     `json:"type"`
@@ -192,6 +250,36 @@ type BridgeDeviceInfo struct {
 	} `xml:"device"`
 }
 
+type syncGroup struct {
+	GroupIndex   int
+	State        LightStateInput
+	Indexes      []int
+	ArrayIndexes []int
+}
+
+func (sg *syncGroup) Matches(group *GroupData) bool {
+	if len(sg.Indexes) != len(group.Lights) {
+		return false
+	}
+
+	for _, idx := range sg.Indexes {
+		found := false
+		for _, idx2 := range group.Lights {
+			n := strconv.Itoa(idx)
+			if n == idx2 {
+				found = true
+				break
+			}
+		}
+
+		if !found {
+			return false
+		}
+	}
+
+	return true
+}
+
 var buttonNames = []string{"On", "DimUp", "DimDown", "Off"}
 
 var errLinkButtonNotPressed = errors.New("link button not pressed")

internal/drivers/hue/state.go

@@ -1,6 +1,7 @@
 package hue
 
 import (
+	"encoding/json"
 	"git.aiterp.net/lucifer/new-server/models"
 	"strconv"
 	"time"
@@ -16,12 +17,37 @@ type hueLightState struct {
 	stale bool
 }
 
+func (s *hueLightState) MarshalJSON() ([]byte, error) {
+	return json.Marshal(struct {
+		Index      int             `json:"index"`
+		UniqueID   string          `json:"uniqueId"`
+		ExternalID int             `json:"externalId"`
+		Info       LightData       `json:"info"`
+		Input      LightStateInput `json:"input"`
+		Stale      bool            `json:"stale"`
+	}{
+		Index:      s.index,
+		UniqueID:   s.uniqueID,
+		ExternalID: s.externalID,
+		Info:       s.info,
+		Input:      s.input,
+		Stale:      s.stale,
+	})
+}
+
 func (s *hueLightState) Update(state models.DeviceState) {
 	input := LightStateInput{}
 	if state.Power {
 		input.On = ptrBool(true)
 		if state.Color.IsKelvin() {
 			input.CT = ptrInt(1000000 / state.Color.Kelvin)
+			if *input.CT < s.info.Capabilities.Control.CT.Min {
+				*input.CT = s.info.Capabilities.Control.CT.Min
+			}
+			if *input.CT > s.info.Capabilities.Control.CT.Max {
+				*input.CT = s.info.Capabilities.Control.CT.Max
+			}
+
 			if s.input.CT == nil || *s.input.CT != *input.CT {
 				s.stale = true
 			}
@@ -67,6 +93,13 @@ func (s *hueLightState) Update(state models.DeviceState) {
 }
 
 func (s *hueLightState) CheckStaleness(state LightState) {
+	if s.input.On == nil || state.On != *s.input.On {
+		s.stale = true
+	}
+	if !state.On {
+		return
+	}
+
 	if state.ColorMode == "xy" {
 		s.stale = true
 		if s.input.CT == nil && s.input.Hue == nil {
@@ -80,7 +113,7 @@ func (s *hueLightState) CheckStaleness(state LightState) {
 			s.stale = true
 		}
 	} else {
-		if s.input.Hue == nil || state.Hue != *s.input.Hue || s.input.Sat == nil || state.Sat == *s.input.Sat {
+		if s.input.Hue == nil || state.Hue != *s.input.Hue || s.input.Sat == nil || state.Sat != *s.input.Sat {
 			s.stale = true
 		}
 	}
@@ -122,6 +155,9 @@ func (state *hueSensorState) Update(newData SensorData) *models.Event {
 			if time.Since(stateTime) > time.Second*3 {
 				return nil
 			}
+			if state.prevData == nil {
+				return nil
+			}
 
 			pe := state.prevData.State.ButtonEvent
 			ce := newData.State.ButtonEvent

internal/drivers/nanoleaf/bridge.go

@@ -177,7 +177,7 @@ func (b *bridge) Update(devices []models.Device) {
 					red, green, blue := color.RGB255()
 					newColor := [4]byte{red, green, blue, 255}
 					if newColor != panel.ColorRGBA {
-						panel.update(newColor, time.Now().Add(time.Millisecond*120))
+						panel.update(newColor, time.Now().Add(time.Millisecond*220))
 					}
 				} else {
 					panel.update([4]byte{0, 0, 0, 0}, time.Now())

internal/mysql/scenerepo.go

@@ -2,6 +2,7 @@ package mysql
 
 import (
 	"context"
+	"database/sql"
 	"encoding/json"
 	"git.aiterp.net/lucifer/new-server/models"
 	"github.com/jmoiron/sqlx"
@@ -32,6 +33,10 @@ func (r *SceneRepo) FetchAll(ctx context.Context) ([]models.Scene, error) {
 	scenes := make([]sceneRecord, 0, 8)
 	err := r.DBX.SelectContext(ctx, &scenes, "SELECT * FROM scene")
 	if err != nil {
+		if err == sql.ErrNoRows {
+			return []models.Scene{}, nil
+		}
+
 		return nil, dbErr(err)
 	}
 

models/colorvalue.go

@@ -26,9 +26,11 @@ func (c *ColorValue) String() string {
 		return fmt.Sprintf("k:%d", c.Kelvin)
 	}
 
-	return fmt.Sprintf("hs:%g,%g", c.Hue, c.Saturation)
+	return fmt.Sprintf("hs:%.4g,%.3g", c.Hue, c.Saturation)
 }
 
+
+
 func ParseColorValue(raw string) (ColorValue, error) {
 	tokens := strings.SplitN(raw, ":", 2)
 	if len(tokens) != 2 {

models/device.go

@@ -18,6 +18,7 @@ type Device struct {
 	DriverProperties map[string]interface{}  `json:"driverProperties"`
 	UserProperties   map[string]string       `json:"userProperties"`
 	SceneAssignments []DeviceSceneAssignment `json:"sceneAssignments"`
+	SceneState       *DeviceState            `json:"sceneState"`
 	State            DeviceState             `json:"state"`
 	Tags             []string                `json:"tags"`
 }
@@ -200,7 +201,7 @@ func (s *NewDeviceState) RelativeTo(device Device) NewDeviceState {
 	if s.Color != nil {
 		c, err := ParseColorValue(*s.Color)
 		if err == nil {
-			c.Hue = math.Mod(device.State.Color.Hue + c.Hue, 360)
+			c.Hue = math.Mod(device.State.Color.Hue+c.Hue, 360)
 			c.Saturation *= device.State.Color.Saturation
 			c.Kelvin += device.State.Color.Kelvin
 		}

models/eventhandler.go

@@ -5,6 +5,7 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"time"
 )
 
 type EventHandler struct {
@@ -168,6 +169,20 @@ func (c *EventCondition) checkDevice(key string, device Device) (matches bool, s
 		}
 
 		return c.matches(strconv.FormatFloat(device.State.Temperature, 'f', -1, 64)), false
+	case "scene":
+		if len(device.SceneAssignments) == 0 {
+			return false, false
+		}
+
+		sceneId := -1
+		for _, assignment := range device.SceneAssignments {
+			duration := time.Duration(assignment.DurationMS) * time.Millisecond
+			if duration <= 0 || time.Now().Before(assignment.StartTime.Add(duration)) {
+				sceneId = assignment.SceneID
+			}
+		}
+
+		return c.matches(strconv.Itoa(sceneId)), false
 	default:
 		return false, true
 	}
@@ -214,12 +229,14 @@ func (c *EventCondition) matches(value string) bool {
 }
 
 type EventAction struct {
-	SetPower       *bool    `json:"setPower"`
+	SetPower       *bool                  `json:"setPower"`
-	SetColor       *string  `json:"setColor"`
+	SetColor       *string                `json:"setColor"`
-	SetIntensity   *float64 `json:"setIntensity"`
+	SetIntensity   *float64               `json:"setIntensity"`
-	SetTemperature *int     `json:"setTemperature"`
+	SetTemperature *int                   `json:"setTemperature"`
-	AddIntensity   *float64 `json:"addIntensity"`
+	AddIntensity   *float64               `json:"addIntensity"`
-	FireEvent      *Event   `json:"fireEvent"`
+	FireEvent      *Event                 `json:"fireEvent"`
+	SetScene       *DeviceSceneAssignment `json:"setScene"`
+	PushScene      *DeviceSceneAssignment `json:"pushScene"`
 }
 
 func (action *EventAction) Apply(other EventAction) {
@@ -238,6 +255,12 @@ func (action *EventAction) Apply(other EventAction) {
 	if action.FireEvent == nil {
 		action.FireEvent = other.FireEvent
 	}
+	if action.SetScene == nil {
+		action.SetScene = other.SetScene
+	}
+	if action.PushScene == nil {
+		action.PushScene = other.PushScene
+	}
 }
 
 func (c EventCondition) String() string {

models/scene.go

@@ -56,7 +56,7 @@ func (s *Scene) RoleIndex(device *Device) int {
 type SceneEffect string
 
 const (
-	SEStatic          SceneEffect = "Plain"
+	SEStatic          SceneEffect = "Static"
 	SERandom          SceneEffect = "Random"
 	SEGradient        SceneEffect = "Gradient"
 	SEWalkingGradient SceneEffect = "WalkingGradient"
@@ -114,13 +114,13 @@ func (r *SceneRole) Validate() error {
 	}
 
 	switch r.PowerMode {
-	case SPScene, SPDevice:
+	case SPScene, SPDevice, SPBoth:
 	default:
 		return ErrSceneRoleUnknownPowerMode
 	}
 
 	switch r.Effect {
-	case SEStatic, SERandom, SEGradient, SETransition:
+	case SEStatic, SERandom, SEGradient, SEWalkingGradient, SETransition:
 	default:
 		return ErrSceneRoleUnknownEffect
 	}
@@ -188,7 +188,12 @@ func (r *SceneRole) ApplyEffect(device *Device, c SceneRunContext) (newState New
 	case SPDevice:
 		newState.Power = nil
 	case SPScene:
-		// Do nothing
+	// Do nothing
+	case SPBoth:
+		if newState.Power != nil {
+			powerIntersection := *newState.Power && device.State.Power
+			newState.Power = &powerIntersection
+		}
 	}
 
 	return
@@ -201,8 +206,6 @@ func (r *SceneRole) State(fac float64) NewDeviceState {
 		return r.States[0]
 	}
 
-
-
 	if r.Interpolate {
 		if len(r.States) == 2 {
 			return r.States[0].Interpolate(r.States[1], fac)
@@ -228,6 +231,7 @@ type ScenePowerMode string
 const (
 	SPDevice ScenePowerMode = "Device" // Device state decides power. Scene state may only power off.
 	SPScene  ScenePowerMode = "Scene"  // Scene state decide power.
+	SPBoth   ScenePowerMode = "Both"   // Power is only on if both Device and Scene says it is.
 )
 
 // DeviceSceneAssignment is an entry on the device stack. StartTime and DurationMS are only respected when the scene

scene-examples/evening.yaml

@@ -0,0 +1,63 @@
+name: Evening
+interval: 1500
+roles:
+  - effect: WalkingGradient
+    power_mode: Device
+    target_kind: Tag
+    target_value: Hexagon
+    interpolate: true
+    relative: false
+    order: -name
+    states:
+      - color: 'hs:30,1'
+        intensity: 0.20
+      - color: 'hs:30,1'
+        intensity: 0.15
+
+  - effect: Gradient
+    power_mode: Device
+    target_kind: Tag
+    target_value: SquareLeft
+    interpolate: true
+    relative: false
+    order: +name
+    states:
+      - color: 'hs:25,1'
+        intensity: 0.075
+      - color: 'hs:50,1'
+        intensity: 0.15
+
+  - effect: Random
+    power_mode: Device
+    target_kind: Tag
+    target_value: SquareRight
+    interpolate: true
+    relative: false
+    order: +name
+    states:
+      - color: 'hs:220,0.7'
+        intensity: 0.22
+      - color: 'hs:220,0.6'
+        intensity: 0.25
+
+  - effect: Static
+    power_mode: Device
+    target_kind: Tag
+    target_value: Accent
+    interpolate: true
+    relative: false
+    order: +name
+    states:
+      - color: 'hs:250,0.7'
+        intensity: 0.25
+
+  - effect: Static
+    power_mode: Device
+    target_kind: All
+    target_value: ""
+    interpolate: true
+    relative: false
+    order: +name
+    states:
+      - color: 'k:2000'
+        intensity: 0.3

scene-examples/flash.yaml

@@ -0,0 +1,26 @@
+name: Flash
+interval: 0
+roles:
+  - effect: Static
+    power_mode: Device
+    target_kind: Tag
+    target_value: Nanoleaf
+    states:
+      - intensity: 1
+        color: hs:220,0.1
+
+  - effect: Static
+    power_mode: Device
+    target_kind: Tag
+    target_value: Hue
+    states:
+      - intensity: 1
+        color: k:6500
+
+  - effect: Static
+    power_mode: Device
+    target_kind: All
+    target_value: ""
+    states:
+      - intensity: 1
+        color: hs:0,0

scene-examples/late.yaml

@@ -0,0 +1,57 @@
+name: Late
+interval: 60000
+roles:
+  - effect: Random
+    power_mode: Device
+    target_kind: Tag
+    target_value: Hexagon
+    interpolate: true
+    relative: false
+    order: +name
+    states:
+      - color: 'hs:35,1'
+        intensity: 0.08
+      - color: 'hs:35,1'
+        intensity: 0.085
+      - color: 'hs:35,1'
+        intensity: 0.09
+      - color: 'hs:35,1'
+        intensity: 0.12
+
+  - effect: Gradient
+    power_mode: Both
+    target_kind: Tag
+    target_value: Square
+    interpolate: true
+    relative: false
+    order: +name
+    states:
+      - color: 'hs:25,1'
+        intensity: 0.05
+        power: off
+      - color: 'hs:30,1'
+        intensity: 0.06
+        power: off
+      - color: 'hs:35,1'
+        intensity: 0.07
+        power: on
+
+  - effect: Static
+    power_mode: Device
+    target_kind: Tag
+    target_value: Nightstand
+    interpolate: true
+    relative: false
+    order: +name
+    states:
+      - color: 'k:2000'
+        intensity: 0.15
+
+  - effect: Static
+    power_mode: Scene
+    target_kind: All
+    target_value: ''
+    interpolate: true
+    relative: false
+    states:
+      - power: false

scene-examples/morning.yaml

@@ -0,0 +1,40 @@
+name: Morning
+interval: 1000
+roles:
+  - effect: WalkingGradient
+    power_mode: Device
+    target_kind: Tag
+    target_value: Hexagon
+    interpolate: true
+    relative: false
+    order: +name
+    states:
+      - color: 'hs:220,0.4'
+        intensity: 0.65
+      - color: 'hs:220,0.5'
+        intensity: 0.50
+
+  - effect: Random
+    power_mode: Device
+    target_kind: Tag
+    target_value: Square
+    interpolate: true
+    relative: false
+    order: +name
+    states:
+      - color: 'hs:220,0.6'
+        intensity: 0.30
+      - color: 'hs:220,0.5'
+        intensity: 0.35
+
+  - effect: Static
+    power_mode: Device
+    target_kind: All
+    target_value: ''
+    interpolate: true
+    relative: false
+    order: +name
+    states:
+      - color: 'hs:250,0.6'
+        intensity: 0.3
+

scene-examples/saturday.yaml

@@ -0,0 +1,42 @@
+name: Saturday
+interval: 700
+roles:
+  - effect: WalkingGradient
+    power_mode: Device
+    target_kind: Tag
+    target_value: Hexagon
+    interpolate: true
+    relative: false
+    order: +name
+    states:
+      - color: 'hs:220,0.5'
+        intensity: 0.25
+      - color: 'hs:220,0.5'
+        intensity: 0.30
+
+  - effect: Random
+    power_mode: Device
+    target_kind: Tag
+    target_value: Square
+    interpolate: true
+    relative: false
+    order: +name
+    states:
+      - color: 'hs:220,0.6'
+        intensity: 0.15
+      - color: 'hs:220,0.55'
+        intensity: 0.16
+      - color: 'hs:220,0.5'
+        intensity: 0.20
+
+  - effect: Static
+    power_mode: Device
+    target_kind: All
+    target_value: ''
+    interpolate: true
+    relative: false
+    order: +name
+    states:
+      - color: 'hs:250,0.7'
+        intensity: 0.3
+