@things-factory/integration-base 7.0.1-rc.10 → 7.0.1-rc.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "7.0.1-rc.10",
+  "version": "7.0.1-rc.12",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -27,13 +27,13 @@
   "dependencies": {
     "@apollo/client": "^3.6.9",
     "@operato/moment-timezone-es": "^7.0.0-rc",
-    "@things-factory/api": "^7.0.1-rc.10",
-    "@things-factory/auth-base": "^7.0.1-rc.10",
-    "@things-factory/cache-service": "^7.0.1-rc.10",
+    "@things-factory/api": "^7.0.1-rc.12",
+    "@things-factory/auth-base": "^7.0.1-rc.11",
+    "@things-factory/cache-service": "^7.0.1-rc.11",
     "@things-factory/env": "^7.0.1-rc.8",
-    "@things-factory/oauth2-client": "^7.0.1-rc.10",
-    "@things-factory/scheduler-client": "^7.0.1-rc.10",
-    "@things-factory/shell": "^7.0.1-rc.10",
+    "@things-factory/oauth2-client": "^7.0.1-rc.12",
+    "@things-factory/scheduler-client": "^7.0.1-rc.11",
+    "@things-factory/shell": "^7.0.1-rc.11",
     "@things-factory/utils": "^7.0.1-rc.7",
     "async-mqtt": "^2.5.0",
     "chance": "^1.1.11",
@@ -44,5 +44,5 @@
     "readline": "^1.3.0",
     "ses": "^1.5.0"
   },
-  "gitHead": "259524f7aeb4368a5a4792aa31e4d11b525dbb28"
+  "gitHead": "b2e8166c8d03cc4908965fbf8736146acca6b3e0"
 }

package/server/engine/connection-manager.ts

@@ -138,14 +138,22 @@ export class ConnectionManager {
   }
 
   static getConnectionInstanceEntityByName(domain: Domain, name: string): any {
-    const entities = ConnectionManager.entities[domain.id]
-    return entities?.[name]
+    const connection = ConnectionManager.entities[domain.id]?.[name]
+    if(connection) {
+      return connection
+    }
+
+    if(domain.parentId) {
+      return ConnectionManager.entities[domain.id]?.[name]
+    }    
   }
 
   static getConnectionInstances(domain: Domain): { [connectionName: string]: any } {
     const connections = ConnectionManager.connections[domain.id]
+    const parentConnections = domain.parentId && ConnectionManager.connections[domain.parentId]
 
     return {
+      ...parentConnections,
       ...connections
     }
   }

package/server/service/scenario/scenario.ts

@@ -98,15 +98,30 @@ export class Scenario {
   @RelationId((scenario: Scenario) => scenario.updater)
   updaterId?: string
 
-  async start(instanceName, variables?: any) {
+  async start(options?: {
+    instanceName?: string;
+    domain?: Domain;
+    user?: User;
+    variables?: any;
+  }) {
     try {
-      await ScenarioEngine.load(instanceName || this.name, this, { domain: this.domain, user: this.updater, variables })
+      await ScenarioEngine.load(options?.instanceName || this.name, 
+        this, 
+        { 
+          domain: options?.domain || this.domain, 
+          user: options?.user || this.updater, 
+          variables: options?.variables 
+        })
     } catch (ex) {}
   }
 
-  async stop(instanceName?) {
+  async stop(options?: {
+    instanceName?: string;
+    domain?: Domain,
+    user?: User
+  }) {
     try {
-      await ScenarioEngine.unload(this.domain, instanceName || this.name)
+      await ScenarioEngine.unload(options?.domain || this.domain, options?.instanceName || this.name)
     } finally {
     }
   }