Merge branch 'asmodeus' of git.aiterp.net:lucifer/new-server into asmodeus

internal/drivers/hue2/bridge.go

@@ -619,3 +619,14 @@ func (b *Bridge) SearchDevices(ctx context.Context, timeout time.Duration) ([]mo
 	// Return said devices.
 	return newDevices, nil
 }
+
+func (b *Bridge) Forget(ctx context.Context, device models.Device) error {
+	b.mu.Lock()
+	resource := b.resources[device.InternalID]
+	b.mu.Unlock()
+	if resource == nil || resource.LegacyID == "" {
+		return errors.New("resource not found")
+	}
+
+	return b.client.legacyDelete(ctx, resource.LegacyID, nil)
+}

internal/drivers/hue2/client.go

@@ -305,6 +305,38 @@ func (c *Client) legacyPost(ctx context.Context, resource string, body interface
 	return json.NewDecoder(res.Body).Decode(target)
 }
 
+func (c *Client) legacyDelete(ctx context.Context, resource string, target interface{}) error {
+	select {
+	case <-ctx.Done():
+		return ctx.Err()
+	case <-c.ch:
+		defer func() {
+			c.ch <- struct{}{}
+		}()
+	}
+
+	if c.token != "" {
+		resource = c.token + "/" + resource
+	}
+
+	req, err := http.NewRequest("DELETE", fmt.Sprintf("http://%s/api/%s", c.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 reqBody(body interface{}) (io.Reader, error) {
 	if body == nil {
 		return nil, nil

internal/drivers/hue2/driver.go

@@ -100,6 +100,10 @@ func (d *Driver) Run(ctx context.Context, bridge models.Bridge, ch chan<- models
 	return d.ensureBridge(bridge).Run(ctx, ch)
 }
 
+func (d *Driver) ForgetDevice(ctx context.Context, bridge models.Bridge, device models.Device) error {
+	return d.ensureBridge(bridge).Forget(ctx, device)
+}
+
 func (d *Driver) ensureBridge(info models.Bridge) *Bridge {
 	d.mu.Lock()
 	for _, bridge := range d.bridges {

internal/drivers/mill/bridge.go

@@ -6,6 +6,7 @@ import (
 	"crypto/rand"
 	"crypto/sha1"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"git.aiterp.net/lucifer/new-server/internal/lerrors"
 	"git.aiterp.net/lucifer/new-server/models"
@@ -83,6 +84,10 @@ func (b *bridge) listDevices(ctx context.Context) ([]models.Device, error) {
 }
 
 func (b *bridge) pushStateChange(ctx context.Context, deviceModel models.Device) error {
+	if ip, ok := deviceModel.DriverProperties["ip"].(string); ok {
+		return b.pushWifiStateChange(ctx, ip, deviceModel.State.Temperature)
+	}
+
 	b.mu.Lock()
 	if b.luciferMillIDMap == nil {
 		b.luciferMillIDMap = make(map[int]int, 4)
@@ -154,6 +159,40 @@ func (b *bridge) pushStateChange(ctx context.Context, deviceModel models.Device)
 	return nil
 }
 
+func (b *bridge) pushWifiStateChange(ctx context.Context, ip string, temperature int) error {
+	b.mu.Lock()
+	defer b.mu.Unlock()
+
+	data, err := json.Marshal(wifiSetTemperatureBody{
+		Type:  "Normal",
+		Value: temperature,
+	})
+	if err != nil {
+		return err
+	}
+
+	req, err := http.NewRequestWithContext(
+		ctx,
+		"POST",
+		fmt.Sprintf("http://%s/set-temperature", ip),
+		bytes.NewReader(data),
+	)
+	if err != nil {
+		return err
+	}
+
+	res, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return err
+	}
+
+	if res.StatusCode > 299 {
+		return errors.New("mill: negative response from " + ip)
+	}
+
+	return nil
+}
+
 func (b *bridge) command(ctx context.Context, command string, payload interface{}, target interface{}) error {
 	err := b.authenticate(ctx)
 	if err != nil {

internal/drivers/mill/mill.go

@@ -73,6 +73,11 @@ type deviceControlGen3Body struct {
 	HoldTemp  int    `json:"holdTemp,omitempty"`
 }
 
+type wifiSetTemperatureBody struct {
+	Type  string `json:"type"`
+	Value int    `json:"value"`
+}
+
 var location *time.Location
 
 func init() {