core: don't save async commands records for ack (#3904)

src/Simplex/Chat/Messages.hs

@@ -871,8 +871,7 @@ data SndMsgDelivery = SndMsgDelivery
 data RcvMsgDelivery = RcvMsgDelivery
   { connId :: Int64,
     agentMsgId :: AgentMsgId,
-    agentMsgMeta :: MsgMeta,
-    agentAckCmdId :: CommandId
+    agentMsgMeta :: MsgMeta
   }
   deriving (Show)
 
@@ -899,7 +898,7 @@ msgMetaToJson MsgMeta {integrity, recipient = (rcvId, rcvTs), broker = (serverId
 
 data MsgDeliveryStatus (d :: MsgDirection) where
   MDSRcvAgent :: MsgDeliveryStatus 'MDRcv
-  MDSRcvAcknowledged :: MsgDeliveryStatus 'MDRcv
+  MDSRcvAcknowledged :: MsgDeliveryStatus 'MDRcv -- not used
   MDSSndPending :: MsgDeliveryStatus 'MDSnd
   MDSSndAgent :: MsgDeliveryStatus 'MDSnd
   MDSSndSent :: MsgDeliveryStatus 'MDSnd

src/Simplex/Chat/Migrations/M20240313_drop_agent_ack_cmd_id.hs

@@ -0,0 +1,22 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Migrations.M20240313_drop_agent_ack_cmd_id where
+
+import Database.SQLite.Simple (Query)
+import Database.SQLite.Simple.QQ (sql)
+
+m20240313_drop_agent_ack_cmd_id :: Query
+m20240313_drop_agent_ack_cmd_id =
+  [sql|
+DROP INDEX idx_msg_deliveries_agent_ack_cmd_id;
+
+ALTER TABLE msg_deliveries DROP COLUMN agent_ack_cmd_id;
+|]
+
+down_m20240313_drop_agent_ack_cmd_id :: Query
+down_m20240313_drop_agent_ack_cmd_id =
+  [sql|
+ALTER TABLE msg_deliveries ADD COLUMN agent_ack_cmd_id INTEGER;
+
+CREATE INDEX idx_msg_deliveries_agent_ack_cmd_id ON msg_deliveries(connection_id, agent_ack_cmd_id);
+|]

src/Simplex/Chat/Migrations/chat_schema.sql

@@ -556,7 +556,6 @@ CREATE TABLE IF NOT EXISTS "msg_deliveries"(
   chat_ts TEXT NOT NULL DEFAULT(datetime('now')),
   created_at TEXT CHECK(created_at NOT NULL),
   updated_at TEXT CHECK(updated_at NOT NULL),
-  agent_ack_cmd_id INTEGER, -- broker_ts for received, created_at for sent
   delivery_status TEXT -- MsgDeliveryStatus
 );
 CREATE TABLE note_folders(
@@ -826,10 +825,6 @@ CREATE INDEX idx_contact_requests_updated_at ON contact_requests(
 );
 CREATE INDEX idx_connections_updated_at ON connections(user_id, updated_at);
 CREATE INDEX idx_msg_deliveries_message_id ON "msg_deliveries"(message_id);
-CREATE INDEX idx_msg_deliveries_agent_ack_cmd_id ON "msg_deliveries"(
-  connection_id,
-  agent_ack_cmd_id
-);
 CREATE INDEX idx_msg_deliveries_agent_msg_id ON "msg_deliveries"(
   connection_id,
   agent_msg_id

src/Simplex/Chat/Store/Messages.hs

@@ -25,7 +25,6 @@ module Simplex.Chat.Store.Messages
     createNewMessageAndRcvMsgDelivery,
     createNewRcvMessage,
     updateSndMsgDeliveryStatus,
-    updateRcvMsgDeliveryStatus,
     createPendingGroupMessage,
     getPendingGroupMessages,
     deletePendingGroupMessage,
@@ -211,7 +210,7 @@ createSndMsgDelivery db SndMsgDelivery {connId, agentMsgId} messageId = do
   insertedRowId db
 
 createNewMessageAndRcvMsgDelivery :: forall e. MsgEncodingI e => DB.Connection -> ConnOrGroupId -> NewRcvMessage e -> Maybe SharedMsgId -> RcvMsgDelivery -> Maybe GroupMemberId -> ExceptT StoreError IO RcvMessage
-createNewMessageAndRcvMsgDelivery db connOrGroupId newMessage sharedMsgId_ RcvMsgDelivery {connId, agentMsgId, agentMsgMeta, agentAckCmdId} authorGroupMemberId_ = do
+createNewMessageAndRcvMsgDelivery db connOrGroupId newMessage sharedMsgId_ RcvMsgDelivery {connId, agentMsgId, agentMsgMeta} authorGroupMemberId_ = do
   msg@RcvMessage {msgId} <- createNewRcvMessage db connOrGroupId newMessage sharedMsgId_ authorGroupMemberId_ Nothing
   liftIO $ do
     currentTs <- getCurrentTime
@@ -219,10 +218,10 @@ createNewMessageAndRcvMsgDelivery db connOrGroupId newMessage sharedMsgId_ RcvMs
       db
       [sql|
         INSERT INTO msg_deliveries
-          (message_id, connection_id, agent_msg_id, agent_msg_meta, agent_ack_cmd_id, chat_ts, created_at, updated_at, delivery_status)
-        VALUES (?,?,?,?,?,?,?,?,?)
+          (message_id, connection_id, agent_msg_id, agent_msg_meta, chat_ts, created_at, updated_at, delivery_status)
+        VALUES (?,?,?,?,?,?,?,?)
       |]
-      (msgId, connId, agentMsgId, msgMetaJson agentMsgMeta, agentAckCmdId, snd $ broker agentMsgMeta, currentTs, currentTs, MDSRcvAgent)
+      (msgId, connId, agentMsgId, msgMetaJson agentMsgMeta, snd $ broker agentMsgMeta, currentTs, currentTs, MDSRcvAgent)
   pure msg
 
 createNewRcvMessage :: forall e. MsgEncodingI e => DB.Connection -> ConnOrGroupId -> NewRcvMessage e -> Maybe SharedMsgId -> Maybe GroupMemberId -> Maybe GroupMemberId -> ExceptT StoreError IO RcvMessage
@@ -273,18 +272,6 @@ updateSndMsgDeliveryStatus db connId agentMsgId sndMsgDeliveryStatus = do
     |]
     (sndMsgDeliveryStatus, currentTs, connId, agentMsgId)
 
-updateRcvMsgDeliveryStatus :: DB.Connection -> Int64 -> CommandId -> MsgDeliveryStatus 'MDRcv -> IO ()
-updateRcvMsgDeliveryStatus db connId cmdId rcvMsgDeliveryStatus = do
-  currentTs <- getCurrentTime
-  DB.execute
-    db
-    [sql|
-      UPDATE msg_deliveries
-      SET delivery_status = ?, updated_at = ?
-      WHERE connection_id = ? AND agent_ack_cmd_id = ?
-    |]
-    (rcvMsgDeliveryStatus, currentTs, connId, cmdId)
-
 createPendingGroupMessage :: DB.Connection -> Int64 -> MessageId -> Maybe Int64 -> IO ()
 createPendingGroupMessage db groupMemberId messageId introId_ = do
   currentTs <- getCurrentTime

src/Simplex/Chat/Store/Migrations.hs

@@ -102,6 +102,7 @@ import Simplex.Chat.Migrations.M20240214_redirect_file_id
 import Simplex.Chat.Migrations.M20240222_app_settings
 import Simplex.Chat.Migrations.M20240226_users_restrict
 import Simplex.Chat.Migrations.M20240228_pq
+import Simplex.Chat.Migrations.M20240313_drop_agent_ack_cmd_id
 import Simplex.Messaging.Agent.Store.SQLite.Migrations (Migration (..))
 
 schemaMigrations :: [(String, Query, Maybe Query)]
@@ -203,7 +204,8 @@ schemaMigrations =
     ("20240214_redirect_file_id", m20240214_redirect_file_id, Just down_m20240214_redirect_file_id),
     ("20240222_app_settings", m20240222_app_settings, Just down_m20240222_app_settings),
     ("20240226_users_restrict", m20240226_users_restrict, Just down_m20240226_users_restrict),
-    ("20240228_pq", m20240228_pq, Just down_m20240228_pq)
+    ("20240228_pq", m20240228_pq, Just down_m20240228_pq),
+    ("20240313_drop_agent_ack_cmd_id", m20240313_drop_agent_ack_cmd_id, Just down_m20240313_drop_agent_ack_cmd_id)
   ]
 
 -- | The list of migrations in ascending order by date

src/Simplex/Chat/Types.hs

@@ -1551,7 +1551,7 @@ data CommandFunction
   | CFJoinConn
   | CFAllowConn
   | CFAcceptContact
-  | CFAckMessage
+  | CFAckMessage -- not used
   | CFDeleteConn -- not used
   deriving (Eq, Show)