@things-factory/integration-base 6.1.48 → 6.1.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "6.1.48",
+  "version": "6.1.52",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -46,5 +46,5 @@
   "devDependencies": {
     "@types/cron": "^2.0.1"
   },
-  "gitHead": "eb4f1fb780cddd2168562ae5678f44254ee6423b"
+  "gitHead": "ef84aece7f35bd03fbdfc9dcde264d2fbe5ef215"
 }

package/server/engine/connection-manager.ts

@@ -109,13 +109,18 @@ export class ConnectionManager {
   }
 
   static getConnectionInstanceByName(domain: Domain, name: string) {
-    var connections = ConnectionManager.connections[domain.id]
+    const connections = ConnectionManager.connections[domain.id]
+    const connection = connections?.[name]
+
+    if (!connection) {
+      throw `The connection with the given name(${name}) cannot be found`
+    }
 
-    return connections?.[name]
+    return connection
   }
 
   static getConnectionInstances(domain: Domain): { [connectionName: string]: any } {
-    var connections = ConnectionManager.connections[domain.id]
+    const connections = ConnectionManager.connections[domain.id]
 
     return {
       ...connections

package/server/restful/unstable/run-scenario.ts

@@ -1,6 +1,7 @@
 import gql from 'graphql-tag'
 
 import { restfulApiRouter as router } from '@things-factory/api'
+import { ScenarioInstanceStatus } from '../../service/scenario-instance/scenario-instance-type'
 
 const debug = require('debug')('things-factory:integration-base:restful:unstable:run-scenario')
 
@@ -17,12 +18,13 @@ router.post('/unstable/run-scenario/:scenarioName', async (context, next) => {
   debug('post:/unstable/run-scenario/:scenarioName', scenarioName)
   let response = await client.mutate({
     mutation: gql`
-      mutation($instanceName: String, $scenarioName: String!, $variables: Object) {
+      mutation ($instanceName: String, $scenarioName: String!, $variables: Object) {
         runScenario(instanceName: $instanceName, scenarioName: $scenarioName, variables: $variables) {
           instanceName
           scenarioName
           state
           data
+          result
           message
           timestamp
         }
@@ -35,5 +37,17 @@ router.post('/unstable/run-scenario/:scenarioName', async (context, next) => {
     },
     context
   })
-  context.body = response.data.runScenario.data || {}
+
+  const { errors, data } = response
+
+  if (!data) {
+    context.status = 500
+    context.body = errors
+
+    return
+  }
+
+  const { result } = data.runScenario
+
+  context.body = result
 })

package/server/service/scenario-instance/scenario-instance-type.ts

@@ -114,6 +114,9 @@ export class ScenarioInstance {
   @Field(type => ScalarObject, { nullable: true })
   data: any
 
+  @Field(type => ScalarObject, { nullable: true })
+  result: any
+
   @Field({ nullable: true })
   timestamp: Date
 
@@ -256,7 +259,16 @@ export class ScenarioInstance {
         ScenarioInstanceStatus.HALTED,
         typeof message == 'object' ? JSON.stringify(message, null, 2) : message
       )
+
+      throw ex
     }
+
+    this.result = this.steps
+      .filter(step => !!step.result)
+      .reduce((sum, step) => {
+        sum[step.name] = this.context.data[step.name]
+        return sum
+      }, {})
   }
 
   async loadSubscenario(step, scenarioConfig, context) {

package/server/service/step/step-type.ts

@@ -81,6 +81,13 @@ export class Step {
   @Field({ nullable: true })
   params: string
 
+  @Column({ nullable: true, default: true })
+  @Field({
+    nullable: true,
+    description: 'a boolean attribute indicating the inclusion status of an element in the result'
+  })
+  result: boolean = true
+
   @CreateDateColumn()
   @Field({ nullable: true })
   createdAt: Date
@@ -133,6 +140,9 @@ export class StepPatch {
   @Field({ nullable: true })
   params?: string
 
+  @Field({ nullable: true })
+  result?: boolean
+
   @Field({ nullable: true })
   cuFlag?: string
 }