-
-
Notifications
You must be signed in to change notification settings - Fork 264
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* rename app folder * clean up package.yaml
- Loading branch information
1 parent
eb2404c
commit 5a2ded7
Showing
11 changed files
with
85 additions
and
118 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,45 +1,92 @@ | ||
{-# LANGUAGE DuplicateRecordFields #-} | ||
{-# LANGUAGE FlexibleContexts #-} | ||
{-# LANGUAGE NamedFieldPuns #-} | ||
{-# LANGUAGE OverloadedStrings #-} | ||
|
||
module Main where | ||
|
||
import Control.Concurrent (threadDelay) | ||
import Control.Concurrent.STM (readTVarIO, retry) | ||
import Control.Monad (forever, void) | ||
import Simplex.Demo (chatLayoutDemo) | ||
import ChatOptions | ||
import Control.Concurrent.STM | ||
import Control.Logger.Simple | ||
import Control.Monad.IO.Unlift | ||
import Control.Monad.Reader | ||
import Simplex.Chat | ||
import Simplex.Chat.Controller | ||
import Simplex.Input | ||
import Simplex.Messaging.Agent (getSMPAgentClient) | ||
import Simplex.Messaging.Agent.Env.SQLite | ||
import Simplex.Messaging.Client (smpDefaultConfig) | ||
import Simplex.Store (createStore) | ||
import System.IO (hFlush, stdout) | ||
import System.Terminal (putStringLn, runTerminalT, withTerminal) | ||
import qualified System.Terminal as C | ||
import qualified System.Terminal.Internal as C | ||
|
||
defaultSettings :: C.Size -> C.VirtualTerminalSettings | ||
defaultSettings size = | ||
C.VirtualTerminalSettings | ||
{ C.virtualType = "xterm", | ||
C.virtualWindowSize = pure size, | ||
C.virtualEvent = retry, | ||
C.virtualInterrupt = retry | ||
import Simplex.Terminal | ||
import System.Directory (getAppUserDataDirectory) | ||
import UnliftIO.Async (race_) | ||
|
||
cfg :: AgentConfig | ||
cfg = | ||
AgentConfig | ||
{ tcpPort = undefined, -- agent does not listen to TCP | ||
smpServers = undefined, -- filled in from options | ||
rsaKeySize = 2048 `div` 8, | ||
connIdBytes = 12, | ||
tbqSize = 16, | ||
dbFile = "smp-chat.db", | ||
smpCfg = smpDefaultConfig | ||
} | ||
|
||
logCfg :: LogConfig | ||
logCfg = LogConfig {lc_file = Nothing, lc_stderr = True} | ||
|
||
main :: IO () | ||
main = do | ||
ChatOpts {dbFile, smpServers} <- welcomeGetOpts | ||
void $ createStore "simplex-chat.db" 4 | ||
ct <- newChatTerminal | ||
a <- getSMPAgentClient cfg {dbFile, smpServers} | ||
cc <- atomically $ newChatController a ct $ tbqSize cfg | ||
-- setLogLevel LogInfo -- LogError | ||
-- withGlobalLogging logCfg $ do | ||
runReaderT simplexChat cc | ||
|
||
welcomeGetOpts :: IO ChatOpts | ||
welcomeGetOpts = do | ||
appDir <- getAppUserDataDirectory "simplex" | ||
opts@ChatOpts {dbFile} <- getChatOpts appDir | ||
putStrLn "SimpleX chat prototype v0.3.1" | ||
putStrLn $ "db: " <> dbFile | ||
putStrLn "type \"/help\" or \"/h\" for usage info" | ||
pure opts | ||
|
||
simplexChat :: (MonadUnliftIO m, MonadReader ChatController m) => m () | ||
simplexChat = race_ runTerminalInput runChatController | ||
|
||
-- defaultSettings :: C.Size -> C.VirtualTerminalSettings | ||
-- defaultSettings size = | ||
-- C.VirtualTerminalSettings | ||
-- { C.virtualType = "xterm", | ||
-- C.virtualWindowSize = pure size, | ||
-- C.virtualEvent = retry, | ||
-- C.virtualInterrupt = retry | ||
-- } | ||
|
||
-- main :: IO () | ||
-- main = do | ||
-- void $ createStore "simplex-chat.db" 4 | ||
|
||
-- hFlush stdout | ||
-- -- ChatTerminal {termSize} <- newChatTerminal | ||
-- -- pos <- C.withVirtualTerminal (defaultSettings termSize) $ | ||
-- -- \t -> runTerminalT (C.setAlternateScreenBuffer True >> C.putString "a" >> C.flush >> C.getCursorPosition) t | ||
-- -- print pos | ||
-- -- race_ (printEvents t) (updateTerminal t) | ||
-- void . withTerminal . runTerminalT $ chatLayoutDemo >> C.flush >> C.awaitEvent | ||
|
||
-- printEvents :: C.VirtualTerminal -> IO () | ||
-- printEvents t = forever $ do | ||
-- event <- withTerminal . runTerminalT $ C.flush >> C.awaitEvent | ||
-- runTerminalT (putStringLn $ show event) t | ||
|
||
hFlush stdout | ||
-- ChatTerminal {termSize} <- newChatTerminal | ||
-- pos <- C.withVirtualTerminal (defaultSettings termSize) $ | ||
-- \t -> runTerminalT (C.setAlternateScreenBuffer True >> C.putString "a" >> C.flush >> C.getCursorPosition) t | ||
-- print pos | ||
-- race_ (printEvents t) (updateTerminal t) | ||
void . withTerminal . runTerminalT $ chatLayoutDemo >> C.flush >> C.awaitEvent | ||
|
||
printEvents :: C.VirtualTerminal -> IO () | ||
printEvents t = forever $ do | ||
event <- withTerminal . runTerminalT $ C.flush >> C.awaitEvent | ||
runTerminalT (putStringLn $ show event) t | ||
|
||
updateTerminal :: C.VirtualTerminal -> IO () | ||
updateTerminal t = forever $ do | ||
threadDelay 10000 | ||
win <- readTVarIO $ C.virtualWindow t | ||
withTerminal . runTerminalT $ mapM_ C.putStringLn win >> C.flush | ||
-- updateTerminal :: C.VirtualTerminal -> IO () | ||
-- updateTerminal t = forever $ do | ||
-- threadDelay 10000 | ||
-- win <- readTVarIO $ C.virtualWindow t | ||
-- withTerminal . runTerminalT $ mapM_ C.putStringLn win >> C.flush |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters