@veramo/cli 5.0.1-next.12 → 5.0.1-next.14

package/src/did.ts

@@ -1,19 +1,19 @@
-import { IDIDManagerCreateArgs } from '@veramo/core-types'
+import { IDIDManagerCreateArgs, IIdentifier } from '@veramo/core-types'
 import { getAgent } from './setup.js'
 import inquirer from 'inquirer'
-import { program } from 'commander'
+import { Command } from 'commander'
 import { printTable } from 'console-table-printer'
 
-const did = program.command('did').description('Decentralized identifiers')
+const did = new Command('did').description('Decentralized identifiers')
 
 did
   .command('providers')
   .description('list available identifier providers')
-  .action(async (cmd) => {
-    const agent = await getAgent(program.opts().config)
+  .action(async (opts: {}, cmd: Command) => {
+    const agent = await getAgent(cmd.optsWithGlobals().config)
 
     const providers = await agent.didManagerGetProviders()
-    const list = providers.map((provider) => ({ provider }))
+    const list = providers.map((provider: string) => ({ provider }))
 
     if (list.length > 0) {
       printTable(list)
@@ -25,13 +25,17 @@ did
 did
   .command('list', { isDefault: true })
   .description('list managed identifiers')
-  .action(async (cmd) => {
-    const agent = await getAgent(program.opts().config)
+  .action(async (opts: {}, cmd: Command) => {
+    const agent = await getAgent(cmd.optsWithGlobals().config)
 
     const list = await agent.didManagerFind()
 
     if (list.length > 0) {
-      const dids = list.map((item) => ({ provider: item.provider, alias: item.alias, did: item.did }))
+      const dids = list.map((item: IIdentifier) => ({
+        provider: item.provider,
+        alias: item.alias,
+        did: item.did,
+      }))
       printTable(dids)
     } else {
       console.log('No dids')
@@ -41,8 +45,9 @@ did
 did
   .command('create')
   .description('create an identifier')
-  .action(async (cmd) => {
-    const agent = await getAgent(program.opts().config)
+  .action(async (opts: {}, cmd: Command) => {
+    // FIXME: CLI add arguments for provider, kms, alias
+    const agent = await getAgent(cmd.optsWithGlobals().config)
 
     try {
       const providers = await agent.didManagerGetProviders()
@@ -79,8 +84,8 @@ did
 did
   .command('delete')
   .description('delete an identifier')
-  .action(async (cmd) => {
-    const agent = await getAgent(program.opts().config)
+  .action(async (opts: {}, cmd: Command) => {
+    const agent = await getAgent(cmd.optsWithGlobals().config)
 
     try {
       const identifiers = await agent.didManagerFind()
@@ -106,8 +111,8 @@ did
 did
   .command('add-service')
   .description('add a service endpoint to did document')
-  .action(async (cmd) => {
-    const agent = await getAgent(program.opts().config)
+  .action(async (opts: {}, cmd: Command) => {
+    const agent = await getAgent(cmd.optsWithGlobals().config)
 
     try {
       const identifiers = await agent.didManagerFind()
@@ -154,8 +159,8 @@ did
 did
   .command('remove-service')
   .description('remove a service endpoint from did document')
-  .action(async (cmd) => {
-    const agent = await getAgent(program.opts().config)
+  .action(async (opts: {}, cmd: Command) => {
+    const agent = await getAgent(cmd.optsWithGlobals().config)
 
     try {
       const identifiers = await agent.didManagerFind()
@@ -187,8 +192,8 @@ did
 did
   .command('add-key')
   .description('create and add a public key to did document')
-  .action(async (cmd) => {
-    const agent = await getAgent(program.opts().config)
+  .action(async (opts: {}, cmd: Command) => {
+    const agent = await getAgent(cmd.optsWithGlobals().config)
 
     try {
       const identifiers = await agent.didManagerFind()
@@ -233,8 +238,8 @@ did
 did
   .command('remove-key')
   .description('remove a key from did document')
-  .action(async (cmd) => {
-    const agent = await getAgent(program.opts().config)
+  .action(async (opts: {}, cmd: Command) => {
+    const agent = await getAgent(cmd.optsWithGlobals().config)
 
     try {
       const identifiers = await agent.didManagerFind()
@@ -266,8 +271,8 @@ did
 did
   .command('export')
   .description('export an identifier')
-  .action(async (cmd) => {
-    const agent = await getAgent(program.opts().config)
+  .action(async (opts: {}, cmd: Command) => {
+    const agent = await getAgent(cmd.optsWithGlobals().config)
 
     try {
       const identifiers = await agent.didManagerFind()
@@ -294,8 +299,8 @@ did
 did
   .command('import')
   .description('import an identifier')
-  .action(async (cmd) => {
-    const agent = await getAgent(program.opts().config)
+  .action(async (opts: {}, cmd: Command) => {
+    const agent = await getAgent(cmd.optsWithGlobals().config)
 
     try {
       const answers = await inquirer.prompt([
@@ -316,8 +321,8 @@ did
 did
   .command('resolve <didUrl>')
   .description('Resolve DID Document')
-  .action(async (didUrl) => {
-    const agent = await getAgent(program.opts().config)
+  .action(async (didUrl: string, opts: {}, cmd: Command) => {
+    const agent = await getAgent(cmd.optsWithGlobals().config)
     try {
       const ddo = await agent.resolveDid({ didUrl })
       console.log(JSON.stringify(ddo, null, 2))
@@ -325,3 +330,5 @@ did
       console.error(e.message)
     }
   })
+
+export { did }

package/src/discover.ts

@@ -1,18 +1,18 @@
 import { getAgent } from './setup.js'
-import { program } from 'commander'
+import { Command } from 'commander'
 import { printTable } from 'console-table-printer'
 
-const discover = program.command('discover').description('Discovery')
+const discover = new Command('discover').description('Discovery')
 
 discover
   .command('did')
   .description('did discovery')
   .option('-q, --query <string>', 'Query string')
 
-  .action(async (cmd) => {
-    const agent = await getAgent(program.opts().config)
+  .action(async (opts: { query: string }, cmd: Command) => {
+    const agent = await getAgent(cmd.optsWithGlobals().config)
 
-    const response = await agent.discoverDid({ query: cmd.query })
+    const response = await agent.discoverDid({ query: opts.query })
     const list: any = []
 
     response.results.forEach((r: any) => {
@@ -30,3 +30,5 @@ discover
       console.log('No dids discovered')
     }
   })
+
+export { discover }

package/src/execute.ts

@@ -1,18 +1,17 @@
-import { program } from 'commander'
+import { Command } from 'commander'
 import inquirer from 'inquirer'
 import { getAgent } from './setup.js'
 import fs from 'fs'
 import OasResolver from 'oas-resolver'
 import fuzzy from 'fuzzy'
 
-program
-  .command('execute')
-  .description('Executes agent method')
+const execute = new Command('execute')
+  .description('Execute agent method')
   .option('-m, --method <string>', 'Method name')
   .option('-a, --argsJSON <string>', 'Method arguments')
   .option('-f, --argsFile <string>', 'Path to a file containing method arguments in a JSON string')
-  .action(async (options) => {
-    const agent = await getAgent(program.opts().config)
+  .action(async (options: { method: string; argsJSON?: string; argsFile?: string }, cmd: Command) => {
+    const agent = await getAgent(cmd.optsWithGlobals().config)
 
     try {
       let method = options.method
@@ -92,9 +91,13 @@ program
       } else {
         if (argsFile) {
           console.log({ argsFile })
-          argsString = fs.readFileSync(argsFile)
+          argsString = fs.readFileSync(argsFile).toString('utf-8')
+        }
+        try {
+          argsObj = JSON.parse(argsString!)
+        } catch (e: any) {
+          console.error('could not parse arguments JSON')
         }
-        argsObj = JSON.parse(argsString)
       }
 
       console.log('\nMethod: ', method)
@@ -111,3 +114,5 @@ program
       console.error(e.message)
     }
   })
+
+export { execute }

package/src/explore/index.ts

@@ -1,12 +1,12 @@
 import { getAgent } from '../setup.js'
 import { Command } from 'commander'
-const program = new Command();
 import { renderMainScreen } from './main.js'
 
-program
-  .command('explore')
+const explore = new Command('explore')
   .description('launch Verifiable Data explorer')
-  .action(async (cmd) => {
-    const agent = await getAgent(program.opts().config)
+  .action(async (opts: {}, cmd: Command) => {
+    const agent = await getAgent(cmd.optsWithGlobals().config)
     await renderMainScreen(agent)
   })
+
+export { explore }

package/src/lib/agentCreator.ts

@@ -1,6 +1,15 @@
 import { TAgent, IPluginMethodMap } from '@veramo/core-types'
 import { createObjects } from './objectCreator.js'
 
+/**
+ * Creates a Veramo agent from a config object containing an `/agent` pointer.
+ * @param config - The configuration object
+ *
+ * @see {@link https://veramo.io/docs/veramo_agent/configuration_internals | Configuration Internals} for details on
+ *   the configuration options.
+ *
+ * @beta - This API may change without a major version bump
+ */
 export async function createAgentFromConfig<T extends IPluginMethodMap>(config: object): Promise<TAgent<T>> {
   // @ts-ignore
   const { agent } = await createObjects(config, { agent: '/agent' })

package/src/lib/objectCreator.ts

@@ -2,7 +2,53 @@ import { set, get } from 'jsonpointer'
 import parse from 'url-parse'
 import { resolve } from 'path'
 
-export async function createObjects(config: object, pointers: Record<string, string>): Promise<any> {
+/**
+ * Creates objects from a configuration object and a set of pointers.
+ *
+ * Example:
+ * ```ts
+ * const { url } = createObjects({ "rpcUrl": "http://localhost:8545", }, { url: '/rpcUrl' })
+ * ```
+ *
+ * The config can contain references (`$ref`) to other objects within using JSON pointers.
+ * Example:
+ * ```json
+ * {
+ *   "rpcUrl": "http://localhost:8545",
+ *   "endpoint": {
+ *     "url": {
+ *       "$ref": "/rpcUrl"
+ *     }
+ *   }
+ * }
+ * ```
+ *
+ * The config object can also contain references to NPM modules using the `$require` property.
+ * Example:
+ * ```json
+ * {
+ *   "agent": {
+ *     "$require": "@veramo/core#Agent",
+ *     "$args": {
+ *       "plugins": [
+ *         { "$require": "@veramo/did-comm#DIDComm" },
+ *       ]
+ *     }
+ *   }
+ * }
+ * ```
+ *
+ * Environment variables can also be specified using the `$env` property.
+ *
+ * @see Please see {@link https://veramo.io/docs/veramo_agent/configuration_internals | Configuration Internals} for
+ *   more information.
+ *
+ * @param config - The configuration object
+ * @param pointers - A map of JSON pointers to objects within that config that you wish to create
+ *
+ * @beta - This API may change without a major version bump
+ */
+export async function createObjects(config: object, pointers: Record<string, string>): Promise<Record<string, any>> {
   const objects = {}
 
   async function resolveRefs(input: any): Promise<any> {
@@ -51,9 +97,9 @@ export async function createObjects(config: object, pointers: Record<string, str
       module = resolve(module)
     }
 
-    const resolvedArgs = args !== undefined ? (await resolveRefs(args)) : []
+    const resolvedArgs = args !== undefined ? await resolveRefs(args) : []
     try {
-      let required = member ? (await import(module))[member] : (await import(module))
+      let required = member ? (await import(module))[member] : await import(module)
       if (type === 'class') {
         object = new required(...resolvedArgs)
       } else if (type === 'function') {

package/src/message.ts

@@ -1,8 +1,8 @@
 import { getAgent } from './setup.js'
-import { program } from 'commander'
+import { Command } from 'commander'
 import fs from 'fs'
 
-const message = program.command('message').description('Messages')
+const message = new Command('message').description('Messages')
 
 message
   .command('handle', { isDefault: true })
@@ -11,8 +11,8 @@ message
   .option('-f, --file <string>', 'Path to a file containing raw message')
   .option('--save <boolean>', 'Save message', true)
 
-  .action(async (options) => {
-    const agent = await getAgent(program.opts().config)
+  .action(async (options: { file: string; raw: string; save: boolean }, cmd: Command) => {
+    const agent = await getAgent(cmd.optsWithGlobals().config)
     try {
       let raw
 
@@ -35,3 +35,5 @@ message
       console.error(e.message)
     }
   })
+
+export { message }

package/src/presentation.ts

@@ -1,22 +1,22 @@
 import { getAgent } from './setup.js'
-import { program } from 'commander'
+import { Command } from 'commander'
 import inquirer from 'inquirer'
 import qrcode from 'qrcode-terminal'
 import { readStdin } from './util.js'
 import * as fs from 'fs'
 import * as json5 from 'json5'
 import { extractIssuer } from '@veramo/utils'
-import { PartialIdentifier, UniqueVerifiablePresentation } from "@veramo/core-types";
+import { PartialIdentifier, UniqueVerifiablePresentation } from '@veramo/core-types'
 
-const presentation = program.command('presentation').description('W3C Verifiable Presentation')
+const presentation = new Command('presentation').description('W3C Verifiable Presentation')
 
 presentation
   .command('create', { isDefault: true })
   .description('Create W3C Verifiable Presentation')
   .option('-s, --send', 'Send')
   .option('-q, --qrcode', 'Show qrcode')
-  .action(async (cmd) => {
-    const agent = await getAgent(program.opts().config)
+  .action(async (opts: { send: boolean; qrcode: boolean }, cmd: Command) => {
+    const agent = await getAgent(cmd.optsWithGlobals().config)
     const myIdentifiers = await agent.didManagerFind()
     if (myIdentifiers.length === 0) {
       console.error('No dids')
@@ -33,7 +33,7 @@ presentation
       ...ids.map((id: PartialIdentifier) => id.did),
     ]
 
-    let aud:string[] = []
+    let aud: string[] = []
     const answers = await inquirer.prompt([
       {
         type: 'list',
@@ -72,8 +72,8 @@ presentation
           type: 'list',
           name: 'aud',
           message: 'Select Verifier or enter manually',
-          choices: identifiers
-        }
+          choices: identifiers,
+        },
       ])
       answer = audAnswer.aud
       if (answer === 'manual') {
@@ -144,8 +144,8 @@ presentation
         proofFormat: 'jwt',
       })
 
-      if (cmd.send) {
-        for(var verifier in aud) {
+      if (opts.send) {
+        for (var verifier in aud) {
           try {
             const message = await agent.sendMessageDIDCommAlpha1({
               save: true,
@@ -163,7 +163,7 @@ presentation
         }
       }
 
-      if (cmd.qrcode) {
+      if (opts.qrcode) {
         qrcode.generate(verifiablePresentation.proof.jwt)
       } else {
         console.dir(verifiablePresentation, { depth: 10 })
@@ -178,54 +178,57 @@ presentation
   .option('-d, --domain <string>', 'Optional. Specify a domain that the presentation should match.')
   .option('-f, --filename <string>', 'Optional. Read the presentation from a file instead of stdin')
   .option('-r, --raw <string>', 'Optional. Presentation as a parameter string instead of a file or stdin.')
-  .action(async (options) => {
-    const agent = await getAgent(program.opts().config)
-    let raw: string = ''
-    if (options.raw) {
-      raw = options.raw
-    } else if (options.filename) {
-      raw = await fs.promises.readFile(options.filename, 'utf-8')
-    } else {
-      raw = await readStdin()
-    }
-    let presentationAsJSON: any
-    try {
-      presentationAsJSON = json5.parse(raw)
-    } catch (e: any) {
-      presentationAsJSON = {
-        proof: {
-          type: 'JwtProof2020',
-          jwt: raw,
-        },
-      } as any
-    }
-    const result = await agent.verifyPresentation({
-      presentation: presentationAsJSON,
-      challenge: options.challenge,
-      domain: options.domain,
-    })
-    if (result.verified === true) {
-      console.log('Presentation was verified successfully.')
-    } else {
-      console.error('Presentation could not be verified.')
-    }
-  })
+  .action(
+    async (options: { challenge: string; domain: string; filename: string; raw: string }, cmd: Command) => {
+      const agent = await getAgent(cmd.optsWithGlobals().config)
+      let raw: string = ''
+      if (options.raw) {
+        raw = options.raw
+      } else if (options.filename) {
+        raw = await fs.promises.readFile(options.filename, 'utf-8')
+      } else {
+        raw = await readStdin()
+      }
+      let presentationAsJSON: any
+      try {
+        presentationAsJSON = json5.parse(raw)
+      } catch (e: any) {
+        presentationAsJSON = {
+          proof: {
+            type: 'JwtProof2020',
+            jwt: raw,
+          },
+        } as any
+      }
+      const result = await agent.verifyPresentation({
+        presentation: presentationAsJSON,
+        challenge: options.challenge,
+        domain: options.domain,
+      })
+      if (result.verified === true) {
+        console.log('Presentation was verified successfully.')
+      } else {
+        console.error('Presentation could not be verified.')
+      }
+    },
+  )
 
 presentation
   .command('output')
   .description('Print W3C Verifiable Presentation to stdout')
   .option('-t, --tag <string>', 'Optional. Specify the tag for the presentation.')
-  .action(async (options) => {
-    const agent = await getAgent(program.opts().config)
+  .action(async (options: { tag: string }, cmd: Command) => {
+    const agent = await getAgent(cmd.optsWithGlobals().config)
 
-    const presentations: UniqueVerifiablePresentation[] = await agent.dataStoreORMGetVerifiablePresentations({})
+    const presentations: UniqueVerifiablePresentation[] = await agent.dataStoreORMGetVerifiablePresentations(
+      {},
+    )
 
     if (presentations.length > 0) {
-
       let selected = null
       const list: any = []
       if (options.tag) {
-        const matches = presentations.filter(pres => pres.verifiablePresentation.tag === options.tag)
+        const matches = presentations.filter((pres) => pres.verifiablePresentation.tag === options.tag)
         if (matches.length > 1) {
           console.log('Found multiple matching presentations. Only showing the first one.')
         }
@@ -263,3 +266,5 @@ presentation
       console.log('No presentations found.')
     }
   })
+
+export { presentation }

package/src/sdr.ts

@@ -1,6 +1,6 @@
 import { ICredentialRequestInput } from '@veramo/selective-disclosure'
 import { getAgent } from './setup.js'
-import { program } from 'commander'
+import { Command } from 'commander'
 import inquirer from 'inquirer'
 import qrcode from 'qrcode-terminal'
 import { shortDate, shortDid } from './explore/utils.js'
@@ -9,13 +9,14 @@ import { asArray, extractIssuer } from '@veramo/utils'
 
 import fuzzy from 'fuzzy'
 
-const sdr = program.command('sdr').description('Selective Disclosure Request')
+const sdr = new Command('sdr').description('Selective Disclosure Request')
 
 sdr
   .command('create', { isDefault: true })
   .description('create Selective Disclosure Request')
-  .action(async (cmd) => {
-    const agent = await getAgent(program.opts().config)
+  .option('-q, --qrcode', 'Show qrcode')
+  .action(async (opts: { qrcode: boolean }, cmd: Command) => {
+    const agent = await getAgent(cmd.optsWithGlobals().config)
     const identifiers = await agent.didManagerFind()
 
     const knownDids = await agent.dataStoreORMGetIdentifiers()
@@ -253,7 +254,7 @@ sdr
       console.log('Subject not specified')
     }
 
-    if (cmd.qrcode) {
+    if (opts.qrcode) {
       qrcode.generate(jwt)
     } else {
       console.dir(data, { depth: 10 })
@@ -264,8 +265,8 @@ sdr
 sdr
   .command('respond')
   .description('respond to Selective Disclosure Request')
-  .action(async (cmd) => {
-    const agent = await getAgent(program.opts().config)
+  .action(async (opts: {}, cmd: Command) => {
+    const agent = await getAgent(cmd.optsWithGlobals().config)
     const sdrMessages = await agent.dataStoreORMGetMessages({
       where: [{ column: 'type', value: ['sdr'] }],
       order: [{ column: 'createdAt', direction: 'DESC' }],
@@ -354,3 +355,5 @@ sdr
 
     console.dir(verifiablePresentation, { depth: 10 })
   })
+
+export { sdr }

package/src/server.ts

@@ -1,30 +1,34 @@
 import express from 'express'
-import { program } from 'commander'
+import { Command } from 'commander'
 import { getConfig } from './setup.js'
 import { createObjects } from './lib/objectCreator.js'
 
-program
-  .command('server')
+const server = new Command('server')
   .description('Launch OpenAPI server')
   .option('-p, --port <number>', 'Optionally set port to override config')
-  .action(async (cmd) => {
+  .action(async (opts: { port: number }, cmd: Command) => {
     const app = express()
 
     let server: any
 
     try {
-      const config = await createObjects(getConfig(program.opts().config), { server: '/server' })
+      const config = await createObjects(getConfig(cmd.optsWithGlobals().config), { server: '/server' })
       server = config.server
     } catch (e: any) {
-      console.log(e.message)
+      console.error(e.message)
       process.exit(1)
     }
 
     for (let router of server.use) {
       app.use(...router)
+      if (typeof router[0] === 'string') {
+        console.log(`Listening to route: ${server.baseUrl}${router[0]}`)
+      }
     }
 
-    app.listen(cmd.port || server.port, async () => {
+    app.listen(opts.port || server.port, async () => {
       console.log(`🚀 Cloud Agent ready at ${server.baseUrl}`)
     })
   })
+
+export { server }

package/src/setup.ts

@@ -16,17 +16,33 @@ import { createAgentFromConfig } from './lib/agentCreator.js'
 
 import fs from 'fs'
 
-export const getConfig = (fileName: string): any => {
-  if (!fs.existsSync(fileName)) {
-    console.log('Config file not found: ' + fileName)
+/**
+ * Parses a yaml config file and returns a config object
+ * @param filePath
+ */
+export const getConfig = async (filePath: fs.PathLike): Promise<{ version?: number; [x: string]: any }> => {
+  let fileContent: string
+
+  // read file async
+  try {
+    fileContent = await fs.promises.readFile(filePath, 'utf8')
+  } catch (e) {
+    console.log('Config file not found: ' + filePath)
     console.log('Use "veramo config create" to create one')
     process.exit(1)
   }
 
-  const config = yaml.parse(fs.readFileSync(fileName).toString(), { prettyErrors: true })
+  let config
+
+  try {
+    config = yaml.parse(fileContent, { prettyErrors: true })
+  } catch (e) {
+    console.error(`Unable to parse config file: ${e.message} ${e.linePos}`)
+    process.exit(1)
+  }
 
   if (config?.version != 3) {
-    console.log('Unsupported configuration file version:', config.version)
+    console.error('Unsupported configuration file version:', config.version)
     process.exit(1)
   }
   return config
@@ -47,7 +63,7 @@ export type ConfiguredAgent = TAgent<EnabledInterfaces>
 
 export async function getAgent(fileName: string): Promise<ConfiguredAgent> {
   try {
-    return await createAgentFromConfig<EnabledInterfaces>(getConfig(fileName))
+    return await createAgentFromConfig<EnabledInterfaces>(await getConfig(fileName))
   } catch (e: any) {
     console.log('Unable to create agent from ' + fileName + '.', e.message)
     process.exit(1)

package/build/version.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=version.d.ts.map