@things-factory/integration-base 6.0.118 → 6.0.119
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-server/engine/scenario-engine.js +3 -1
- package/dist-server/engine/scenario-engine.js.map +1 -1
- package/dist-server/service/scenario-instance/scenario-instance-mutation.js +2 -1
- package/dist-server/service/scenario-instance/scenario-instance-mutation.js.map +1 -1
- package/dist-server/service/scenario-instance/scenario-instance-type.js +2 -1
- package/dist-server/service/scenario-instance/scenario-instance-type.js.map +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/server/engine/scenario-engine.ts +4 -1
- package/server/service/scenario-instance/scenario-instance-mutation.ts +2 -1
- package/server/service/scenario-instance/scenario-instance-type.ts +2 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/integration-base",
|
|
3
|
-
"version": "6.0.
|
|
3
|
+
"version": "6.0.119",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -46,5 +46,5 @@
|
|
|
46
46
|
"devDependencies": {
|
|
47
47
|
"@types/cron": "^2.0.1"
|
|
48
48
|
},
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "6e54141ddf5c8a1c9a65d1a9b99fbca9236cd3c6"
|
|
50
50
|
}
|
|
@@ -34,7 +34,9 @@ export class ScenarioEngine {
|
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
public static async load(instanceName, scenarioConfig, context?) {
|
|
37
|
-
const { domain } = scenarioConfig
|
|
37
|
+
const { domain: scenarioDomain } = scenarioConfig
|
|
38
|
+
const domain = context?.domain || scenarioDomain
|
|
39
|
+
|
|
38
40
|
debug('load', domain.subdomain, instanceName)
|
|
39
41
|
|
|
40
42
|
var scenarioInstances = ScenarioEngine.scenarioInstances[domain.id]
|
|
@@ -78,6 +80,7 @@ export class ScenarioEngine {
|
|
|
78
80
|
instance.unload()
|
|
79
81
|
}
|
|
80
82
|
|
|
83
|
+
// will be deprecated soon
|
|
81
84
|
public static async loadAll() {
|
|
82
85
|
const SCENARIOS = await getRepository(Scenario).find({
|
|
83
86
|
where: { active: true },
|
|
@@ -54,6 +54,7 @@ export class ScenarioInstanceMutation {
|
|
|
54
54
|
/* 시나리오 인스턴스를 생성한다. */
|
|
55
55
|
instanceName = instanceName || scenarioName + '-' + String(Date.now())
|
|
56
56
|
var instance = new ScenarioInstance(instanceName, scenario, {
|
|
57
|
+
domain,
|
|
57
58
|
variables,
|
|
58
59
|
client: GraphqlLocalClient.client
|
|
59
60
|
})
|
|
@@ -85,7 +86,7 @@ export class ScenarioInstanceMutation {
|
|
|
85
86
|
}
|
|
86
87
|
|
|
87
88
|
instanceName = instanceName || scenarioName
|
|
88
|
-
return await ScenarioEngine.load(instanceName, scenario, { variables })
|
|
89
|
+
return await ScenarioEngine.load(instanceName, scenario, { domain, variables })
|
|
89
90
|
}
|
|
90
91
|
|
|
91
92
|
@Mutation(returns => ScenarioInstance, { nullable: true, description: 'To start new scenario instance' })
|
|
@@ -145,7 +145,8 @@ export class ScenarioInstance {
|
|
|
145
145
|
}
|
|
146
146
|
}
|
|
147
147
|
|
|
148
|
-
constructor(instanceName, { name: scenarioName, steps, domain }, context?) {
|
|
148
|
+
constructor(instanceName, { name: scenarioName, steps, domain: scenarioDomain }, context?) {
|
|
149
|
+
const domain = context?.domain || scenarioDomain
|
|
149
150
|
this.instanceName = instanceName
|
|
150
151
|
this.scenarioName = scenarioName
|
|
151
152
|
this.steps = orderBy(steps || [], step => step.sequence)
|