Merge branch 'smp-web' into ep/smp-web

Author: epoberezkin

simplexmq.cabal

@@ -1,7 +1,7 @@
 cabal-version: 1.12
 
 name:           simplexmq
-version:        6.5.0.10
+version:        6.5.0.11
 synopsis:       SimpleXMQ message broker
 description:    This package includes <./docs/Simplex-Messaging-Server.html server>,
                 <./docs/Simplex-Messaging-Client.html client> and

src/Simplex/Messaging/Agent/Store/AgentStore.hs

@@ -457,7 +457,7 @@ checkConfirmedSndQueueExists_ db SndQueue {server, sndId} =
     DB.query
       db
       ( "SELECT 1 FROM snd_queues WHERE host = ? AND port = ? AND snd_id = ? AND status != ? LIMIT 1"
-#if defined(dpPostgres)
+#if defined(dbPostgres)
           <> " FOR UPDATE"
 #endif
       )

src/Simplex/Messaging/Util.hs

@@ -350,6 +350,7 @@ groupAllOn f = groupOn f . sortOn f
 -- n must be > 0
 toChunks :: Int -> [a] -> [NonEmpty a]
 toChunks _ [] = []
+toChunks 0 (x : xs) = [x :| xs]
 toChunks n xs =
   let (ys, xs') = splitAt n xs
    in maybe id (:) (L.nonEmpty ys) (toChunks n xs')

src/Simplex/RemoteControl/Types.hs

@@ -13,7 +13,6 @@ module Simplex.RemoteControl.Types
     RCPVersion,
     VersionRCP,
     VersionRangeRCP,
-    IpProbe (..),
     RCHostHello (..),
     RCCtrlHello (..),
     RCHostPairing (..),
@@ -141,16 +140,6 @@ currentRCPVersion = VersionRCP 1
 supportedRCPVRange :: VersionRangeRCP
 supportedRCPVRange = mkVersionRange (VersionRCP 1) currentRCPVersion
 
-data IpProbe = IpProbe
-  { versionRange :: VersionRangeRCP,
-    randomNonce :: ByteString
-  }
-  deriving (Show)
-
-instance Encoding IpProbe where
-  smpEncode IpProbe {versionRange, randomNonce} = smpEncode (versionRange, 'I', randomNonce)
-  smpP = IpProbe <$> (smpP <* "I") *> smpP
-
 -- * Session
 
 data RCHostHello = RCHostHello

tests/Test.hs

@@ -40,6 +40,7 @@ import XFTPWebTests (xftpWebTests)
 
 #if defined(dbPostgres)
 import Fixtures
+import Simplex.Messaging.Agent.Store.Postgres.Util (dropAllSchemasExceptSystem)
 #else
 import AgentTests.SchemaDump (schemaDumpTest)
 #endif
@@ -151,7 +152,11 @@ main = do
           describe "XFTP file description" fileDescriptionTests
           describe "XFTP CLI" xftpCLITests
           describe "XFTP agent" xftpAgentTests
-        describe "XFTP Web Client" xftpWebTests
+#if defined(dbPostgres)
+        describe "XFTP Web Client" $ xftpWebTests (dropAllSchemasExceptSystem testDBConnectInfo)
+#else
+        describe "XFTP Web Client" $ xftpWebTests (pure ())
+#endif
         describe "XRCP" remoteControlTests
         describe "Web" webTests
         describe "Server CLIs" cliTests

tests/XFTPWebTests.hs

@@ -50,7 +50,7 @@ import AgentTests.FunctionalAPITests (rfGet, runRight, runRight_, sfGet, withAge
 import Simplex.Messaging.Agent (AgentClient, xftpReceiveFile, xftpSendFile, xftpStartWorkers)
 import Simplex.Messaging.Agent.Protocol (AEvent (..))
 import SMPAgentClient (agentCfg, initAgentServers, testDB)
-import XFTPCLI (recipientFiles, senderFiles)
+import XFTPCLI (recipientFiles, senderFiles, testBracket)
 import qualified Simplex.Messaging.Crypto.File as CF
 
 xftpWebDir :: FilePath
@@ -167,8 +167,8 @@ impAddr = "import * as Addr from './dist/protocol/address.js';"
 jsOut :: String -> String
 jsOut expr = "process.stdout.write(Buffer.from(" <> expr <> "));"
 
-xftpWebTests :: Spec
-xftpWebTests = do
+xftpWebTests :: IO () -> Spec
+xftpWebTests dbCleanup = do
   distExists <- runIO $ doesDirectoryExist (xftpWebDir <> "/dist")
   if distExists
     then do
@@ -187,7 +187,7 @@ xftpWebTests = do
       tsClientTests
       tsDownloadTests
       tsAddressTests
-      tsIntegrationTests
+      tsIntegrationTests dbCleanup
     else
       it "skipped (run 'cd xftp-web && npm install && npm run build' first)" $
         pendingWith "TS project not compiled"
@@ -2829,8 +2829,9 @@ tsAddressTests = describe "protocol/address" $ do
 
 -- ── integration ───────────────────────────────────────────────────
 
-tsIntegrationTests :: Spec
-tsIntegrationTests = describe "integration" $ do
+tsIntegrationTests :: IO () -> Spec
+tsIntegrationTests dbCleanup = describe "integration" $
+  around_ testBracket . after_ dbCleanup $ do
   it "web handshake with Ed25519 identity verification" $
     webHandshakeTest testXFTPServerConfigEd25519SNI "tests/fixtures/ed25519/ca.crt"
   it "web handshake with Ed448 identity verification" $

xftp-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simplex-chat/xftp-web",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "XFTP file transfer protocol client for web/browser environments",
   "license": "AGPL-3.0-only",
   "repository": {