@things-factory/integration-base 6.0.118 → 6.0.120

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "6.0.118",
+  "version": "6.0.120",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -46,5 +46,5 @@
   "devDependencies": {
     "@types/cron": "^2.0.1"
   },
-  "gitHead": "1e7ddc3436e494f42a9428443e834b221c7256bb"
+  "gitHead": "6182ee6f7dec8b5b96ff6fc386c2e9dcc25e0186"
 }

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/graphql-mutate.ts

@@ -8,7 +8,7 @@ import { TaskRegistry } from '../task-registry'
 
 async function GraphqlMutate(step, context) {
   var { connection: connectionName, params: stepOptions } = step
-  var { mutation, variables: variablesAccessorMap } = stepOptions || {}
+  var { mutation, variables: variablesAccessorMap, headers } = stepOptions || {}
 
   var { domain, data, variables } = context
 
@@ -34,7 +34,8 @@ async function GraphqlMutate(step, context) {
     mutation: gql`
       ${mutation}
     `,
-    variables: queryVariables
+    variables: queryVariables,
+    headers
   })
 
   return {
@@ -51,10 +52,12 @@ GraphqlMutate.parameterSpec = [
   {
     type: 'key-values',
     name: 'variables',
-    label: 'variables',
-    property: {
-      options: [] //'scenario-step-input'
-    }
+    label: 'variables'
+  },
+  {
+    type: 'key-values',
+    name: 'headers',
+    label: 'headers'
   }
 ]
 GraphqlMutate.help = 'integration/task/graphql-mutate'

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

@@ -8,7 +8,7 @@ import { TaskRegistry } from '../task-registry'
 
 async function GraphqlQuery(step, context) {
   var { connection: connectionName, params: stepOptions } = step
-  var { query, variables: variablesAccessorMap } = stepOptions || {}
+  var { query, variables: variablesAccessorMap, headers } = stepOptions || {}
   var { domain, data, variables } = context
 
   const vm = new VM({
@@ -33,7 +33,8 @@ async function GraphqlQuery(step, context) {
     query: gql`
       ${query}
     `,
-    variables: queryVariables
+    variables: queryVariables,
+    headers
   })
 
   return {
@@ -50,10 +51,12 @@ GraphqlQuery.parameterSpec = [
   {
     type: 'key-values',
     name: 'variables',
-    label: 'variables',
-    property: {
-      options: [] //'scenario-step-input'
-    }
+    label: 'variables'
+  },
+  {
+    type: 'key-values',
+    name: 'headers',
+    label: 'headers'
   }
 ]
 

package/server/engine/task/index.ts

@@ -35,3 +35,4 @@ import './csv-readline'
 import './data-mapper'
 import './headless-post'
 import './headless-scrap'
+import './set-domain'

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

@@ -9,7 +9,7 @@ import { TaskRegistry } from '../task-registry'
 
 async function LocalGraphqlMutate(step, context) {
   var { params, updaterId } = step
-  var { mutation, variables: variablesAccessorMap } = params || {}
+  var { mutation, variables: variablesAccessorMap, headers } = params || {}
   var { client, domain, data, variables } = context
 
   const user = await getRepository(User).findOne({
@@ -38,6 +38,7 @@ async function LocalGraphqlMutate(step, context) {
       ${mutation}
     `,
     variables: queryVariables,
+    headers,
     context: {
       state: {
         domain,
@@ -60,10 +61,12 @@ LocalGraphqlMutate.parameterSpec = [
   {
     type: 'key-values',
     name: 'variables',
-    label: 'variables',
-    property: {
-      options: [] //'scenario-step-input'
-    }
+    label: 'variables'
+  },
+  {
+    type: 'key-values',
+    name: 'headers',
+    label: 'headers'
   }
 ]
 

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

@@ -9,7 +9,7 @@ import { TaskRegistry } from '../task-registry'
 
 async function LocalGraphqlQuery(step, context) {
   var { params, updaterId } = step
-  var { query, variables: variablesAccessorMap } = params || {}
+  var { query, variables: variablesAccessorMap, headers } = params || {}
   var { client, domain, data, variables } = context
 
   const user = await getRepository(User).findOne({
@@ -38,6 +38,7 @@ async function LocalGraphqlQuery(step, context) {
       ${query}
     `,
     variables: queryVariables,
+    headers,
     context: {
       state: {
         domain,
@@ -60,10 +61,12 @@ LocalGraphqlQuery.parameterSpec = [
   {
     type: 'key-values',
     name: 'variables',
-    label: 'variables',
-    property: {
-      options: [] //'scenario-step-input'
-    }
+    label: 'variables'
+  },
+  {
+    type: 'key-values',
+    name: 'headers',
+    label: 'headers'
   }
 ]
 

package/server/engine/task/set-domain.ts

@@ -0,0 +1,34 @@
+import { TaskRegistry } from '../task-registry'
+import { Domain, getRepository } from '@things-factory/shell'
+
+async function SetDomain(step, context) {
+  var {
+    params: { subdomain }
+  } = step
+
+  var { logger, domain } = context || {}
+
+  logger.info(`domain => ${subdomain}`)
+
+  if (subdomain) {
+    context.domain = (await getRepository(Domain).findOneBy({ subdomain })) || domain
+  }
+
+  return {
+    data: domain.subdomain // previous domain
+  }
+}
+
+SetDomain.parameterSpec = [
+  {
+    type: 'string',
+    name: 'subdomain',
+    placeholder: 'subdomain',
+    label: 'subdomain'
+  }
+]
+
+SetDomain.connectorFree = true
+SetDomain.help = 'integration/task/set-domain'
+
+TaskRegistry.registerTaskHandler('set-domain', SetDomain)

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,9 @@ 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)