@credo-ts/didcomm 0.6.0-pr-2195-20250322195244 → 0.6.0-pr-2324-20250625125237

package/build/DidCommModule.js

@@ -85,7 +85,6 @@ class DidCommModule {
             await transport.start(agentContext);
         }
     }
-    // TODO: Shall shutdown and initialize be part of API (so Agent can be stopped/restarted without creating a new instance)?
     async shutdown(agentContext) {
         const messageReceiver = agentContext.dependencyManager.resolve(MessageReceiver_1.MessageReceiver);
         const messageSender = agentContext.dependencyManager.resolve(MessageSender_1.MessageSender);

package/build/DidCommModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"DidCommModule.js","sourceRoot":"","sources":["../src/DidCommModule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DidCommModule.js","sourceRoot":"","sources":["../src/DidCommModule.ts"],"names":[],"mappings":"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"}

package/build/DidCommModuleConfig.d.ts

@@ -1,3 +1,4 @@
+import { QueueTransportRepository } from './transport';
 /**
  * MediatorModuleConfigOptions defines the interface for the options of the MediatorModuleConfig class.
  * This can contain optional parameters that have default values in the config class itself.
@@ -9,10 +10,12 @@ export interface DidCommModuleConfigOptions {
     processDidCommMessagesConcurrently?: boolean;
     didCommMimeType?: string;
     useDidKeyInProtocols?: boolean;
+    queueTransportRepository?: QueueTransportRepository;
 }
 export declare class DidCommModuleConfig {
     private options;
     private _endpoints?;
+    private _queueTransportRepository;
     constructor(options?: DidCommModuleConfigOptions);
     get endpoints(): [string, ...string[]];
     set endpoints(endpoints: string[]);
@@ -30,4 +33,9 @@ export declare class DidCommModuleConfig {
      * in a given protocol (i.e. it does not support Aries RFC 0360).
      */
     get useDidKeyInProtocols(): boolean;
+    /**
+     * Allows to specify a custom queue transport queue. It defaults to an in-memory queue
+     *
+     */
+    get queueTransportRepository(): QueueTransportRepository;
 }

package/build/DidCommModuleConfig.js

@@ -2,11 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DidCommModuleConfig = void 0;
 const constants_1 = require("./constants");
+const transport_1 = require("./transport");
 const types_1 = require("./types");
 class DidCommModuleConfig {
     constructor(options) {
         this.options = options ?? {};
         this._endpoints = options?.endpoints;
+        this._queueTransportRepository = options?.queueTransportRepository ?? new transport_1.InMemoryQueueTransportRepository();
     }
     get endpoints() {
         // if endpoints is not set, return queue endpoint
@@ -43,6 +45,13 @@ class DidCommModuleConfig {
     get useDidKeyInProtocols() {
         return this.options.useDidKeyInProtocols ?? true;
     }
+    /**
+     * Allows to specify a custom queue transport queue. It defaults to an in-memory queue
+     *
+     */
+    get queueTransportRepository() {
+        return this._queueTransportRepository;
+    }
 }
 exports.DidCommModuleConfig = DidCommModuleConfig;
 //# sourceMappingURL=DidCommModuleConfig.js.map

package/build/DidCommModuleConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"DidCommModuleConfig.js","sourceRoot":"","sources":["../src/DidCommModuleConfig.ts"],"names":[],"mappings":";;;AAAA,2CAAsD;AACtD,mCAAyC;AAezC,MAAa,mBAAmB;IAI9B,YAAmB,OAAoC;QACrD,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,EAAE,CAAA;QAC5B,IAAI,CAAC,UAAU,GAAG,OAAO,EAAE,SAAS,CAAA;IACtC,CAAC;IAED,IAAW,SAAS;QAClB,iDAAiD;QACjD,8EAA8E;QAC9E,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrD,OAAO,CAAC,oCAAwB,CAAC,CAAA;QACnC,CAAC;QAED,OAAO,IAAI,CAAC,UAAmC,CAAA;IACjD,CAAC;IAED,IAAW,SAAS,CAAC,SAAmB;QACtC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAA;IAC7B,CAAC;IAED,IAAW,2BAA2B;QACpC,OAAO,IAAI,CAAC,OAAO,CAAC,2BAA2B,IAAI,KAAK,CAAA;IAC1D,CAAC;IAED;;OAEG;IACH,IAAW,kBAAkB;QAC3B,OAAO,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAA;IACxC,CAAC;IAED,IAAW,kCAAkC;QAC3C,OAAO,IAAI,CAAC,OAAO,CAAC,kCAAkC,IAAI,KAAK,CAAA;IACjE,CAAC;IAED,IAAW,eAAe;QACxB,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,IAAI,uBAAe,CAAC,EAAE,CAAA;IAC3D,CAAC;IAED;;;;;OAKG;IACH,IAAW,oBAAoB;QAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,oBAAoB,IAAI,IAAI,CAAA;IAClD,CAAC;CACF;AAnDD,kDAmDC"}
+{"version":3,"file":"DidCommModuleConfig.js","sourceRoot":"","sources":["../src/DidCommModuleConfig.ts"],"names":[],"mappings":";;;AAAA,2CAAsD;AACtD,2CAAwF;AACxF,mCAAyC;AAgBzC,MAAa,mBAAmB;IAK9B,YAAmB,OAAoC;QACrD,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,EAAE,CAAA;QAC5B,IAAI,CAAC,UAAU,GAAG,OAAO,EAAE,SAAS,CAAA;QACpC,IAAI,CAAC,yBAAyB,GAAG,OAAO,EAAE,wBAAwB,IAAI,IAAI,4CAAgC,EAAE,CAAA;IAC9G,CAAC;IAED,IAAW,SAAS;QAClB,iDAAiD;QACjD,8EAA8E;QAC9E,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrD,OAAO,CAAC,oCAAwB,CAAC,CAAA;QACnC,CAAC;QAED,OAAO,IAAI,CAAC,UAAmC,CAAA;IACjD,CAAC;IAED,IAAW,SAAS,CAAC,SAAmB;QACtC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAA;IAC7B,CAAC;IAED,IAAW,2BAA2B;QACpC,OAAO,IAAI,CAAC,OAAO,CAAC,2BAA2B,IAAI,KAAK,CAAA;IAC1D,CAAC;IAED;;OAEG;IACH,IAAW,kBAAkB;QAC3B,OAAO,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAA;IACxC,CAAC;IAED,IAAW,kCAAkC;QAC3C,OAAO,IAAI,CAAC,OAAO,CAAC,kCAAkC,IAAI,KAAK,CAAA;IACjE,CAAC;IAED,IAAW,eAAe;QACxB,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,IAAI,uBAAe,CAAC,EAAE,CAAA;IAC3D,CAAC;IAED;;;;;OAKG;IACH,IAAW,oBAAoB;QAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,oBAAoB,IAAI,IAAI,CAAA;IAClD,CAAC;IAED;;;OAGG;IACH,IAAW,wBAAwB;QACjC,OAAO,IAAI,CAAC,yBAAyB,CAAA;IACvC,CAAC;CACF;AA7DD,kDA6DC"}

package/build/EnvelopeService.d.ts

@@ -1,20 +1,25 @@
-import type { AgentContext } from '@credo-ts/core';
+import { AgentContext, Kms } from '@credo-ts/core';
 import type { AgentMessage } from './AgentMessage';
 import type { EncryptedMessage, PlaintextMessage } from './types';
-import { Key, Logger } from '@credo-ts/core';
+import { Logger } from '@credo-ts/core';
+import { DidCommDocumentService } from './services/DidCommDocumentService';
 export interface EnvelopeKeys {
-    recipientKeys: Key[];
-    routingKeys: Key[];
-    senderKey: Key | null;
+    recipientKeys: Kms.PublicJwk<Kms.Ed25519PublicJwk>[];
+    routingKeys: Kms.PublicJwk<Kms.Ed25519PublicJwk>[];
+    senderKey: Kms.PublicJwk<Kms.Ed25519PublicJwk> | null;
 }
 export declare class EnvelopeService {
     private logger;
-    constructor(logger: Logger);
+    private didcommDocumentService;
+    constructor(logger: Logger, didcommDocumentService: DidCommDocumentService);
+    private encryptDidcommV1Message;
+    private decryptDidcommV1Message;
     packMessage(agentContext: AgentContext, payload: AgentMessage, keys: EnvelopeKeys): Promise<EncryptedMessage>;
     unpackMessage(agentContext: AgentContext, encryptedMessage: EncryptedMessage): Promise<DecryptedMessageContext>;
+    private extractOurRecipientKeyWithKeyId;
 }
 export interface DecryptedMessageContext {
     plaintextMessage: PlaintextMessage;
-    senderKey?: Key;
-    recipientKey?: Key;
+    senderKey?: Kms.PublicJwk<Kms.Ed25519PublicJwk>;
+    recipientKey: Kms.PublicJwk<Kms.Ed25519PublicJwk>;
 }

package/build/EnvelopeService.js

@@ -14,53 +14,313 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EnvelopeService = void 0;
 const core_1 = require("@credo-ts/core");
+const core_2 = require("@credo-ts/core");
 const DidCommModuleConfig_1 = require("./DidCommModuleConfig");
-const messages_1 = require("./modules/routing/messages");
+const helpers_1 = require("./modules/connections/services/helpers");
+const OutOfBandRole_1 = require("./modules/oob/domain/OutOfBandRole");
+const OutOfBandRepository_1 = require("./modules/oob/repository/OutOfBandRepository");
+const outOfBandRecordMetadataTypes_1 = require("./modules/oob/repository/outOfBandRecordMetadataTypes");
+const ForwardMessage_1 = require("./modules/routing/messages/ForwardMessage");
+const MediatorRoutingRepository_1 = require("./modules/routing/repository/MediatorRoutingRepository");
+const DidCommDocumentService_1 = require("./services/DidCommDocumentService");
 let EnvelopeService = class EnvelopeService {
-    constructor(logger) {
+    constructor(logger, didcommDocumentService) {
         this.logger = logger;
+        this.didcommDocumentService = didcommDocumentService;
+    }
+    async encryptDidcommV1Message(agentContext, message, recipientKeys, senderKey) {
+        const kms = agentContext.dependencyManager.resolve(core_1.Kms.KeyManagementApi);
+        // Generally we would never generate the content encryption key outside of the KMS
+        // However how DIDcommV1 is specified to calcualte the aad we need the encrypted content
+        // encryption key, and thus we can't use the normal combined key agrement + encryption flow
+        const contentEncryptionKey = kms.randomBytes({ length: 32 });
+        const recipients = [];
+        for (const recipientKey of recipientKeys) {
+            let encryptedSender = undefined;
+            if (senderKey) {
+                // Encrypt the sender
+                const { encrypted } = await kms.encrypt({
+                    key: {
+                        keyAgreement: {
+                            algorithm: 'ECDH-HSALSA20',
+                            // DIDComm v1 uses Ed25519 keys but encryption happens with X25519 keys
+                            externalPublicJwk: recipientKey.convertTo(core_1.Kms.X25519PublicJwk).toJson(),
+                        },
+                    },
+                    encryption: {
+                        algorithm: 'XSALSA20-POLY1305',
+                    },
+                    data: core_1.TypedArrayEncoder.fromString(core_1.TypedArrayEncoder.toBase58(senderKey.publicKey.publicKey)),
+                });
+                encryptedSender = core_1.TypedArrayEncoder.toBase64URL(encrypted);
+            }
+            // Encrypt the key
+            const { encrypted, iv } = await kms.encrypt({
+                key: {
+                    keyAgreement: {
+                        algorithm: 'ECDH-HSALSA20',
+                        externalPublicJwk: recipientKey.convertTo(core_1.Kms.X25519PublicJwk).toJson(),
+                        // Sender key only needed for Authcrypt
+                        keyId: senderKey?.keyId,
+                    },
+                },
+                data: contentEncryptionKey,
+                encryption: {
+                    algorithm: 'XSALSA20-POLY1305',
+                },
+            });
+            recipients.push({
+                encrypted_key: core_1.TypedArrayEncoder.toBase64URL(encrypted),
+                header: {
+                    kid: core_1.TypedArrayEncoder.toBase58(recipientKey.publicKey.publicKey),
+                    iv: iv ? core_1.TypedArrayEncoder.toBase64URL(iv) : undefined,
+                    sender: encryptedSender,
+                },
+            });
+        }
+        const protectedString = core_1.JsonEncoder.toBase64URL({
+            enc: 'xchacha20poly1305_ietf',
+            typ: 'JWM/1.0',
+            alg: senderKey ? 'Authcrypt' : 'Anoncrypt',
+            recipients,
+        });
+        // Perofrm the actual encryption
+        const { encrypted, iv, tag } = await kms.encrypt({
+            encryption: {
+                algorithm: 'C20P',
+                aad: core_1.TypedArrayEncoder.fromString(protectedString),
+            },
+            data: core_1.JsonEncoder.toBuffer(message),
+            key: {
+                privateJwk: {
+                    kty: 'oct',
+                    k: core_1.TypedArrayEncoder.toBase64URL(contentEncryptionKey),
+                },
+            },
+        });
+        if (!iv || !tag) {
+            throw new core_1.CredoError("Expected 'iv' and 'tag' to be defined");
+        }
+        return {
+            ciphertext: core_1.TypedArrayEncoder.toBase64URL(encrypted),
+            iv: core_1.TypedArrayEncoder.toBase64URL(iv),
+            tag: core_1.TypedArrayEncoder.toBase64URL(tag),
+            protected: protectedString,
+        };
+    }
+    async decryptDidcommV1Message(agentContext, encryptedMessage) {
+        const kms = agentContext.dependencyManager.resolve(core_1.Kms.KeyManagementApi);
+        const protectedJson = core_1.JsonEncoder.fromBase64(encryptedMessage.protected);
+        const alg = protectedJson.alg;
+        if (alg !== 'Anoncrypt' && alg !== 'Authcrypt') {
+            throw new core_1.CredoError(`Unsupported pack algorithm: ${alg}`);
+        }
+        if (protectedJson.enc !== 'xchacha20poly1305_ietf') {
+            throw new core_1.CredoError(`Unsupported enc algorithm: ${protectedJson.enc}`);
+        }
+        let recipientKey = null;
+        let recipient = null;
+        for (const _recipient of protectedJson.recipients) {
+            recipientKey = await this.extractOurRecipientKeyWithKeyId(agentContext, _recipient);
+            if (recipientKey) {
+                recipient = _recipient;
+            }
+        }
+        if (!recipientKey || !recipient) {
+            throw new core_1.CredoError('No corresponding recipient key found');
+        }
+        if (alg === 'Authcrypt' && (!recipient.header.sender || !recipient.header.iv)) {
+            throw new core_1.CredoError('Sender and iv header values are required for Authcrypt');
+        }
+        let senderPublicJwk = undefined;
+        if (recipient.header.sender) {
+            const { data } = await kms.decrypt({
+                key: {
+                    keyAgreement: {
+                        algorithm: 'ECDH-HSALSA20',
+                        keyId: recipientKey.keyId,
+                    },
+                },
+                decryption: {
+                    algorithm: 'XSALSA20-POLY1305',
+                },
+                encrypted: core_1.TypedArrayEncoder.fromBase64(recipient.header.sender),
+            });
+            senderPublicJwk = core_1.Kms.PublicJwk.fromPublicKey({
+                crv: 'Ed25519',
+                kty: 'OKP',
+                publicKey: core_1.TypedArrayEncoder.fromBase58(core_1.TypedArrayEncoder.toUtf8String(data)),
+            });
+        }
+        // Perofrm the actual decryption
+        const { data: contentEncryptionKey } = await kms.decrypt({
+            decryption: {
+                algorithm: 'XSALSA20-POLY1305',
+                iv: recipient.header.iv ? core_1.TypedArrayEncoder.fromBase64(recipient.header.iv) : undefined,
+            },
+            encrypted: core_1.TypedArrayEncoder.fromBase64(recipient.encrypted_key),
+            key: {
+                keyAgreement: {
+                    algorithm: 'ECDH-HSALSA20',
+                    keyId: recipientKey.keyId,
+                    // Optionally we have a sender
+                    externalPublicJwk: senderPublicJwk?.convertTo(core_1.Kms.X25519PublicJwk).toJson(),
+                },
+            },
+        });
+        const { data: message } = await kms.decrypt({
+            decryption: {
+                algorithm: 'C20P',
+                iv: core_1.TypedArrayEncoder.fromBase64(encryptedMessage.iv),
+                tag: core_1.TypedArrayEncoder.fromBase64(encryptedMessage.tag),
+                aad: core_1.TypedArrayEncoder.fromString(encryptedMessage.protected),
+            },
+            key: {
+                privateJwk: {
+                    kty: 'oct',
+                    k: core_1.TypedArrayEncoder.toBase64URL(contentEncryptionKey),
+                },
+            },
+            encrypted: core_1.TypedArrayEncoder.fromBase64(encryptedMessage.ciphertext),
+        });
+        return {
+            plaintextMessage: core_1.JsonEncoder.fromBuffer(message),
+            senderKey: senderPublicJwk,
+            recipientKey,
+        };
     }
     async packMessage(agentContext, payload, keys) {
         const didcommConfig = agentContext.dependencyManager.resolve(DidCommModuleConfig_1.DidCommModuleConfig);
-        const { recipientKeys, routingKeys, senderKey } = keys;
-        let recipientKeysBase58 = recipientKeys.map((key) => key.publicKeyBase58);
-        const routingKeysBase58 = routingKeys.map((key) => key.publicKeyBase58);
-        const senderKeyBase58 = senderKey?.publicKeyBase58;
+        const { routingKeys, senderKey } = keys;
+        let recipientKeys = keys.recipientKeys;
         // pass whether we want to use legacy did sov prefix
         const message = payload.toJSON({ useDidSovPrefixWhereAllowed: didcommConfig.useDidSovPrefixWhereAllowed });
         this.logger.debug(`Pack outbound message ${message['@type']}`);
-        let encryptedMessage = await agentContext.wallet.pack(message, recipientKeysBase58, senderKeyBase58 ?? undefined);
+        let encryptedMessage = await this.encryptDidcommV1Message(agentContext, message, recipientKeys, senderKey);
         // If the message has routing keys (mediator) pack for each mediator
-        for (const routingKeyBase58 of routingKeysBase58) {
-            const forwardMessage = new messages_1.ForwardMessage({
+        for (const routingKey of routingKeys) {
+            const forwardMessage = new ForwardMessage_1.ForwardMessage({
                 // Forward to first recipient key
-                to: recipientKeysBase58[0],
+                to: core_1.TypedArrayEncoder.toBase58(recipientKeys[0].publicKey.publicKey),
                 message: encryptedMessage,
             });
-            recipientKeysBase58 = [routingKeyBase58];
+            recipientKeys = [routingKey];
             this.logger.debug('Forward message created', forwardMessage);
             const forwardJson = forwardMessage.toJSON({
                 useDidSovPrefixWhereAllowed: didcommConfig.useDidSovPrefixWhereAllowed,
             });
             // Forward messages are anon packed
-            encryptedMessage = await agentContext.wallet.pack(forwardJson, [routingKeyBase58], undefined);
+            encryptedMessage = await this.encryptDidcommV1Message(agentContext, forwardJson, [routingKey]);
         }
         return encryptedMessage;
     }
     async unpackMessage(agentContext, encryptedMessage) {
-        const decryptedMessage = await agentContext.wallet.unpack(encryptedMessage);
-        const { recipientKey, senderKey, plaintextMessage } = decryptedMessage;
-        return {
-            recipientKey: recipientKey ? core_1.Key.fromPublicKeyBase58(recipientKey, core_1.KeyType.Ed25519) : undefined,
-            senderKey: senderKey ? core_1.Key.fromPublicKeyBase58(senderKey, core_1.KeyType.Ed25519) : undefined,
-            plaintextMessage,
-        };
+        const decryptedMessage = await this.decryptDidcommV1Message(agentContext, encryptedMessage);
+        return decryptedMessage;
+    }
+    async extractOurRecipientKeyWithKeyId(agentContext, recipient) {
+        const kms = agentContext.resolve(core_1.Kms.KeyManagementApi);
+        const publicKey = core_1.Kms.PublicJwk.fromPublicKey({
+            kty: 'OKP',
+            crv: 'Ed25519',
+            publicKey: core_1.TypedArrayEncoder.fromBase58(recipient.header.kid),
+        });
+        // We need to find the associated did based on the recipient key
+        // so we can extract the kms key id from the did record.
+        try {
+            const { didDocument, keys } = await this.didcommDocumentService.resolveCreatedDidDocumentWithKeysByRecipientKey(agentContext, publicKey);
+            const verificationMethod = didDocument.findVerificationMethodByPublicKey(publicKey);
+            const kmsKeyId = keys?.find(({ didDocumentRelativeKeyId }) => verificationMethod.id.endsWith(didDocumentRelativeKeyId))?.kmsKeyId;
+            agentContext.config.logger.debug(`Found did '${didDocument.id}' for recipient key '${publicKey.fingerprint}' for incoming didcomm message`);
+            publicKey.keyId = kmsKeyId ?? publicKey.legacyKeyId;
+            return publicKey;
+        }
+        catch (error) {
+            // If there is no did record yet, we first look at the mediator routing record
+            const mediatorRoutingRepository = agentContext.dependencyManager.resolve(MediatorRoutingRepository_1.MediatorRoutingRepository);
+            if (error instanceof core_1.RecordNotFoundError) {
+                const mediatorRoutingRecord = await mediatorRoutingRepository.findSingleByQuery(agentContext, {
+                    routingKeyFingerprints: [publicKey.fingerprint],
+                });
+                if (mediatorRoutingRecord) {
+                    agentContext.config.logger.debug(`Found mediator routing record with id '${mediatorRoutingRecord.id}' for recipient key '${publicKey.fingerprint}' for incoming didcomm message`);
+                    const routingKey = mediatorRoutingRecord.routingKeysWithKeyId.find((routingKey) => publicKey.equals(routingKey));
+                    // This should not happen as we only get here if the tag matches
+                    if (!routingKey) {
+                        throw new core_1.CredoError(`Expected to find key with fingerprint '${publicKey.fingerprint}' in routing keys of mediator routing record '${mediatorRoutingRecord.id}'`);
+                    }
+                    if (routingKey) {
+                        return routingKey;
+                    }
+                }
+                //  If there is no mediator routing record, we look at the out of band record
+                const outOfBandRepository = agentContext.dependencyManager.resolve(OutOfBandRepository_1.OutOfBandRepository);
+                const outOfBandRecord = await outOfBandRepository.findSingleByQuery(agentContext, {
+                    $or: [
+                        // In case we are the creator of the out of band invitation we can query based on
+                        // out of band invitation recipient key fingerprint
+                        {
+                            role: OutOfBandRole_1.OutOfBandRole.Sender,
+                            recipientKeyFingerprints: [publicKey.fingerprint],
+                        },
+                        // In case we are the receiver of the out of band invitation we need to query
+                        // for the recipient routing fingerprint
+                        {
+                            role: OutOfBandRole_1.OutOfBandRole.Receiver,
+                            recipientRoutingKeyFingerprint: publicKey.fingerprint,
+                        },
+                    ],
+                });
+                if (outOfBandRecord?.role === OutOfBandRole_1.OutOfBandRole.Sender) {
+                    agentContext.config.logger.debug(`Found out of band record with id '${outOfBandRecord.id}' and role '${outOfBandRecord.role}' for recipient key '${publicKey.fingerprint}' for incoming didcomm message`);
+                    for (const service of outOfBandRecord.outOfBandInvitation.getInlineServices()) {
+                        const resolvedService = (0, helpers_1.getResolvedDidcommServiceWithSigningKeyId)(service, outOfBandRecord.invitationInlineServiceKeys);
+                        const _recipientKey = resolvedService.recipientKeys.find((recipientKey) => recipientKey.equals(publicKey));
+                        if (_recipientKey) {
+                            return _recipientKey;
+                        }
+                    }
+                }
+                else if (outOfBandRecord?.role === OutOfBandRole_1.OutOfBandRole.Receiver) {
+                    agentContext.config.logger.debug(`Found out of band record with id '${outOfBandRecord.id}' and role '${outOfBandRecord.role}' for recipient key '${publicKey.fingerprint}' for incoming didcomm message`);
+                    // If there is still no key we need to look at the metadata
+                    const recipieintRouting = outOfBandRecord.metadata.get(outOfBandRecordMetadataTypes_1.OutOfBandRecordMetadataKeys.RecipientRouting);
+                    if (recipieintRouting?.recipientKeyFingerprint === publicKey.fingerprint) {
+                        publicKey.keyId = recipieintRouting.recipientKeyId ?? publicKey.legacyKeyId;
+                        return publicKey;
+                    }
+                }
+                // If there is no did found, no out of band record found, and not mediator routing record
+                // this is either:
+                //  - a connectionless oob exchange initiated before we added key ids.
+                //  - a message for a mediator, where the mediator routing record is created before we added key ids
+                //
+                // We will check if the public key exists based on the base58 encoded public key. We can remove this flow once we create a migration
+                // that optimizes this flow.
+                const kmsJwkPublic = await kms
+                    .getPublicKey({
+                    keyId: publicKey.legacyKeyId,
+                })
+                    .catch((error) => {
+                    if (error instanceof core_1.Kms.KeyManagementKeyNotFoundError)
+                        return null;
+                    throw error;
+                });
+                if (kmsJwkPublic) {
+                    agentContext.config.logger.debug(`Found public key with legacy key id '${publicKey.legacyKeyId}' for recipient key '${publicKey.fingerprint}' for incoming didcomm message`);
+                    publicKey.keyId = publicKey.legacyKeyId;
+                    return publicKey;
+                }
+            }
+        }
+        // no match found
+        return null;
     }
 };
 exports.EnvelopeService = EnvelopeService;
 exports.EnvelopeService = EnvelopeService = __decorate([
-    (0, core_1.injectable)(),
+    (0, core_2.injectable)(),
     __param(0, (0, core_1.inject)(core_1.InjectionSymbols.Logger)),
-    __metadata("design:paramtypes", [Object])
+    __metadata("design:paramtypes", [Object, DidCommDocumentService_1.DidCommDocumentService])
 ], EnvelopeService);
 //# sourceMappingURL=EnvelopeService.js.map

package/build/EnvelopeService.js.map

@@ -1 +1 @@
-{"version":3,"file":"EnvelopeService.js","sourceRoot":"","sources":["../src/EnvelopeService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAIA,yCAA2F;AAE3F,+DAA2D;AAC3D,yDAA2D;AASpD,IAAM,eAAe,GAArB,MAAM,eAAe;IAG1B,YAAoD,MAAc;QAChE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAEM,KAAK,CAAC,WAAW,CACtB,YAA0B,EAC1B,OAAqB,EACrB,IAAkB;QAElB,MAAM,aAAa,GAAG,YAAY,CAAC,iBAAiB,CAAC,OAAO,CAAC,yCAAmB,CAAC,CAAA;QAEjF,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,IAAI,CAAA;QACtD,IAAI,mBAAmB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;QACzE,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;QACvE,MAAM,eAAe,GAAG,SAAS,EAAE,eAAe,CAAA;QAElD,oDAAoD;QACpD,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,2BAA2B,EAAE,aAAa,CAAC,2BAA2B,EAAE,CAAC,CAAA;QAE1G,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAE9D,IAAI,gBAAgB,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,mBAAmB,EAAE,eAAe,IAAI,SAAS,CAAC,CAAA;QAEjH,oEAAoE;QACpE,KAAK,MAAM,gBAAgB,IAAI,iBAAiB,EAAE,CAAC;YACjD,MAAM,cAAc,GAAG,IAAI,yBAAc,CAAC;gBACxC,iCAAiC;gBACjC,EAAE,EAAE,mBAAmB,CAAC,CAAC,CAAC;gBAC1B,OAAO,EAAE,gBAAgB;aAC1B,CAAC,CAAA;YACF,mBAAmB,GAAG,CAAC,gBAAgB,CAAC,CAAA;YACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,cAAc,CAAC,CAAA;YAE5D,MAAM,WAAW,GAAG,cAAc,CAAC,MAAM,CAAC;gBACxC,2BAA2B,EAAE,aAAa,CAAC,2BAA2B;aACvE,CAAC,CAAA;YAEF,mCAAmC;YACnC,gBAAgB,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,gBAAgB,CAAC,EAAE,SAAS,CAAC,CAAA;QAC/F,CAAC;QAED,OAAO,gBAAgB,CAAA;IACzB,CAAC;IAEM,KAAK,CAAC,aAAa,CACxB,YAA0B,EAC1B,gBAAkC;QAElC,MAAM,gBAAgB,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;QAC3E,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,gBAAgB,EAAE,GAAG,gBAAgB,CAAA;QACtE,OAAO;YACL,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,UAAG,CAAC,mBAAmB,CAAC,YAAY,EAAE,cAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS;YAC/F,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,UAAG,CAAC,mBAAmB,CAAC,SAAS,EAAE,cAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS;YACtF,gBAAgB;SACjB,CAAA;IACH,CAAC;CACF,CAAA;AA3DY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,iBAAU,GAAE;IAIS,WAAA,IAAA,aAAM,EAAC,uBAAgB,CAAC,MAAM,CAAC,CAAA;;GAHxC,eAAe,CA2D3B"}
+{"version":3,"file":"EnvelopeService.js","sourceRoot":"","sources":["../src/EnvelopeService.ts"],"names":[],"mappings":"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"}

package/build/MessageSender.d.ts

@@ -3,12 +3,12 @@ import type { EnvelopeKeys } from './EnvelopeService';
 import type { ConnectionRecord } from './modules/connections/repository';
 import type { OutboundTransport } from './transport/OutboundTransport';
 import type { EncryptedMessage, OutboundPackage } from './types';
-import { AgentContext, DidResolverService, EventEmitter, Logger } from '@credo-ts/core';
+import { AgentContext, EventEmitter } from '@credo-ts/core';
+import { DidCommModuleConfig } from './DidCommModuleConfig';
 import { EnvelopeService } from './EnvelopeService';
 import { TransportService } from './TransportService';
 import { DID_COMM_TRANSPORT_QUEUE } from './constants';
 import { OutboundMessageContext } from './models';
-import { MessagePickupRepository } from './modules/message-pickup/storage';
 import { DidCommDocumentService } from './services/DidCommDocumentService';
 export interface TransportPriorityOptions {
     schemes: string[];
@@ -17,13 +17,11 @@ export interface TransportPriorityOptions {
 export declare class MessageSender {
     private envelopeService;
     private transportService;
-    private messagePickupRepository;
-    private logger;
-    private didResolverService;
+    private queueTransportRepository;
     private didCommDocumentService;
     private eventEmitter;
     private _outboundTransports;
-    constructor(envelopeService: EnvelopeService, transportService: TransportService, messagePickupRepository: MessagePickupRepository, logger: Logger, didResolverService: DidResolverService, didCommDocumentService: DidCommDocumentService, eventEmitter: EventEmitter);
+    constructor(envelopeService: EnvelopeService, transportService: TransportService, didCommModuleConfig: DidCommModuleConfig, didCommDocumentService: DidCommDocumentService, eventEmitter: EventEmitter);
     get outboundTransports(): OutboundTransport[];
     registerOutboundTransport(outboundTransport: OutboundTransport): void;
     unregisterOutboundTransport(outboundTransport: OutboundTransport): Promise<void>;