Encapsulate State to make it impossible to read
This was NightLightStateMachine's purpose, but it fits equally well in the actual production code.
This commit is contained in:
parent
a741938f89
commit
bd550bfcd9
4 changed files with 29 additions and 29 deletions
|
|
@ -7,7 +7,7 @@ open NightLight.Core.Models
|
||||||
open NightLight.Core.Core
|
open NightLight.Core.Core
|
||||||
|
|
||||||
type NightLightStateMachine(now: DateTime) =
|
type NightLightStateMachine(now: DateTime) =
|
||||||
let mutable state = { Time = now }
|
let mutable state = State now
|
||||||
|
|
||||||
let transmittedCommands = new List<Message>()
|
let transmittedCommands = new List<Message>()
|
||||||
|
|
||||||
|
|
@ -18,7 +18,7 @@ type NightLightStateMachine(now: DateTime) =
|
||||||
|
|
||||||
let sendEvent event =
|
let sendEvent event =
|
||||||
result {
|
result {
|
||||||
let! newState, commands = onEventReceived state event
|
let! newState, commands = state.OnEventReceived event
|
||||||
state <- newState
|
state <- newState
|
||||||
transmittedCommands.AddRange commands
|
transmittedCommands.AddRange commands
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
module NightLight.Core.Core
|
module NightLight.Core.Core
|
||||||
|
|
||||||
|
open System
|
||||||
open NightLight.Core.Models
|
open NightLight.Core.Models
|
||||||
open NightLight.Core.PartsOfDay
|
open NightLight.Core.PartsOfDay
|
||||||
open NightLight.Core.ZigbeeEvents
|
open NightLight.Core.ZigbeeEvents
|
||||||
|
|
@ -16,16 +17,17 @@ let internal generateZigbeeCommandToFixLight partOfDay light =
|
||||||
|
|
||||||
generateZigbeeCommand light.FriendlyName color brightness
|
generateZigbeeCommand light.FriendlyName color brightness
|
||||||
|
|
||||||
let onEventReceived (state: State) (event: Event) : Result<State * Message seq, ParseEventError> =
|
type State(time: DateTime) =
|
||||||
|
member this.OnEventReceived(event: Event) : Result<State * Message seq, ParseEventError> =
|
||||||
result {
|
result {
|
||||||
let partOfDay = getPartOfDay state.Time
|
let partOfDay = getPartOfDay time
|
||||||
|
|
||||||
match event with
|
match event with
|
||||||
| ReceivedZigbeeEvent payload ->
|
| ReceivedZigbeeEvent payload ->
|
||||||
let! zigbeeEvent = parseZigbeeEvent payload |> Result.mapError ParseZigbeeEventError
|
let! zigbeeEvent = parseZigbeeEvent payload |> Result.mapError ParseZigbeeEventError
|
||||||
|
|
||||||
return
|
return
|
||||||
state,
|
this,
|
||||||
match zigbeeEvent with
|
match zigbeeEvent with
|
||||||
| DeviceAnnounce friendlyName ->
|
| DeviceAnnounce friendlyName ->
|
||||||
let maybeLight = tryFindLight friendlyName
|
let maybeLight = tryFindLight friendlyName
|
||||||
|
|
@ -33,9 +35,9 @@ let onEventReceived (state: State) (event: Event) : Result<State * Message seq,
|
||||||
match maybeLight with
|
match maybeLight with
|
||||||
| Some light -> generateZigbeeCommandToFixLight partOfDay light |> Seq.singleton
|
| Some light -> generateZigbeeCommandToFixLight partOfDay light |> Seq.singleton
|
||||||
| None -> Seq.empty
|
| None -> Seq.empty
|
||||||
| TimeChanged time ->
|
| TimeChanged newTime ->
|
||||||
let newState = { Time = time }
|
let newState = State newTime
|
||||||
let newPartOfDay = getPartOfDay time
|
let newPartOfDay = getPartOfDay newTime
|
||||||
|
|
||||||
return
|
return
|
||||||
newState,
|
newState,
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,6 @@ module NightLight.Core.Models
|
||||||
|
|
||||||
open System
|
open System
|
||||||
|
|
||||||
type State = { Time: DateTime }
|
|
||||||
|
|
||||||
type Message = { Topic: string; Payload: string }
|
type Message = { Topic: string; Payload: string }
|
||||||
|
|
||||||
type Event =
|
type Event =
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,7 @@ let mainAsync _ =
|
||||||
let mqttClientOptions = MqttClientOptionsBuilder().WithTcpServer(server).Build()
|
let mqttClientOptions = MqttClientOptionsBuilder().WithTcpServer(server).Build()
|
||||||
|
|
||||||
let stateLock = new SemaphoreSlim(1, 1)
|
let stateLock = new SemaphoreSlim(1, 1)
|
||||||
let mutable state = { Time = DateTime.Now }
|
let mutable state = State DateTime.Now
|
||||||
|
|
||||||
mqttClient.add_ApplicationMessageReceivedAsync (fun e ->
|
mqttClient.add_ApplicationMessageReceivedAsync (fun e ->
|
||||||
async {
|
async {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue