e3148dd · skrepka · git.iko.soy

client/ApiClient.fs+35−38

compare with master

unifiedsplit

@@ -12,12 +12,46 @@ module ApiClient =

12 [<CLIMutable>]

13 type EventPayload = { EncryptedBlob: string; Timestamp: int64 }

14

15+ [<JsonConverter(typeof<EventTypeConverter>)>]

15 type EventType = Message | Ack | UnknownEvent of string

16 type EventType = Message | Ack | UnknownEvent of string

17+ and private EventTypeConverter() =

18+ inherit JsonConverter<EventType>()

19+ override _.Read(reader, _, _) =

20+ match reader.GetString() with

21+ | "message" -> Message

22+ | "ack" -> Ack

23+ | s -> UnknownEvent s

24+ override _.Write(writer, value, _) =

25+ writer.WriteStringValue(

26+ match value with

27+ | Message -> "message"

28+ | Ack -> "ack"

29+ | UnknownEvent s -> s)

16

30

17 [<CLIMutable>]

31 [<CLIMutable>]

18 type PollEvent = { Id: string; EventType: EventType; Payload: EventPayload }

32 type PollEvent = { Id: string; EventType: EventType; Payload: EventPayload }

19

33

34+ [<JsonConverter(typeof<MessageStatusConverter>)>]

36+ and private MessageStatusConverter() =

37+ inherit JsonConverter<MessageStatus>()

38+ override _.Read(reader, _, _) =

39+ match reader.GetString() with

40+ | "delivered" -> Delivered

41+ | "federated" -> Federated

42+ | "queued" -> Queued

43+ | "rejected" -> Rejected

44+ | "unauthorized" -> Unauthorized

45+ | s -> UnknownStatus s

46+ override _.Write(writer, value, _) =

47+ writer.WriteStringValue(

48+ match value with

49+ | Delivered -> "delivered"

50+ | Federated -> "federated"

51+ | Queued -> "queued"

52+ | Rejected -> "rejected"

53+ | Unauthorized -> "unauthorized"

54+ | UnknownStatus s -> s)

21

55

22 [<CLIMutable>]

56 [<CLIMutable>]

23 type private SendResult = { Status: MessageStatus }

57 type private SendResult = { Status: MessageStatus }

@@ -41,45 +75,8 @@ module ApiClient =

41 else ok t.Result)

75 else ok t.Result)

42 |> ignore)

76 |> ignore)

43

77

44− type private MessageStatusConverter() =

45− inherit JsonConverter<MessageStatus>()

46− override _.Read(reader, _, _) =

47− match reader.GetString() with

48− | "delivered" -> Delivered

49− | "federated" -> Federated

50− | "queued" -> Queued

51− | "rejected" -> Rejected

52− | "unauthorized" -> Unauthorized

53− | s -> UnknownStatus s

54− override _.Write(writer, value, _) =

55− writer.WriteStringValue(

56− match value with

57− | Delivered -> "delivered"

58− | Federated -> "federated"

59− | Queued -> "queued"

60− | Rejected -> "rejected"

61− | Unauthorized -> "unauthorized"

62− | UnknownStatus s -> s)

63−

64− type private EventTypeConverter() =

65− inherit JsonConverter<EventType>()

66− override _.Read(reader, _, _) =

67− match reader.GetString() with

68− | "message" -> Message

69− | "ack" -> Ack

70− | s -> UnknownEvent s

71− override _.Write(writer, value, _) =

72− writer.WriteStringValue(

73− match value with

74− | Message -> "message"

75− | Ack -> "ack"

76− | UnknownEvent s -> s)

77−

78 let private jsonOpts =

79− let opts = JsonSerializerOptions(PropertyNameCaseInsensitive = true, NumberHandling = JsonNumberHandling.AllowReadingFromString)

79+ JsonSerializerOptions(PropertyNameCaseInsensitive = true, NumberHandling = JsonNumberHandling.AllowReadingFromString)

80− opts.Converters.Add(MessageStatusConverter())

81− opts.Converters.Add(EventTypeConverter())

82− opts

83

80

84 let private client =

81 let private client =

85 let c = new HttpClient()

82 let c = new HttpClient()

client/App.fs+3−3

@@ -319,7 +319,7 @@ module App =

319

320 match Crypto.decrypt privKey blob with

321 | Some(plaintext, senderHex) ->

322− let envelope = JsonSerializer.Deserialize<TextEnvelope>(plaintext, envelopeJsonOpts)

322+ let envelope = JsonSerializer.Deserialize<TextEnvelope>(plaintext)

323

324 match envelope.Type with

325 | Text ->

@@ -336,7 +336,7 @@ module App =

336 let mapCmd cmdMsg =

337 match cmdMsg with

338 | CmdGenIdentity ->

339− asyncCmd (async { return IdentityReady(Crypto.generateIdentity ()) })

339+ Cmd.ofEffect (fun dispatch -> dispatch (IdentityReady(Crypto.generateIdentity ())))

340

341 | CmdConnect(url, identity) ->

342 asyncCmd (async {

@@ -353,7 +353,7 @@ module App =

353 try

354 let recipPub = Crypto.fromHex recipientHex

355 let ts = DateTimeOffset.UtcNow.ToUnixTimeSeconds()

356− let payload = JsonSerializer.Serialize<TextEnvelope>({ Type = Text; Id = messageId; Body = text }, envelopeJsonOpts)

356+ let payload = JsonSerializer.Serialize<TextEnvelope>({ Type = Text; Id = messageId; Body = text })

357 let blob = Crypto.encrypt session.Identity.PrivKey recipPub payload

358 let! status = sendMessage session.Url session.Token recipientHex (Crypto.toHex blob) ts

359

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-maccatalyst/maccatalyst-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+a6088f11f8b9f333baecd765cfde004d371fea16")>]

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

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-maccatalyst/maccatalyst-arm64/Skrepka.AssemblyInfoInputs.cache+1−1

@@ -1 +1 @@

1−c792c6af7fcf4a9f3bc9ffab40c693a5335abf2b4bd4c1fd73018e15acd8228b

1+35309a0fe3ed35bcd80b2e755c52f81fc42b7e6e3c07f1b3a7cf0e54f7919e32

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

Binary file not shown.

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

Binary file not shown.

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

@@ -1 +1 @@

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

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

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

Binary file not shown.

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

Binary file not shown.

server.knot+11−12

@@ -115,7 +115,7 @@ type PresenceEntry = {pubkey: PubkeyHex, server: AnyServerName, expiresAt: Times

115type ForwardEntry = {messageId: MessageIdHex, toServer: ServerName, createdAt: Timestamp, toKey: PubkeyHex, fromKey: PubkeyHex, encryptedBlob: BlobHex, timestamp: Timestamp}

116type AckedEntry = {messageId: MessageIdHex, toKey: PubkeyHex, ackedAt: Timestamp, originServer: ServerName}

117type AuthResult = Authorized {pubkey: PubkeyHex} | Unauthorized {}

118−type SendResult = SendUnauthorized {} | SendRejected {} | SendDone {status: MessageStatus, remoteServers: [ServerName], fromKey: PubkeyHex}

118+type SendResult = SendFailed {status: MessageStatus} | SendDone {status: MessageStatus, remoteServers: [ServerName], fromKey: PubkeyHex}

119

120

121-- ============================================

@@ -818,11 +818,11 @@ serve = \req -> case req of

818 auth <- authenticateRequest authorization t

819 case auth of

820 Unauthorized {} ->

821− yield {pr: pr, send: SendUnauthorized {}}

821+ yield {pr: pr, send: SendFailed {status: MsUnauthorized {}}}

822 Authorized {pubkey: fromKey} -> do

823 messages <- *messages

824 if countMessagesFor messages to t >= maxMessagesPerRecipient

825− then yield {pr: pr, send: SendRejected {}}

825+ then yield {pr: pr, send: SendFailed {status: MsRejected {}}}

826 else do

827 presence <- *presence

828 seqCounter <- *seqCounter

@@ -860,8 +860,7 @@ serve = \req -> case req of

860 _ -> yield {}

861 broadcastOfflineGossip t result.pr.peerServers result.pr.expiredLocal)

862 yield (case result.send of

863− SendUnauthorized _ -> respond {status: MsUnauthorized {}, messageId: ""}

864− SendRejected _ -> respond {status: MsRejected {}, messageId: ""}

863+ SendFailed {status} -> respond {status: status, messageId: ""}

865 SendDone {status} -> respond {status: status, messageId: msgId})

864 SendDone {status} -> respond {status: status, messageId: msgId})

866

865

867 AckMessages {messageIds, authorization, respond} -> do

866 AckMessages {messageIds, authorization, respond} -> do

@@ -913,10 +912,10 @@ serve = \req -> case req of

913 where p.pubkey == pubkey && p.expiresAt > t

912 where p.pubkey == pubkey && p.expiresAt > t

914 yield p

913 yield p

915 let foundServer = (fold (\acc p ->

914 let foundServer = (fold (\acc p ->

916− if acc.local then acc

915+ if acc.server == serverHostN then acc

917− else if p.server == serverHostN then {server: serverHostN, best: 0, local: True {}}

916+ else if p.server == serverHostN then {server: serverHostN, best: 0}

918− else if p.expiresAt > acc.best then {server: p.server, best: p.expiresAt, local: False {}}

917+ else if p.expiresAt > acc.best then {server: p.server, best: p.expiresAt}

919− else acc) {server: "", best: 0, local: False {}} valid).server

918+ else acc) {server: "", best: 0} valid).server

920 yield {pr: pr, authorized: True {}, foundServer: foundServer}

919 yield {pr: pr, authorized: True {}, foundServer: foundServer}

921 forkBroadcastOffline t result.pr

920 forkBroadcastOffline t result.pr

922 yield (respond {online: result.foundServer != "", server: result.foundServer, authorized: result.authorized})

921 yield (respond {online: result.foundServer != "", server: result.foundServer, authorized: result.authorized})

@@ -932,16 +931,16 @@ serve = \req -> case req of

932 else do

931 else do

933 let allValidEntries = validGossipEvents events t

932 let allValidEntries = validGossipEvents events t

934 let onlineEntries = do e <- allValidEntries; where isGossipOnline e.eventType; yield e

933 let onlineEntries = do e <- allValidEntries; where isGossipOnline e.eventType; yield e

935− let offlineEntries = do e <- allValidEntries; where not (isGossipOnline e.eventType); yield e

934+ let offlineEntries = diff allValidEntries onlineEntries

935+ let trustedOffline = do e <- offlineEntries; where e.server == fromServer; yield e

936 let filteredOnline = do

937 e <- onlineEntries

938− where none offlineEntries (\o -> o.server == fromServer && samePubkeyServer o e && o.timestamp > e.timestamp)

938+ where none trustedOffline (\o -> samePubkeyServer o e && o.timestamp > e.timestamp)

939 yield e

940 let filteredOffline = do

941 e <- offlineEntries

942 where none onlineEntries (\o -> samePubkeyServer o e && o.timestamp > e.timestamp)

943 yield e

944− let trustedOffline = do e <- offlineEntries; where e.server == fromServer; yield e

945 let deduped = mergeByPubkeyServer [] filteredOnline

944 let deduped = mergeByPubkeyServer [] filteredOnline

946 gossipResult <- atomic do

945 gossipResult <- atomic do

947 pr <- maybePrune t

946 pr <- maybePrune t