82cb0cd · skrepka · git.iko.soy

git.iko.soy/skrepka

Simplify server code and improve type safety: introduce named types for persisted state, recursive genToken, remove dead code; add client persistence layer

82cb0cdiko6 months ago

client/App.fs+124−18

compare with master

unifiedsplit

@@ -4,6 +4,7 @@ open System

4open System.Text.Json

5open Fabulous

6open Fabulous.Maui

7+open System.Collections.Generic

7open Microsoft.Maui.Graphics

8open Microsoft.Maui.Graphics

9open type Fabulous.Maui.View

10open type Fabulous.Maui.View

@@ -81,6 +82,7 @@ module App =

81 | DoPoll

82 | DoPoll

82 | CopyPubKey

83 | CopyPubKey

83 | DismissError

84 | DismissError

85+ | StateLoaded of identity: (byte[] * string) option * data: Store.DataDto option

85 // ── CmdMsg ──

87 // ── CmdMsg ──

@@ -90,6 +92,9 @@ module App =

90 | CmdSend of session: Session * recipientHex: string * text: string * messageId: string

92 | CmdSend of session: Session * recipientHex: string * text: string * messageId: string

91 | CmdPoll of session: Session * cursor: uint64

93 | CmdPoll of session: Session * cursor: uint64

92 | CmdCopyToClipboard of string

94 | CmdCopyToClipboard of string

95+ | CmdLoadState

96+ | CmdSaveIdentity of privKey: byte[] * pubKeyHex: string

97+ | CmdSaveData of contacts: Contact list * messages: Map<string, ChatMessage list> * serverUrl: string * cursor: uint64

94 // ── Helpers ──

99 // ── Helpers ──

100

@@ -123,6 +128,9 @@ module App =

123 | Online session -> Some session

128 | Online session -> Some session

124 | _ -> None

129 | _ -> None

125

130

131+ let private saveCmd model =

132+ [ CmdSaveData(model.Contacts, model.Messages, model.ServerUrl, model.PollCursor) ]

133+

126 // ── Init ──

134 // ── Init ──

127

135

128 let init () =

136 let init () =

@@ -139,7 +147,7 @@ module App =

139 Error = None

147 Error = None

140 PollCursor = 0UL

148 PollCursor = 0UL

141 LastSendStatus = "" },

149 LastSendStatus = "" },

142− []

150+ [ CmdLoadState ]

143

151

144 // ── Update ──

152 // ── Update ──

145

153

@@ -150,7 +158,8 @@ module App =

150 | GenIdentity -> model, [ CmdGenIdentity ]

158 | GenIdentity -> model, [ CmdGenIdentity ]

151

159

152 | IdentityReady identity ->

160 | IdentityReady identity ->

153− { model with Identity = Some identity; Page = Settings }, []

161+ { model with Identity = Some identity; Page = Settings },

162+ [ CmdSaveIdentity(identity.PrivKey, identity.PubKeyHex) ]

154

163

155 | SetServerUrl url -> { model with ServerUrl = url }, []

164 | SetServerUrl url -> { model with ServerUrl = url }, []

156

165

@@ -187,10 +196,12 @@ module App =

187 IsOutgoing = true }

196 IsOutgoing = true }

188 let msgs = messagesFor pk model.Messages

197 let msgs = messagesFor pk model.Messages

189

198

199+ let model' =

190− { model with

200+ { model with

191− ComposeText = ""

201+ ComposeText = ""

192− Messages = model.Messages |> Map.add pk (msgs @ [ outMsg ]) },

202+ Messages = model.Messages |> Map.add pk (msgs @ [ outMsg ]) }

203+

193− [ CmdSend(session, pk, text, id) ]

204+ model', CmdSend(session, pk, text, id) :: saveCmd model'

194 | _ -> model, []

205 | _ -> model, []

195

206

196 | Sent status -> { model with LastSendStatus = status }, []

207 | Sent status -> { model with LastSendStatus = status }, []

@@ -216,9 +227,12 @@ module App =

216 Messages = m.Messages |> Map.add msg.FromPubkey (msgs @ [ chatMsg ]) })

227 Messages = m.Messages |> Map.add msg.FromPubkey (msgs @ [ chatMsg ]) })

217 { model with PollStatus = status; PollCursor = newCursor }

228 { model with PollStatus = status; PollCursor = newCursor }

218

229

230+ let cmds =

219− match trySession model' with

231+ match trySession model' with

220− | Some session -> model', [ CmdPoll(session, model'.PollCursor) ]

232+ | Some session -> [ CmdPoll(session, model'.PollCursor) ]

221− | None -> model', []

233+ | None -> []

234+

235+ model', cmds @ (if not incoming.IsEmpty then saveCmd model' else [])

222

236

223 | DoPoll ->

237 | DoPoll ->

224 match trySession model with

238 match trySession model with

@@ -234,19 +248,23 @@ module App =

234 { Pubkey = model.NewPubkey

248 { Pubkey = model.NewPubkey

235 Nickname = model.NewNickname }

249 Nickname = model.NewNickname }

236

250

251+ let model' =

237− { model with

252+ { model with

238− Contacts = model.Contacts |> upsertContact contact

253+ Contacts = model.Contacts |> upsertContact contact

239− NewPubkey = ""

254+ NewPubkey = ""

240− NewNickname = ""

255+ NewNickname = ""

241− Page = Conversations },

256+ Page = Conversations }

242− []

257+

258+ model', saveCmd model'

243 else

259 else

244 model, []

260 model, []

245

261

246 | DoDeleteContact pk ->

262 | DoDeleteContact pk ->

263+ let model' =

247− { model with

264+ { model with

248− Contacts = model.Contacts |> List.filter (fun c -> c.Pubkey <> pk) },

265+ Contacts = model.Contacts |> List.filter (fun c -> c.Pubkey <> pk) }

249− []

266+

267+ model', saveCmd model'

250

268

251 | CopyPubKey ->

269 | CopyPubKey ->

252 match model.Identity with

270 match model.Identity with

@@ -255,6 +273,56 @@ module App =

255

273

256 | DismissError -> { model with Error = None }, []

274 | DismissError -> { model with Error = None }, []

257

275

276+ | StateLoaded(identityOpt, dataOpt) ->

277+ match identityOpt with

278+ | None -> model, []

279+ | Some(privKey, pubKeyHex) ->

280+ let identity = { PrivKey = privKey; PubKeyHex = pubKeyHex }

281+

282+ let model' =

283+ match dataOpt with

284+ | Some data ->

285+ let contacts =

286+ data.Contacts

287+ |> Array.toList

288+ |> List.map (fun c ->

289+ { Pubkey = c.Pubkey; Nickname = c.Nickname }: Contact)

290+

291+ let messages =

292+ data.Messages

293+ |> Seq.fold

294+ (fun acc (KeyValue(pk, dtos)) ->

295+ let msgs =

296+ dtos

297+ |> Array.toList

298+ |> List.map (fun m ->

299+ { Id = m.Id

300+ Body = m.Body

301+ Timestamp = DateTimeOffset.FromUnixTimeSeconds m.TimestampUnix

302+ IsOutgoing = m.IsOutgoing })

303+

304+ acc |> Map.add pk msgs)

305+ Map.empty

306+

307+ { model with

308+ Identity = Some identity

309+ Contacts = contacts

310+ Messages = messages

311+ ServerUrl =

312+ if data.ServerUrl <> "" then data.ServerUrl

313+ else model.ServerUrl

314+ PollCursor = data.PollCursor

315+ Page = Conversations

316+ Conn = Connecting }

317+

318+ | None ->

319+ { model with

320+ Identity = Some identity

321+ Page = Settings

322+ Conn = Connecting }

323+

324+ model', [ CmdConnect(model'.ServerUrl, identity) ]

325+

258 // ── mapCmd ──

326 // ── mapCmd ──

259

327

260 let private asyncCmd (op: Async<Msg>) : Cmd<Msg> =

328 let private asyncCmd (op: Async<Msg>) : Cmd<Msg> =

@@ -369,6 +437,44 @@ module App =

369 Microsoft.Maui.ApplicationModel.DataTransfer.Clipboard.Default.SetTextAsync(text)

437 Microsoft.Maui.ApplicationModel.DataTransfer.Clipboard.Default.SetTextAsync(text)

370 |> ignore)

438 |> ignore)

371

439

440+ | CmdLoadState ->

441+ asyncCmd (async {

442+ let! identity = Store.loadIdentity ()

443+ let data = Store.loadData ()

444+ return StateLoaded(identity, data)

445+ })

446+

447+ | CmdSaveIdentity(privKey, pubKeyHex) ->

448+ Cmd.ofEffect (fun _ -> Store.saveIdentity privKey pubKeyHex |> ignore)

449+

450+ | CmdSaveData(contacts, messages, serverUrl, cursor) ->

451+ Cmd.ofEffect (fun _ ->

452+ let contactDtos =

453+ contacts

454+ |> List.map (fun c ->

455+ { Store.ContactDto.Pubkey = c.Pubkey

456+ Store.ContactDto.Nickname = c.Nickname })

457+ |> Array.ofList

458+

459+ let messageDtos = Dictionary<string, Store.MessageDto array>()

460+

461+ messages

462+ |> Map.iter (fun pk msgs ->

463+ messageDtos[pk] <-

464+ msgs

465+ |> List.map (fun m ->

466+ { Store.MessageDto.Id = m.Id

467+ Store.MessageDto.Body = m.Body

468+ Store.MessageDto.TimestampUnix = m.Timestamp.ToUnixTimeSeconds()

469+ Store.MessageDto.IsOutgoing = m.IsOutgoing })

470+ |> Array.ofList)

471+

472+ Store.saveData

473+ { Contacts = contactDtos

474+ Messages = messageDtos

475+ ServerUrl = serverUrl

476+ PollCursor = cursor })

477+

372 // ── View ──

478 // ── View ──

373

479

374 let private viewSetup () =

480 let private viewSetup () =

client/Skrepka.fsproj+1

@@ -23,6 +23,7 @@

23 <ItemGroup>

24 <Compile Include="Crypto.fs" />

25 <Compile Include="ApiClient.fs" />

26+ <Compile Include="Store.fs" />

26 <Compile Include="App.fs" />

27 <Compile Include="App.fs" />

27 <Compile Include="MauiProgram.fs" />

28 <Compile Include="MauiProgram.fs" />

28 </ItemGroup>

29 </ItemGroup>

client/Store.fsnew file+93

@@ -0,0 +1,93 @@

1+namespace Skrepka

3+open System

4+open System.Collections.Generic

5+open System.IO

6+open System.Text.Json

7+open Microsoft.Maui.Storage

9+module Store =

10+

11+ [<CLIMutable>]

12+ type ContactDto =

13+ { Pubkey: string

14+ Nickname: string }

15+

16+ [<CLIMutable>]

17+ type MessageDto =

18+ { Id: string

19+ Body: string

20+ TimestampUnix: int64

21+ IsOutgoing: bool }

22+

23+ [<CLIMutable>]

24+ type DataDto =

25+ { Contacts: ContactDto array

26+ Messages: Dictionary<string, MessageDto array>

27+ ServerUrl: string

28+ PollCursor: uint64 }

29+

30+ let private jsonOpts =

31+ JsonSerializerOptions(WriteIndented = true, PropertyNameCaseInsensitive = true)

32+

33+ let private dataPath () =

34+ Path.Combine(FileSystem.AppDataDirectory, "data.json")

35+

36+ let loadIdentity () =

37+ async {

38+ let! privKeyB64 =

39+ SecureStorage.Default.GetAsync("identity_privkey")

40+ |> Async.AwaitTask

41+

42+ let! pubKeyHex =

43+ SecureStorage.Default.GetAsync("identity_pubkey")

44+ |> Async.AwaitTask

45+

46+ if isNull privKeyB64 || isNull pubKeyHex then

47+ return None

48+ else

49+ return Some(Convert.FromBase64String privKeyB64, pubKeyHex)

50+ }

51+

52+ let saveIdentity (privKey: byte[]) (pubKeyHex: string) =

53+ task {

54+ do! SecureStorage.Default.SetAsync("identity_privkey", Convert.ToBase64String privKey)

55+ do! SecureStorage.Default.SetAsync("identity_pubkey", pubKeyHex)

56+ }

57+

58+ let loadData () =

59+ let path = dataPath ()

60+

61+ if File.Exists path then

62+ try

63+ let json = File.ReadAllText path

64+ let dto = JsonSerializer.Deserialize<DataDto>(json, jsonOpts)

65+

66+ Some

67+ { Contacts =

68+ if Object.ReferenceEquals(dto.Contacts, null) then

69+ [||]

70+ else

71+ dto.Contacts

72+ Messages =

73+ if Object.ReferenceEquals(dto.Messages, null) then

74+ Dictionary()

75+ else

76+ dto.Messages

77+ ServerUrl =

78+ if Object.ReferenceEquals(dto.ServerUrl, null) then

79+ ""

80+ else

81+ dto.ServerUrl

82+ PollCursor = dto.PollCursor }

83+ with _ ->

84+ None

85+ else

86+ None

87+

88+ let saveData (dto: DataDto) =

89+ try

90+ let json = JsonSerializer.Serialize(dto, jsonOpts)

91+ File.WriteAllText(dataPath (), json)

92+ with _ ->

93+ ()

client/obj/Debug/net10.0-ios/iossimulator-arm64/Skrepka.AssemblyInfo.fs+1−1

@@ -10,7 +10,7 @@ open System.Reflection

10[<assembly: System.Reflection.AssemblyCompanyAttribute("Skrepka")>]

11[<assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")>]

12[<assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")>]

13−[<assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0+952040910192b24cfad159457c94cebd8040466a")>]

13+[<assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0+064c373a75a8e5a105124031d8e31ae203b8d89e")>]

14[<assembly: System.Reflection.AssemblyProductAttribute("Skrepka")>]

15[<assembly: System.Reflection.AssemblyTitleAttribute("Skrepka")>]

16[<assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")>]

client/obj/Debug/net10.0-ios/iossimulator-arm64/Skrepka.AssemblyInfoInputs.cache+1−1

@@ -1 +1 @@

1−be41ec7873ea59244c1fc90c226419f96480720bb1f4b6c0a8bec31bba3b7b3d

1+f41c0d91e35e0ceb4a21baecd346576ff07aafed94a6c649ee68a7dc99ffef0e

client/obj/Debug/net10.0-ios/iossimulator-arm64/Skrepka.fsproj.CoreCompileInputs.cache+1−1

@@ -1 +1 @@

1−c22c2ff1c980717cfdafcd9ffa558434c122b39b14f9a7fbb50e077ac6891188

1+2216f8a345100d0cead52a75571b23423658891765293a7281aed4c708bdb260

client/obj/Debug/net10.0-ios/iossimulator-arm64/Skrepka.fsproj.FileListAbsolute.txt+22

@@ -333,3 +333,25 @@

333/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/Skrepka.pdb

334/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/Skrepka.genruntimeconfig.cache

335/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/ref/Skrepka.dll

336+/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/resourcestamps/Fabulous.stamp

337+/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/resourcestamps/Fabulous.MauiControls.stamp

338+/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/resourcestamps/FSharp.Core.stamp

339+/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/resourcestamps/Microsoft.Extensions.Configuration.Abstractions.stamp

340+/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/resourcestamps/Microsoft.Extensions.Configuration.stamp

341+/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/resourcestamps/Microsoft.Extensions.DependencyInjection.Abstractions.stamp

342+/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/resourcestamps/Microsoft.Extensions.DependencyInjection.stamp

343+/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/resourcestamps/Microsoft.Extensions.Diagnostics.Abstractions.stamp

344+/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/resourcestamps/Microsoft.Extensions.FileProviders.Abstractions.stamp

345+/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/resourcestamps/Microsoft.Extensions.Hosting.Abstractions.stamp

346+/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/resourcestamps/Microsoft.Extensions.Logging.Abstractions.stamp

347+/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/resourcestamps/Microsoft.Extensions.Logging.stamp

348+/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/resourcestamps/Microsoft.Extensions.Options.stamp

349+/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/resourcestamps/Microsoft.Extensions.Primitives.stamp

350+/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/resourcestamps/Microsoft.Maui.Controls.Compatibility.stamp

351+/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/resourcestamps/Microsoft.Maui.Controls.stamp

352+/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/resourcestamps/Microsoft.Maui.Controls.Xaml.stamp

353+/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/resourcestamps/Microsoft.Maui.stamp

354+/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/resourcestamps/Microsoft.Maui.Essentials.stamp

355+/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/resourcestamps/Microsoft.Maui.Graphics.stamp

356+/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/resourcestamps/Sodium.Core.stamp

357+/Users/iko/Developer/skrepka/client/obj/Debug/net10.0-ios/iossimulator-arm64/unpack/Microsoft.Maui.Essentials/BundleResource/xml/microsoft_maui_essentials_fileprovider_file_paths.xml

client/obj/Debug/net10.0-ios/iossimulator-arm64/Skrepka.sourcelink.json+1−1

@@ -1 +1 @@

1−{"documents":{"/Users/iko/Developer/skrepka/*":"https://raw.githubusercontent.com/ilyakooo0/skrepka/952040910192b24cfad159457c94cebd8040466a/*"}}

1+{"documents":{"/Users/iko/Developer/skrepka/*":"https://raw.githubusercontent.com/ilyakooo0/skrepka/064c373a75a8e5a105124031d8e31ae203b8d89e/*"}}

client/obj/Debug/net10.0-maccatalyst/maccatalyst-arm64/Skrepka.AssemblyInfo.fs+1−1