feat: initial plugin api

Signed-off-by: Timo Glastra <[email protected]>

packages/core/src/agent/Agent.ts

@@ -12,21 +12,25 @@ import type { DependencyContainer } from 'tsyringe'
 import { concatMap, takeUntil } from 'rxjs/operators'
 import { container as baseContainer } from 'tsyringe'
 
+import { CacheRepository } from '../cache'
 import { InjectionSymbols } from '../constants'
+import { JwsService } from '../crypto/JwsService'
 import { AriesFrameworkError } from '../error'
 import { BasicMessagesModule } from '../modules/basic-messages/BasicMessagesModule'
 import { ConnectionsModule } from '../modules/connections/ConnectionsModule'
 import { CredentialsModule } from '../modules/credentials/CredentialsModule'
 import { DidsModule } from '../modules/dids/DidsModule'
 import { DiscoverFeaturesModule } from '../modules/discover-features'
 import { GenericRecordsModule } from '../modules/generic-records/GenericRecordsModule'
+import { IndyModule } from '../modules/indy/module'
 import { LedgerModule } from '../modules/ledger/LedgerModule'
 import { OutOfBandModule } from '../modules/oob/OutOfBandModule'
 import { ProofsModule } from '../modules/proofs/ProofsModule'
 import { QuestionAnswerModule } from '../modules/question-answer/QuestionAnswerModule'
 import { MediatorModule } from '../modules/routing/MediatorModule'
 import { RecipientModule } from '../modules/routing/RecipientModule'
-import { StorageUpdateService } from '../storage'
+import { DependencyManager } from '../plugins'
+import { DidCommMessageRepository, StorageUpdateService, StorageVersionRepository } from '../storage'
 import { InMemoryMessageRepository } from '../storage/InMemoryMessageRepository'
 import { IndyStorageService } from '../storage/IndyStorageService'
 import { UpdateAssistant } from '../storage/migration/UpdateAssistant'
@@ -36,6 +40,8 @@ import { WalletModule } from '../wallet/WalletModule'
 import { WalletError } from '../wallet/error'
 
 import { AgentConfig } from './AgentConfig'
+import { Dispatcher } from './Dispatcher'
+import { EnvelopeService } from './EnvelopeService'
 import { EventEmitter } from './EventEmitter'
 import { AgentEventTypes } from './Events'
 import { MessageReceiver } from './MessageReceiver'
@@ -45,7 +51,7 @@ import { TransportService } from './TransportService'
 export class Agent {
   protected agentConfig: AgentConfig
   protected logger: Logger
-  protected container: DependencyContainer
+  public readonly dependencyManager: DependencyManager
   protected eventEmitter: EventEmitter
   protected messageReceiver: MessageReceiver
   protected transportService: TransportService
@@ -74,28 +80,13 @@ export class Agent {
     injectionContainer?: DependencyContainer
   ) {
     // Take input container or child container so we don't interfere with anything outside of this agent
-    this.container = injectionContainer ?? baseContainer.createChildContainer()
+    const container = injectionContainer ?? baseContainer.createChildContainer()
+
+    this.dependencyManager = new DependencyManager(container)
 
     this.agentConfig = new AgentConfig(initialConfig, dependencies)
     this.logger = this.agentConfig.logger
 
-    // Bind class based instances
-    this.container.registerInstance(AgentConfig, this.agentConfig)
-
-    // Based on interfaces. Need to register which class to use
-    if (!this.container.isRegistered(InjectionSymbols.Wallet)) {
-      this.container.register(InjectionSymbols.Wallet, { useToken: IndyWallet })
-    }
-    if (!this.container.isRegistered(InjectionSymbols.Logger)) {
-      this.container.registerInstance(InjectionSymbols.Logger, this.logger)
-    }
-    if (!this.container.isRegistered(InjectionSymbols.StorageService)) {
-      this.container.registerSingleton(InjectionSymbols.StorageService, IndyStorageService)
-    }
-    if (!this.container.isRegistered(InjectionSymbols.MessageRepository)) {
-      this.container.registerSingleton(InjectionSymbols.MessageRepository, InMemoryMessageRepository)
-    }
-
     this.logger.info('Creating agent with config', {
       ...initialConfig,
       // Prevent large object being logged.
@@ -111,27 +102,29 @@ export class Agent {
       )
     }
 
+    this.registerDependencies(this.dependencyManager)
+
     // Resolve instances after everything is registered
-    this.eventEmitter = this.container.resolve(EventEmitter)
-    this.messageSender = this.container.resolve(MessageSender)
-    this.messageReceiver = this.container.resolve(MessageReceiver)
-    this.transportService = this.container.resolve(TransportService)
-    this.walletService = this.container.resolve(InjectionSymbols.Wallet)
+    this.eventEmitter = this.dependencyManager.resolve(EventEmitter)
+    this.messageSender = this.dependencyManager.resolve(MessageSender)
+    this.messageReceiver = this.dependencyManager.resolve(MessageReceiver)
+    this.transportService = this.dependencyManager.resolve(TransportService)
+    this.walletService = this.dependencyManager.resolve(InjectionSymbols.Wallet)
 
     // We set the modules in the constructor because that allows to set them as read-only
-    this.connections = this.container.resolve(ConnectionsModule)
-    this.credentials = this.container.resolve(CredentialsModule) as CredentialsModule
-    this.proofs = this.container.resolve(ProofsModule)
-    this.mediator = this.container.resolve(MediatorModule)
-    this.mediationRecipient = this.container.resolve(RecipientModule)
-    this.basicMessages = this.container.resolve(BasicMessagesModule)
-    this.questionAnswer = this.container.resolve(QuestionAnswerModule)
-    this.genericRecords = this.container.resolve(GenericRecordsModule)
-    this.ledger = this.container.resolve(LedgerModule)
-    this.discovery = this.container.resolve(DiscoverFeaturesModule)
-    this.dids = this.container.resolve(DidsModule)
-    this.wallet = this.container.resolve(WalletModule)
-    this.oob = this.container.resolve(OutOfBandModule)
+    this.connections = this.dependencyManager.resolve(ConnectionsModule)
+    this.credentials = this.dependencyManager.resolve(CredentialsModule) as CredentialsModule
+    this.proofs = this.dependencyManager.resolve(ProofsModule)
+    this.mediator = this.dependencyManager.resolve(MediatorModule)
+    this.mediationRecipient = this.dependencyManager.resolve(RecipientModule)
+    this.basicMessages = this.dependencyManager.resolve(BasicMessagesModule)
+    this.questionAnswer = this.dependencyManager.resolve(QuestionAnswerModule)
+    this.genericRecords = this.dependencyManager.resolve(GenericRecordsModule)
+    this.ledger = this.dependencyManager.resolve(LedgerModule)
+    this.discovery = this.dependencyManager.resolve(DiscoverFeaturesModule)
+    this.dids = this.dependencyManager.resolve(DidsModule)
+    this.wallet = this.dependencyManager.resolve(WalletModule)
+    this.oob = this.dependencyManager.resolve(OutOfBandModule)
 
     // Listen for new messages (either from transports or somewhere else in the framework / extensions)
     this.messageSubscription = this.eventEmitter
@@ -187,7 +180,7 @@ export class Agent {
     }
 
     // Make sure the storage is up to date
-    const storageUpdateService = this.container.resolve(StorageUpdateService)
+    const storageUpdateService = this.dependencyManager.resolve(StorageUpdateService)
     const isStorageUpToDate = await storageUpdateService.isUpToDate()
     this.logger.info(`Agent storage is ${isStorageUpToDate ? '' : 'not '}up to date.`)
 
@@ -269,7 +262,7 @@ export class Agent {
   }
 
   public get injectionContainer() {
-    return this.container
+    return this.dependencyManager.container
   }
 
   public get config() {
@@ -304,4 +297,55 @@ export class Agent {
     }
     return connection
   }
+
+  private registerDependencies(dependencyManager: DependencyManager) {
+    dependencyManager.registerInstance(AgentConfig, this.agentConfig)
+
+    // Register internal dependencies
+    dependencyManager.registerSingleton(EventEmitter)
+    dependencyManager.registerSingleton(MessageSender)
+    dependencyManager.registerSingleton(MessageReceiver)
+    dependencyManager.registerSingleton(TransportService)
+    dependencyManager.registerSingleton(Dispatcher)
+    dependencyManager.registerSingleton(EnvelopeService)
+    dependencyManager.registerSingleton(JwsService)
+    dependencyManager.registerSingleton(CacheRepository)
+    dependencyManager.registerSingleton(DidCommMessageRepository)
+    dependencyManager.registerSingleton(StorageVersionRepository)
+    dependencyManager.registerSingleton(StorageUpdateService)
+
+    // Register possibly already defined services
+    if (!dependencyManager.isRegistered(InjectionSymbols.Wallet)) {
+      this.dependencyManager.registerSingleton(IndyWallet)
+      const wallet = this.dependencyManager.resolve(IndyWallet)
+      dependencyManager.registerInstance(InjectionSymbols.Wallet, wallet)
+    }
+    if (!dependencyManager.isRegistered(InjectionSymbols.Logger)) {
+      dependencyManager.registerInstance(InjectionSymbols.Logger, this.logger)
+    }
+    if (!dependencyManager.isRegistered(InjectionSymbols.StorageService)) {
+      dependencyManager.registerSingleton(InjectionSymbols.StorageService, IndyStorageService)
+    }
+    if (!dependencyManager.isRegistered(InjectionSymbols.MessageRepository)) {
+      dependencyManager.registerSingleton(InjectionSymbols.MessageRepository, InMemoryMessageRepository)
+    }
+
+    // Register all modules
+    dependencyManager.registerModules(
+      ConnectionsModule,
+      CredentialsModule,
+      ProofsModule,
+      MediatorModule,
+      RecipientModule,
+      BasicMessagesModule,
+      QuestionAnswerModule,
+      GenericRecordsModule,
+      LedgerModule,
+      DiscoverFeaturesModule,
+      DidsModule,
+      WalletModule,
+      OutOfBandModule,
+      IndyModule
+    )
+  }
 }

packages/core/src/agent/Dispatcher.ts

@@ -5,10 +5,9 @@ import type { AgentMessageProcessedEvent } from './Events'
 import type { Handler } from './Handler'
 import type { InboundMessageContext } from './models/InboundMessageContext'
 
-import { Lifecycle, scoped } from 'tsyringe'
-
 import { AgentConfig } from '../agent/AgentConfig'
 import { AriesFrameworkError } from '../error/AriesFrameworkError'
+import { injectable } from '../plugins'
 import { canHandleMessageType, parseMessageType } from '../utils/messageType'
 
 import { ProblemReportMessage } from './../modules/problem-reports/messages/ProblemReportMessage'
@@ -17,7 +16,7 @@ import { AgentEventTypes } from './Events'
 import { MessageSender } from './MessageSender'
 import { isOutboundServiceMessage } from './helpers'
 
-@scoped(Lifecycle.ContainerScoped)
+@injectable()
 class Dispatcher {
   private handlers: Handler[] = []
   private messageSender: MessageSender

packages/core/src/agent/EnvelopeService.ts

@@ -2,12 +2,11 @@ import type { Logger } from '../logger'
 import type { EncryptedMessage, PlaintextMessage } from '../types'
 import type { AgentMessage } from './AgentMessage'
 
-import { inject, scoped, Lifecycle } from 'tsyringe'
-
 import { InjectionSymbols } from '../constants'
 import { KeyType } from '../crypto'
 import { Key } from '../modules/dids'
 import { ForwardMessage } from '../modules/routing/messages'
+import { inject, injectable } from '../plugins'
 import { Wallet } from '../wallet/Wallet'
 
 import { AgentConfig } from './AgentConfig'
@@ -18,7 +17,7 @@ export interface EnvelopeKeys {
   senderKey: Key | null
 }
 
-@scoped(Lifecycle.ContainerScoped)
+@injectable()
 export class EnvelopeService {
   private wallet: Wallet
   private logger: Logger

packages/core/src/agent/EventEmitter.ts

@@ -3,11 +3,12 @@ import type { EventEmitter as NativeEventEmitter } from 'events'
 
 import { fromEventPattern } from 'rxjs'
 import { takeUntil } from 'rxjs/operators'
-import { Lifecycle, scoped } from 'tsyringe'
+
+import { injectable } from '../plugins'
 
 import { AgentConfig } from './AgentConfig'
 
-@scoped(Lifecycle.ContainerScoped)
+@injectable()
 export class EventEmitter {
   private agentConfig: AgentConfig
   private eventEmitter: NativeEventEmitter

packages/core/src/agent/MessageReceiver.ts

@@ -6,11 +6,10 @@ import type { AgentMessage } from './AgentMessage'
 import type { DecryptedMessageContext } from './EnvelopeService'
 import type { TransportSession } from './TransportService'
 
-import { Lifecycle, scoped } from 'tsyringe'
-
 import { AriesFrameworkError } from '../error'
 import { ConnectionsModule } from '../modules/connections'
 import { ProblemReportError, ProblemReportMessage, ProblemReportReason } from '../modules/problem-reports'
+import { injectable } from '../plugins'
 import { isValidJweStructure } from '../utils/JWE'
 import { JsonTransformer } from '../utils/JsonTransformer'
 import { canHandleMessageType, parseMessageType, replaceLegacyDidSovPrefixOnMessage } from '../utils/messageType'
@@ -23,7 +22,7 @@ import { TransportService } from './TransportService'
 import { createOutboundMessage } from './helpers'
 import { InboundMessageContext } from './models/InboundMessageContext'
 
-@scoped(Lifecycle.ContainerScoped)
+@injectable()
 export class MessageReceiver {
   private config: AgentConfig
   private envelopeService: EnvelopeService

packages/core/src/agent/MessageSender.ts

@@ -7,8 +7,6 @@ import type { AgentMessage } from './AgentMessage'
 import type { EnvelopeKeys } from './EnvelopeService'
 import type { TransportSession } from './TransportService'
 
-import { inject, Lifecycle, scoped } from 'tsyringe'
-
 import { DID_COMM_TRANSPORT_QUEUE, InjectionSymbols } from '../constants'
 import { ReturnRouteTypes } from '../decorators/transport/TransportDecorator'
 import { AriesFrameworkError } from '../error'
@@ -18,6 +16,7 @@ import { getKeyDidMappingByVerificationMethod } from '../modules/dids/domain/key
 import { DidCommV1Service, IndyAgentService } from '../modules/dids/domain/service'
 import { didKeyToInstanceOfKey, verkeyToInstanceOfKey } from '../modules/dids/helpers'
 import { DidResolverService } from '../modules/dids/services/DidResolverService'
+import { inject, injectable } from '../plugins'
 import { MessageRepository } from '../storage/MessageRepository'
 import { MessageValidator } from '../utils/MessageValidator'
 import { getProtocolScheme } from '../utils/uri'
@@ -37,7 +36,7 @@ export interface TransportPriorityOptions {
   restrictive?: boolean
 }
 
-@scoped(Lifecycle.ContainerScoped)
+@injectable()
 export class MessageSender {
   private envelopeService: EnvelopeService
   private transportService: TransportService

packages/core/src/agent/TransportService.ts

@@ -4,11 +4,10 @@ import type { EncryptedMessage } from '../types'
 import type { AgentMessage } from './AgentMessage'
 import type { EnvelopeKeys } from './EnvelopeService'
 
-import { Lifecycle, scoped } from 'tsyringe'
-
 import { DID_COMM_TRANSPORT_QUEUE } from '../constants'
+import { injectable } from '../plugins'
 
-@scoped(Lifecycle.ContainerScoped)
+@injectable()
 export class TransportService {
   public transportSessionTable: TransportSessionTable = {}
 

packages/core/src/agent/__tests__/Agent.test.ts

@@ -38,7 +38,7 @@ describe('Agent', () => {
     let agent: Agent
 
     afterEach(async () => {
-      const wallet = agent.injectionContainer.resolve<Wallet>(InjectionSymbols.Wallet)
+      const wallet = agent.dependencyManager.resolve<Wallet>(InjectionSymbols.Wallet)
 
       if (wallet.isInitialized) {
         await wallet.delete()
@@ -59,7 +59,7 @@ describe('Agent', () => {
       expect.assertions(4)
 
       agent = new Agent(config, dependencies)
-      const wallet = agent.injectionContainer.resolve<Wallet>(InjectionSymbols.Wallet)
+      const wallet = agent.dependencyManager.resolve<Wallet>(InjectionSymbols.Wallet)
 
       expect(agent.isInitialized).toBe(false)
       expect(wallet.isInitialized).toBe(false)
@@ -110,7 +110,7 @@ describe('Agent', () => {
   describe('Dependency Injection', () => {
     it('should be able to resolve registered instances', () => {
       const agent = new Agent(config, dependencies)
-      const container = agent.injectionContainer
+      const container = agent.dependencyManager
 
       // Modules
       expect(container.resolve(ConnectionsModule)).toBeInstanceOf(ConnectionsModule)
@@ -153,7 +153,7 @@ describe('Agent', () => {
 
     it('should return the same instance for consequent resolves', () => {
       const agent = new Agent(config, dependencies)
-      const container = agent.injectionContainer
+      const container = agent.dependencyManager
 
       // Modules
       expect(container.resolve(ConnectionsModule)).toBe(container.resolve(ConnectionsModule))

packages/core/src/cache/CacheRepository.ts

@@ -1,13 +1,12 @@
-import { inject, scoped, Lifecycle } from 'tsyringe'
-
 import { EventEmitter } from '../agent/EventEmitter'
 import { InjectionSymbols } from '../constants'
+import { inject, injectable } from '../plugins'
 import { Repository } from '../storage/Repository'
 import { StorageService } from '../storage/StorageService'
 
 import { CacheRecord } from './CacheRecord'
 
-@scoped(Lifecycle.ContainerScoped)
+@injectable()
 export class CacheRepository extends Repository<CacheRecord> {
   public constructor(
     @inject(InjectionSymbols.StorageService) storageService: StorageService<CacheRecord>,

packages/core/src/crypto/JwsService.ts

@@ -1,10 +1,9 @@
 import type { Buffer } from '../utils'
 import type { Jws, JwsGeneralFormat } from './JwsTypes'
 
-import { inject, Lifecycle, scoped } from 'tsyringe'
-
 import { InjectionSymbols } from '../constants'
 import { AriesFrameworkError } from '../error'
+import { inject, injectable } from '../plugins'
 import { JsonEncoder, TypedArrayEncoder } from '../utils'
 import { Wallet } from '../wallet'
 import { WalletError } from '../wallet/error'
@@ -14,7 +13,7 @@ const JWS_KEY_TYPE = 'OKP'
 const JWS_CURVE = 'Ed25519'
 const JWS_ALG = 'EdDSA'
 
-@scoped(Lifecycle.ContainerScoped)
+@injectable()
 export class JwsService {
   private wallet: Wallet