Merge pull request #115 from mesg-foundation/feature/workflow-compiler

Workflow compilation

package.json

@@ -30,7 +30,7 @@
     "is-git-url": "^1.0.0",
     "js-yaml": "^3.13.1",
     "lodash.pick": "^4.4.0",
-    "mesg-js": "^4.1.0",
+    "mesg-js": "^4.2.0-beta3",
     "node-docker-api": "^1.1.22",
     "rimraf": "^2.6.3",
     "tar": "^4.4.8",

src/commands/service/compile.ts

@@ -1,5 +1,5 @@
 import {readFileSync} from 'fs'
-import {Service} from 'mesg-js/lib/api'
+import {Service} from 'mesg-js/lib/api/types'
 import {join} from 'path'
 
 import {WithoutPassphrase} from '../../account-command'

src/commands/service/create.ts

@@ -19,6 +19,7 @@ export default class ServiceCreate extends Command {
     const {args} = this.parse(ServiceCreate)
     this.spinner.start('Create service')
     const resp = await this.api.service.create(JSON.parse(args.DEFINITION))
+    if (!resp.hash) { throw new Error('invalid response') }
     this.spinner.stop(resp.hash)
     return resp
   }

src/commands/service/execute.ts

@@ -38,6 +38,7 @@ export default class ServiceExecute extends Command {
     const instance = await this.api.instance.get({
       hash: instanceHash
     })
+    if (!instance.serviceHash) { throw new Error('invalid service hash') }
     const service = await ServiceDetail.run([instance.serviceHash, '--silent'])
 
     const task = service.tasks.find((x: any) => x.key === args.TASK)

src/commands/service/list.ts

@@ -1,5 +1,5 @@
 import cli from 'cli-ux'
-import {Instance} from 'mesg-js/lib/api'
+import {Instance, Service} from 'mesg-js/lib/api/types'
 
 import Command from '../../root-command'
 
@@ -16,17 +16,17 @@ export default class ServiceList extends Command {
     const {services} = await this.api.service.list({})
     const {instances} = await this.api.instance.list({})
     if (!services) return []
-    cli.table(services, {
+    cli.table<Service>(services, {
       hash: {header: 'HASH', get: x => x.hash},
       sid: {header: 'SID', get: x => x.sid},
       instances: {
         header: 'INSTANCES',
-        get: x => (instances || [])
+        get: x => (instances as Instance[])
           .filter(y => y.serviceHash === x.hash)
-          .map(x => x.hash)
+          .map(y => y.hash)
           .join('\n')
       }
     }, {printLine: this.log, ...flags})
-    return instances
+    return instances || []
   }
 }

src/commands/service/logs.ts

@@ -119,7 +119,7 @@ export default class ServiceLogs extends Command {
   }
 
   formatEvent(event: Event) {
-    return `EVENT[${event.key}]: ` + chalk.gray(event.data)
+    return `EVENT[${event.key}]: ` + chalk.gray(event.data || '')
   }
   formatResult(execution: Execution) {
     if (execution.error) {

src/commands/service/start.ts

@@ -29,6 +29,7 @@ export default class ServiceStart extends Command {
       serviceHash,
       env: flags.env
     })
+    if (!instance.hash) throw new Error('invalid instance')
     this.spinner.stop(instance.hash)
     return instance
   }

src/utils/compiler.ts

@@ -1,5 +1,6 @@
 import yaml from 'js-yaml'
 import pick from 'lodash.pick'
+import {Service} from 'mesg-js/lib/api/types'
 
 const decode = (content: Buffer) => yaml.safeLoad(content.toString())
 
@@ -13,7 +14,7 @@ const parseParams = (params: any): any => mapToArray(params).map(x => ({
   object: parseParams(x.object),
 }))
 
-export default async (content: Buffer): Promise<any> => {
+export default async (content: Buffer): Promise<Service> => {
   const definition = decode(content)
   return {
     ...pick(definition, ['sid', 'name', 'description', 'configuration', 'repository']),
@@ -27,5 +28,6 @@ export default async (content: Buffer): Promise<any> => {
       ...pick(x, ['key', 'name', 'description']),
       data: parseParams(x.data)
     })),
+    workflows: mapToArray(definition.workflows).map(x => pick(x, ['key', 'trigger', 'task']))
   }
 }

src/utils/service-resolver.ts

@@ -6,7 +6,7 @@ export default async (api: API, sidOrHash: hash | string): Promise<hash> => {
     return sidOrHash
   } catch {
     const {services} = await api.service.list({})
-    const match = services.filter(x => x.sid === sidOrHash)
+    const match = (services || []).filter(x => x.sid === sidOrHash)
     if (match.length === 0) throw new Error(`no service matching ${sidOrHash}`)
     if (match.length > 1) throw new Error(`multiple services matching ${sidOrHash}`)
     return match[0].hash as hash