From dea1845908b0a3c949efd5454a293aff0cf50155 Mon Sep 17 00:00:00 2001 From: Nikita Poberezkin <39944650+npoberezkin@users.noreply.github.com> Date: Sun, 23 May 2021 14:19:19 +0300 Subject: [PATCH] 0.3.2 (#146) --- CHANGELOG.md | 5 +++++ package.yaml | 2 +- src/Simplex/Messaging/Agent.hs | 2 +- src/Simplex/Messaging/Transport.hs | 2 +- tests/SMPAgentClient.hs | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ed357378..4cd989e5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 0.3.2 + +- Support websockets +- SMP server CLI commands + # 0.3.1 - Released to hackage.org diff --git a/package.yaml b/package.yaml index b2eda0eab..33cdc28f1 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: simplexmq -version: 0.3.1 +version: 0.3.2 synopsis: SimpleXMQ message broker description: | This package includes <./docs/Simplex-Messaging-Server.html server>, diff --git a/src/Simplex/Messaging/Agent.hs b/src/Simplex/Messaging/Agent.hs index 013a07e18..4556e6727 100644 --- a/src/Simplex/Messaging/Agent.hs +++ b/src/Simplex/Messaging/Agent.hs @@ -75,7 +75,7 @@ runSMPAgentBlocking (ATransport t) started cfg@AgentConfig {tcpPort} = runReader where smpAgent :: forall c m'. (Transport c, MonadUnliftIO m', MonadReader Env m') => TProxy c -> m' () smpAgent _ = runTransportServer started tcpPort $ \(h :: c) -> do - liftIO $ putLn h "Welcome to SMP v0.3.1 agent" + liftIO $ putLn h "Welcome to SMP v0.3.2 agent" c <- getSMPAgentClient logConnection c True race_ (connectClient h c) (runSMPAgentClient c) diff --git a/src/Simplex/Messaging/Transport.hs b/src/Simplex/Messaging/Transport.hs index 8872e32af..18e05260b 100644 --- a/src/Simplex/Messaging/Transport.hs +++ b/src/Simplex/Messaging/Transport.hs @@ -216,7 +216,7 @@ major :: SMPVersion -> (Int, Int) major (SMPVersion a b _ _) = (a, b) currentSMPVersion :: SMPVersion -currentSMPVersion = SMPVersion 0 3 1 0 +currentSMPVersion = SMPVersion 0 3 2 0 serializeSMPVersion :: SMPVersion -> ByteString serializeSMPVersion (SMPVersion a b c d) = B.intercalate "." [bshow a, bshow b, bshow c, bshow d] diff --git a/tests/SMPAgentClient.hs b/tests/SMPAgentClient.hs index fdb8e9be6..918b276f0 100644 --- a/tests/SMPAgentClient.hs +++ b/tests/SMPAgentClient.hs @@ -173,7 +173,7 @@ testSMPAgentClientOn :: (Transport c, MonadUnliftIO m) => ServiceName -> (c -> m testSMPAgentClientOn port' client = do runTransportClient agentTestHost port' $ \h -> do line <- liftIO $ getLn h - if line == "Welcome to SMP v0.3.1 agent" + if line == "Welcome to SMP v0.3.2 agent" then client h else error $ "wrong welcome message: " <> B.unpack line