dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-09-21 05:16:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

rework batching

Browse Source
This commit is contained in:
spaced4ndy
2023-12-20 20:15:16 +04:00
parent cadce7488f
commit a832e217a7
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Simplex/Chat.hs
+19 -9
View File
@@ -5656,24 +5656,34 @@ batchChatMessages = mkBatch []
where
mkBatch :: [ChatMessageBatch] -> NonEmpty SndMessage -> [ChatMessageBatch]
mkBatch batches msgs =
let (batch, msgs_) = encodeBatch "[" 1 0 [] msgs
let (batch, msgs_) = encodeBatch mempty 0 0 [] msgs
batches' = batch : batches
in maybe batches' (mkBatch batches') msgs_
encodeBatch :: Builder.Builder -> Int -> Int -> [SndMessage] -> NonEmpty SndMessage -> (ChatMessageBatch, Maybe (NonEmpty SndMessage))
encodeBatch builder len cnt batchedMsgs remainingMsgs@(msg :| msgs_)
| len' <= maxChatMsgSize - 1 =
| len' <= maxSize' =
case L.nonEmpty msgs_ of
Just msgs' -> encodeBatch builder' len' cnt' batchedMsgs' msgs'
Nothing -> (CMBMessages $ MessagesBatch (builder' <> "]") (reverse batchedMsgs'), Nothing)
| cnt == 0 = (CMBLargeMessage msg, L.nonEmpty msgs_)
| otherwise = (CMBMessages $ MessagesBatch (builder <> "]") (reverse batchedMsgs), Just remainingMsgs)
Nothing -> (CMBMessages $ MessagesBatch (completeBuilder builder') (reverse batchedMsgs'), Nothing)
| cnt' == 1 = (CMBLargeMessage msg, L.nonEmpty msgs_)
| otherwise = (CMBMessages $ MessagesBatch (completeBuilder builder) (reverse batchedMsgs), Just remainingMsgs)
where
SndMessage {msgBody} = msg
len' = len + B.length msgBody
builder'
| cnt == 0 = builder <> Builder.byteString msgBody
| otherwise = builder <> "," <> Builder.byteString msgBody
cnt' = cnt + 1
len'
| cnt' == 1 = B.length msgBody -- initially len = 0
| cnt' == 2 = len + B.length msgBody + 2 -- for opening bracket "[" and comma ","
| otherwise = len + B.length msgBody + 1 -- for comma ","
builder'
| cnt' == 1 = Builder.byteString msgBody
| cnt' == 2 = "[" <> builder <> "," <> Builder.byteString msgBody
| otherwise = builder <> "," <> Builder.byteString msgBody
completeBuilder bldr
| cnt' == 1 = bldr
| otherwise = bldr <> "]"
maxSize'
| cnt' == 1 = maxChatMsgSize
| otherwise = maxChatMsgSize - 1 -- for closing bracket "]"
batchedMsgs' = msg : batchedMsgs
directMessage :: (MsgEncodingI e, ChatMonad m) => ChatMsgEvent e -> m ByteString