@things-factory/integration-base 6.0.115 → 6.0.119

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "6.0.115",
+  "version": "6.0.119",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -26,12 +26,12 @@
   },
   "dependencies": {
     "@apollo/client": "^3.6.9",
-    "@things-factory/api": "^6.0.115",
-    "@things-factory/auth-base": "^6.0.115",
+    "@things-factory/api": "^6.0.118",
+    "@things-factory/auth-base": "^6.0.118",
     "@things-factory/env": "^6.0.101",
-    "@things-factory/oauth2-client": "^6.0.115",
-    "@things-factory/scheduler-client": "^6.0.115",
-    "@things-factory/shell": "^6.0.115",
+    "@things-factory/oauth2-client": "^6.0.118",
+    "@things-factory/scheduler-client": "^6.0.118",
+    "@things-factory/shell": "^6.0.118",
     "async-mqtt": "^2.5.0",
     "chance": "^1.1.11",
     "cross-fetch": "^3.0.4",
@@ -46,5 +46,5 @@
   "devDependencies": {
     "@types/cron": "^2.0.1"
   },
-  "gitHead": "4937b4fe2040f49d906a4df5cdfced17553b83ef"
+  "gitHead": "6e54141ddf5c8a1c9a65d1a9b99fbca9236cd3c6"
 }

package/server/engine/scenario-engine.ts

@@ -34,7 +34,9 @@ export class ScenarioEngine {
   }
 
   public static async load(instanceName, scenarioConfig, context?) {
-    const { domain } = scenarioConfig
+    const { domain: scenarioDomain } = scenarioConfig
+    const domain = context?.domain || scenarioDomain
+
     debug('load', domain.subdomain, instanceName)
 
     var scenarioInstances = ScenarioEngine.scenarioInstances[domain.id]
@@ -78,6 +80,7 @@ export class ScenarioEngine {
     instance.unload()
   }
 
+  // will be deprecated soon
   public static async loadAll() {
     const SCENARIOS = await getRepository(Scenario).find({
       where: { active: true },

package/server/engine/task/database-query.ts

@@ -13,6 +13,7 @@ async function DatabaseQuery(step, context) {
 
   const vm = new VM({
     sandbox: {
+      domain,
       data,
       variables
     }

package/server/engine/task/graphql-mutate.ts

@@ -10,10 +10,11 @@ async function GraphqlMutate(step, context) {
   var { connection: connectionName, params: stepOptions } = step
   var { mutation, variables: variablesAccessorMap } = stepOptions || {}
 
-  var { data, variables } = context
+  var { domain, data, variables } = context
 
   const vm = new VM({
     sandbox: {
+      domain,
       data,
       variables
     }

package/server/engine/task/graphql-query.ts

@@ -13,6 +13,7 @@ async function GraphqlQuery(step, context) {
 
   const vm = new VM({
     sandbox: {
+      domain,
       data,
       variables
     }

package/server/engine/task/local-graphql-mutate.ts

@@ -19,6 +19,7 @@ async function LocalGraphqlMutate(step, context) {
 
   const vm = new VM({
     sandbox: {
+      domain,
       data,
       variables
     }

package/server/engine/task/local-graphql-query.ts

@@ -19,6 +19,7 @@ async function LocalGraphqlQuery(step, context) {
 
   const vm = new VM({
     sandbox: {
+      domain,
       data,
       variables
     }

package/server/engine/task/script.ts

@@ -6,13 +6,14 @@ async function Script(step, context) {
     params: { script }
   } = step
 
-  const { data, variables } = context
+  const { domain, data, variables } = context
 
   const vm = new NodeVM({
     timeout: 5000,
     wrapper: 'none',
     console: 'inherit',
     sandbox: {
+      domain,
       data,
       variables
     }

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

@@ -54,6 +54,7 @@ export class ScenarioInstanceMutation {
     /* 시나리오 인스턴스를 생성한다. */
     instanceName = instanceName || scenarioName + '-' + String(Date.now())
     var instance = new ScenarioInstance(instanceName, scenario, {
+      domain,
       variables,
       client: GraphqlLocalClient.client
     })
@@ -85,7 +86,7 @@ export class ScenarioInstanceMutation {
     }
 
     instanceName = instanceName || scenarioName
-    return await ScenarioEngine.load(instanceName, scenario, { variables })
+    return await ScenarioEngine.load(instanceName, scenario, { domain, variables })
   }
 
   @Mutation(returns => ScenarioInstance, { nullable: true, description: 'To start new scenario instance' })

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

@@ -145,7 +145,8 @@ export class ScenarioInstance {
     }
   }
 
-  constructor(instanceName, { name: scenarioName, steps, domain }, context?) {
+  constructor(instanceName, { name: scenarioName, steps, domain: scenarioDomain }, context?) {
+    const domain = context?.domain || scenarioDomain
     this.instanceName = instanceName
     this.scenarioName = scenarioName
     this.steps = orderBy(steps || [], step => step.sequence)