dandri/simplexmq
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplexmq.git synced 2026-08-28 23:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Transaction fields for size, session IDs, refactor (#222)

Browse Source 
* add SMP session IDs/tls-unique to transmission

* refactor SMP transmissions: precise transmission types in server & client

* use correct session IDs

* remove TSession
This commit is contained in:
Evgeny Poberezkin
2021-12-15 08:06:34 +00:00
committed by GitHub
parent 83d352cfbe
commit cf3d0dfdc3
9 changed files with 351 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Simplex/Messaging/Server/Env/STM.hs
+7 -6
View File
@@ -19,7 +19,7 @@ import Simplex.Messaging.Server.MsgStore.STM
import Simplex.Messaging.Server.QueueStore (QueueRec (..))
import Simplex.Messaging.Server.QueueStore.STM
import Simplex.Messaging.Server.StoreLog
import Simplex.Messaging.Transport (ATransport, loadServerCredential)
import Simplex.Messaging.Transport (ATransport, SessionId, loadServerCredential)
import System.IO (IOMode (..))
import UnliftIO.STM
@@ -58,8 +58,9 @@ data Server = Server
data Client = Client
{ subscriptions :: TVar (Map RecipientId Sub),
ntfSubscriptions :: TVar (Map NotifierId ()),
rcvQ :: TBQueue Transmission,
sndQ :: TBQueue Transmission
rcvQ :: TBQueue (Transmission ClientCmd),
sndQ :: TBQueue BrokerTransmission,
sndSessionId :: SessionId
}
data SubscriptionThread = NoSub | SubPending | SubThread ThreadId
@@ -77,13 +78,13 @@ newServer qSize = do
notifiers <- newTVar M.empty
return Server {subscribedQ, subscribers, ntfSubscribedQ, notifiers}
newClient :: Natural -> STM Client
newClient qSize = do
newClient :: Natural -> SessionId -> STM Client
newClient qSize sndSessionId = do
subscriptions <- newTVar M.empty
ntfSubscriptions <- newTVar M.empty
rcvQ <- newTBQueue qSize
sndQ <- newTBQueue qSize
return Client {subscriptions, ntfSubscriptions, rcvQ, sndQ}
return Client {subscriptions, ntfSubscriptions, rcvQ, sndQ, sndSessionId}
newSubscription :: STM Sub
newSubscription = do