simplify mobile API to have single controller (#274)

* simplify mobile API to have single controller

* update chat response in swift

* add async to stack

tests/ChatClient.hs

@@ -79,7 +79,7 @@ virtualSimplexChat dbFilePrefix profile = do
   Right user <- runExceptT $ createUser st profile True
   t <- withVirtualTerminal termSettings pure
   ct <- newChatTerminal t
-  cc <- newChatController st user cfg opts {dbFilePrefix} . const $ pure () -- no notifications
+  cc <- newChatController st (Just user) cfg opts {dbFilePrefix} . const $ pure () -- no notifications
   chatAsync <- async $ runSimplexChat user ct cc
   termQ <- newTQueueIO
   termAsync <- async $ readTerminalOutput t termQ
@@ -108,16 +108,18 @@ readTerminalOutput t termQ = do
             then map (dropWhileEnd (== ' ')) diff
             else getDiff_ (n + 1) len win' win
 
-testChatN :: [Profile] -> ([TestCC] -> IO ()) -> IO ()
-testChatN ps test =
+withTmpFiles :: IO () -> IO ()
+withTmpFiles =
   bracket_
     (createDirectoryIfMissing False "tests/tmp")
     (removeDirectoryRecursive "tests/tmp")
-    $ do
-      let envs = zip ps $ map ((testDBPrefix <>) . show) [(1 :: Int) ..]
-      tcs <- getTestCCs envs []
-      test tcs
-      concurrentlyN_ $ map (<// 100000) tcs
+
+testChatN :: [Profile] -> ([TestCC] -> IO ()) -> IO ()
+testChatN ps test = withTmpFiles $ do
+  let envs = zip ps $ map ((testDBPrefix <>) . show) [(1 :: Int) ..]
+  tcs <- getTestCCs envs []
+  test tcs
+  concurrentlyN_ $ map (<// 100000) tcs
   where
     getTestCCs [] tcs = pure tcs
     getTestCCs ((p, db) : envs') tcs = (:) <$> virtualSimplexChat db p <*> getTestCCs envs' tcs

tests/ChatTests.hs

@@ -10,6 +10,7 @@ import Control.Concurrent.Async (concurrently_)
 import Control.Concurrent.STM
 import qualified Data.ByteString as B
 import Data.Char (isDigit)
+import Data.Maybe (fromJust)
 import qualified Data.Text as T
 import Simplex.Chat.Controller
 import Simplex.Chat.Types (Profile (..), User (..))
@@ -753,7 +754,7 @@ connectUsers cc1 cc2 = do
 
 showName :: TestCC -> IO String
 showName (TestCC ChatController {currentUser} _ _ _ _) = do
-  User {localDisplayName, profile = Profile {fullName}} <- readTVarIO currentUser
+  Just User {localDisplayName, profile = Profile {fullName}} <- readTVarIO currentUser
   pure . T.unpack $ localDisplayName <> " (" <> fullName <> ")"
 
 createGroup2 :: String -> TestCC -> TestCC -> IO ()
@@ -811,7 +812,7 @@ cc1 <##> cc2 = do
   cc1 <# (name2 <> "> hey")
 
 userName :: TestCC -> IO [Char]
-userName (TestCC ChatController {currentUser} _ _ _ _) = T.unpack . localDisplayName <$> readTVarIO currentUser
+userName (TestCC ChatController {currentUser} _ _ _ _) = T.unpack . localDisplayName . fromJust <$> readTVarIO currentUser
 
 (##>) :: TestCC -> String -> IO ()
 cc ##> cmd = do

tests/MobileTests.hs

@@ -0,0 +1,43 @@
+{-# LANGUAGE NamedFieldPuns #-}
+
+module MobileTests where
+
+import ChatClient
+import ChatTests
+import Control.Monad.Except
+import Simplex.Chat.Mobile
+import Simplex.Chat.Store
+import Test.Hspec
+
+mobileTests :: Spec
+mobileTests = do
+  describe "mobile API" $ do
+    it "start new chat without user" testChatApiNoUser
+    it "start new chat with existing user" testChatApi
+
+noActiveUser :: String
+noActiveUser = "{\"resp\":{\"chatCmdError\":{\"chatError\":{\"error\":{\"errorType\":{\"noActiveUser\":{}}}}}}}"
+
+activeUserExists :: String
+activeUserExists = "{\"resp\":{\"chatCmdError\":{\"chatError\":{\"error\":{\"errorType\":{\"activeUserExists\":{}}}}}}}"
+
+activeUser :: String
+activeUser = "{\"resp\":{\"activeUser\":{\"user\":{\"userId\":1,\"userContactId\":1,\"localDisplayName\":\"alice\",\"profile\":{\"displayName\":\"alice\",\"fullName\":\"Alice\"},\"activeUser\":true}}}}"
+
+testChatApiNoUser :: IO ()
+testChatApiNoUser = withTmpFiles $ do
+  cc <- chatInit testDBPrefix
+  chatSendCmd cc "/u" `shouldReturn` noActiveUser
+  chatSendCmd cc "/_start" `shouldReturn` noActiveUser
+  chatSendCmd cc "/u alice Alice" `shouldReturn` activeUser
+  chatSendCmd cc "/_start" `shouldReturn` "{\"resp\":{\"chatStarted\":{}}}"
+
+testChatApi :: IO ()
+testChatApi = withTmpFiles $ do
+  let f = chatStoreFile testDBPrefix
+  st <- createStore f 1
+  Right _ <- runExceptT $ createUser st aliceProfile True
+  cc <- chatInit testDBPrefix
+  chatSendCmd cc "/u" `shouldReturn` activeUser
+  chatSendCmd cc "/u alice Alice" `shouldReturn` activeUserExists
+  chatSendCmd cc "/_start" `shouldReturn` "{\"resp\":{\"chatStarted\":{}}}"

tests/Test.hs

@@ -1,6 +1,7 @@
 import ChatClient
 import ChatTests
 import MarkdownTests
+import MobileTests
 import ProtocolTests
 import Test.Hspec
 
@@ -8,4 +9,5 @@ main :: IO ()
 main = withSmpServer . hspec $ do
   describe "SimpleX chat markdown" markdownTests
   describe "SimpleX chat protocol" protocolTests
+  describe "Mobile API Tests" mobileTests
   describe "SimpleX chat client" chatTests