@things-factory/integration-base 6.2.118 → 6.2.120

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

@@ -1,35 +1,14 @@
 import { Arg, Ctx, Mutation, Resolver } from 'type-graphql'
 
-import { getRepository, Domain, GraphqlLocalClient, ScalarObject } from '@things-factory/shell'
+import { ScalarObject } from '@things-factory/shell'
 
-import { ScenarioEngine } from '../../engine'
-import { Scenario } from '../scenario/scenario'
 import { ScenarioInstance } from './scenario-instance-type'
-import { PrivilegeObject, User, checkPermission } from '@things-factory/auth-base'
-import { Step } from '../step/step-type'
 
-const debug = require('debug')('things-factory:integration-base:scenario-instance-mutation')
-
-async function findScenario(
-  scenarioName: string,
-  domain: Domain
-): Promise<{ name: string; steps: Step[]; domain: Domain; privilege?: PrivilegeObject }> {
-  var repository = getRepository(Scenario)
-
-  var scenario = await repository.findOne({
-    where: { domain: { id: domain.id }, name: scenarioName },
-    relations: ['domain', 'steps', 'creator', 'updater']
-  })
-
-  if (!scenario && domain.parentId) {
-    scenario = await repository.findOne({
-      where: { domain: { id: domain.parentId }, name: scenarioName },
-      relations: ['domain', 'steps', 'creator', 'updater']
-    })
-  }
-
-  return scenario as any
-}
+import {
+  runScenario as controllerRunScenario,
+  startScenario as controllerStartScenario,
+  stopScenario as controllerStopScenario
+} from '../../controllers/scenario-controller'
 
 @Resolver(ScenarioInstance)
 export class ScenarioInstanceMutation {
@@ -42,42 +21,7 @@ export class ScenarioInstanceMutation {
     @Arg('variables', type => ScalarObject, { nullable: true }) variables: any,
     @Ctx() context: ResolverContext
   ): Promise<ScenarioInstance> {
-    const { domain, user, lng, unsafeIP, prohibitedPrivileges } = context.state
-
-    debug('runScenario', scenarioName, instanceName, variables)
-
-    var scenario = await findScenario(scenarioName, domain)
-
-    if (!scenario) {
-      throw new Error(
-        context.t('error.scenario not found', {
-          scenario: scenarioName
-        })
-      )
-    }
-
-    if (!(await checkPermission(scenario.privilege, user, domain, unsafeIP, prohibitedPrivileges))) {
-      const { category, privilege } = scenario.privilege || {}
-      throw new Error(
-        `Unauthorized! ${
-          category && privilege ? category + ':' + privilege + ' privilege' : 'ownership granted'
-        } required`
-      )
-    }
-
-    /* 시나리오 인스턴스를 생성한다. */
-    instanceName = instanceName || scenarioName + '-' + String(Date.now())
-    var instance = new ScenarioInstance(instanceName, scenario, {
-      domain,
-      user,
-      lng,
-      variables,
-      client: GraphqlLocalClient.client
-    })
-
-    await instance.run()
-
-    return instance
+    return await controllerRunScenario(instanceName, scenarioName, variables, context)
   }
 
   @Mutation(returns => ScenarioInstance, { description: 'To start new scenario instance' })
@@ -87,66 +31,11 @@ export class ScenarioInstanceMutation {
     @Arg('variables', type => ScalarObject, { nullable: true }) variables: any,
     @Ctx() context: ResolverContext
   ): Promise<ScenarioInstance> {
-    const { domain, user, lng, unsafeIP, prohibitedPrivileges } = context.state
-
-    debug('startScenario', instanceName, scenarioName, variables)
-
-    var scenario = await findScenario(scenarioName, domain)
-
-    if (!scenario) {
-      throw new Error(
-        context.t('error.scenario not found', {
-          scenario: scenarioName
-        })
-      )
-    }
-
-    if (!(await checkPermission(scenario.privilege, user, domain, unsafeIP, prohibitedPrivileges))) {
-      const { category, privilege } = scenario.privilege || {}
-      throw new Error(
-        `Unauthorized! ${
-          category && privilege ? category + ':' + privilege + ' privilege' : 'ownership granted'
-        } required`
-      )
-    }
-
-    instanceName = instanceName || scenarioName
-    return await ScenarioEngine.load(instanceName, scenario, { domain, user, lng, variables })
+    return await controllerStartScenario(instanceName, scenarioName, variables, context)
   }
 
   @Mutation(returns => ScenarioInstance, { nullable: true, description: 'To start new scenario instance' })
-  async stopScenario(
-    @Arg('instanceName', { nullable: true }) instanceName: string,
-    @Ctx() context: ResolverContext
-  ): Promise<ScenarioInstance | undefined> {
-    const { domain, user, unsafeIP, prohibitedPrivileges } = context.state
-
-    debug('stopScenario', instanceName)
-
-    var scenarioInstance = ScenarioEngine.getScenarioInstance(domain, instanceName)
-
-    if (!scenarioInstance) {
-      debug('stopScenario', `ScenarioInstance(${instanceName}) Not Found.`)
-      throw new Error(
-        context.t('error.scenario instance not found', {
-          instance: instanceName
-        })
-      )
-    }
-
-    var scenario = await findScenario(scenarioInstance.scenarioName, domain)
-
-    if (!(await checkPermission(scenario.privilege, user, domain, unsafeIP, prohibitedPrivileges))) {
-      const { category, privilege } = scenario.privilege || {}
-      throw new Error(
-        `Unauthorized! ${
-          category && privilege ? category + ':' + privilege + ' privilege' : 'ownership granted'
-        } required`
-      )
-    }
-
-    await ScenarioEngine.unload(domain, instanceName)
-
-    return scenarioInstance
+  async stopScenario(@Arg('instanceName', { nullable: true }) instanceName: string, @Ctx() context: ResolverContext): Promise<ScenarioInstance | undefined> {
+    return await controllerStopScenario(instanceName, context)
   }
 }

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

@@ -125,7 +125,7 @@ export class ScenarioInstance {
   timestamp: Date
 
   @Field({ nullable: true })
-  private message: string
+  public message: string
 
   private steps: Step[]
   private rounds: number = 0
@@ -267,10 +267,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 +373,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