svenvanheugten/night-light
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Strongly type the device FriendlyName

Browse source
This commit is contained in:
Sven van Heugten 2026-01-05 17:51:57 +01:00
parent 8cc59c4738
commit 89a8c599c7
4 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
NightLight.Core.Tests/FakeHome.fs
View file

@ -59,7 +59,11 @@ type FakeHome() =
option {
let! friendlyName =
let m = Regex.Match(command.Topic, "^zigbee2mqtt/(.+)/set$")
if m.Success then Some m.Groups.[1].Value else None
if m.Success then
Some(DeviceFriendlyName m.Groups.[1].Value)
else
None
let! fakeLight = Map.tryFind friendlyName friendlyNameToFakeLight
@ -94,7 +98,7 @@ type FakeHome() =
Payload =
$@"{{
""type"": ""device_announce"",
""data"": {{ ""friendly_name"": ""{light.FriendlyName}"" }}
""data"": {{ ""friendly_name"": ""{light.FriendlyName.Get}"" }}
}}" }
|> ReceivedZigbeeEvent
|> onEventPublished.Trigger

19
NightLight.Core/Models.fs
View file

@ -30,24 +30,31 @@ type Bulb =
| IkeaBulb
| PaulmannBulb
type DeviceFriendlyName =
| DeviceFriendlyName of string
member this.Get =
match this with
| DeviceFriendlyName deviceFriendlyName -> deviceFriendlyName
type Light =
{ FriendlyName: string
{ FriendlyName: DeviceFriendlyName
Room: Room
Bulb: Bulb }
let lights =
[ { FriendlyName = "Vardagsrum - Fönsterlampa"
[ { FriendlyName = DeviceFriendlyName "Vardagsrum - Fönsterlampa"
Room = LivingRoom
Bulb = IkeaBulb }
{ FriendlyName = "Vardagsrum - Vägglampa"
{ FriendlyName = DeviceFriendlyName "Vardagsrum - Vägglampa"
Room = LivingRoom
Bulb = PaulmannBulb }
{ FriendlyName = "Vardagsrum - Golvlampa"
{ FriendlyName = DeviceFriendlyName "Vardagsrum - Golvlampa"
Room = LivingRoom
Bulb = PaulmannBulb }
{ FriendlyName = "Badrum - Taklampa"
{ FriendlyName = DeviceFriendlyName "Badrum - Taklampa"
Room = Bathroom
Bulb = IkeaBulb }
{ FriendlyName = "Sovrum - Nattduksbordlampa"
{ FriendlyName = DeviceFriendlyName "Sovrum - Nattduksbordlampa"
Room = Bedroom
Bulb = IkeaBulb } ]

4
NightLight.Core/ZigbeeCommands.fs
View file

@ -4,7 +4,7 @@ open System.Text.Json.Nodes
open NightLight.Core.Models
open NightLight.Core.Moods
let generateZigbeeCommand friendlyName targetColor targetBrightness =
let generateZigbeeCommand (friendlyName: DeviceFriendlyName) targetColor targetBrightness =
let commandObj = JsonObject()
match targetColor with
@ -19,7 +19,7 @@ let generateZigbeeCommand friendlyName targetColor targetBrightness =
match targetBrightness with
| Brightness b -> b
let topic = $"zigbee2mqtt/{friendlyName}/set"
let topic = $"zigbee2mqtt/{friendlyName.Get}/set"
let payload = commandObj.ToJsonString()
{ Topic = topic; Payload = payload }

4
NightLight.Core/ZigbeeEvents.fs
View file

@ -4,7 +4,7 @@ open NightLight.Core.Models
open FsToolkit.ErrorHandling
open FSharp.Data
type ZigbeeEvent = DeviceAnnounce of FriendlyName: string
type ZigbeeEvent = DeviceAnnounce of DeviceFriendlyName
let parseZigbeeEvent (message: Message) =
result {
@ -17,7 +17,7 @@ let parseZigbeeEvent (message: Message) =
match messageType with
| JsonValue.String "device_announce" ->
match messageData.TryGetProperty "friendly_name" with
| Some(JsonValue.String friendlyName) -> Ok(DeviceAnnounce friendlyName)
| Some(JsonValue.String friendlyName) -> Ok <| DeviceAnnounce(DeviceFriendlyName friendlyName)
| Some _ -> Error InvalidFriendlyNameField
| None -> Error MissingFriendlyNameField
| JsonValue.String _ -> Error UnknownType