@things-factory/integration-base 7.0.0-alpha.1 → 7.0.0-alpha.21

package/openapi/unstable/scenario.yaml

@@ -2,9 +2,9 @@ paths:
   /scenario/{scenarioId}:
     get:
       tags:
-        - 'integration'
-      description: 'Use this call to get information for single integration scenario.'
-      operationId: 'scenario'
+        - integration
+      description: Use this call to get information for single integration scenario.
+      operationId: scenario
       parameters:
         - in: header
           name: x-things-factory-domain
@@ -12,28 +12,28 @@ paths:
             type: string
           required: false
           description: things-factory subdomain name
-        - in: 'path'
-          name: 'scenarioId'
+        - in: path
+          name: scenarioId
           required: true
-          type: 'string'
+          type: string
       responses:
         '200':
-          description: 'OK'
+          description: OK
         '400':
-          description: 'Bad request is sent'
+          description: Bad request is sent
         '401':
-          description: 'Authentication Error'
+          description: Authentication Error
         '404':
-          description: 'Resource not found'
+          description: Resource not found
         '500':
-          description: 'Server error'
+          description: Server error
 
   /scenarios:
     get:
       tags:
-        - 'integration'
-      description: 'Use this API to get a list of integration scenarios.'
-      operationId: 'scenarios'
+        - integration
+      description: Use this API to get a list of integration scenarios.
+      operationId: scenarios
       parameters:
         - in: header
           name: x-things-factory-domain
@@ -41,34 +41,34 @@ paths:
             type: string
           required: false
           description: things-factory subdomain name
-        - in: 'query'
-          name: 'page'
-          description: 'This integer value is used to specify the maximum number of entries to return in a single "page" of data. Max entries per page is 100.'
-          type: 'integer'
-          format: 'uint32'
-        - in: 'query'
-          name: 'offset'
-          description: 'Specifies the starting entry of data to return in the current call. Default is 1. if data is more than one page, the offset can be some entry to start next call.'
-          type: 'integer'
-          format: 'uint32'
+        - in: query
+          name: page
+          description: This integer value is used to specify the maximum number of entries to return in a single "page" of data. Max entries per page is 100.
+          type: integer
+          format: uint32
+        - in: query
+          name: offset
+          description: Specifies the starting entry of data to return in the current call. Default is 1. if data is more than one page, the offset can be some entry to start next call.
+          type: integer
+          format: uint32
       responses:
         '200':
-          description: 'OK'
+          description: OK
         '400':
-          description: 'Bad request is sent'
+          description: Bad request is sent
         '401':
-          description: 'Authentication Error'
+          description: Authentication Error
         '404':
-          description: 'Resource not found'
+          description: Resource not found
         '500':
-          description: 'Server error'
+          description: Server error
 
   /scenario-instance/{instanceName}:
     get:
       tags:
-        - 'integration'
-      description: 'Use this call to get information for single integration scenario instance.'
-      operationId: 'scenarioInstance'
+        - integration
+      description: Use this call to get information for single integration scenario instance.
+      operationId: scenarioInstance
       parameters:
         - in: header
           name: x-things-factory-domain
@@ -76,28 +76,28 @@ paths:
             type: string
           required: false
           description: things-factory subdomain name
-        - in: 'path'
-          name: 'instanceName'
+        - in: path
+          name: instanceName
           required: true
-          type: 'string'
+          type: string
       responses:
         '200':
-          description: 'OK'
+          description: OK
         '400':
-          description: 'Bad request is sent'
+          description: Bad request is sent
         '401':
-          description: 'Authentication Error'
+          description: Authentication Error
         '404':
-          description: 'Resource not found'
+          description: Resource not found
         '500':
-          description: 'Server error'
+          description: Server error
 
   /scenario-instances:
     get:
       tags:
-        - 'integration'
-      description: 'Use this API to get a list of integration scenario instances.'
-      operationId: 'scenarioInstances'
+        - integration
+      description: Use this API to get a list of integration scenario instances.
+      operationId: scenarioInstances
       parameters:
         - in: header
           name: x-things-factory-domain
@@ -105,34 +105,34 @@ paths:
             type: string
           required: false
           description: things-factory subdomain name
-        - in: 'query'
-          name: 'page'
-          description: 'This integer value is used to specify the maximum number of entries to return in a single "page" of data. Max entries per page is 100.'
-          type: 'integer'
-          format: 'uint32'
-        - in: 'query'
-          name: 'offset'
-          description: 'Specifies the starting entry of data to return in the current call. Default is 1. if data is more than one page, the offset can be some entry to start next call.'
-          type: 'integer'
-          format: 'uint32'
+        - in: query
+          name: page
+          description: This integer value is used to specify the maximum number of entries to return in a single "page" of data. Max entries per page is 100.
+          type: integer
+          format: uint32
+        - in: query
+          name: offset
+          description: Specifies the starting entry of data to return in the current call. Default is 1. if data is more than one page, the offset can be some entry to start next call.
+          type: integer
+          format: uint32
       responses:
         '200':
-          description: 'OK'
+          description: OK
         '400':
-          description: 'Bad request is sent'
+          description: Bad request is sent
         '401':
-          description: 'Authentication Error'
+          description: Authentication Error
         '404':
-          description: 'Resource not found'
+          description: Resource not found
         '500':
-          description: 'Server error'
+          description: Server error
 
   /run-scenario/{scenarioName}:
     post:
       tags:
-        - 'integration'
-      description: 'Use this call to run scenario as standalone.'
-      operationId: 'runScenario'
+        - integration
+      description: Use this call to run scenario as standalone.
+      operationId: runScenario
       requestBody:
         content:
           application/json:
@@ -140,11 +140,11 @@ paths:
               type: object
               properties:
                 instanceName:
-                  type: 'string'
-                  description: 'Scenario Instance Name to identify new scenario instance to run'
+                  type: string
+                  description: Scenario Instance Name to identify new scenario instance to run
                 variables:
-                  type: 'object'
-                  description: 'Input parameters for the new scenario instance to run'
+                  type: object
+                  description: Input parameters for the new scenario instance to run
       parameters:
         - in: header
           name: x-things-factory-domain
@@ -152,28 +152,28 @@ paths:
             type: string
           required: false
           description: things-factory subdomain name
-        - in: 'path'
-          name: 'scenarioName'
+        - in: path
+          name: scenarioName
           required: true
-          type: 'string'
+          type: string
       responses:
         '200':
-          description: 'OK'
+          description: OK
         '400':
-          description: 'Bad request is sent'
+          description: Bad request is sent
         '401':
-          description: 'Authentication Error'
+          description: Authentication Error
         '404':
-          description: 'Resource not found'
+          description: Resource not found
         '500':
-          description: 'Server error'
+          description: Server error
 
   /start-scenario/{scenarioName}:
     post:
       tags:
-        - 'integration'
-      description: 'Use this call to start scenario as a given instance name.'
-      operationId: 'startScenario'
+        - integration
+      description: Use this call to start scenario as a given instance name.
+      operationId: startScenario
       requestBody:
         content:
           application/json:
@@ -181,11 +181,11 @@ paths:
               type: object
               properties:
                 instanceName:
-                  type: 'string'
-                  description: 'Scenario Instance Name to identify new scenario instance to start'
+                  type: string
+                  description: Scenario Instance Name to identify new scenario instance to start
                 variables:
-                  type: 'object'
-                  description: 'Input parameters for the new scenario instance to start'
+                  type: object
+                  description: Input parameters for the new scenario instance to start
       parameters:
         - in: header
           name: x-things-factory-domain
@@ -193,28 +193,28 @@ paths:
             type: string
           required: false
           description: things-factory subdomain name
-        - in: 'path'
-          name: 'scenarioName'
+        - in: path
+          name: scenarioName
           required: true
-          type: 'string'
+          type: string
       responses:
         '200':
-          description: 'OK'
+          description: OK
         '400':
-          description: 'Bad request is sent'
+          description: Bad request is sent
         '401':
-          description: 'Authentication Error'
+          description: Authentication Error
         '404':
-          description: 'Resource not found'
+          description: Resource not found
         '500':
-          description: 'Server error'
+          description: Server error
 
   /stop-scenario/{instanceName}:
     post:
       tags:
-        - 'integration'
-      description: 'Use this call to stop scenario running as a given instance name.'
-      operationId: 'stopScenario'
+        - integration
+      description: Use this call to stop scenario running as a given instance name.
+      operationId: stopScenario
       parameters:
         - in: header
           name: x-things-factory-domain
@@ -222,19 +222,19 @@ paths:
             type: string
           required: false
           description: things-factory subdomain name
-        - in: 'path'
-          name: 'instanceName'
+        - in: path
+          name: instanceName
           required: true
-          type: 'string'
-          description: 'scenario instance name to be stopped'
+          type: string
+          description: scenario instance name to be stopped
       responses:
         '200':
-          description: 'OK'
+          description: OK
         '400':
-          description: 'Bad request is sent'
+          description: Bad request is sent
         '401':
-          description: 'Authentication Error'
+          description: Authentication Error
         '404':
-          description: 'Resource not found'
+          description: Resource not found
         '500':
-          description: 'Server error'
+          description: Server error

package/openapi/unstable.yaml

@@ -3,22 +3,22 @@ info:
   description: >
     For the latest release information please check our [release notes](https://developer.myoperato.com/release_notes).
     The Integration API exposes integrations endpoint and related functions.
-  version: 'unstable'
-  title: 'Integration'
-  termsOfService: 'https://myoperato.com/terms/'
+  version: unstable
+  title: Integration
+  termsOfService: https://myoperato.com/terms/
   contact:
-    email: 'heartyoh@hatiolab.com'
+    email: heartyoh@hatiolab.com
   license:
     name: MIT
     url: http://mit-license.org/
 tags:
-  - name: 'integration'
-    description: 'API to integrate with other systems'
+  - name: integration
+    description: API to integrate with other systems
 schemes:
-  - 'https'
-  - 'http'
+  - https
+  - http
 servers:
-  - url: '/api/unstable/'
+  - url: /api/unstable/
 
 components:
   securitySchemes:
@@ -37,5 +37,5 @@ responses:
     description: Unauthorized
 
 externalDocs:
-  description: 'Find out about our release notes'
-  url: 'https://developer.myoperato.com/release_notes'
+  description: Find out about our release notes
+  url: https://developer.myoperato.com/release_notes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "7.0.0-alpha.1",
+  "version": "7.0.0-alpha.21",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -26,26 +26,22 @@
   },
   "dependencies": {
     "@apollo/client": "^3.6.9",
-    "@things-factory/api": "^7.0.0-alpha.1",
-    "@things-factory/auth-base": "^7.0.0-alpha.1",
+    "@things-factory/api": "^7.0.0-alpha.21",
+    "@things-factory/auth-base": "^7.0.0-alpha.21",
     "@things-factory/env": "^7.0.0-alpha.0",
-    "@things-factory/oauth2-client": "^7.0.0-alpha.1",
-    "@things-factory/scheduler-client": "^7.0.0-alpha.1",
-    "@things-factory/shell": "^7.0.0-alpha.1",
+    "@things-factory/oauth2-client": "^7.0.0-alpha.21",
+    "@things-factory/scheduler-client": "^7.0.0-alpha.21",
+    "@things-factory/shell": "^7.0.0-alpha.21",
     "@things-factory/utils": "^7.0.0-alpha.0",
     "async-mqtt": "^2.5.0",
     "chance": "^1.1.11",
     "cross-fetch": "^3.0.4",
     "ieee754": "^1.2.1",
     "moment-timezone": "^0.5.40",
-    "mssql": "^8.1.2",
     "node-fetch": "^2.6.0",
     "promise-socket": "^7.0.0",
     "readline": "^1.3.0",
     "vm2": "3.9.11"
   },
-  "devDependencies": {
-    "@types/cron": "^2.0.1"
-  },
-  "gitHead": "778315d165d7f15e147583a45d5079c3d7cbce38"
+  "gitHead": "6dff39aa0d60f0fcf760cca9b8453626f222fa57"
 }

package/server/controllers/index.ts

@@ -0,0 +1 @@
+export * from './scenario-controller'

package/server/controllers/scenario-controller.ts

@@ -0,0 +1,116 @@
+import { getRepository, Domain, GraphqlLocalClient } from '@things-factory/shell'
+import { PrivilegeObject, checkPermission } from '@things-factory/auth-base'
+
+import { ScenarioEngine } from '../engine/scenario-engine'
+import { Scenario } from '../service/scenario/scenario'
+import { ScenarioInstance } from '../service/scenario-instance/scenario-instance-type'
+import { Step } from '../service/step/step-type'
+
+const debug = require('debug')('things-factory:integration-base:controller:run-scenario')
+
+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
+}
+
+export async function runScenario(instanceName: string, scenarioName: string, variables: any, 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
+}
+
+export async function startScenario(instanceName: string, scenarioName: string, variables: any, 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 })
+}
+
+export async function stopScenario(instanceName: string, context: ResolverContext): Promise<ScenarioInstance | undefined> {
+  const { domain, user, unsafeIP, prohibitedPrivileges } = context.state
+
+  debug('stopScenario', instanceName)
+
+  runScenario
+
+  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
+}

package/server/engine/connection-manager.ts

@@ -5,6 +5,7 @@ import { Domain, getRepository, pubsub, PubSubLogTransport } from '@things-facto
 
 import { Connection, ConnectionStatus } from '../service'
 import { Connector } from './types'
+import { ProxyConnector } from './connector/proxy-connector'
 
 const { combine, timestamp, splat, printf } = format
 const debug = require('debug')('things-factory:integration-base:connections')
@@ -17,7 +18,8 @@ const systemTimestamp = format((info, opts) => {
 
 export class ConnectionManager {
   private static connectors: { [propName: string]: Connector } = {}
-  private static connections = {}
+  private static connections: { [domainId: string]: { [name: string]: any } } = {}
+  private static entities = {}
   private static logFormat = printf(({ level, message, timestamp }) => {
     return `${timestamp} ${level}: ${message}`
   })
@@ -43,7 +45,7 @@ export class ConnectionManager {
     const CONNECTIONS = (
       await getRepository(Connection).find({
         where: { active: true },
-        relations: ['domain', 'creator', 'updater']
+        relations: ['domain', 'edge', 'creator', 'updater']
       })
     ).map(connection => {
       var params = {}
@@ -63,12 +65,21 @@ export class ConnectionManager {
     ConnectionManager.logger.info('Initializing ConnectionManager...')
 
     return await Promise.all(
-      Object.keys(ConnectionManager.connectors).map(type => {
-        var connector = ConnectionManager.connectors[type]
+      [...Object.keys(ConnectionManager.connectors), 'proxy-connector'].map(type => {
+        const connector = 'proxy-connector' ? ProxyConnector.instance : ConnectionManager.getConnector(type)
+
         ConnectionManager.logger.info(`Connector '${type}' started to ready`)
 
         return connector
-          .ready(CONNECTIONS.filter(connection => connection.type == type) as any)
+          .ready(
+            CONNECTIONS.filter(connection => {
+              if (type == 'proxy-connector') {
+                return !!connection.edge
+              } else {
+                return !connection.edge && connection.type == type
+              }
+            }) as any
+          )
           .catch(error => {
             ConnectionManager.logger.error(error.message)
           })
@@ -103,6 +114,14 @@ export class ConnectionManager {
     delete ConnectionManager.connectors[type]
   }
 
+  static getConnections() {
+    return ConnectionManager.connections
+  }
+
+  static getEntities() {
+    return ConnectionManager.entities
+  }
+
   static getConnectionInstance(connection: Connection): any {
     const { domain, name } = connection
     return ConnectionManager.connections[domain.id]?.[name]
@@ -119,6 +138,11 @@ export class ConnectionManager {
     return connection
   }
 
+  static getConnectionInstanceEntityByName(domain: Domain, name: string): any {
+    const entities = ConnectionManager.entities[domain.id]
+    return entities?.[name]
+  }
+
   static getConnectionInstances(domain: Domain): { [connectionName: string]: any } {
     const connections = ConnectionManager.connections[domain.id]
 
@@ -127,6 +151,14 @@ export class ConnectionManager {
     }
   }
 
+  static getConnectionInstanceEntities(domain: Domain): { [connectionName: string]: any } {
+    const connections = ConnectionManager.entities[domain.id]
+
+    return {
+      ...connections
+    }
+  }
+
   static addConnectionInstance(connection: Connection, instance: any) {
     const { domain, name } = connection
 
@@ -135,7 +167,13 @@ export class ConnectionManager {
       connections = ConnectionManager.connections[domain.id] = {}
     }
 
+    var entities = ConnectionManager.entities[domain.id]
+    if (!entities) {
+      entities = ConnectionManager.entities[domain.id] = {}
+    }
+
     connections[name] = instance
+    entities[name] = connection
 
     ConnectionManager.publishState(connection, ConnectionStatus.CONNECTED)
     debug('add-connection', domain.subdomain, name)
@@ -144,6 +182,8 @@ export class ConnectionManager {
   static removeConnectionInstance(connection: Connection): any {
     const { domain, name } = connection
     var connections = ConnectionManager.connections[domain.id]
+    var entities = ConnectionManager.entities[domain.id]
+
     var instance = connections?.[name]
 
     if (!connections || !instance) {
@@ -152,6 +192,7 @@ export class ConnectionManager {
     }
 
     delete connections[name]
+    delete entities[name]
 
     ConnectionManager.publishState(connection, ConnectionStatus.DISCONNECTED)
     debug('remove-connection', `'${name}' connection is removed from domain '${domain.subdomain}'`)
@@ -159,8 +200,8 @@ export class ConnectionManager {
     return instance
   }
 
-  static publishState(connection: Connection, state) {
-    const { domain, id, name, description, type } = connection
+  private static async publishState(connection: Connection, state) {
+    const { domain, id, name, description, type, edge } = connection
 
     pubsub.publish('connection-state', {
       connectionState: {
@@ -169,6 +210,7 @@ export class ConnectionManager {
         name,
         description,
         type,
+        edge,
         state,
         timestamp: new Date()
       }