@veramo/cli 5.0.1-next.9 → 5.1.2-next.2

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' }],
@@ -278,7 +279,7 @@ sdr
         ' ' +
         shortDid(message.from) +
         ' asking to share: ' +
-        //@ts-ignore
+        // @ts-ignore
         message.data?.claims?.map((claim) => claim.claimType).join(','),
       value: message,
     }))
@@ -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

package/build/version.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,CAAA"}

package/build/version.js

@@ -1,7 +0,0 @@
-import { program } from 'commander';
-import module from "module";
-const requireCjs = module.createRequire(import.meta.url);
-const data = requireCjs("../package.json");
-const { version } = data;
-program.version(version, '-v, --version');
-//# sourceMappingURL=version.js.map

package/build/version.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,MAAM,UAAU,GAAG,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACzD,MAAM,IAAI,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAC;AAC3C,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;AAExB,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAA"}

package/src/__tests__/default.test.ts

@@ -1,6 +0,0 @@
-describe('veramo-cli', () => {
-  const a = 100
-  it('should run a dummy test', () => {
-    expect(a).toEqual(100)
-  })
-})

package/src/version.ts

@@ -1,9 +0,0 @@
-import { program } from 'commander'
-import module from "module";
-const requireCjs = module.createRequire(import.meta.url);
-const data = requireCjs("../package.json");
-const { version } = data
-
-program.version(version, '-v, --version')
-
-export {}