@things-factory/integration-base 7.0.0-alpha.1 → 7.0.0-alpha.21

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

@@ -10,9 +10,11 @@ import { Domain, pubsub, PubSubLogTransport, ScalarObject } from '@things-factor
 import { User } from '@things-factory/auth-base'
 import { sleep } from '@things-factory/utils'
 
+import { ConnectionManager } from '../../engine/connection-manager'
 import { TaskRegistry } from '../../engine'
 import { Context } from '../../engine/types'
 import { Step } from '../step/step-type'
+import { handler as edgeHandler } from '../../engine/edge-client'
 
 const debug = require('debug')('things-factory:integration-base:scenario-instance')
 const { combine, timestamp, splat, printf } = format
@@ -125,7 +127,7 @@ export class ScenarioInstance {
   timestamp: Date
 
   @Field({ nullable: true })
-  private message: string
+  public message: string
 
   private steps: Step[]
   private rounds: number = 0
@@ -267,10 +269,7 @@ export class ScenarioInstance {
       this.context.logger.error(ex.message ? ex.message : ex)
 
       debug('failed to run ', `[ Domain: ${domain.name}, Scenario: ${scenarioName} ]\n`, ex)
-      this.setState(
-        ScenarioInstanceStatus.HALTED,
-        typeof message == 'object' ? JSON.stringify(message, null, 2) : message
-      )
+      this.setState(ScenarioInstanceStatus.HALTED, typeof message == 'object' ? JSON.stringify(message, null, 2) : message)
 
       throw ex
     }
@@ -376,9 +375,9 @@ export class ScenarioInstance {
       return
     }
 
-    this.message = `${this.instanceName}:[state changed] ${ScenarioInstanceStatus[this.getState()]} => ${
-      ScenarioInstanceStatus[state]
-    }${message ? ' caused by ' + util.inspect(message, false, 2, true) : ''}`
+    this.message = `${this.instanceName}:[state changed] ${ScenarioInstanceStatus[this.getState()]} => ${ScenarioInstanceStatus[state]}${
+      message ? ' caused by ' + util.inspect(message, false, 2, true) : ''
+    }`
 
     this.context.state = state
 
@@ -421,6 +420,12 @@ export class ScenarioInstance {
     if (this.disposer) {
       await this.disposer.call(this)
     }
+
+    // {{ CHECKPOINT 본 인스턴스를 위해서 생성된 logger를 닫는다.
+    if (this.context?.logger) {
+      this.context.logger.close()
+    }
+    // }}
   }
 
   async process(step, context): Promise<{ next: string; state: ScenarioInstanceStatus; data: object }> {
@@ -437,12 +442,18 @@ export class ScenarioInstance {
     }
     step.params = step.params || {}
 
-    var handler = TaskRegistry.getTaskHandler(step.task)
-    if (!handler) {
-      throw new Error(`no task handler for step '${step.name}'(${step.id})`)
-    }
+    const connection = step.connection && ConnectionManager.getConnectionInstanceEntityByName(this.domain, step.connection)
 
-    var retval: any = await handler(step, context)
+    if (!connection || !connection.edgeId) {
+      var handler = TaskRegistry.getTaskHandler(step.task)
+      if (!handler) {
+        throw new Error(`no task handler for step '${step.name}'(${step.id})`)
+      }
+
+      var retval: any = await handler(step, context)
+    } else {
+      var retval: any = await edgeHandler(step, context)
+    }
 
     if (step.log) {
       var { data } = retval || {}