core: xftp servers option; use local xftp server in tests (#2015)

src/Simplex/Chat.hs

@@ -146,7 +146,7 @@ createChatDatabase filePrefix key yesToMigrations = do
   pure ChatDatabase {chatStore, agentStore}
 
 newChatController :: ChatDatabase -> Maybe User -> ChatConfig -> ChatOpts -> Maybe (Notification -> IO ()) -> IO ChatController
-newChatController ChatDatabase {chatStore, agentStore} user cfg@ChatConfig {agentConfig = aCfg, defaultServers, inlineFiles, tempDir} ChatOpts {coreOptions = CoreChatOpts {smpServers, networkConfig, logLevel, logConnections, logServerHosts, logFile, tbqSize}, optFilesFolder, allowInstantFiles} sendToast = do
+newChatController ChatDatabase {chatStore, agentStore} user cfg@ChatConfig {agentConfig = aCfg, defaultServers, inlineFiles, tempDir} ChatOpts {coreOptions = CoreChatOpts {smpServers, xftpServers, networkConfig, logLevel, logConnections, logServerHosts, logFile, tbqSize}, optFilesFolder, allowInstantFiles} sendToast = do
   let inlineFiles' = if allowInstantFiles then inlineFiles else inlineFiles {sendChunks = 0, receiveInstant = False}
       config = cfg {logLevel, tbqSize, subscriptionEvents = logConnections, hostEvents = logServerHosts, defaultServers = configServers, inlineFiles = inlineFiles'}
       sendNotification = fromMaybe (const $ pure ()) sendToast
@@ -178,7 +178,8 @@ newChatController ChatDatabase {chatStore, agentStore} user cfg@ChatConfig {agen
     configServers :: DefaultAgentServers
     configServers =
       let smp' = fromMaybe (smp (defaultServers :: DefaultAgentServers)) (nonEmpty smpServers)
-       in defaultServers {smp = smp', netCfg = networkConfig}
+          xftp' = fromMaybe (xftp (defaultServers :: DefaultAgentServers)) (nonEmpty xftpServers)
+       in defaultServers {smp = smp', xftp = xftp', netCfg = networkConfig}
     agentServers :: ChatConfig -> IO InitialAgentServers
     agentServers config@ChatConfig {defaultServers = defServers@DefaultAgentServers {ntf, netCfg}} = do
       users <- withTransaction chatStore getUsers

src/Simplex/Chat/Mobile.hs

@@ -130,6 +130,7 @@ mobileChatOpts dbFilePrefix dbKey =
           { dbFilePrefix,
             dbKey,
             smpServers = [],
+            xftpServers = [],
             networkConfig = defaultNetworkConfig,
             logLevel = CLLImportant,
             logConnections = False,

src/Simplex/Chat/Options.hs

@@ -25,7 +25,7 @@ import Simplex.Chat.Controller (ChatLogLevel (..), updateStr, versionNumber, ver
 import Simplex.Messaging.Client (NetworkConfig (..), defaultNetworkConfig)
 import Simplex.Messaging.Encoding.String
 import Simplex.Messaging.Parsers (parseAll)
-import Simplex.Messaging.Protocol (SMPServerWithAuth)
+import Simplex.Messaging.Protocol (SMPServerWithAuth, XFTPServerWithAuth)
 import Simplex.Messaging.Transport.Client (SocksProxy, defaultSocksProxy)
 import System.FilePath (combine)
 
@@ -43,6 +43,7 @@ data CoreChatOpts = CoreChatOpts
   { dbFilePrefix :: String,
     dbKey :: String,
     smpServers :: [SMPServerWithAuth],
+    xftpServers :: [XFTPServerWithAuth],
     networkConfig :: NetworkConfig,
     logLevel :: ChatLogLevel,
     logConnections :: Bool,
@@ -88,6 +89,14 @@ coreChatOptsP appDir defaultDbFileName = do
           <> help "Semicolon-separated list of SMP server(s) to use (each server can have more than one hostname)"
           <> value []
       )
+  xftpServers <-
+    option
+      parseXFTPServers
+      ( long "xftp-server"
+          <> metavar "SERVER"
+          <> help "Semicolon-separated list of XFTP server(s) to use (each server can have more than one hostname)"
+          <> value []
+      )
   socksProxy <-
     flag' (Just defaultSocksProxy) (short 'x' <> help "Use local SOCKS5 proxy at :9050")
       <|> option
@@ -156,6 +165,7 @@ coreChatOptsP appDir defaultDbFileName = do
       { dbFilePrefix,
         dbKey,
         smpServers,
+        xftpServers,
         networkConfig = fullNetworkConfig socksProxy (useTcpTimeout socksProxy t) (logTLSErrors || logLevel == CLLDebug),
         logLevel,
         logConnections = logConnections || logLevel <= CLLInfo,
@@ -236,6 +246,9 @@ fullNetworkConfig socksProxy tcpTimeout logTLSErrors =
 parseSMPServers :: ReadM [SMPServerWithAuth]
 parseSMPServers = eitherReader $ parseAll smpServersP . B.pack
 
+parseXFTPServers :: ReadM [XFTPServerWithAuth]
+parseXFTPServers = eitherReader $ parseAll xftpServersP . B.pack
+
 parseSocksProxy :: ReadM (Maybe SocksProxy)
 parseSocksProxy = eitherReader $ parseAll strP . B.pack
 
@@ -248,6 +261,9 @@ serverPortP = Just . B.unpack <$> A.takeWhile A.isDigit
 smpServersP :: A.Parser [SMPServerWithAuth]
 smpServersP = strP `A.sepBy1` A.char ';'
 
+xftpServersP :: A.Parser [XFTPServerWithAuth]
+xftpServersP = strP `A.sepBy1` A.char ';'
+
 parseLogLevel :: ReadM ChatLogLevel
 parseLogLevel = eitherReader $ \case
   "debug" -> Right CLLDebug