core: agent users (#1727)

src/Simplex/Chat/Controller.hs

@@ -43,7 +43,7 @@ import Simplex.Chat.Store (AutoAccept, StoreError, UserContactLink)
 import Simplex.Chat.Types
 import Simplex.Messaging.Agent (AgentClient)
 import Simplex.Messaging.Agent.Client (AgentLocks, SMPTestFailure)
-import Simplex.Messaging.Agent.Env.SQLite (AgentConfig, InitialAgentServers, NetworkConfig)
+import Simplex.Messaging.Agent.Env.SQLite (AgentConfig, NetworkConfig)
 import Simplex.Messaging.Agent.Lock
 import Simplex.Messaging.Agent.Protocol
 import Simplex.Messaging.Agent.Store.SQLite (SQLiteStore)
@@ -51,7 +51,7 @@ import qualified Simplex.Messaging.Crypto as C
 import Simplex.Messaging.Encoding.String
 import Simplex.Messaging.Notifications.Protocol (DeviceToken (..), NtfTknStatus)
 import Simplex.Messaging.Parsers (dropPrefix, enumJSON, parseAll, parseString, sumTypeJSON)
-import Simplex.Messaging.Protocol (AProtocolType, CorrId, MsgFlags)
+import Simplex.Messaging.Protocol (AProtocolType, CorrId, MsgFlags, NtfServer)
 import Simplex.Messaging.TMap (TMap)
 import Simplex.Messaging.Transport.Client (TransportHost)
 import System.IO (Handle)
@@ -70,7 +70,7 @@ updateStr = "To update run: curl -o- https://raw.githubusercontent.com/simplex-c
 data ChatConfig = ChatConfig
   { agentConfig :: AgentConfig,
     yesToMigrations :: Bool,
-    defaultServers :: InitialAgentServers,
+    defaultServers :: DefaultAgentServers,
     tbqSize :: Natural,
     fileChunkSize :: Integer,
     inlineFiles :: InlineFilesConfig,
@@ -80,6 +80,12 @@ data ChatConfig = ChatConfig
     testView :: Bool
   }
 
+data DefaultAgentServers = DefaultAgentServers
+  { smp :: NonEmpty SMPServerWithAuth,
+    ntf :: [NtfServer],
+    netCfg :: NetworkConfig
+  }
+
 data InlineFilesConfig = InlineFilesConfig
   { offerChunks :: Integer,
     sendChunks :: Integer,
@@ -203,7 +209,7 @@ data ChatCommand
   | GetUserSMPServers
   | APISetUserSMPServers UserId SMPServersConfig
   | SetUserSMPServers SMPServersConfig
-  | TestSMPServer SMPServerWithAuth
+  | TestSMPServer UserId SMPServerWithAuth
   | APISetChatItemTTL UserId (Maybe Int64)
   | SetChatItemTTL (Maybe Int64)
   | APIGetChatItemTTL UserId

src/Simplex/Chat/Migrations/M20230111_users_agent_user_id.hs

@@ -0,0 +1,17 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Migrations.M20230111_users_agent_user_id where
+
+import Database.SQLite.Simple (Query)
+import Database.SQLite.Simple.QQ (sql)
+
+m20230111_users_agent_user_id :: Query
+m20230111_users_agent_user_id =
+  [sql|
+PRAGMA ignore_check_constraints=ON;
+
+ALTER TABLE users ADD COLUMN agent_user_id INTEGER CHECK (agent_user_id NOT NULL);
+UPDATE users SET agent_user_id = 1;
+
+PRAGMA ignore_check_constraints=OFF;
+|]

src/Simplex/Chat/Migrations/chat_schema.sql

@@ -29,7 +29,8 @@ CREATE TABLE users(
   local_display_name TEXT NOT NULL UNIQUE,
   active_user INTEGER NOT NULL DEFAULT 0,
   created_at TEXT CHECK(created_at NOT NULL),
-  updated_at TEXT CHECK(updated_at NOT NULL), -- 1 for active user
+  updated_at TEXT CHECK(updated_at NOT NULL),
+  agent_user_id INTEGER CHECK(agent_user_id NOT NULL), -- 1 for active user
   FOREIGN KEY(user_id, local_display_name)
   REFERENCES display_names(user_id, local_display_name)
   ON DELETE CASCADE

src/Simplex/Chat/Store.hs

@@ -25,7 +25,7 @@ module Simplex.Chat.Store
     createChatStore,
     chatStoreFile,
     agentStoreFile,
-    createUser,
+    createUserRecord,
     getUsers,
     setActiveUser,
     getSetActiveUser,
@@ -330,6 +330,7 @@ import Simplex.Chat.Migrations.M20221222_chat_ts
 import Simplex.Chat.Migrations.M20221223_idx_chat_items_item_status
 import Simplex.Chat.Migrations.M20221230_idxs
 import Simplex.Chat.Migrations.M20230107_connections_auth_err_counter
+import Simplex.Chat.Migrations.M20230111_users_agent_user_id
 import Simplex.Chat.Protocol
 import Simplex.Chat.Types
 import Simplex.Chat.Util (week)
@@ -390,7 +391,8 @@ schemaMigrations =
     ("20221222_chat_ts", m20221222_chat_ts),
     ("20221223_idx_chat_items_item_status", m20221223_idx_chat_items_item_status),
     ("20221230_idxs", m20221230_idxs),
-    ("20230107_connections_auth_err_counter", m20230107_connections_auth_err_counter)
+    ("20230107_connections_auth_err_counter", m20230107_connections_auth_err_counter),
+    ("20230111_users_agent_user_id", m20230111_users_agent_user_id)
   ]
 
 -- | The list of migrations in ascending order by date
@@ -419,15 +421,15 @@ handleSQLError err e
 insertedRowId :: DB.Connection -> IO Int64
 insertedRowId db = fromOnly . head <$> DB.query_ db "SELECT last_insert_rowid()"
 
-createUser :: DB.Connection -> Profile -> Bool -> ExceptT StoreError IO User
-createUser db Profile {displayName, fullName, image, preferences = userPreferences} activeUser =
+createUserRecord :: DB.Connection -> AgentUserId -> Profile -> Bool -> ExceptT StoreError IO User
+createUserRecord db (AgentUserId auId) Profile {displayName, fullName, image, preferences = userPreferences} activeUser =
   checkConstraint SEDuplicateName . liftIO $ do
     currentTs <- getCurrentTime
     when activeUser $ DB.execute_ db "UPDATE users SET active_user = 0"
     DB.execute
       db
-      "INSERT INTO users (local_display_name, active_user, contact_id, created_at, updated_at) VALUES (?,?,0,?,?)"
-      (displayName, activeUser, currentTs, currentTs)
+      "INSERT INTO users (agent_user_id, local_display_name, active_user, contact_id, created_at, updated_at) VALUES (?,?,?,0,?,?)"
+      (auId, displayName, activeUser, currentTs, currentTs)
     userId <- insertedRowId db
     DB.execute
       db
@@ -444,7 +446,7 @@ createUser db Profile {displayName, fullName, image, preferences = userPreferenc
       (profileId, displayName, userId, True, currentTs, currentTs)
     contactId <- insertedRowId db
     DB.execute db "UPDATE users SET contact_id = ? WHERE user_id = ?" (contactId, userId)
-    pure $ toUser (userId, contactId, profileId, activeUser, displayName, fullName, image, userPreferences)
+    pure $ toUser (userId, auId, contactId, profileId, activeUser, displayName, fullName, image, userPreferences)
 
 getUsers :: DB.Connection -> IO [User]
 getUsers db =
@@ -453,16 +455,16 @@ getUsers db =
 userQuery :: Query
 userQuery =
   [sql|
-    SELECT u.user_id, u.contact_id, cp.contact_profile_id, u.active_user, u.local_display_name, cp.full_name, cp.image, cp.preferences
+    SELECT u.user_id, u.agent_user_id, u.contact_id, cp.contact_profile_id, u.active_user, u.local_display_name, cp.full_name, cp.image, cp.preferences
     FROM users u
     JOIN contacts ct ON ct.contact_id = u.contact_id
     JOIN contact_profiles cp ON cp.contact_profile_id = ct.contact_profile_id
   |]
 
-toUser :: (UserId, ContactId, ProfileId, Bool, ContactName, Text, Maybe ImageData, Maybe Preferences) -> User
-toUser (userId, userContactId, profileId, activeUser, displayName, fullName, image, userPreferences) =
+toUser :: (UserId, UserId, ContactId, ProfileId, Bool, ContactName, Text, Maybe ImageData, Maybe Preferences) -> User
+toUser (userId, auId, userContactId, profileId, activeUser, displayName, fullName, image, userPreferences) =
   let profile = LocalProfile {profileId, displayName, fullName, image, preferences = userPreferences, localAlias = ""}
-   in User {userId, userContactId, localDisplayName = displayName, profile, activeUser, fullPreferences = mergePreferences Nothing userPreferences}
+   in User {userId, agentUserId = AgentUserId auId, userContactId, localDisplayName = displayName, profile, activeUser, fullPreferences = mergePreferences Nothing userPreferences}
 
 setActiveUser :: DB.Connection -> UserId -> IO ()
 setActiveUser db userId = do

src/Simplex/Chat/Terminal.hs

@@ -17,7 +17,6 @@ import Simplex.Chat.Options
 import Simplex.Chat.Terminal.Input
 import Simplex.Chat.Terminal.Notification
 import Simplex.Chat.Terminal.Output
-import Simplex.Messaging.Agent.Env.SQLite (InitialAgentServers (..))
 import Simplex.Messaging.Client (defaultNetworkConfig)
 import Simplex.Messaging.Util (raceAny_)
 import System.Exit (exitFailure)
@@ -26,7 +25,7 @@ terminalChatConfig :: ChatConfig
 terminalChatConfig =
   defaultChatConfig
     { defaultServers =
-        InitialAgentServers
+        DefaultAgentServers
           { smp =
               L.fromList
                 [ "smp://u2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU=@smp4.simplex.im,o5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion",

src/Simplex/Chat/Types.hs

@@ -80,8 +80,31 @@ instance IsContact Contact where
   preferences' Contact {profile = LocalProfile {preferences}} = preferences
   {-# INLINE preferences' #-}
 
+newtype AgentUserId = AgentUserId UserId
+  deriving (Eq, Show)
+
+instance StrEncoding AgentUserId where
+  strEncode (AgentUserId uId) = strEncode uId
+  strDecode s = AgentUserId <$> strDecode s
+  strP = AgentUserId <$> strP
+
+instance FromJSON AgentUserId where
+  parseJSON = strParseJSON "AgentUserId"
+
+instance ToJSON AgentUserId where
+  toJSON = strToJSON
+  toEncoding = strToJEncoding
+
+instance FromField AgentUserId where fromField f = AgentUserId <$> fromField f
+
+instance ToField AgentUserId where toField (AgentUserId uId) = toField uId
+
+aUserId :: User -> UserId
+aUserId User {agentUserId = AgentUserId uId} = uId
+
 data User = User
   { userId :: UserId,
+    agentUserId :: AgentUserId,
     userContactId :: ContactId,
     localDisplayName :: ContactName,
     profile :: LocalProfile,
@@ -92,7 +115,7 @@ data User = User
 
 instance ToJSON User where toEncoding = J.genericToEncoding J.defaultOptions
 
-type UserId = ContactId
+type UserId = Int64
 
 type ContactId = Int64