agent: use double ratchet from the first message in contact addresses, request rejection, RPC (#1831)

* agent: initialize double ratchet from the invitation via contact address (#1829) * rfc: agent support for PRC pattern without duplex connection * update rfc, plan * corrections Co-authored-by: Evgeny <evgeny@poberezkin.com> * split rfcs, add plan * update rfc * update rfc and plan * update plan * add double ratchet keys to address * agent schema * fix version in test * change ContactRequest encoding * fix tests * update plan * tests, refactor * fix compilation * refactor * refactor more * fix * add export * fix * refactor * refactor * update schema * rename * refactor * refactor 2 * comment, type * type * rename * refactor more * move type * refactor * remove comment * diff * refactor * comment * puns * get correct key * rename * add autoincrement * refactor * move * move back * simplify * rename * refactor * tuple * comment * split decryption * refactor * rename * refactor * move * remove createSndQueue * remove comment * remove JoinInvitationReq * simplify * rename * fix * type synonim * getConnData * simplify * move * encoding * version * async join with ratchet keys * fix encoding * rotate address ratchet keys * rename, parameter order * refactor, include ratchet keys into ConnectionRequestUri * simplify * remove records * refactor * rename, encoding * clean up * refactor * compatible * addrKeysE2EVersion * support IKUsePQ for contact addresses * comments, refactor condition * typos --------- Co-authored-by: Evgeny @ SimpleX Chat <259188159+evgeny-simplex@users.noreply.github.com> * agent: contact request rejection and service requests (#1833) * agent: request rejection * implement RPC requests/responses * simplify rpc, test, async * renames * clean up * fix * fix query * set flag at creation * move * command type, schema * rename * refactor * typo Co-authored-by: simplex-chat-agent[bot] <287173099+simplex-chat-agent[bot]@users.noreply.github.com> * allow overriding the service request timeout per request * fixes * use SSENT event for service replies * AgentServiceError encoding * sign service requests * add bad signature error * update the plan * clean up * refactor * empty line Co-authored-by: simplex-chat-agent[bot] <287173099+simplex-chat-agent[bot]@users.noreply.github.com> * add indices --------- Co-authored-by: Evgeny @ SimpleX Chat <259188159+evgeny-simplex@users.noreply.github.com> Co-authored-by: simplex-chat-agent[bot] <287173099+simplex-chat-agent[bot]@users.noreply.github.com> * update schemas * tryAllErrors * combine queries --------- Co-authored-by: Evgeny @ SimpleX Chat <259188159+evgeny-simplex@users.noreply.github.com> Co-authored-by: simplex-chat-agent[bot] <287173099+simplex-chat-agent[bot]@users.noreply.github.com>
2026-10-23 13:02:28 +00:00 · 2026-07-31 19:32:34 +01:00
1 parent 066a93861b
commit e4e5ce75fa
@@ -45,6 +45,8 @@ module Simplex.Messaging.Agent.Store
    AcceptedConfirmation (..),
    NewInvitation (..),
    Invitation (..),
+    ContactRequest (..),
+    DRInvitation (..),
    PrevExternalSndId,
    PrevRcvMsgHash,
    PrevSndMsgHash,
@@ -463,7 +465,9 @@ data ConnData = ConnData
    lastExternalSndId :: PrevExternalSndId,
    deleted :: Bool,
    ratchetSyncState :: RatchetSyncState,
-    pqSupport :: PQSupport
+    pqSupport :: PQSupport,
+    -- client side: set on the requester's connection for a service request; Nothing otherwise. The time the client stops waiting for the response (created + serviceRequestTimeout or per-call override).
+    serviceRequestExpiresAt :: Maybe UTCTime
  }
  deriving (Eq, Show)

@@ -535,6 +539,7 @@ data InternalCommand
  | ICDeleteRcvQueue SMP.RecipientId
  | ICQSecure SMP.RecipientId SMP.SndPublicAuthKey
  | ICQDelete SMP.RecipientId
+  | ICReplyDel

 data InternalCommandTag
  = ICAck_
@@ -545,6 +550,7 @@ data InternalCommandTag
  | ICDeleteRcvQueue_
  | ICQSecure_
  | ICQDelete_
+  | ICReplyDel_
  deriving (Show)

 instance StrEncoding InternalCommand where
@@ -557,6 +563,7 @@ instance StrEncoding InternalCommand where
    ICDeleteRcvQueue rId -> strEncode (ICDeleteRcvQueue_, rId)
    ICQSecure rId senderKey -> strEncode (ICQSecure_, rId, senderKey)
    ICQDelete rId -> strEncode (ICQDelete_, rId)
+    ICReplyDel -> strEncode ICReplyDel_
  strP =
    strP >>= \case
      ICAck_ -> ICAck <$> _strP <*> _strP
@@ -567,6 +574,7 @@ instance StrEncoding InternalCommand where
      ICDeleteRcvQueue_ -> ICDeleteRcvQueue <$> _strP
      ICQSecure_ -> ICQSecure <$> _strP <*> _strP
      ICQDelete_ -> ICQDelete <$> _strP
+      ICReplyDel_ -> pure ICReplyDel

 instance StrEncoding InternalCommandTag where
  strEncode = \case
@@ -578,6 +586,7 @@ instance StrEncoding InternalCommandTag where
    ICDeleteRcvQueue_ -> "DELETE_RCV_QUEUE"
    ICQSecure_ -> "QSECURE"
    ICQDelete_ -> "QDELETE"
+    ICReplyDel_ -> "REPLY_DEL"
  strP =
    A.takeTill (== ' ') >>= \case
      "ACK" -> pure ICAck_
@@ -588,6 +597,7 @@ instance StrEncoding InternalCommandTag where
      "DELETE_RCV_QUEUE" -> pure ICDeleteRcvQueue_
      "QSECURE" -> pure ICQSecure_
      "QDELETE" -> pure ICQDelete_
+      "REPLY_DEL" -> pure ICReplyDel_
      _ -> fail "bad InternalCommandTag"

 agentCommandTag :: AgentCommand -> AgentCommandTag
@@ -605,6 +615,7 @@ internalCmdTag = \case
  ICDeleteRcvQueue {} -> ICDeleteRcvQueue_
  ICQSecure {} -> ICQSecure_
  ICQDelete _ -> ICQDelete_
+  ICReplyDel -> ICReplyDel_

 -- * Confirmation types

@@ -626,19 +637,28 @@ data AcceptedConfirmation = AcceptedConfirmation

 data NewInvitation = NewInvitation
  { contactConnId :: ConnId,
-    connReq :: ConnectionRequestUri 'CMInvitation,
-    recipientConnInfo :: ConnInfo
+    connReq :: ContactRequest,
+    recipientConnInfo :: ConnInfo,
+    -- service side: the received request is a service request (SREQ) not a contact request (REQ)
+    serviceRequest :: Bool
  }

 data Invitation = Invitation
  { invitationId :: InvitationId,
    contactConnId_ :: Maybe ConnId,
-    connReq :: ConnectionRequestUri 'CMInvitation,
+    connReq :: ContactRequest,
    recipientConnInfo :: ConnInfo,
    ownConnInfo :: Maybe ConnInfo,
-    accepted :: Bool
+    accepted :: Bool,
+    -- service side: the received request is a service request (SREQ) not a contact request (REQ)
+    serviceRequest :: Bool,
+    createdAt :: UTCTime
  }

+data ContactRequest
+  = CRInvitation (ConnectionRequestUri 'CMInvitation)
+  | CRInvitationDR DRInvitation
+
 -- * Message integrity validation types

 -- | Corresponds to `last_external_snd_msg_id` in `connections` table