feat(core): connection-less issuance and verification

README.md

@@ -63,12 +63,12 @@ Some features are not yet supported, but are on our roadmap. Check [the roadmap]
 - ✅ Basic Message Protocol ([RFC 0095](https://github.com/hyperledger/aries-rfcs/blob/master/features/0095-basic-message/README.md))
 - ✅ Indy Credentials (with `did:sov` support)
 - ✅ HTTP Transport
+- ✅ Connection-less Issuance and Verification
 - ✅ Mediator Coordination Protocol ([RFC 0211](https://github.com/hyperledger/aries-rfcs/blob/master/features/0211-route-coordination/README.md))
 - 🚧 Revocation of Indy Credentials
 - 🚧 Electron
 - 🚧 WebSocket Transport
 - ❌ Browser
-- ❌ Connection-less Issuance and Verification
 - ❌ Issue Credential V2, Present Proof V2, DID Exchange Protocol, Out-Of-Band
 - ❌ W3C Linked Data VCs, BBS+ Signatures
 

packages/core/src/agent/AgentMessage.ts

@@ -1,6 +1,7 @@
 import { AckDecorated } from '../decorators/ack/AckDecoratorExtension'
 import { AttachmentDecorated } from '../decorators/attachment/AttachmentExtension'
 import { L10nDecorated } from '../decorators/l10n/L10nDecoratorExtension'
+import { ServiceDecorated } from '../decorators/service/ServiceDecoratorExtension'
 import { ThreadDecorated } from '../decorators/thread/ThreadDecoratorExtension'
 import { TimingDecorated } from '../decorators/timing/TimingDecoratorExtension'
 import { TransportDecorated } from '../decorators/transport/TransportDecoratorExtension'
@@ -16,6 +17,7 @@ const DefaultDecorators = [
   TimingDecorated,
   AckDecorated,
   AttachmentDecorated,
+  ServiceDecorated,
 ]
 
 export class AgentMessage extends Compose(BaseMessage, DefaultDecorators) {

packages/core/src/agent/Dispatcher.ts

@@ -7,17 +7,15 @@ import { Lifecycle, scoped } from 'tsyringe'
 import { AriesFrameworkError } from '../error/AriesFrameworkError'
 
 import { MessageSender } from './MessageSender'
-import { TransportService } from './TransportService'
+import { isOutboundServiceMessage } from './helpers'
 
 @scoped(Lifecycle.ContainerScoped)
 class Dispatcher {
   private handlers: Handler[] = []
   private messageSender: MessageSender
-  private transportService: TransportService
 
-  public constructor(messageSender: MessageSender, transportService: TransportService) {
+  public constructor(messageSender: MessageSender) {
     this.messageSender = messageSender
-    this.transportService = transportService
   }
 
   public registerHandler(handler: Handler) {
@@ -34,7 +32,14 @@ class Dispatcher {
 
     const outboundMessage = await handler.handle(messageContext)
 
-    if (outboundMessage) {
+    if (outboundMessage && isOutboundServiceMessage(outboundMessage)) {
+      await this.messageSender.sendMessageToService({
+        message: outboundMessage.payload,
+        service: outboundMessage.service,
+        senderKey: outboundMessage.senderKey,
+        returnRoute: true,
+      })
+    } else if (outboundMessage) {
       await this.messageSender.sendMessage(outboundMessage)
     }
   }

packages/core/src/agent/EnvelopeService.ts

@@ -1,5 +1,5 @@
 import type { Logger } from '../logger'
-import type { PackedMessage, UnpackedMessageContext } from '../types'
+import type { UnpackedMessageContext, WireMessage } from '../types'
 import type { AgentMessage } from './AgentMessage'
 import type { Verkey } from 'indy-sdk'
 
@@ -27,7 +27,7 @@ class EnvelopeService {
     this.logger = agentConfig.logger
   }
 
-  public async packMessage(payload: AgentMessage, keys: EnvelopeKeys): Promise<PackedMessage> {
+  public async packMessage(payload: AgentMessage, keys: EnvelopeKeys): Promise<WireMessage> {
     const { routingKeys, recipientKeys, senderKey: senderVk } = keys
     const message = payload.toJSON()
 
@@ -50,7 +50,7 @@ class EnvelopeService {
     return wireMessage
   }
 
-  public async unpackMessage(packedMessage: PackedMessage): Promise<UnpackedMessageContext> {
+  public async unpackMessage(packedMessage: WireMessage): Promise<UnpackedMessageContext> {
     return this.wallet.unpack(packedMessage)
   }
 }

packages/core/src/agent/Handler.ts

@@ -1,11 +1,11 @@
-import type { OutboundMessage } from '../types'
+import type { OutboundMessage, OutboundServiceMessage } from '../types'
 import type { AgentMessage } from './AgentMessage'
 import type { InboundMessageContext } from './models/InboundMessageContext'
 
 export interface Handler<T extends typeof AgentMessage = typeof AgentMessage> {
   readonly supportedMessages: readonly T[]
 
-  handle(messageContext: InboundMessageContext): Promise<OutboundMessage | void>
+  handle(messageContext: InboundMessageContext): Promise<OutboundMessage | OutboundServiceMessage | void>
 }
 
 /**

packages/core/src/agent/MessageReceiver.ts

@@ -1,5 +1,5 @@
 import type { Logger } from '../logger'
-import type { UnpackedMessageContext, UnpackedMessage } from '../types'
+import type { UnpackedMessageContext, UnpackedMessage, WireMessage } from '../types'
 import type { AgentMessage } from './AgentMessage'
 import type { TransportSession } from './TransportService'
 
@@ -53,13 +53,15 @@ export class MessageReceiver {
 
     this.logger.debug(`Agent ${this.config.label} received message`)
 
-    const unpackedMessage = await this.unpackMessage(inboundPackedMessage as Record<string, unknown>)
-    const senderKey = unpackedMessage.sender_verkey
+    const unpackedMessage = await this.unpackMessage(inboundPackedMessage as WireMessage)
+    const senderKey = unpackedMessage.senderVerkey
+    const recipientKey = unpackedMessage.recipientVerkey
+
     let connection = undefined
-    if (senderKey && unpackedMessage.recipient_verkey) {
+    if (senderKey && recipientKey) {
       // TODO: only attach if theirKey is present. Otherwise a connection that may not be complete, validated or correct will
       // be attached to the message context. See #76
-      connection = (await this.connectionService.findByVerkey(unpackedMessage.recipient_verkey)) || undefined
+      connection = (await this.connectionService.findByVerkey(recipientKey)) || undefined
 
       // We check whether the sender key is the same as the key we have stored in the connection
       // otherwise everyone could send messages to our key and we would just accept
@@ -80,26 +82,25 @@ export class MessageReceiver {
     const messageContext = new InboundMessageContext(message, {
       connection,
       senderVerkey: senderKey,
-      recipientVerkey: unpackedMessage.recipient_verkey,
+      recipientVerkey: recipientKey,
     })
 
     // We want to save a session if there is a chance of returning outbound message via inbound transport.
     // That can happen when inbound message has `return_route` set to `all` or `thread`.
     // If `return_route` defines just `thread`, we decide later whether to use session according to outbound message `threadId`.
-    if (connection && message.hasAnyReturnRoute() && session) {
+    if (senderKey && recipientKey && message.hasAnyReturnRoute() && session) {
       const keys = {
-        // TODO handle the case when senderKey is missing
-        recipientKeys: senderKey ? [senderKey] : [],
+        recipientKeys: [senderKey],
         routingKeys: [],
-        senderKey: connection?.verkey || null,
+        senderKey: recipientKey,
       }
       session.keys = keys
       session.inboundMessage = message
       session.connection = connection
       this.transportService.saveSession(session)
     }
 
-    return await this.dispatcher.dispatch(messageContext)
+    await this.dispatcher.dispatch(messageContext)
   }
 
   /**
@@ -108,7 +109,7 @@ export class MessageReceiver {
    *
    * @param packedMessage the received, probably packed, message to unpack
    */
-  private async unpackMessage(packedMessage: Record<string, unknown>): Promise<UnpackedMessageContext> {
+  private async unpackMessage(packedMessage: WireMessage): Promise<UnpackedMessageContext> {
     // If the inbound message has no @type field we assume
     // the message is packed and must be unpacked first
     if (!this.isUnpackedMessage(packedMessage)) {