13fba34 · skrepka · git.iko.soy

git.iko.soy/skrepka

on master help sign in

Simplify client: eliminate DecryptedEvent and PollReceived types, inline error handling

13fba34iko6 months ago

client/ApiClient.fs+5−7

compare with master

unifiedsplit

@@ -51,12 +51,6 @@ module ApiClient =

51 | Unauthorized -> "unauthorized"

52 | UnknownStatus s -> s)

54− let messageStatusToError = function

55− | Delivered | Federated | Queued -> None

56− | Rejected -> Some "Message rejected by server"

57− | Unauthorized -> Some "Not authorized to deliver message"

58− | UnknownStatus s -> Some $"Unexpected status: {s}"

59−

60 [<CLIMutable>]

54 [<CLIMutable>]

61 type private SendResult = { Status: MessageStatus }

55 type private SendResult = { Status: MessageStatus }

@@ -126,7 +120,11 @@ module ApiClient =

126 let body = JsonSerializer.Serialize({| ``to`` = toHex; encryptedBlob = blobHex; timestamp = timestamp |})

120 let body = JsonSerializer.Serialize({| ``to`` = toHex; encryptedBlob = blobHex; timestamp = timestamp |})

127 async {

121 async {

128 let! result = postJson<SendResult> client $"{serverUrl}/messages" body (Some token)

122 let! result = postJson<SendResult> client $"{serverUrl}/messages" body (Some token)

129− return result.Status

123+ match result.Status with

124+ | Delivered | Federated | Queued -> ()

125+ | Rejected -> failwith "Message rejected by server"

126+ | Unauthorized -> failwith "Not authorized to deliver message"

127+ | UnknownStatus s -> failwith $"Unexpected status: {s}"

130 }

128 }

131

129

132 let poll (serverUrl: string) (token: string) (cursor: int64) =

130 let poll (serverUrl: string) (token: string) (cursor: int64) =

client/App.fs+27−43

@@ -36,19 +36,18 @@ module App =

36 | NoIdentity

37 | Identified of identity: Identity * conn: ConnStatus

39− type DecryptedEvent =

39+ [<RequireQualifiedAccess>]

40− | ChatMsg of ChatMessage

40+ type Envelope =

41+ | TextMessage of id: string * body: string

41 | DeliveryAck of ackIds: string list

42 | DeliveryAck of ackIds: string list

42− | ProfileUpdate of Profile

43+ | ProfileMessage of profile: Profile

43−

44− type IncomingEvent = { Sender: string; Event: DecryptedEvent }

46− type PollReceived = { Events: int; Messages: int; Errors: int; FirstError: string option }

45+ type IncomingEvent = { Sender: string; Timestamp: int64; Envelope: Envelope }

48 type PollStatus =

47 type PollStatus =

49 | Idle

48 | Idle

50 | Polling

49 | Polling

51− | Received of PollReceived

50+ | Received of string

52 | PollError of string

51 | PollError of string

54 // ── Model ──

53 // ── Model ──

@@ -152,16 +151,19 @@ module App =

152 { c with DisplayName = p.DisplayName; Bio = p.Bio; PhotoBase64 = p.PhotoBase64 }

151 { c with DisplayName = p.DisplayName; Bio = p.Bio; PhotoBase64 = p.PhotoBase64 }

153

152

154 let private applyEvent (m: Model) (evt: IncomingEvent) =

153 let private applyEvent (m: Model) (evt: IncomingEvent) =

155− match evt.Event with

154+ match evt.Envelope with

155+ | Envelope.TextMessage(id, body) ->

156− | ChatMsg message ->

156+ let message =

157+ { Id = id; Body = body; Timestamp = DateTimeOffset.FromUnixTimeSeconds(evt.Timestamp)

158+ IsOutgoing = false; Status = DeliveryStatus.Delivered }

157 { m with

159 { m with

158 Contacts =

160 Contacts =

159 if Map.containsKey evt.Sender m.Contacts then m.Contacts

161 if Map.containsKey evt.Sender m.Contacts then m.Contacts

160 else Map.add evt.Sender (newContact evt.Sender (truncKey evt.Sender)) m.Contacts

162 else Map.add evt.Sender (newContact evt.Sender (truncKey evt.Sender)) m.Contacts

161 Messages = m.Messages |> appendMessage evt.Sender message }

163 Messages = m.Messages |> appendMessage evt.Sender message }

162− | DeliveryAck ackIds ->

164+ | Envelope.DeliveryAck ackIds ->

163 { m with Messages = m.Messages |> markDelivered evt.Sender ackIds }

165 { m with Messages = m.Messages |> markDelivered evt.Sender ackIds }

164− | ProfileUpdate profile ->

166+ | Envelope.ProfileMessage profile ->

165 { m with Contacts = m.Contacts |> Map.change evt.Sender (Option.map (withProfile profile)) }

167 { m with Contacts = m.Contacts |> Map.change evt.Sender (Option.map (withProfile profile)) }

166

168

167 let private trySession model =

169 let private trySession model =

@@ -335,12 +337,6 @@ module App =

335 }

337 }

336 |> Async.Start)

338 |> Async.Start)

337

339

338− [<RequireQualifiedAccess>]

339− type private Envelope =

340− | TextMessage of id: string * body: string

341− | DeliveryAck of ackIds: string list

342− | ProfileMessage of profile: Profile

343−

344 let private serializeEnvelope = function

340 let private serializeEnvelope = function

345 | Envelope.TextMessage(id, body) ->

341 | Envelope.TextMessage(id, body) ->

346 JsonSerializer.Serialize({| ``type`` = "text"; id = id; body = body |})

342 JsonSerializer.Serialize({| ``type`` = "text"; id = id; body = body |})

@@ -354,7 +350,7 @@ module App =

354 let payload = serializeEnvelope envelope

350 let payload = serializeEnvelope envelope

355 let blob = Crypto.encrypt session.Identity.PrivKey (Crypto.fromHex recipientHex) payload

351 let blob = Crypto.encrypt session.Identity.PrivKey (Crypto.fromHex recipientHex) payload

356 let ts = DateTimeOffset.UtcNow.ToUnixTimeSeconds()

352 let ts = DateTimeOffset.UtcNow.ToUnixTimeSeconds()

357− return! sendMessage session.Url session.Token recipientHex (Crypto.toHex blob) ts

353+ do! sendMessage session.Url session.Token recipientHex (Crypto.toHex blob) ts

358 }

354 }

359

355

360 let private tryGetJsonString (el: JsonElement) (name: string) =

356 let private tryGetJsonString (el: JsonElement) (name: string) =

@@ -378,23 +374,13 @@ module App =

378 Some(Envelope.ProfileMessage { DisplayName = displayName; Bio = bio; PhotoBase64 = photo })

374 Some(Envelope.ProfileMessage { DisplayName = displayName; Bio = bio; PhotoBase64 = photo })

379 | _ -> None

375 | _ -> None

380

376

381− let private toDecryptedEvent timestamp = function

382− | Envelope.TextMessage(id, body) ->

383− ChatMsg

384− { Id = id; Body = body

385− Timestamp = DateTimeOffset.FromUnixTimeSeconds(timestamp)

386− IsOutgoing = false

387− Status = DeliveryStatus.Delivered }

388− | Envelope.DeliveryAck ackIds -> DeliveryAck ackIds

389− | Envelope.ProfileMessage profile -> ProfileUpdate profile

390−

391 let private decryptEvent (privKey: byte[]) (payload: EventPayload) =

377 let private decryptEvent (privKey: byte[]) (payload: EventPayload) =

392 try

378 try

393 let blob = Crypto.fromHex payload.EncryptedBlob

379 let blob = Crypto.fromHex payload.EncryptedBlob

394 match Crypto.decrypt privKey blob with

380 match Crypto.decrypt privKey blob with

395 | Some(plaintext, senderHex) ->

381 | Some(plaintext, senderHex) ->

396 match parseEnvelope plaintext with

382 match parseEnvelope plaintext with

397− | Some envelope -> Ok { Sender = senderHex; Event = toDecryptedEvent payload.Timestamp envelope }

383+ | Some envelope -> Ok { Sender = senderHex; Timestamp = payload.Timestamp; Envelope = envelope }

398 | None -> Error "unknown envelope type"

384 | None -> Error "unknown envelope type"

399 | None -> Error "decrypt failed"

385 | None -> Error "decrypt failed"

400 with ex ->

386 with ex ->

@@ -404,12 +390,12 @@ module App =

404 async {

390 async {

405 let chatsBySender =

391 let chatsBySender =

406 events

392 events

407− |> List.choose (fun evt -> match evt.Event with ChatMsg msg -> Some(evt.Sender, msg.Id) | _ -> None)

393+ |> List.choose (fun evt -> match evt.Envelope with Envelope.TextMessage(id, _) -> Some(evt.Sender, id) | _ -> None)

408 |> List.groupBy fst

394 |> List.groupBy fst

409 |> List.map (fun (sender, pairs) -> sender, List.map snd pairs)

395 |> List.map (fun (sender, pairs) -> sender, List.map snd pairs)

410

396

411 for sender, msgIds in chatsBySender do

397 for sender, msgIds in chatsBySender do

412− try do! sendEnvelope session sender (Envelope.DeliveryAck msgIds) |> Async.Ignore

398+ try do! sendEnvelope session sender (Envelope.DeliveryAck msgIds)

413 with _ -> ()

399 with _ -> ()

414 }

400 }

415

401

@@ -427,12 +413,10 @@ module App =

427 | CmdSend(session, recipientHex, text, messageId) ->

413 | CmdSend(session, recipientHex, text, messageId) ->

428 asyncCmd (async {

414 asyncCmd (async {

429 try

415 try

430− let! status = sendEnvelope session recipientHex (Envelope.TextMessage(messageId, text))

416+ do! sendEnvelope session recipientHex (Envelope.TextMessage(messageId, text))

431− match messageStatusToError status with

432− | Some err -> return SendFailed err

433− | None -> return SendOk

417+ return SendOk

434 with ex ->

418 with ex ->

435− return SendFailed $"Send failed: {ex.Message}"

419+ return SendFailed ex.Message

436 })

420 })

437

421

438 | CmdPoll(session, cursor) ->

422 | CmdPoll(session, cursor) ->

@@ -457,9 +441,11 @@ module App =

457

441

458 do! sendDeliveryAcks session events

442 do! sendDeliveryAcks session events

459

443

460− let chatCount = events |> List.sumBy (fun e -> match e.Event with ChatMsg _ -> 1 | _ -> 0)

444+ let chatCount = events |> List.sumBy (fun e -> match e.Envelope with Envelope.TextMessage _ -> 1 | _ -> 0)

445+ let status =

461− let status = Received { Events = response.Events.Length; Messages = chatCount; Errors = errors.Length; FirstError = List.tryHead errors }

446+ $"evts:{response.Events.Length} msgs:{chatCount} errs:{errors.Length}"

447+ + (match List.tryHead errors with Some e -> $" [{e}]" | None -> "")

462− return PollResult(events, status, response.Cursor)

448+ return PollResult(events, Received status, response.Cursor)

463 with

449 with

464 | :? TimeoutException ->

450 | :? TimeoutException ->

465 return PollResult([], Polling, cursor)

451 return PollResult([], Polling, cursor)

@@ -509,7 +495,7 @@ module App =

509 Cmd.ofEffect (fun _ ->

495 Cmd.ofEffect (fun _ ->

510 async {

496 async {

511 for recipientHex in recipientHexes do

497 for recipientHex in recipientHexes do

512− try do! sendEnvelope session recipientHex (Envelope.ProfileMessage profile) |> Async.Ignore

498+ try do! sendEnvelope session recipientHex (Envelope.ProfileMessage profile)

513 with _ -> ()

499 with _ -> ()

514 } |> Async.Start)

500 } |> Async.Start)

515

501

@@ -518,9 +504,7 @@ module App =

518 let private formatPollStatus = function

504 let private formatPollStatus = function

519 | Idle -> ""

505 | Idle -> ""

520 | Polling -> "polling..."

506 | Polling -> "polling..."

521− | Received r ->

507+ | Received s -> s

522− $"evts:{r.Events} msgs:{r.Messages} errs:{r.Errors}"

523− + (match r.FirstError with Some e -> $" [{e}]" | None -> "")

524 | PollError msg -> $"poll error: {msg}"

508 | PollError msg -> $"poll error: {msg}"

525

509

526 let private viewErrorBanner (error: string option) =

510 let private viewErrorBanner (error: string option) =

client/Store.fs+1−1

@@ -120,11 +120,11 @@ module Store =

120 let contacts =

121 db.GetCollection<Contact>("contacts").FindAll()

122 |> Seq.map (fun c ->

123+ c.Pubkey,

123 { c with

124 { c with

124 DisplayName = orEmpty c.DisplayName

125 DisplayName = orEmpty c.DisplayName

125 Bio = orEmpty c.Bio

126 Bio = orEmpty c.Bio

126 PhotoBase64 = orEmpty c.PhotoBase64 })

127 PhotoBase64 = orEmpty c.PhotoBase64 })

127− |> Seq.map (fun c -> c.Pubkey, c)

128 |> Map.ofSeq

129

130 let messages =

client/bin/Debug/net10.0-ios/iossimulator-arm64/Skrepka.app/Skrepka.dll

Binary file not shown.

client/bin/Debug/net10.0-ios/iossimulator-arm64/Skrepka.app/Skrepka.pdb

Binary file not shown.

client/bin/Debug/net10.0-ios/iossimulator-arm64/Skrepka.app/_CodeSignature/CodeResources+4−4

@@ -166,11 +166,11 @@

166 </data>

167 <key>Skrepka.dll</key>

168 <data>

169− c9k898gnYMQdWHhdAHoE6Fz59nI=

169+ CVxF8wyk0z3J28KIFnEY6UjWNJI=

170 </data>

171 <key>Skrepka.pdb</key>

172 <data>

173− LhHFBGciNjCwn3byqpt0UM3stjc=

173+ G7nf25PmZnCBg5i1vZYRnqmejdc=

174 </data>

175 <key>Sodium.Core.dll</key>

176 <data>

@@ -1393,14 +1393,14 @@

1393 <dict>

1394 <key>hash2</key>

1395 <data>

1396− bWxl+IGnsw/NXLyjxBqYhs+LU+FYTOCHPAoXsPEfR6w=

1396+ 8HBXEBvFZVoHcetj8atOdmzoBkDu0SNC+Vkh/V/BwPg=

1397 </data>

1398 </dict>

1399 <key>Skrepka.pdb</key>

1400 <dict>

1401 <key>hash2</key>

1402 <data>

1403− TsmGxaRiClJJVFjrmZPl9EK0DTxasYWDClFY+GEdgCw=

1403+ FssxM3lPIPLJE+kwOrOMkmtxBhrZd/URY71MZtiAT9Q=

1404 </data>

1405 </dict>

1406 <key>Sodium.Core.dll</key>

client/bin/Debug/net10.0-ios/iossimulator-arm64/Skrepka.dll

Binary file not shown.

client/bin/Debug/net10.0-ios/iossimulator-arm64/Skrepka.pdb

Binary file not shown.

client/bin/Debug/net10.0-maccatalyst/maccatalyst-arm64/Skrepka.app/Contents/MonoBundle/Skrepka.dll

Binary file not shown.

client/bin/Debug/net10.0-maccatalyst/maccatalyst-arm64/Skrepka.app/Contents/MonoBundle/Skrepka.pdb

Binary file not shown.

client/bin/Debug/net10.0-maccatalyst/maccatalyst-arm64/Skrepka.app/Contents/_CodeSignature/CodeResources+2−2

@@ -251,14 +251,14 @@

251 <dict>

252 <key>hash2</key>

253 <data>

254− 65gZOa6bguKqFrbqG66bXLi5mKgH6P58g1W2RBihBN8=

254+ uu2JUNh2BV4Cx+DaGDT6+qwp5+CZ+rHHPcnDibLYIM4=

255 </data>

256 </dict>

257 <key>MonoBundle/Skrepka.pdb</key>

258 <dict>

259 <key>hash2</key>

260 <data>

261− Zqn8PM92ySvTibkdxVFqryCishi0DoTg0qz8e/xc+AY=

261+ BgzRedMZeH7jNYuTzL20RHyUSWyA5RU9R0efsBMush8=

262 </data>

263 </dict>

264 <key>MonoBundle/Sodium.Core.dll</key>

client/bin/Debug/net10.0-maccatalyst/maccatalyst-arm64/Skrepka.dll

Binary file not shown.

client/bin/Debug/net10.0-maccatalyst/maccatalyst-arm64/Skrepka.pdb

Binary file not shown.

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+f4d37c22efe1c611f1e26330703855536736e15a")>]

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

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−5c7a8aee9ac955a94dfa896b7bc128b149d464c9238bf5df93509d4192198883

1+c92865f901e6343a5442debcd3534cfae1be9b5fb5c9e182cd1bad60a00a4f3b

client/obj/Debug/net10.0-ios/iossimulator-arm64/Skrepka.dll

Binary file not shown.

client/obj/Debug/net10.0-ios/iossimulator-arm64/Skrepka.pdb

Binary file not shown.

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/f4d37c22efe1c611f1e26330703855536736e15a/*"}}

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

client/obj/Debug/net10.0-ios/iossimulator-arm64/ref/Skrepka.dll

Binary file not shown.

client/obj/Debug/net10.0-ios/iossimulator-arm64/refint/Skrepka.dll

Binary file not shown.

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