feat(mercury): fix mercury issues

Author: goncalo-frade-iohk

AtalaPrismSDK/Domain/Sources/Models/Errors.swift

@@ -383,6 +383,13 @@ public enum MercuryError: KnownPrismError {
 
     /// An error case representing invalid body data in a message.
     case messageInvalidBodyDataError
+
+    /**
+     An error case representing a DIDComm error.
+     - Parameters:
+        - msg: The message describing the error.
+        - underlyingErrors: An array of underlying errors that may have contributed to this error, if provided.
+    */
     case didcommError(msg: String, underlyingErrors: [Error]? = nil)
 
     /// The error code returned by the server.

AtalaPrismSDK/Mercury/Sources/DIDCommWrappers/PackEncryptedOperation.swift

@@ -44,7 +44,10 @@ final class PackEncryptedOperation: OnPackEncryptedResult {
                     continuation.resume(returning: result)
                 })
             do {
-                print("Packing message \(message.piuri) sender:\(fromDID) \nto:\(toDID)")
+                logger.debug(message: "Packing message \(message.piuri)", metadata: [
+                    .maskedMetadataByLevel(key: "Sender", value: fromDID.string, level: .debug),
+                    .maskedMetadataByLevel(key: "Receiver", value: toDID.string, level: .debug)
+                ])
                 let status = didcomm.packEncrypted(
                     msg: try DIDCommxSwift.Message(domain: message, mediaType: .contentTypePlain),
                     to: toDID.string,

AtalaPrismSDK/Mercury/Sources/DIDCommWrappers/UnpackOperation.swift

@@ -84,7 +84,6 @@ Error on parsing DIDComm library model message to Domain message : \(error.local
     }
 
     func error(err: DIDCommxSwift.ErrorKind, msg: String) {
-        print(err.localizedDescription)
         let error = MercuryError.didcommError(
             msg:
 """

AtalaPrismSDK/Mercury/Sources/MecuryImpl+SendMessage.swift

@@ -10,7 +10,6 @@ extension MercuryImpl {
     public func sendMessage(_ msg: Message) async throws -> Data? {
         guard let toDID = msg.to else { throw MercuryError.noRecipientDIDSetError }
         guard let fromDID = msg.from else { throw MercuryError.noRecipientDIDSetError }
-        print("Send message \(msg.piuri) sender:\(fromDID.string) \nto:\(toDID.string)")
         let document = try await castor.resolveDID(did: toDID)
 
         let originalPackedMessage = try await packMessage(msg: msg)
@@ -24,8 +23,23 @@ extension MercuryImpl {
                 encrypted: encryptedData,
                 mediatorDID: mediatorDID
             )
-            print("Send message \(forwardMessage.piuri) sender:\(forwardMessage.from?.string) \nto:\(forwardMessage.to?.string)")
-            let forwardPackedMessage = try await packMessage(msg: forwardMessage)
+
+            logger.debug(
+                message: "Sending forward message with internal message type \(msg.piuri)",
+                metadata: [
+                    .maskedMetadataByLevel(
+                        key: "Sender",
+                        value: forwardMessage.from.string,
+                        level: .debug
+                    ),
+                    .maskedMetadataByLevel(
+                        key: "Receiver",
+                        value: forwardMessage.to.string,
+                        level: .debug
+                    )
+                ]
+            )
+            let forwardPackedMessage = try await packMessage(msg: forwardMessage.makeMessage())
             let mediatorDocument = try await castor.resolveDID(did: mediatorDID)
             guard
                 let url = getDIDCommURL(document: mediatorDocument),
@@ -41,6 +55,21 @@ extension MercuryImpl {
             else {
                 throw MercuryError.noValidServiceFoundError(did: toDID.string)
             }
+            logger.debug(
+                message: "Sending message with type \(msg.piuri)",
+                metadata: [
+                    .maskedMetadataByLevel(
+                        key: "Sender",
+                        value: fromDID.string,
+                        level: .debug
+                    ),
+                    .maskedMetadataByLevel(
+                        key: "Receiver",
+                        value: toDID.string,
+                        level: .debug
+                    )
+                ]
+            )
             return try await sendHTTPMessage(url: url, packedMessage: data)
         }
     }
@@ -56,7 +85,6 @@ extension MercuryImpl {
             let msgStr = String(data: msgData, encoding: .utf8),
             msgStr != "null"
         else { return nil }
-        print("Data returned: \(msgStr)")
         return try? await self.unpackMessage(msg: msgStr)
     }
 
@@ -67,15 +95,19 @@ extension MercuryImpl {
             headers: ["content-type": MediaType.contentTypeEncrypted.rawValue]
         )
     }
-    private func prepareForwardMessage(msg: Message, encrypted: Data, mediatorDID: DID) throws -> Message {
+    private func prepareForwardMessage(
+        msg: Message,
+        encrypted: Data,
+        mediatorDID: DID
+    ) throws -> ForwardMessage {
         guard let fromDID = msg.from else { throw MercuryError.noSenderDIDSetError }
         guard let toDID = msg.to else { throw MercuryError.noRecipientDIDSetError }
-        return try ForwardMessage(
+        return ForwardMessage(
             from: fromDID,
             to: mediatorDID,
             body: .init(next: toDID.string),
             encryptedJsonMessage: encrypted
-        ).makeMessage()
+        )
     }
 
     private func getDIDCommURL(document: DIDDocument) -> URL? {

AtalaPrismSDK/Mercury/Sources/MercuryImpl+Public.swift

@@ -10,7 +10,7 @@ extension MercuryImpl: Mercury {
     /// - Returns: The string representation of the packed message
     /// - Throws: An error if the message object is invalid
     public func packMessage(msg: Domain.Message) async throws -> String {
-        try await PackEncryptedOperation(didcomm: didcomm, message: msg, logger: logger).packEncrypted()
+        try await PackEncryptedOperation(didcomm: getDidcomm(), message: msg, logger: logger).packEncrypted()
     }
 
     /// unpackMessage asynchronously unpacks a given string representation of a message into a message object. This function may throw an error if the string is not a valid message representation.
@@ -19,6 +19,6 @@ extension MercuryImpl: Mercury {
     /// - Returns: The message object
     /// - Throws: An error if the string is not a valid message representation
     public func unpackMessage(msg: String) async throws -> Domain.Message {
-        try await UnpackOperation(didcomm: didcomm, castor: castor, logger: logger).unpackEncrypted(messageString: msg)
+        try await UnpackOperation(didcomm: getDidcomm(), castor: castor, logger: logger).unpackEncrypted(messageString: msg)
     }
 }

AtalaPrismSDK/Mercury/Sources/MercuryImpl.swift

@@ -8,7 +8,6 @@ public struct MercuryImpl {
     let castor: Castor
     let apollo: Apollo
     let pluto: Pluto
-    let didcomm: DidComm
     let logger: PrismLogger
 
     public init(
@@ -24,14 +23,17 @@ public struct MercuryImpl {
         self.castor = castor
         self.apollo = apollo
         self.pluto = pluto
+    }
+
+    func getDidcomm() -> DidComm {
         let didResolver = DIDCommDIDResolverWrapper(castor: castor, logger: logger)
         let secretsResolver = DIDCommSecretsResolverWrapper(
             apollo: apollo,
             pluto: pluto,
             castor: castor,
             logger: logger
         )
-        self.didcomm = DidComm(
+        return DidComm(
             didResolver: didResolver,
             secretResolver: secretsResolver
         )

AtalaPrismSDK/Pluto/Sources/PersistentStorage/DAO/CDDIDPrivateKeyDAO+DIDPrivateKeyStore.swift

@@ -21,6 +21,7 @@ extension CDDIDPrivateKeyDAO: DIDPrivateKeyStore {
 
 private extension CDDIDPrivateKey {
     func parseFrom(did: DID, privateKeys: [PrivateKey], alias: String?) {
+        self.alias = alias
         self.did = did.string
         self.schema = did.schema
         self.method = did.method
@@ -37,7 +38,6 @@ private extension CDDIDPrivateKey {
                 break
             }
         }
-        self.alias = alias
     }
 }
 

AtalaPrismSDK/Pluto/Sources/Resources/PrismPluto.xcdatamodeld/Model.xcdatamodel/contents

@@ -231,12 +231,6 @@ Could not find key in storage please use Castor instead and provide the private
         }
     }
 
-    func getAllRegisteredPeerDIDs() -> AnyPublisher<[(did: DID, alias: String?)], Error> {
-        pluto.getAllPeerDIDs()
-            .map { $0.map { ($0.did, $0.alias) } }
-            .eraseToAnyPublisher()
-    }
-
     /// This function registers a DID pair in the `pluto` store
     ///
     /// - Parameter pair: The DID pair to register
@@ -253,4 +247,13 @@ Could not find key in storage please use Castor instead and provide the private
     func getAllDIDPairs() -> AnyPublisher<[DIDPair], Error> {
         pluto.getAllDidPairs()
     }
+
+    /// This function gets all the DID peers from the `pluto` store
+    ///
+    /// - Returns: A publisher that emits an array of tuples (`DID`, `String?`) objects, or an error if there was a problem getting the dids
+    func getAllRegisteredPeerDIDs() -> AnyPublisher<[(did: DID, alias: String?)], Error> {
+        pluto.getAllPeerDIDs()
+            .map { $0.map { ($0.did, $0.alias) } }
+            .eraseToAnyPublisher()
+    }
 }

AtalaPrismSDK/PrismAgent/Sources/PrismAgent+DIDHigherFucntions.swift

@@ -5,8 +5,8 @@ import Foundation
 // MARK: Messaging events funcionalities
 public extension PrismAgent {
     /// Start fetching the messages from the mediator
-    func startFetchingMessages() {
-        // Check if messagesStreamTask is nil
+    func startFetchingMessages(timeBetweenRequests: Int = 5) {
+        let timeInterval = max(timeBetweenRequests, 5)
         guard messagesStreamTask == nil else { return }
 
         logger.info(message: "Start streaming new unread messages")
@@ -22,7 +22,7 @@ public extension PrismAgent {
                     // Handle errors that occur during the message fetching process
                     logger.error(error: error)
                 }
-                sleep(90)
+                sleep(UInt32(timeInterval))
             }
         }
     }
@@ -56,7 +56,6 @@ public extension PrismAgent {
     func handleReceivedMessagesEvents() -> AnyPublisher<Message, Error> {
         pluto.getAllMessagesReceived()
             .flatMap { $0.publisher }
-            .print()
             .eraseToAnyPublisher()
 //            .flatMap { message -> AnyPublisher<Message, Error> in
 //                if let issueCredential = try? IssueCredential(fromMessage: message) {

AtalaPrismSDK/PrismAgent/Sources/PrismAgent+MessageEvents.swift

@@ -26,7 +26,6 @@ struct MediationKeysUpdateList {
         self.id = id
         self.from = from
         self.to = to
-        print(recipientDids.map { $0.string })
         self.body = .init(
             updates: recipientDids.map {
                 Body.Update(recipientDid: $0.string)

AtalaPrismSDK/PrismAgent/Sources/Protocols/Mediation/MediationKeysUpdateList.swift

@@ -0,0 +1,61 @@
+import Core
+import Domain
+import Foundation
+
+public struct BasicMessage {
+
+    public struct Body: Codable {
+        public let content: String
+
+        public init(content: String) {
+            self.content = content
+        }
+    }
+
+    public let id: String
+    public let type = ProtocolTypes.didcommBasicMessage.rawValue
+    public let from: DID
+    public let to: DID
+    public let date: Date
+    public let body: Body
+
+    public init(
+        id: String = UUID().uuidString,
+        from: DID,
+        to: DID,
+        body: Body,
+        date: Date = Date()
+    ) {
+        self.id = id
+        self.from = from
+        self.to = to
+        self.body = body
+        self.date = date
+    }
+
+    public init?(fromMessage: Message) throws {
+        guard
+            fromMessage.piuri == ProtocolTypes.didcommBasicMessage.rawValue,
+            let from = fromMessage.from,
+            let to = fromMessage.to
+        else {
+            return nil
+        }
+        self.id = fromMessage.id
+        self.from = from
+        self.to = to
+        self.body = try JSONDecoder.didComm().decode(Body.self, from: fromMessage.body)
+        self.date = fromMessage.createdTime
+    }
+
+    public func makeMessage() throws -> Message {
+        return Message(
+            id: id,
+            piuri: type,
+            from: from,
+            to: to,
+            body: try JSONEncoder.didComm().encode(body),
+            createdTime: date
+        )
+    }
+}

AtalaPrismSDK/PrismAgent/Sources/Protocols/Others/BasicMessage.swift

@@ -1,6 +1,7 @@
 import Foundation
 
 enum ProtocolTypes: String {
+    case didcommBasicMessage = "https://didcomm.org/basicmessage/2.0/message"
     case didcommMediationRequest = "https://didcomm.org/coordinate-mediation/2.0/mediate-request"
     case didcommMediationGrant = "https://didcomm.org/coordinate-mediation/2.0/mediate-grant"
     case didcommMediationDeny = "https://didcomm.org/coordinate-mediation/2.0/mediate-deny"

AtalaPrismSDK/PrismAgent/Sources/Protocols/ProtocolTypes.swift

@@ -24,6 +24,7 @@ struct ChatView<ViewModel: ChatViewModel>: View {
                     MessageView(text: message.text, isSent: message.sent)
                 }
             }
+            .padding()
 
             HStack {
                 TextField("Type your message...", text: $viewModel.sendingText)

Sample/DIDChat/DIDChat/Modules/ChatView/ChatView.swift

@@ -61,6 +61,7 @@ final class ChatViewModelImpl: ChatViewModel {
                 ))
 
                 self.messages = self.messageList.sorted { $0.date < $1.date }
+                self.sendingText = ""
             }
         }
     }

Sample/DIDChat/DIDChat/Modules/ChatView/ChatViewModel.swift

@@ -62,7 +62,7 @@ struct AddContactView<ViewModel: ContactsViewModel>: View {
     @EnvironmentObject var viewModel: ViewModel
     @Environment(\.presentationMode) var presentationMode
     @State var newContactName: String = "Bob"
-    @State var newContactPeerDID: String = "did:peer:2.Ez6LSpAMSF7BxhxJEqWApn258toZ3RYFD5Bp6TaCCE1JkSNZW.Vz6MkmSoU3wZ1TfXEmrC8nzm5WvHvxrg8mmxe1BnGAZPXzTpR.SeyJyIjpbXSwicyI6ImRpZDpwZWVyOjIuRXo2TFNtaWJDSkxkeHFTc21hYUJ1c1NrUXdYek1ZUnFVTHRCWEdaWDd1dERKSE5HbS5WejZNa293a0Vxd1dEVVM0TUNOTG50UFpHVGV0YWM3dGtKbk1HWVB2eDlnZmh1N2RyLlNleUpwWkNJNkltNWxkeTFwWkNJc0luUWlPaUprYlNJc0luTWlPaUpvZEhSd2N6b3ZMMjFsWkdsaGRHOXlMbkp2YjNSemFXUXVZMnh2ZFdRaUxDSmhJanBiSW1ScFpHTnZiVzB2ZGpJaVhYMCIsImEiOltdLCJ0IjoiZG0ifQ"
+    @State var newContactPeerDID: String = "did:peer:2.Ez6LSc9cZDE5ioLyEV9WKtcpejzr7GvzcWHHP8rwnWeZwYyaV.Vz6MkkbB59SstKEkTLfLhGmc5iyesyMzCgmNuZqgMz3c4sLgy.SeyJyIjpbXSwicyI6ImRpZDpwZWVyOjIuRXo2TFNjUGI0ZG1GbUR3RXd2aGpLTXphN1p0TnhDRlVGeWkxb0xKSHF0REZDWWhTVC5WejZNa3J2TWFjV0daa3RiWk16UFdDQ2dCYUs1VEdYdGJSUlNWZk1rZmtROWlrTER0LlNleUpwWkNJNkltNWxkeTFwWkNJc0luUWlPaUprYlNJc0luTWlPaUpvZEhSd2N6b3ZMMjFsWkdsaGRHOXlMbkp2YjNSemFXUXVZMnh2ZFdRaUxDSmhJanBiSW1ScFpHTnZiVzB2ZGpJaVhYMCIsImEiOltdLCJ0IjoiZG0ifQ"
     @State var newPeerDIDAlias: String = ""
 
     var body: some View {

Sample/DIDChat/DIDChat/Modules/ContactsView/ContactsView.swift

@@ -12,4 +12,14 @@ struct ContactsViewState {
             hasher.combine(name)
         }
     }
+
+    struct PossibleContact: Identifiable, Hashable {
+        let id: String
+        let name: String
+        
+        func hash(into hasher: inout Hasher) {
+            hasher.combine(id)
+            hasher.combine(name)
+        }
+    }
 }

Sample/DIDChat/DIDChat/Modules/ContactsView/ContactsViewState.swift

@@ -29,7 +29,8 @@ class MediatorViewModelImpl: MediatorViewModel {
             do {
                 PrismAgent.setupLogging(logLevels: [
                     .prismAgent: .debug,
-                    .mercury: .debug
+                    .mercury: .debug,
+                    .castor: .debug
                 ])
                 let agent = PrismAgent(mediatorDID: did)
                 try await agent.start()