fix scene reassignment on expiry not working.

.drone.yml

@@ -4,6 +4,15 @@ kind: pipeline
 type: docker
 
 steps:
+  - name: go-build
+    image: golang:1.17
+    commands:
+      - go test -v ./...
+    when:
+      event:
+        exclude:
+          - tag
+
   - name: go-test
     image: golang:1.17
     commands:

app/api/bridges.go

@@ -52,7 +52,7 @@ func Bridges(r gin.IRoutes) {
 			return []models.Bridge{bridge}, nil
 		}
 
-		bridges, err := driver.SearchBridge(ctxOf(c), body.Address, body.Token, body.DryRun)
+		bridges, err := driver.SearchBridge(ctxOf(c), body.Address, body.DryRun)
 		if err != nil {
 			return nil, err
 		}

app/api/devices.go

@@ -7,7 +7,6 @@ import (
 	"git.aiterp.net/lucifer/new-server/models"
 	"github.com/gin-gonic/gin"
 	"log"
-	"strconv"
 	"time"
 )
 
@@ -138,10 +137,12 @@ func Devices(r gin.IRoutes) {
 
 		config.PublishChannel <- devices
 
+		go func() {
 			err = config.DeviceRepository().SaveMany(ctxOf(c), models.SMState, devices)
 			if err != nil {
 				log.Println("Failed to save devices states")
 			}
+		}()
 
 		return withSceneState(devices), nil
 	}))
@@ -266,46 +267,6 @@ 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 {

app/config/driver.go

@@ -4,7 +4,6 @@ import (
 	"git.aiterp.net/lucifer/new-server/internal/drivers"
 	"git.aiterp.net/lucifer/new-server/internal/drivers/hue"
 	"git.aiterp.net/lucifer/new-server/internal/drivers/lifx"
-	"git.aiterp.net/lucifer/new-server/internal/drivers/mill"
 	"git.aiterp.net/lucifer/new-server/internal/drivers/nanoleaf"
 	"git.aiterp.net/lucifer/new-server/models"
 	"sync"
@@ -19,7 +18,6 @@ func DriverProvider() models.DriverProvider {
 			models.DTNanoLeaf: &nanoleaf.Driver{},
 			models.DTHue:      &hue.Driver{},
 			models.DTLIFX:     &lifx.Driver{},
-			models.DTMill:     &mill.Driver{},
 		}
 	})
 

app/config/env.go

@@ -1,27 +1,10 @@
 package config
 
 import (
-	"log"
 	"os"
 	"strconv"
-	"time"
 )
 
-func Location() *time.Location {
-	env, ok := os.LookupEnv("LUCIFER_LOCATION")
-	if !ok {
-		return time.UTC
-	}
-
-	loc, err := time.LoadLocation(env)
-	if err != nil {
-		log.Printf("Location lookup failed: %s (%s)", env, err.Error())
-		return time.UTC
-	}
-
-	return loc
-}
-
 func MySqlHost() string     { return strEnv("LUCIFER_MYSQL_HOST") }
 func MySqlPort() int        { return intEnv("LUCIFER_MYSQL_PORT") }
 func MySqlSchema() string   { return strEnv("LUCIFER_MYSQL_SCHEMA") }

app/server.go

@@ -7,7 +7,6 @@ import (
 	"git.aiterp.net/lucifer/new-server/app/config"
 	"git.aiterp.net/lucifer/new-server/app/services"
 	"git.aiterp.net/lucifer/new-server/app/services/publisher"
-	"git.aiterp.net/lucifer/new-server/models"
 	"github.com/gin-gonic/gin"
 	"log"
 	"time"
@@ -39,7 +38,5 @@ func StartServer() {
 	api.EventHandlers(apiGin.Group("/event-handlers"))
 	api.Scenes(apiGin.Group("/scenes"))
 
-	models.TimeOfDayTimeZone = config.Location()
-
 	log.Fatal(ginny.Run(fmt.Sprintf("0.0.0.0:%d", config.ServerPort())))
 }

app/services/events.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"git.aiterp.net/lucifer/new-server/app/config"
-	"git.aiterp.net/lucifer/new-server/app/services/publisher"
 	"git.aiterp.net/lucifer/new-server/models"
 	"log"
 	"math"
@@ -67,6 +66,7 @@ func handleEvent(event models.Event) (responses []models.Event) {
 	err := handleSpecial(event)
 	if err != nil {
 		log.Printf("Special event handler error (%s): %v", event.Name, err)
+		return
 	}
 
 	paramStrings := make([]string, 0, 8)
@@ -220,29 +220,6 @@ func handleSpecial(event models.Event) error {
 		}
 
 		return driver.Publish(ctx, bridge, devices)
-	case models.ENSensorPresenceStarted, models.ENSensorPresenceEnded, models.ENSensorTemperature:
-		id, _ := strconv.Atoi(event.Payload["deviceId"])
-		updateTime, _ := strconv.ParseInt(event.Payload["lastUpdated"], 10, 64)
-		state := models.SceneSensor{
-			ID:          id,
-			UpdateTime:  time.Unix(updateTime, 0),
-		}
-
-		switch event.Name {
-		case models.ENSensorPresenceStarted:
-			presence := true
-			state.Presence = &presence
-		case models.ENSensorPresenceEnded:
-			presence := false
-			state.Presence = &presence
-		case models.ENSensorTemperature:
-			temperature, _ := strconv.ParseFloat(event.Payload["temperature"], 64)
-			state.Temperature = &temperature
-		}
-
-		publisher.Global().UpdateSensor(state)
-
-		return nil
 	default:
 		return nil
 	}

app/services/handlerfactory/config.go

@@ -1,62 +0,0 @@
-package handlerfactory
-
-import (
-	"git.aiterp.net/lucifer/new-server/models"
-	"gopkg.in/yaml.v2"
-	"io"
-	"io/ioutil"
-	"strings"
-)
-
-type FactoryConfig struct {
-	Mode            FCMOde   `yaml:"mode"`
-	Target          string   `yaml:"target"`
-	SceneNames      []string `yaml:"scenes"`
-	TriggerDeviceID string   `yaml:"trigger_device_id"`
-	After           []After  `yaml:"after"`
-	From            string   `yaml:"from"`
-	To              string   `yaml:"to"`
-}
-
-type FCMOde string
-
-var (
-	SceneDimmer  FCMOde = "SceneDimmer"
-	MotionSensor FCMOde = "MotionSensor"
-)
-
-type After struct {
-	Minutes  int                   `yaml:"minutes"`
-	NewState models.NewDeviceState `yaml:"new_state"`
-}
-
-func ParseConfigs(reader io.Reader) ([]FactoryConfig, error) {
-	readAll, err := ioutil.ReadAll(reader)
-	if err != nil {
-		return nil, err
-	}
-
-	splits := strings.Split(string(readAll), "\n---\n")
-	configs := make([]FactoryConfig, 0, 8)
-	for _, split := range splits {
-		var factoryConfig FactoryConfig
-		err := yaml.NewDecoder(strings.NewReader(split)).Decode(&factoryConfig)
-		if err != nil {
-			return nil, err
-		}
-
-		configs = append(configs, factoryConfig)
-	}
-
-	return configs, nil
-}
-
-func (f *FactoryConfig) FromTime() models.TimeOfDay {
-	tod, _ := models.ParseTimeOfDay(f.From)
-	return tod
-}
-
-func (f *FactoryConfig) ToTime() models.TimeOfDay {
-	tod, _ := models.ParseTimeOfDay(f.To)
-	return tod
-}

app/services/handlerfactory/factory.go

@@ -1,235 +0,0 @@
-package handlerfactory
-
-import (
-	"fmt"
-	"git.aiterp.net/lucifer/new-server/models"
-)
-
-func CreateHandlers(
-	config FactoryConfig,
-	scenes []models.Scene,
-	existing []models.EventHandler,
-) ([]models.EventHandler, []models.EventHandler) {
-	switch config.Mode {
-	case SceneDimmer:
-		return sceneDimmer(config, scenes, existing)
-	case MotionSensor:
-		return motionSensor(config, existing)
-	default:
-		return []models.EventHandler{}, []models.EventHandler{}
-	}
-}
-
-func sceneDimmer(
-	config FactoryConfig,
-	scenes []models.Scene,
-	existing []models.EventHandler,
-) ([]models.EventHandler, []models.EventHandler) {
-	kind, refValue := models.ParseFetchString(config.Target)
-
-	toRemove := make([]models.EventHandler, 0, 8)
-	for _, old := range existing {
-		if old.Conditions["deviceId"].EQ == config.TriggerDeviceID {
-			toRemove = append(toRemove, old)
-		}
-	}
-
-	resolvedScenes := make([]models.Scene, 0, len(config.SceneNames))
-	for _, name := range config.SceneNames {
-		for _, scene := range scenes {
-			if name == scene.Name {
-				resolvedScenes = append(resolvedScenes, scene)
-				break
-			}
-		}
-	}
-
-	if len(scenes) < 2 {
-		return []models.EventHandler{}, []models.EventHandler{}
-	}
-
-	handlers := make([]models.EventHandler, 0, len(scenes)+4)
-
-	handlers = append(handlers, models.EventHandler{
-		EventName: "ButtonPressed",
-		Conditions: map[string]models.EventCondition{
-			"deviceId":   {EQ: config.TriggerDeviceID},
-			"buttonName": {EQ: "On"},
-		},
-		OneShot:     false,
-		Priority:    100,
-		TargetKind:  kind,
-		TargetValue: refValue,
-		Actions:     models.EventAction{SetPower: &myTrue},
-		From:        config.FromTime(),
-		To:          config.ToTime(),
-	})
-
-	handlers = append(handlers, models.EventHandler{
-		EventName: "ButtonPressed",
-		Conditions: map[string]models.EventCondition{
-			"deviceId":   {EQ: config.TriggerDeviceID},
-			"buttonName": {EQ: "Off"},
-		},
-		OneShot:     false,
-		Priority:    100,
-		TargetKind:  kind,
-		TargetValue: refValue,
-		Actions:     models.EventAction{SetPower: &myFalse},
-		From:        config.FromTime(),
-		To:          config.ToTime(),
-	})
-
-	for i, scene := range resolvedScenes {
-		if i > 0 {
-			handlers = append(handlers, models.EventHandler{
-				EventName: "ButtonPressed",
-				Conditions: map[string]models.EventCondition{
-					"deviceId":   {EQ: config.TriggerDeviceID},
-					"buttonName": {EQ: "DimDown"},
-					"any.scene":  {EQ: fmt.Sprintf("%d", scene.ID)},
-				},
-				OneShot:     false,
-				Priority:    100,
-				TargetKind:  kind,
-				TargetValue: refValue,
-				Actions: models.EventAction{SetScene: &models.DeviceSceneAssignment{
-					SceneID:    resolvedScenes[i-1].ID,
-					Group:      refValue,
-					DurationMS: 0,
-				}},
-				From: config.FromTime(),
-				To:   config.ToTime(),
-			})
-		}
-
-		if i < len(resolvedScenes)-1 {
-			handlers = append(handlers, models.EventHandler{
-				EventName: "ButtonPressed",
-				Conditions: map[string]models.EventCondition{
-					"deviceId":   {EQ: config.TriggerDeviceID},
-					"buttonName": {EQ: "DimUp"},
-					"any.scene":  {EQ: fmt.Sprintf("%d", scene.ID)},
-				},
-				OneShot:     false,
-				Priority:    100,
-				TargetKind:  kind,
-				TargetValue: refValue,
-				Actions: models.EventAction{SetScene: &models.DeviceSceneAssignment{
-					SceneID:    resolvedScenes[i+1].ID,
-					Group:      refValue,
-					DurationMS: 0,
-				}},
-				From: config.FromTime(),
-				To:   config.ToTime(),
-			})
-		}
-	}
-
-	handlers = append(handlers, models.EventHandler{
-		EventName: "ButtonPressed",
-		Conditions: map[string]models.EventCondition{
-			"deviceId":   {EQ: config.TriggerDeviceID},
-			"buttonName": {EQ: "DimDown"},
-		},
-		OneShot:     false,
-		Priority:    90,
-		TargetKind:  kind,
-		TargetValue: refValue,
-		Actions: models.EventAction{SetScene: &models.DeviceSceneAssignment{
-			SceneID:    resolvedScenes[len(resolvedScenes)-1].ID,
-			Group:      refValue,
-			DurationMS: 0,
-		}},
-		From: config.FromTime(),
-		To:   config.ToTime(),
-	})
-
-	handlers = append(handlers, models.EventHandler{
-		EventName: "ButtonPressed",
-		Conditions: map[string]models.EventCondition{
-			"deviceId":   {EQ: config.TriggerDeviceID},
-			"buttonName": {EQ: "DimUp"},
-		},
-		OneShot:     false,
-		Priority:    90,
-		TargetKind:  kind,
-		TargetValue: refValue,
-		Actions: models.EventAction{SetScene: &models.DeviceSceneAssignment{
-			SceneID:    resolvedScenes[0].ID,
-			Group:      refValue,
-			DurationMS: 0,
-		}},
-		From: config.FromTime(),
-		To:   config.ToTime(),
-	})
-
-	return optimizeLists(handlers, toRemove)
-}
-
-func motionSensor(
-	config FactoryConfig,
-	existing []models.EventHandler,
-) ([]models.EventHandler, []models.EventHandler) {
-	kind, refValue := models.ParseFetchString(config.Target)
-
-	toRemove := make([]models.EventHandler, 0, 8)
-	for _, old := range existing {
-		if old.From != config.FromTime() || old.To != config.ToTime() {
-			continue
-		}
-
-		if old.Conditions["deviceId"].EQ == config.TriggerDeviceID {
-			toRemove = append(toRemove, old)
-		}
-	}
-
-	handlers := make([]models.EventHandler, 0, len(config.After))
-	for _, after := range config.After {
-		if after.Minutes == 0 {
-			handlers = append(handlers, models.EventHandler{
-				EventName: "SensorPresenceStarted",
-				Conditions: map[string]models.EventCondition{
-					"deviceId": {EQ: config.TriggerDeviceID},
-				},
-				OneShot:     false,
-				Priority:    100,
-				TargetKind:  kind,
-				TargetValue: refValue,
-				Actions: models.EventAction{
-					SetPower:       after.NewState.Power,
-					SetColor:       after.NewState.Color,
-					SetIntensity:   after.NewState.Intensity,
-					SetTemperature: after.NewState.Temperature,
-				},
-				From: config.FromTime(),
-				To:   config.ToTime(),
-			})
-		} else {
-			handlers = append(handlers, models.EventHandler{
-				EventName: "SensorPresenceEnded",
-				Conditions: map[string]models.EventCondition{
-					"deviceId":       {EQ: config.TriggerDeviceID},
-					"minutesElapsed": {EQ: fmt.Sprintf("%d", after.Minutes)},
-				},
-				OneShot:     false,
-				Priority:    100,
-				TargetKind:  kind,
-				TargetValue: refValue,
-				Actions: models.EventAction{
-					SetPower:       after.NewState.Power,
-					SetColor:       after.NewState.Color,
-					SetIntensity:   after.NewState.Intensity,
-					SetTemperature: after.NewState.Temperature,
-				},
-				From: config.FromTime(),
-				To:   config.ToTime(),
-			})
-		}
-	}
-
-	return optimizeLists(handlers, toRemove)
-}
-
-var myTrue = true
-var myFalse = false

app/services/handlerfactory/utils.go

@@ -1,72 +0,0 @@
-package handlerfactory
-
-import (
-	"git.aiterp.net/lucifer/new-server/models"
-)
-
-func optimizeLists(
-	add []models.EventHandler,
-	del []models.EventHandler,
-) ([]models.EventHandler, []models.EventHandler) {
-	newAdd := make([]models.EventHandler, 0, len(add))
-	newDel := make([]models.EventHandler, 0, len(del))
-
-OptimizeLoop1:
-	for _, addItem := range add {
-		for _, delItem := range del {
-			if checkDuplicate(&addItem, &delItem) {
-				continue OptimizeLoop1
-			}
-		}
-
-		newAdd = append(newAdd, addItem)
-	}
-
-OptimizeLoop2:
-	for _, delItem := range del {
-		for _, addItem := range add {
-			if checkDuplicate(&addItem, &delItem) {
-				continue OptimizeLoop2
-			}
-		}
-
-		newDel = append(newDel, delItem)
-	}
-
-	return newAdd, newDel
-}
-
-func checkDuplicate(a *models.EventHandler, b *models.EventHandler) bool {
-	check := true
-	check = check && a.EventName == b.EventName
-	check = check && len(a.Conditions) == len(b.Conditions)
-	for k := range a.Conditions {
-		check = check && a.Conditions[k] == b.Conditions[k]
-	}
-	check = check && a.OneShot == b.OneShot
-	check = check && a.Priority == b.Priority
-	check = check && a.TargetKind == b.TargetKind
-	check = check && a.TargetValue == b.TargetValue
-	check = check && a.From == b.From
-	check = check && a.To == b.To
-
-	aPower := a.Actions.SetPower
-	bPower := b.Actions.SetPower
-	powerEq := (aPower == nil && bPower == nil) || (aPower != nil && bPower != nil && *aPower == *bPower)
-
-	aColor := a.Actions.SetColor
-	bColor := b.Actions.SetColor
-	colorEq := (aColor == nil && bColor == nil) || (aColor != nil && bColor != nil && *aColor == *bColor)
-
-	aInt := a.Actions.SetIntensity
-	bInt := b.Actions.SetIntensity
-	intEq := (aInt == nil && bInt == nil) || (aInt != nil && bInt != nil && *aInt == *bInt)
-
-	aTemp := a.Actions.SetTemperature
-	bTemp := b.Actions.SetTemperature
-	tempEq := (aTemp == nil && bTemp == nil) || (aTemp != nil && bTemp != nil && *aTemp == *bTemp)
-
-	check = check && powerEq && colorEq && intEq && tempEq
-
-	return check
-}

app/services/publisher/publisher.go

@@ -17,7 +17,6 @@ type Publisher struct {
 	started         map[int]bool
 	pending         map[int][]models.Device
 	waiting         map[int]chan struct{}
-	sensorCache     map[int]models.SceneSensor
 }
 
 func (p *Publisher) SceneState(deviceID int) *models.DeviceState {
@@ -43,15 +42,6 @@ func (p *Publisher) UpdateScene(data models.Scene) {
 	p.mu.Unlock()
 }
 
-func (p *Publisher) UpdateSensor(data models.SceneSensor) {
-	p.mu.Lock()
-	if assignment := p.sceneAssignment[data.ID]; assignment != nil {
-		assignment.UpdateSensor(data)
-	}
-	p.sensorCache[data.ID] = data
-	p.mu.Unlock()
-}
-
 func (p *Publisher) ReloadScenes(ctx context.Context) error {
 	scenes, err := config.SceneRepository().FetchAll(ctx)
 	if err != nil {
@@ -100,10 +90,6 @@ func (p *Publisher) Publish(devices ...models.Device) {
 
 		if p.sceneAssignment[device.ID] != nil {
 			p.sceneAssignment[device.ID].UpsertDevice(device)
-
-			if cache, ok := p.sensorCache[device.ID]; ok {
-				p.sceneAssignment[device.ID].UpdateSensor(cache)
-			}
 		} else {
 			p.pending[device.BridgeID] = append(p.pending[device.BridgeID], device)
 			if p.waiting[device.BridgeID] != nil {
@@ -124,16 +110,19 @@ func (p *Publisher) Run() {
 	ticker := time.NewTicker(time.Millisecond * 100)
 	deleteList := make([]int, 0, 8)
 	updatedList := make([]models.Device, 0, 16)
+	reassignList := make([]models.Device, 0, 16)
 
 	for range ticker.C {
 		deleteList = deleteList[:0]
 		updatedList = updatedList[:0]
+		reassignList = reassignList[:0]
 
 		p.mu.Lock()
 		for i, scene := range p.scenes {
 			if (!scene.endTime.IsZero() && time.Now().After(scene.endTime)) || scene.Empty() {
 				deleteList = append(deleteList, i-len(deleteList))
 				updatedList = append(updatedList, scene.AllDevices()...)
+				reassignList = append(reassignList, scene.AllDevices()...)
 
 				log.Printf("Removing scene instance for %s (%d)", scene.data.Name, scene.data.ID)
 
@@ -153,6 +142,14 @@ func (p *Publisher) Run() {
 			p.scenes = append(p.scenes[:i], p.scenes[i+1:]...)
 		}
 
+		for _, device := range reassignList {
+			p.reassignDevice(device)
+
+			if p.sceneAssignment[device.ID] != nil {
+				p.sceneAssignment[device.ID].UpsertDevice(device)
+			}
+		}
+
 		for _, device := range updatedList {
 			if !p.started[device.BridgeID] {
 				p.started[device.BridgeID] = true
@@ -173,10 +170,10 @@ func (p *Publisher) Run() {
 // should trigger an update.
 func (p *Publisher) reassignDevice(device models.Device) bool {
 	var selectedAssignment *models.DeviceSceneAssignment
-	for _, assignment := range device.SceneAssignments {
+	for i, assignment := range device.SceneAssignments {
 		duration := time.Duration(assignment.DurationMS) * time.Millisecond
 		if duration <= 0 || time.Now().Before(assignment.StartTime.Add(duration)) {
-			selectedAssignment = &assignment
+			selectedAssignment = &device.SceneAssignments[i]
 		}
 	}
 
@@ -305,7 +302,6 @@ var publisher = Publisher{
 	started:         make(map[int]bool),
 	pending:         make(map[int][]models.Device),
 	waiting:         make(map[int]chan struct{}),
-	sensorCache:     make(map[int]models.SceneSensor),
 }
 
 func Global() *Publisher {

app/services/publisher/scene.go

@@ -13,25 +13,11 @@ type Scene struct {
 	roleMap    map[int]int
 	roleList   map[int][]models.Device
 	lastStates map[int]models.DeviceState
-	sensors    []models.SceneSensor
 
 	due          bool
 	lastInterval int64
 }
 
-func (s *Scene) UpdateSensor(data models.SceneSensor) {
-	s.due = true
-
-	for i, sensor := range s.sensors {
-		if sensor.ID == data.ID {
-			s.sensors[i] = data
-			return
-		}
-	}
-
-	s.sensors = append(s.sensors, data)
-}
-
 // UpdateScene updates the scene data and re-seats all devices.
 func (s *Scene) UpdateScene(data models.Scene) {
 	devices := make([]models.Device, 0, 16)
@@ -100,13 +86,6 @@ func (s *Scene) RemoveDevice(device models.Device) {
 
 	delete(s.roleMap, device.ID)
 	delete(s.lastStates, device.ID)
-
-	for i, sensor := range s.sensors {
-		if sensor.ID == device.ID {
-			s.sensors = append(s.sensors[:i], s.sensors[i+1:]...)
-			break
-		}
-	}
 }
 
 func (s *Scene) Empty() bool {
@@ -151,7 +130,6 @@ func (s *Scene) Run() []models.Device {
 		return []models.Device{}
 	}
 
-	currentTime := time.Now()
 	intervalNumber := int64(0)
 	intervalMax := int64(1)
 	if s.data.IntervalMS > 0 {
@@ -171,31 +149,14 @@ func (s *Scene) Run() []models.Device {
 			continue
 		}
 
-		sensorCount := 0
-		for _, device := range list {
-			if device.IsOnlySensor() {
-				sensorCount += 1
-			}
-		}
-
 		role := s.data.Roles[i]
 
-		jSkip := 0
-
 		for j, device := range list {
-			if device.IsOnlySensor() {
-				updatedDevices = append(updatedDevices, device)
-				jSkip += 1
-				continue
-			}
-
 			newState := role.ApplyEffect(&device, models.SceneRunContext{
-				CurrentTime:    currentTime,
+				Index:          j,
-				Index:          j - jSkip,
+				Length:         len(list),
-				Length:         len(list) - sensorCount,
 				IntervalNumber: intervalNumber,
 				IntervalMax:    intervalMax,
-				Sensors:        s.sensors,
 			})
 
 			err := device.SetState(newState)

cmd/bridgetest/main.go

@@ -33,7 +33,7 @@ func main() {
 	}
 
 	// Find bridge
-	bridges, err := driver.SearchBridge(context.Background(), *flagAddress, *flagToken, !*flagPair)
+	bridges, err := driver.SearchBridge(context.Background(), *flagAddress, !*flagPair)
 	if err != nil {
 		log.Fatalln("Failed to search bridge:", err)
 	}

cmd/lucy/factorycmd.go

@@ -1,75 +0,0 @@
-package main
-
-import (
-	"context"
-	"fmt"
-	"git.aiterp.net/lucifer/new-server/app/client"
-	"git.aiterp.net/lucifer/new-server/app/services/handlerfactory"
-	"log"
-	"os"
-)
-
-func factoryCmd(
-	ctx context.Context,
-	c client.Client,
-) {
-	cmd := parseCommand(os.Args[2:])
-
-	switch cmd.Name {
-	case "run":
-		fileName := cmd.Params.Get(0).String()
-		if fileName == nil {
-			log.Fatalln("Missing filename")
-		}
-
-		scenes, err := c.GetScenes(ctx)
-		if err != nil {
-			log.Fatalln(err.Error())
-		}
-
-		handlers, err := c.GetHandlers(ctx)
-		if err != nil {
-			log.Fatalln(err.Error())
-		}
-
-		file, err := os.Open(*fileName)
-		if err != nil {
-			log.Fatalln("Failed to open file:", err)
-		}
-		defer file.Close()
-
-		configs, err := handlerfactory.ParseConfigs(file)
-		if err != nil {
-			log.Fatalln("Failed to parse file:", err)
-		}
-
-		for _, config := range configs {
-			toAdd, toRemove := handlerfactory.CreateHandlers(config, scenes, handlers)
-
-			for _, removing := range toRemove {
-				_, err := c.DeleteHandler(ctx, removing.ID)
-				if err != nil {
-					log.Fatalln(err.Error())
-				}
-
-				log.Printf("Removed handler %d", removing.ID)
-			}
-
-			for _, adding := range toAdd {
-				res, err := c.AddHandler(ctx, adding)
-				if err != nil {
-					log.Fatalln(err.Error())
-				}
-
-				log.Printf("Added handler %d", res.ID)
-			}
-		}
-
-	default:
-		if cmd.Name != "help" {
-			log.Println("Unknown command:", cmd.Name)
-		}
-
-		_, _ = fmt.Fprintln(os.Stderr, helpString[1:])
-	}
-}

cmd/lucy/handlercmd.go

@@ -76,21 +76,6 @@ func handlerCmd(
 
 		WriteHandlerInfoTable(os.Stdout, []models.EventHandler{*returned})
 	case "delete":
-		if cmd.Params.Get(0).StringOr("_not") == "all" {
-			handlers, err := c.GetHandlers(ctx)
-			if err != nil {
-				log.Fatalln(err)
-			}
-
-			for _, handler := range handlers {
-				_, err = c.DeleteHandler(ctx, handler.ID)
-				if err != nil {
-					log.Fatalln(err)
-				}
-			}
-
-			log.Printf("Deleted %d handlers", len(handlers))
-		} else {
 		id := cmd.Params.Get(0).Int()
 		if id == nil {
 			log.Fatalln("ID missing")
@@ -102,7 +87,6 @@ func handlerCmd(
 		}
 
 		WriteHandlerInfoTable(os.Stdout, []models.EventHandler{*handler})
-		}
 	default:
 		if cmd.Name != "help" {
 			log.Println("Unknown command:", cmd.Name)
@@ -173,7 +157,6 @@ func applyCmdToHandler(model models.EventHandler, cmd Command) models.EventHandl
 	model.Actions.SetPower = nds.Power
 	model.Actions.SetColor = nds.Color
 	model.Actions.SetIntensity = nds.Intensity
-	model.Actions.SetTemperature = nds.Temperature
 
 	// Add intensity
 	model.Actions.AddIntensity = cmd.Params.Get("add-intensity").Float()

cmd/lucy/help.go

@@ -32,38 +32,6 @@ EVENT HANDLER COMMANDS
                <-fire> <-fire.payload.*>
   handler delete <id>
 
-EVENT HANDLER FACTORY COMMANDS
-
-  factory run <file.yaml>
-
-File example (use '---' to delimit multiple configs in one file):
-mode: SceneDimmer
-target: tag:Soverom
-scenes:
- - kveldslys
- - landskap
- - vasking
-trigger_device_id: 14
----
-mode: MotionSensor
-target: tag:Bod
-trigger_device_id: 36
-after:
- - minutes: 0
-   new_state:
-     power: true
-     color: hs:240,0.6
-     intensity: 0.8
- - minutes: 1
-   new_state:
-     power: false
-from: 08:00
-to: 15:59:59
----
-(more modes coming soon)
-
-WARNING: Similar event handlers will be removed!
-
 EVENT COMMANDS
   run <event name> <*=S>
 

cmd/lucy/main.go

@@ -93,9 +93,6 @@ func main() {
 			WriteDeviceInfoTable(os.Stdout, devices)
 		}
 
-	case "factory":
-		factoryCmd(ctx, c)
-
 	case "handler":
 		handlerCmd(ctx, c)
 
@@ -129,3 +126,4 @@ func main() {
 		_, _ = fmt.Fprintln(os.Stderr, helpString[1:])
 	}
 }
+

cmd/lucy/tables.go

@@ -44,7 +44,7 @@ func WriteDeviceStateTable(w io.Writer, devices []models.Device) {
 
 		temperatureString := ""
 		if v.HasCapability(models.DCTemperatureControl, models.DCTemperatureSensor) {
-			temperatureString = fmt.Sprintf("%d", v.State.Temperature)
+			temperatureString = strconv.FormatFloat(v.State.Temperature, 'f', -1, 64)
 		}
 
 		intensityString := ""

internal/drivers/hue/bridge.go

@@ -10,7 +10,6 @@ import (
 	"io"
 	"net"
 	"net/http"
-	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -23,7 +22,6 @@ type Bridge struct {
 	externalID     int
 	lightStates    []*hueLightState
 	sensorStates   []*hueSensorState
-	quarantine     map[string]time.Time
 	syncingPublish uint32
 }
 
@@ -35,10 +33,6 @@ 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 {
@@ -73,10 +67,6 @@ 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 {
@@ -146,44 +136,6 @@ func (b *Bridge) SyncStale(ctx context.Context) error {
 	return eg.Wait()
 }
 
-func (b *Bridge) ForgetDevice(ctx context.Context, device models.Device) error {
-	// Find index
-	b.mu.Lock()
-	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
-	}
-
-	// Delete light from bridge
-	err := b.deleteLight(ctx, index)
-	if err != nil {
-		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
-}
-
 func (b *Bridge) SyncSensors(ctx context.Context) ([]models.Event, error) {
 	sensorMap, err := b.getSensors(ctx)
 	if err != nil {
@@ -218,14 +170,6 @@ 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) 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)
@@ -263,33 +207,6 @@ 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
@@ -309,29 +226,6 @@ 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,14 +3,8 @@ 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"`
@@ -89,58 +83,6 @@ 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"`
@@ -250,36 +192,6 @@ 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/driver.go

@@ -19,7 +19,7 @@ type Driver struct {
 	bridges []*Bridge
 }
 
-func (d *Driver) SearchBridge(ctx context.Context, address, _ string, dryRun bool) ([]models.Bridge, error) {
+func (d *Driver) SearchBridge(ctx context.Context, address string, dryRun bool) ([]models.Bridge, error) {
 	if address == "" {
 		if !dryRun {
 			return nil, models.ErrAddressOnlyDryRunnable
@@ -372,15 +372,6 @@ 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 {

internal/drivers/hue/state.go

@@ -1,7 +1,6 @@
 package hue
 
 import (
-	"encoding/json"
 	"git.aiterp.net/lucifer/new-server/models"
 	"strconv"
 	"time"
@@ -17,37 +16,12 @@ 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
 			}
@@ -93,13 +67,6 @@ 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 {
@@ -113,7 +80,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
 		}
 	}
@@ -219,7 +186,6 @@ func (state *hueSensorState) Update(newData SensorData) *models.Event {
 						"deviceInternalId": newData.UniqueID,
 						"minutesElapsed":   strconv.Itoa(state.presenceCooldown - 1),
 						"secondsElapsed":   strconv.Itoa((state.presenceCooldown - 1) * 60),
-						"lastUpdated":      strconv.FormatInt(stateTime.Unix(), 10),
 					},
 				}
 			}
@@ -236,7 +202,6 @@ func (state *hueSensorState) Update(newData SensorData) *models.Event {
 					"temperature":      strconv.FormatFloat(float64(newData.State.Temperature)/100, 'f', 2, 64),
 					"deviceId":         strconv.Itoa(state.externalID),
 					"deviceInternalId": newData.UniqueID,
-					"lastUpdated":      strconv.FormatInt(stateTime.Unix(), 10),
 				},
 			}
 		}

internal/drivers/lifx/driver.go

@@ -14,7 +14,7 @@ type Driver struct {
 	bridges []*Bridge
 }
 
-func (d *Driver) SearchBridge(ctx context.Context, address, _ string, _ bool) ([]models.Bridge, error) {
+func (d *Driver) SearchBridge(ctx context.Context, address string, _ bool) ([]models.Bridge, error) {
 	if address == "" {
 		ifaces, err := net.Interfaces()
 		if err != nil {

internal/drivers/mill/bridge.go

@@ -1,240 +0,0 @@
-package mill
-
-import (
-	"bytes"
-	"context"
-	"crypto/rand"
-	"crypto/sha1"
-	"encoding/json"
-	"fmt"
-	"git.aiterp.net/lucifer/new-server/models"
-	"io"
-	"log"
-	"net/http"
-	"strconv"
-	"sync"
-	"time"
-)
-
-type bridge struct {
-	mu sync.Mutex
-
-	luciferID int
-	username  string
-	password  string
-
-	token         string
-	userId        int
-	mustRefreshBy time.Time
-
-	luciferMillIDMap map[int]int
-	millLuciferIDMap map[int]int
-}
-
-func (b *bridge) listDevices(ctx context.Context) ([]models.Device, error) {
-	err := b.authenticate(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	var shlRes listHomeResBody
-	err = b.command(ctx, "selectHomeList", listHomeReqBody{}, &shlRes)
-	if err != nil {
-		return nil, err
-	}
-
-	devices := make([]millDevice, 0, 16)
-	for _, home := range shlRes.HomeList {
-		var gidRes listDeviceResBody
-		err = b.command(ctx, "getIndependentDevices", listDeviceReqBody{HomeID: home.HomeID}, &gidRes)
-		if err != nil {
-			return nil, err
-		}
-
-		devices = append(devices, gidRes.DeviceInfo...)
-	}
-
-	luciferDevices := make([]models.Device, len(devices), len(devices))
-	for i, device := range devices {
-		luciferDevices[i] = models.Device{
-			ID:           b.millLuciferIDMap[device.DeviceID],
-			BridgeID:     b.luciferID,
-			InternalID:   fmt.Sprintf("%d", device.DeviceID),
-			Icon:         "heater",
-			Name:         device.DeviceName,
-			Capabilities: []models.DeviceCapability{models.DCTemperatureControl, models.DCPower},
-			ButtonNames:  nil,
-			DriverProperties: map[string]interface{}{
-				"subDomain": fmt.Sprintf("%d", device.SubDomainID),
-			},
-			UserProperties:   nil,
-			SceneAssignments: nil,
-			SceneState:       nil,
-			State: models.DeviceState{
-				Power:       device.PowerStatus > 0,
-				Temperature: device.HolidayTemp,
-			},
-			Tags: nil,
-		}
-	}
-
-	return luciferDevices, nil
-}
-
-func (b *bridge) pushStateChange(ctx context.Context, deviceModel models.Device) error {
-	b.mu.Lock()
-	if b.luciferMillIDMap == nil {
-		b.luciferMillIDMap = make(map[int]int, 4)
-		b.millLuciferIDMap = make(map[int]int, 4)
-	}
-
-	if b.luciferMillIDMap[deviceModel.ID] == 0 {
-		millID, _ := strconv.Atoi(deviceModel.InternalID)
-		b.luciferMillIDMap[deviceModel.ID] = millID
-		b.millLuciferIDMap[millID] = deviceModel.ID
-	}
-	b.mu.Unlock()
-
-	status := 0
-	if deviceModel.State.Power {
-		status = 1
-	}
-	powerReq := deviceControlReqBody{
-		SubDomain:  deviceModel.DriverProperties["subDomain"].(string),
-		DeviceID:   b.luciferMillIDMap[deviceModel.ID],
-		TestStatus: 1,
-		Status:     status,
-	}
-	err := b.command(ctx, "deviceControl", powerReq, nil)
-	if err != nil {
-		return err
-	}
-
-	tempReq := changeInfoReqBody{
-		DeviceID:    b.luciferMillIDMap[deviceModel.ID],
-		Value:       deviceModel.State.Temperature,
-		TimeZoneNum: "+02:00",
-		Key:         "holidayTemp",
-	}
-	err = b.command(ctx, "changeDeviceInfo", tempReq, nil)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (b *bridge) command(ctx context.Context, command string, payload interface{}, target interface{}) error {
-	err := b.authenticate(ctx)
-	if err != nil {
-		return err
-	}
-
-	url := serviceEndpoint + command
-	method := "POST"
-	nonce := makeNonce()
-	timestamp := fmt.Sprintf("%d", time.Now().Unix())
-	timeout := "300"
-
-	h := sha1.New()
-	h.Write([]byte(timeout))
-	h.Write([]byte(timestamp))
-	h.Write([]byte(nonce))
-	h.Write([]byte(b.token))
-	signature := fmt.Sprintf("%x", h.Sum(nil))
-
-	body, err := json.Marshal(payload)
-	if err != nil {
-		return err
-	}
-
-	req, err := http.NewRequestWithContext(ctx, method, url, bytes.NewReader(body))
-	if err != nil {
-		return err
-	}
-
-	addDefaultHeaders(req)
-	req.Header.Add("X-Zc-Timestamp", timestamp)
-	req.Header.Add("X-Zc-Timeout", timeout)
-	req.Header.Add("X-Zc-Nonce", nonce)
-	req.Header.Add("X-Zc-User-Id", fmt.Sprintf("%d", b.userId))
-	req.Header.Add("X-Zc-User-Signature", signature)
-	req.Header.Add("X-Zc-Content-Length", fmt.Sprintf("%d", len(body)))
-
-	res, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return models.ErrCannotForwardRequest
-	} else if res.StatusCode != 200 {
-		return models.ErrIncorrectToken
-	}
-
-	if target == nil {
-		return nil
-	}
-
-	err = json.NewDecoder(res.Body).Decode(&target)
-	if err != nil {
-		return models.ErrUnexpectedResponse
-	}
-
-	return nil
-}
-
-func (b *bridge) authenticate(ctx context.Context) error {
-	b.mu.Lock()
-	defer b.mu.Unlock()
-
-	if b.mustRefreshBy.Before(time.Now().Add(-1 * time.Minute)) {
-		body, err := json.Marshal(authReqBody{
-			Account:  b.username,
-			Password: b.password,
-		})
-		if err != nil {
-			return models.ErrMissingToken
-		}
-
-		req, err := http.NewRequestWithContext(ctx, "POST", accountEndpoint + "login", bytes.NewReader(body))
-		if err != nil {
-			return models.ErrMissingToken
-		}
-
-		addDefaultHeaders(req)
-
-		res, err := http.DefaultClient.Do(req)
-		if err != nil {
-			return models.ErrCannotForwardRequest
-		} else if res.StatusCode != 200 {
-			return models.ErrIncorrectToken
-		}
-
-		var resBody authResBody
-		err = json.NewDecoder(res.Body).Decode(&resBody)
-		if err != nil {
-			return models.ErrBridgeSearchFailed
-		}
-
-		log.Printf("Mill: Authenticated as %s", resBody.NickName)
-		b.userId = resBody.UserID
-		b.token = resBody.Token
-		b.mustRefreshBy, err = time.ParseInLocation("2006-01-02 15:04:05", resBody.TokenExpire, location)
-	}
-
-	return nil
-}
-
-func makeNonce() string {
-	buf := make([]byte, 8)
-	_, _ = io.ReadFull(rand.Reader, buf)
-
-	return fmt.Sprintf("%x", buf)
-}
-
-func addDefaultHeaders(req *http.Request) {
-	req.Header.Add("Content-Type", "application/x-zc-object")
-	req.Header.Add("Connection", "Keep-Alive")
-	req.Header.Add("X-Zc-Major-Domain", "seanywell")
-	req.Header.Add("X-Zc-Msg-Name", "millService")
-	req.Header.Add("X-Zc-Sub-Domain", "milltype")
-	req.Header.Add("X-Zc-Seq-Id", "1")
-	req.Header.Add("X-Zc-Version", "1")
-}

internal/drivers/mill/driver.go

@@ -1,100 +0,0 @@
-package mill
-
-import (
-	"context"
-	"fmt"
-	"git.aiterp.net/lucifer/new-server/models"
-	"sync"
-	"time"
-)
-
-type Driver struct {
-	mu      sync.Mutex
-	bridges map[int]*bridge
-}
-
-func (d *Driver) SearchBridge(ctx context.Context, address, token string, _ bool) ([]models.Bridge, error) {
-	bridgeData := models.Bridge{
-		Name:    fmt.Sprintf("Mill account (%s)", address),
-		Driver:  models.DTMill,
-		Address: address,
-		Token:   token,
-	}
-
-	b, err := d.ensureBridge(bridgeData)
-	if err != nil {
-		return nil, err
-	}
-
-	err = b.authenticate(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	return []models.Bridge{bridgeData}, nil
-}
-
-func (d *Driver) SearchDevices(context.Context, models.Bridge, time.Duration) ([]models.Device, error) {
-	// You would have to configure devices with the Mill app, unfortunately.
-	return []models.Device{}, nil
-}
-
-func (d *Driver) ListDevices(ctx context.Context, bridge models.Bridge) ([]models.Device, error) {
-	b, err := d.ensureBridge(bridge)
-	if err != nil {
-		return nil, err
-	}
-
-	return b.listDevices(ctx)
-}
-
-func (d *Driver) Publish(ctx context.Context, bridge models.Bridge, devices []models.Device) error {
-	b, err := d.ensureBridge(bridge)
-	if err != nil {
-		return err
-	}
-
-	for _, device := range devices {
-		err = b.pushStateChange(ctx, device)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (d *Driver) Run(ctx context.Context, _ models.Bridge, _ chan<- models.Event) error {
-	// TODO: Maybe do something with the thermostat on the device
-	for {
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		}
-	}
-}
-
-func (d *Driver) ensureBridge(model models.Bridge) (*bridge, error) {
-	d.mu.Lock()
-	defer d.mu.Unlock()
-
-	if d.bridges == nil {
-		d.bridges = make(map[int]*bridge, 4)
-	}
-
-	if d.bridges[model.ID] == nil {
-		newBridge := &bridge{
-			luciferID: model.ID,
-			username:  model.Address,
-			password:  model.Token,
-		}
-
-		if model.ID <= 0 {
-			return newBridge, nil
-		}
-
-		d.bridges[model.ID] = newBridge
-	}
-
-	return d.bridges[model.ID], nil
-}

internal/drivers/mill/mill.go

@@ -1,77 +0,0 @@
-package mill
-
-import "time"
-
-const accountEndpoint = "https://eurouter.ablecloud.cn:9005/zc-account/v1/"
-
-const serviceEndpoint = "https://eurouter.ablecloud.cn:9005/millService/v1/"
-
-type millHome struct {
-	HomeID   int64  `json:"homeId"`
-	HomeName string `json:"homeName"`
-}
-
-type millDevice struct {
-	DeviceID    int     `json:"deviceId"`
-	DeviceName  string  `json:"deviceName"`
-	PowerStatus int     `json:"powerStatus"`
-	HolidayTemp int     `json:"holidayTemp"`
-	CurrentTemp float64 `json:"currentTemp"`
-	SubDomainID int     `json:"subDomainId"`
-}
-
-type authReqBody struct {
-	Account  string `json:"account"`
-	Password string `json:"password"`
-}
-
-type authResBody struct {
-	Token       string `json:"token"`
-	UserID      int    `json:"userId"`
-	NickName    string `json:"nickName"`
-	TokenExpire string `json:"tokenExpire"`
-}
-
-type listHomeReqBody struct{}
-
-type listHomeResBody struct {
-	HomeList []millHome `json:"homeList"`
-}
-
-type listDeviceReqBody struct {
-	HomeID int64 `json:"homeId"`
-}
-
-type listDeviceResBody struct {
-	DeviceInfo []millDevice `json:"deviceInfo"`
-}
-
-type changeInfoReqBody struct {
-	HomeType    int    `json:"homeType"`
-	DeviceID    int    `json:"deviceId"`
-	Value       int    `json:"value"`
-	TimeZoneNum string `json:"timeZoneNum"`
-	Key         string `json:"key"`
-}
-
-type deviceControlReqBody struct {
-	SubDomain  string `json:"subDomain"`
-	DeviceID   int    `json:"deviceId"`
-	TestStatus int    `json:"testStatus"`
-	Operation  int    `json:"operation"`
-	Status     int    `json:"status"`
-	WindStatus int    `json:"windStatus"`
-	TempType   int    `json:"tempType"`
-	PowerLevel int    `json:"powerLevel"`
-}
-
-var location *time.Location
-
-func init() {
-	myLocation, err := time.LoadLocation("Europe/Oslo")
-	if err != nil {
-		panic(err.Error())
-	}
-
-	location = myLocation
-}

internal/drivers/nanoleaf/driver.go

@@ -17,7 +17,7 @@ type Driver struct {
 
 // SearchBridge checks the bridge at the address. If it's not a dry-run, you must hold down the power button
 // before calling this function and wait for the pattern.
-func (d *Driver) SearchBridge(ctx context.Context, address, _ string, dryRun bool) ([]models.Bridge, error) {
+func (d *Driver) SearchBridge(ctx context.Context, address string, dryRun bool) ([]models.Bridge, error) {
 	res, err := http.Get(fmt.Sprintf("http://%s/device_info", address))
 	if err != nil {
 		return nil, err

internal/mysql/devicerepo.go

@@ -29,7 +29,6 @@ type deviceStateRecord struct {
 	Kelvin     int     `db:"kelvin"`
 	Power      bool    `db:"power"`
 	Intensity  float64 `db:"intensity"`
-	Temperature int     `db:"temperature"`
 }
 
 type devicePropertyRecord struct {
@@ -228,8 +227,8 @@ func (r *DeviceRepo) SaveMany(ctx context.Context, mode models.SaveMode, devices
 
 		if mode == 0 || mode&models.SMState != 0 {
 			_, err = tx.NamedExecContext(ctx, `
-			REPLACE INTO device_state(device_id, hue, saturation, kelvin, power, intensity, temperature)
+			REPLACE INTO device_state(device_id, hue, saturation, kelvin, power, intensity) 
-			VALUES (:device_id, :hue, :saturation, :kelvin, :power, :intensity, :temperature)
+			VALUES (:device_id, :hue, :saturation, :kelvin, :power, :intensity)
 		`, deviceStateRecord{
 				DeviceID:   record.ID,
 				Hue:        device.State.Color.Hue,
@@ -237,7 +236,6 @@ func (r *DeviceRepo) SaveMany(ctx context.Context, mode models.SaveMode, devices
 				Kelvin:     device.State.Color.Kelvin,
 				Power:      device.State.Power,
 				Intensity:  device.State.Intensity,
-				Temperature: device.State.Temperature,
 			})
 			if err != nil {
 				return dbErr(err)
@@ -381,7 +379,6 @@ func (r *DeviceRepo) populate(ctx context.Context, records []deviceRecord) ([]mo
 						Kelvin:     state.Kelvin,
 					},
 					Intensity: state.Intensity,
-					Temperature: state.Temperature,
 				}
 			}
 		}

models/bridge.go

@@ -23,7 +23,6 @@ var (
 	DTHue      DriverKind = "Hue"
 	DTNanoLeaf DriverKind = "Nanoleaf"
 	DTLIFX     DriverKind = "LIFX"
-	DTMill     DriverKind = "Mill"
 )
 
 var ValidDriverKinds = []DriverKind{

models/device.go

@@ -2,6 +2,7 @@ package models
 
 import (
 	"context"
+	"math"
 	"strings"
 	"time"
 )
@@ -37,7 +38,7 @@ type DeviceState struct {
 	Power       bool       `json:"power"`
 	Color       ColorValue `json:"color,omitempty"`
 	Intensity   float64    `json:"intensity,omitempty"`
-	Temperature int        `json:"temperature"`
+	Temperature float64    `json:"temperature"`
 }
 
 type DeviceScene struct {
@@ -155,17 +156,6 @@ func (d *Device) HasTag(tags ...string) bool {
 	return false
 }
 
-func (d *Device) IsOnlySensor() bool {
-	return !d.HasCapability(
-		DCPower,
-		DCColorHS,
-		DCColorHSK,
-		DCColorKelvin,
-		DCIntensity,
-		DCTemperatureControl,
-	)
-}
-
 func (d *Device) HasCapability(capabilities ...DeviceCapability) bool {
 	for _, c := range d.Capabilities {
 		for _, c2 := range capabilities {
@@ -198,10 +188,6 @@ func (d *Device) SetState(newState NewDeviceState) error {
 		d.State.Intensity = *newState.Intensity
 	}
 
-	if newState.Temperature != nil && d.HasCapability(DCTemperatureControl) {
-		d.State.Temperature = *newState.Temperature
-	}
-
 	return nil
 }
 
@@ -212,6 +198,14 @@ func (s *NewDeviceState) RelativeTo(device Device) NewDeviceState {
 		intensity := device.State.Intensity * *s.Intensity
 		n.Intensity = &intensity
 	}
+	if s.Color != nil {
+		c, err := ParseColorValue(*s.Color)
+		if err == nil {
+			c.Hue = math.Mod(device.State.Color.Hue+c.Hue, 360)
+			c.Saturation *= device.State.Color.Saturation
+			c.Kelvin += device.State.Color.Kelvin
+		}
+	}
 
 	return n
 }

models/driver.go

@@ -10,13 +10,9 @@ type DriverProvider interface {
 }
 
 type Driver interface {
-	SearchBridge(ctx context.Context, address, token string, dryRun bool) ([]Bridge, error)
+	SearchBridge(ctx context.Context, address string, dryRun bool) ([]Bridge, error)
 	SearchDevices(ctx context.Context, bridge Bridge, timeout time.Duration) ([]Device, error)
 	ListDevices(ctx context.Context, bridge Bridge) ([]Device, error)
 	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

@@ -15,8 +15,6 @@ var ErrIncorrectToken = errors.New("driver is not accepting authentication infor
 var ErrUnexpectedResponse = errors.New("driver api returned unexpected response (wrong driver selected?)")
 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")

models/event.go

@@ -24,6 +24,7 @@ var (
 	ENBridgeDisconnected    = "BridgeDisconnected"
 	ENButtonPressed         = "ButtonPressed"
 	ENSensorPresenceStarted = "SensorPresenceStarted"
+	ENSensorPresenceEnding  = "SensorPresenceEnding"
 	ENSensorPresenceEnded   = "SensorPresenceEnded"
 	ENSensorTemperature     = "SensorTemperature"
 )

models/eventhandler.go

@@ -168,8 +168,12 @@ func (c *EventCondition) checkDevice(key string, device Device) (matches bool, s
 			return false, true
 		}
 
-		return c.matches(strconv.Itoa(device.State.Temperature)), false
+		return c.matches(strconv.FormatFloat(device.State.Temperature, 'f', -1, 64)), false
 	case "scene":
+		if len(device.SceneAssignments) == 0 {
+			return c.matches("-1"), false
+		}
+
 		sceneId := -1
 		for _, assignment := range device.SceneAssignments {
 			duration := time.Duration(assignment.DurationMS) * time.Millisecond

models/scene.go

@@ -61,15 +61,10 @@ const (
 	SEGradient        SceneEffect = "Gradient"
 	SEWalkingGradient SceneEffect = "WalkingGradient"
 	SETransition      SceneEffect = "Transition"
-	SEMotion          SceneEffect = "Motion"
-	SETemperature     SceneEffect = "Temperature"
 )
 
 type SceneRole struct {
 	Effect      SceneEffect      `json:"effect"`
-	MotionSeconds  float64          `json:"motionSeconds"`
-	MinTemperature int              `json:"minTemperature"`
-	MaxTemperature int              `json:"maxTemperature"`
 	PowerMode   ScenePowerMode   `json:"powerMode"`
 	TargetKind  ReferenceKind    `json:"targetKind"`
 	TargetValue string           `json:"targetValue"`
@@ -80,19 +75,10 @@ type SceneRole struct {
 }
 
 type SceneRunContext struct {
-	CurrentTime    time.Time
 	Index          int
 	Length         int
 	IntervalNumber int64
 	IntervalMax    int64
-	Sensors        []SceneSensor
-}
-
-type SceneSensor struct {
-	ID          int
-	UpdateTime  time.Time
-	Temperature *float64
-	Presence    *bool
 }
 
 func (d *SceneRunContext) PositionFacShifted() float64 {
@@ -134,7 +120,7 @@ func (r *SceneRole) Validate() error {
 	}
 
 	switch r.Effect {
-	case SEStatic, SERandom, SEGradient, SEWalkingGradient, SETransition, SEMotion, SETemperature:
+	case SEStatic, SERandom, SEGradient, SEWalkingGradient, SETransition:
 	default:
 		return ErrSceneRoleUnknownEffect
 	}
@@ -192,53 +178,6 @@ func (r *SceneRole) ApplyEffect(device *Device, c SceneRunContext) (newState New
 		newState = r.State(c.PositionFacShifted())
 	case SETransition:
 		newState = r.State(c.IntervalFac())
-	case SEMotion:
-		presence := false
-		absenceTime := time.Time{}
-
-		for _, sensors := range c.Sensors {
-			if sensors.Presence == nil {
-				continue
-			}
-
-			if *sensors.Presence {
-				presence = true
-			} else {
-				if sensors.UpdateTime.After(absenceTime) {
-					absenceTime = sensors.UpdateTime
-				}
-			}
-		}
-
-		if presence {
-			newState = r.State(0.0)
-		} else {
-			fac := c.CurrentTime.Sub(absenceTime).Seconds() / r.MotionSeconds
-			if fac < 0 {
-				fac = 0
-			} else if fac > 1 {
-				fac = 1
-			}
-
-			newState = r.State(fac)
-		}
-	case SETemperature:
-		avg := 0.0
-		count := 0
-
-		for _, sensor := range c.Sensors {
-			if sensor.Temperature == nil {
-				continue
-			}
-
-			if count == 0 {
-				avg = *sensor.Temperature
-				count = 1
-			} else {
-				avg = ((avg * float64(count)) + *sensor.Temperature) / float64(count+1)
-				count += 1
-			}
-		}
 	}
 
 	if r.Relative {

models/timeofday.go

@@ -9,8 +9,6 @@ import (
 	"time"
 )
 
-var TimeOfDayTimeZone = time.UTC
-
 type TimeOfDay int
 
 func (t *TimeOfDay) UnmarshalJSON(v []byte) error {
@@ -31,6 +29,7 @@ func (t *TimeOfDay) UnmarshalJSON(v []byte) error {
 		}
 	}
 
+
 	t2, err := ParseTimeOfDay(str)
 	if err != nil {
 		return err
@@ -83,12 +82,11 @@ func (t TimeOfDay) IsBetween(from TimeOfDay, to TimeOfDay) bool {
 }
 
 func CurrentTimeOfDay() TimeOfDay {
-	return TimeOfDayFromDate(time.Now().In(TimeOfDayTimeZone))
+	return TimeOfDayFromDate(time.Now().Local())
 }
 
 func TimeOfDayFromDate(date time.Time) TimeOfDay {
-	localDate := date.In(TimeOfDayTimeZone)
+	return NewTimeOfDay(date.Hour(), date.Minute(), date.Second())
-	return NewTimeOfDay(localDate.Hour(), localDate.Minute(), localDate.Second())
 }
 
 func NewTimeOfDay(hours, minutes, seconds int) TimeOfDay {

scripts/20211106223238_device_state_temperature.sql

@@ -1,11 +0,0 @@
--- +goose Up
--- +goose StatementBegin
-ALTER TABLE device_state
-    ADD COLUMN temperature INT NOT NULL DEFAULT 0;
--- +goose StatementEnd
-
--- +goose Down
--- +goose StatementBegin
-ALTER TABLE device_state
-    DROP COLUMN temperature;
--- +goose StatementEnd