@things-factory/integration-base 6.2.86 → 6.2.88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "6.2.86",
+  "version": "6.2.88",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -26,12 +26,13 @@
   },
   "dependencies": {
     "@apollo/client": "^3.6.9",
-    "@things-factory/api": "^6.2.86",
-    "@things-factory/auth-base": "^6.2.84",
+    "@things-factory/api": "^6.2.88",
+    "@things-factory/auth-base": "^6.2.88",
     "@things-factory/env": "^6.2.33",
-    "@things-factory/oauth2-client": "^6.2.86",
-    "@things-factory/scheduler-client": "^6.2.84",
-    "@things-factory/shell": "^6.2.84",
+    "@things-factory/oauth2-client": "^6.2.88",
+    "@things-factory/scheduler-client": "^6.2.88",
+    "@things-factory/shell": "^6.2.88",
+    "@things-factory/utils": "^6.2.48",
     "async-mqtt": "^2.5.0",
     "chance": "^1.1.11",
     "cross-fetch": "^3.0.4",
@@ -46,5 +47,5 @@
   "devDependencies": {
     "@types/cron": "^2.0.1"
   },
-  "gitHead": "f90a5c1ff2a93331bb6e375944972dc68dde8a1f"
+  "gitHead": "700ee6ac193bb6b6bc4f1a569c3ca046a7a049ee"
 }

package/server/engine/connector/echo-back-connector.ts

@@ -3,6 +3,7 @@ import PromiseSocket from 'promise-socket'
 
 import { Connector } from '../types'
 import { ConnectionManager } from '../connection-manager'
+import { InputConnection } from '../../service/connection/connection-type'
 
 export class EchoBack implements Connector {
   async ready(connectionConfigs) {
@@ -11,12 +12,12 @@ export class EchoBack implements Connector {
     ConnectionManager.logger.info('echo-back connections are ready')
   }
 
-  async connect(connection) {
+  async connect(connection: InputConnection) {
     let socket = new PromiseSocket(new net.Socket())
     let [host, port = 8124] = connection.endpoint.split(':')
 
     try {
-      await socket.connect(port, host)
+      await socket.connect(Number(port), host)
       ConnectionManager.addConnectionInstance(connection, socket)
 
       ConnectionManager.logger.info(
@@ -29,7 +30,7 @@ export class EchoBack implements Connector {
     }
   }
 
-  async disconnect(connection) {
+  async disconnect(connection: InputConnection) {
     let socket = ConnectionManager.removeConnectionInstance(connection)
 
     await socket.destroy()

package/server/engine/connector/echo-back-server.ts

@@ -3,15 +3,16 @@ import PromiseSocket from 'promise-socket'
 
 import { Connector } from '../types'
 import { ConnectionManager } from '../connection-manager'
+import { InputConnection } from '../../service/connection/connection-type'
 
 export class EchoBack implements Connector {
-  async ready(connectionConfigs) {
+  async ready(connectionConfigs: InputConnection[]) {
     await Promise.all(connectionConfigs.map(this.connect.bind(this)))
 
     ConnectionManager.logger.info('echo-back-servers are ready')
   }
 
-  async connect(config): Promise<void> {
+  async connect(config: InputConnection): Promise<void> {
     var [host = '0.0.0.0', port = 8124] = config.endpoint.split(':')
 
     return new Promise((resolve, reject) => {
@@ -35,7 +36,7 @@ export class EchoBack implements Connector {
 
         try {
           let promiseSocket = new PromiseSocket(socket)
-          await promiseSocket.connect(port, 'localhost')
+          await promiseSocket.connect(Number(port), 'localhost')
           promiseSocket['__server__'] = server
 
           ConnectionManager.addConnectionInstance(config, promiseSocket)
@@ -53,7 +54,7 @@ export class EchoBack implements Connector {
     })
   }
 
-  async disconnect(connection) {
+  async disconnect(connection: InputConnection) {
     let socket = ConnectionManager.removeConnectionInstance(connection)
     var server = socket['__server__']
 

package/server/engine/connector/graphql-connector.ts

@@ -7,6 +7,7 @@ import { getRepository } from '@things-factory/shell'
 
 import { ConnectionManager } from '../connection-manager'
 import { Connector } from '../types'
+import { InputConnection } from '../../service/connection/connection-type'
 
 const defaultOptions: any = {
   watchQuery: {
@@ -27,13 +28,13 @@ const cache = new InMemoryCache({
 })
 
 export class GraphqlConnector implements Connector {
-  async ready(connectionConfigs) {
+  async ready(connectionConfigs: InputConnection[]) {
     await Promise.all(connectionConfigs.map(this.connect.bind(this)))
 
     ConnectionManager.logger.info('graphql-connector connections are ready')
   }
 
-  async connect(connection) {
+  async connect(connection: InputConnection) {
     var {
       endpoint: uri,
       params: { authClient }
@@ -85,7 +86,7 @@ export class GraphqlConnector implements Connector {
     )
   }
 
-  async disconnect(connection) {
+  async disconnect(connection: InputConnection) {
     var client = ConnectionManager.getConnectionInstance(connection)
     client.stop()
     ConnectionManager.removeConnectionInstance(connection)

package/server/engine/connector/http-connector.ts

@@ -3,15 +3,16 @@ import { getRepository } from '@things-factory/shell'
 
 import { ConnectionManager } from '../connection-manager'
 import { Connector } from '../types'
+import { InputConnection } from '../../service/connection/connection-type'
 
 export class HttpConnector implements Connector {
-  async ready(connectionConfigs) {
+  async ready(connectionConfigs: InputConnection[]) {
     await Promise.all(connectionConfigs.map(this.connect.bind(this)))
 
     ConnectionManager.logger.info('http-connector connections are ready')
   }
 
-  async connect(connection) {
+  async connect(connection: InputConnection) {
     var { params } = connection
     params.rejectUnauthorized = (params.rejectUnauthorized || 'Y') === 'Y'
 
@@ -29,7 +30,7 @@ export class HttpConnector implements Connector {
     ConnectionManager.logger.info(`http-connector connection(${connection.name}:${connection.endpoint}) is connected`)
   }
 
-  async disconnect(connection) {
+  async disconnect(connection: InputConnection) {
     ConnectionManager.removeConnectionInstance(connection)
 
     ConnectionManager.logger.info(`http-connector connection(${connection.name}) is disconnected`)

package/server/engine/connector/mqtt-connector.ts

@@ -1,16 +1,17 @@
 import { Connector } from '../types'
 import { ConnectionManager } from '../connection-manager'
+import { InputConnection } from '../../service/connection/connection-type'
 
 import mqtt from 'async-mqtt'
 
 export class MqttConnector implements Connector {
-  async ready(connectionConfigs) {
+  async ready(connectionConfigs: InputConnection[]) {
     await Promise.all(connectionConfigs.map(this.connect.bind(this)))
 
     ConnectionManager.logger.info('mqtt-connector connections are ready')
   }
 
-  async connect(connection) {
+  async connect(connection: InputConnection) {
     const {
       endpoint: uri,
       params: { user, password }
@@ -43,7 +44,7 @@ export class MqttConnector implements Connector {
     }
   }
 
-  async disconnect(connection) {
+  async disconnect(connection: InputConnection) {
     const { client } = ConnectionManager.removeConnectionInstance(connection)
 
     client && (await client.end())

package/server/engine/connector/mssql-connector.ts

@@ -2,6 +2,7 @@ import { logger } from '@things-factory/env'
 
 import { ConnectionManager } from '../connection-manager'
 import { Connector } from '../types'
+import { InputConnection } from '../../service/connection/connection-type'
 
 try {
   var Client = require('mssql')
@@ -10,13 +11,13 @@ try {
 }
 
 export class MssqlConnector implements Connector {
-  async ready(connectionConfigs) {
+  async ready(connectionConfigs: InputConnection[]) {
     await Promise.all(connectionConfigs.map(this.connect))
 
     ConnectionManager.logger.info('mssql-connector connections are ready')
   }
 
-  async connect(connection) {
+  async connect(connection: InputConnection) {
     const {
       endpoint,
       params: { user, password, database, encrypt = 'Y' }
@@ -50,7 +51,7 @@ export class MssqlConnector implements Connector {
     ConnectionManager.logger.info(`MSSql Database(${connection.name}:${database}) at ${endpoint} connected.`)
   }
 
-  async disconnect(connection) {
+  async disconnect(connection: InputConnection) {
     var client = ConnectionManager.getConnectionInstance(connection)
     try {
       await client.close()

package/server/engine/connector/mysql-connector.ts

@@ -1,20 +1,22 @@
+import Mysql from "mysql2/promise";
+
 import { Connector } from '../types'
 import { ConnectionManager } from '../connection-manager'
-import Mysql from "mysql2/promise";
+import { InputConnection } from '../../service/connection/connection-type'
 
 export class mysqlConnector implements Connector {
-  async ready(connectionConfigs) {
+  async ready(connectionConfigs: InputConnection[]) {
     await Promise.all(connectionConfigs.map(this.connect));
     ConnectionManager.logger.info("mysql-connector connections are ready");
   }
 
-  async connect(connection) {
+  async connect(connection: InputConnection) {
     const {
       endpoint,
       params: { user, password, database },
     } = connection;
 
-    const [host, port = 3306] = endpoint.split(":");
+    let [host, port = '3306'] = endpoint.split(":");
 
     if (!Mysql) {
       throw new Error("mysql module loading failed");
@@ -24,7 +26,7 @@ export class mysqlConnector implements Connector {
       user,
       password,
       host,
-      port,
+      port: Number(port),
       database,
     });
 
@@ -50,7 +52,7 @@ export class mysqlConnector implements Connector {
     );
   }
 
-  async disconnect(connection) {
+  async disconnect(connection: InputConnection) {
     var client = ConnectionManager.getConnectionInstance(connection);
     try {
       await client.close();

package/server/engine/connector/operato-connector.ts

@@ -12,6 +12,8 @@ import gql from 'graphql-tag'
 
 import { ConnectionManager } from '../connection-manager'
 import { Connector } from '../types'
+import { InputConnection } from '../../service/connection/connection-type'
+
 import { Scenario } from '../../service/scenario/scenario'
 import { ScenarioInstance } from '../../service/scenario-instance/scenario-instance-type'
 
@@ -51,13 +53,13 @@ interface SubscriberData {
 export class OperatoConnector implements Connector {
   private context: any
 
-  async ready(connectionConfigs) {
+  async ready(connectionConfigs: InputConnection[]) {
     await Promise.all(connectionConfigs.map(this.connect.bind(this)))
 
     ConnectionManager.logger.info('graphql-connector connections are ready')
   }
 
-  async connect(connection) {
+  async connect(connection: InputConnection) {
     var {
       endpoint: uri,
       params: { authKey, domain, subscriptionHandlers = {} }
@@ -187,7 +189,7 @@ export class OperatoConnector implements Connector {
     )
   }
 
-  async disconnect(connection) {
+  async disconnect(connection: InputConnection) {
     var client = ConnectionManager.getConnectionInstance(connection)
     let subscriptions: SubscriberData[] = client['subscriptions']
     subscriptions.forEach(subscription => subscription.subscriptionObserver.unsubscribe())

package/server/engine/connector/oracle-connector.ts

@@ -2,6 +2,8 @@ import { logger } from '@things-factory/env'
 
 import { ConnectionManager } from '../connection-manager'
 import { Connector } from '../types'
+import { InputConnection } from '../../service/connection/connection-type'
+
 
 try {
   var Client = require('oracledb')
@@ -10,13 +12,13 @@ try {
 }
 
 export class OracleConnector implements Connector {
-  async ready(connectionConfigs) {
+  async ready(connectionConfigs: InputConnection[]) {
     await Promise.all(connectionConfigs.map(this.connect))
 
     ConnectionManager.logger.info('oracle-connector connections are ready')
   }
 
-  async connect(connection) {
+  async connect(connection: InputConnection) {
     const {
       endpoint,
       params: { user, password, database }
@@ -57,8 +59,9 @@ export class OracleConnector implements Connector {
     ConnectionManager.logger.info(`Oracle Database(${connection.name}:${database}) at ${endpoint} connected.`)
   }
 
-  async disconnect(connection) {
+  async disconnect(connection: InputConnection) {
     var client = ConnectionManager.getConnectionInstance(connection)
+
     try {
       await client.close()
       ConnectionManager.logger.info(`Oracle Database(${connection.name}) closed.`)

package/server/engine/connector/postgresql-connector.ts

@@ -2,6 +2,7 @@ import { logger } from '@things-factory/env'
 
 import { ConnectionManager } from '../connection-manager'
 import { Connector } from '../types'
+import { InputConnection } from '../../service/connection/connection-type'
 
 try {
   var { Client } = require('pg')
@@ -10,13 +11,13 @@ try {
 }
 
 export class PostgresqlConnector implements Connector {
-  async ready(connectionConfigs) {
+  async ready(connectionConfigs: InputConnection[]) {
     await Promise.all(connectionConfigs.map(this.connect.bind(this)))
 
     ConnectionManager.logger.info('postgresql-connector connections are ready')
   }
 
-  async connect(connection) {
+  async connect(connection: InputConnection) {
     const {
       endpoint,
       params: { user, password, database }
@@ -59,7 +60,7 @@ export class PostgresqlConnector implements Connector {
     }
   }
 
-  async disconnect(connection) {
+  async disconnect(connection: InputConnection) {
     var client = ConnectionManager.getConnectionInstance(connection)
     try {
       await client.close()

package/server/engine/connector/socket-server.ts

@@ -1,18 +1,19 @@
 import net from 'net'
+import { EventEmitter } from 'events'
 
 import { Connector } from '../types'
 import { ConnectionManager } from '../connection-manager'
-import { EventEmitter } from 'events'
+import { InputConnection } from '../../service/connection/connection-type'
 
 export class SocketServer implements Connector {
   // socket: any
 
-  async ready(connectionConfigs) {
+  async ready(connectionConfigs: InputConnection[]) {
     await Promise.all(connectionConfigs.map(this.connect))
     ConnectionManager.logger.info('socket servers are ready')
   }
 
-  async connect(config): Promise<void> {
+  async connect(config: InputConnection): Promise<void> {
     var em = new EventEmitter()
     var [host = '0.0.0.0', port = 8124] = config.endpoint.split(':')
     return new Promise((resolve, reject) => {
@@ -62,7 +63,7 @@ export class SocketServer implements Connector {
     })
   }
 
-  async disconnect(connection) {
+  async disconnect(connection: InputConnection) {
     let em = ConnectionManager.removeConnectionInstance(connection)
     var tcp = em['__tcp__']
     var server = em['__server__']

package/server/engine/connector/sqlite-connector.ts

@@ -4,6 +4,8 @@ import { logger } from '@things-factory/env'
 
 import { ConnectionManager } from '../connection-manager'
 import { Connector } from '../types'
+import { InputConnection } from '../../service/connection/connection-type'
+
 
 try {
   var sqlite3 = require('sqlite3').verbose()
@@ -12,13 +14,13 @@ try {
 }
 
 export class SqliteConnector implements Connector {
-  async ready(connectionConfigs) {
+  async ready(connectionConfigs: InputConnection[]) {
     await Promise.all(connectionConfigs.map(this.connect.bind(this)))
 
     ConnectionManager.logger.info('sqlite-connector connections are ready')
   }
 
-  async connect(connection) {
+  async connect(connection: InputConnection) {
     var { endpoint } = connection
 
     if (!sqlite3) {
@@ -42,7 +44,7 @@ export class SqliteConnector implements Connector {
     })
   }
 
-  async disconnect(connection) {
+  async disconnect(connection: InputConnection) {
     var database = ConnectionManager.getConnectionInstance(connection)
     try {
       await database.close()

package/server/engine/task/book-up-scenario.ts

@@ -2,10 +2,12 @@ import { access, deepClone } from '@things-factory/utils'
 import { TaskRegistry } from '../task-registry'
 import { substitute } from './utils/substitute'
 import { ScenarioEngine } from '../scenario-engine'
+import { InputStep } from '../../service/step/step-type'
+import { Context } from '../types'
 
 const debug = require('debug')('things-factory:integration-base:book-up-scenarios')
 
-async function BookUpScenario(step, { logger, data, domain }) {
+async function BookUpScenario(step: InputStep, { logger, data, domain }: Context) {
   var {
     params: { scenario, delay, priority, variables, tag }
   } = step

package/server/engine/task/csv-readline.ts

@@ -6,6 +6,9 @@ const { Readable } = require('stream')
 
 import { TaskRegistry } from '../task-registry'
 
+import { InputStep } from '../../service/step/step-type'
+import { Context } from '../types'
+
 async function createReadStream(source) {
   let stream
 
@@ -37,7 +40,7 @@ async function createReadStream(source) {
   return stream
 }
 
-async function CsvReadline(step, context) {
+async function CsvReadline(step: InputStep, context: Context) {
   var {
     params: { path }
   } = step

package/server/engine/task/data-accessor.ts

@@ -1,7 +1,10 @@
 import { access } from '@things-factory/utils'
 import { TaskRegistry } from '../task-registry'
 
-async function DataAccessor(step, { logger, data }) {
+import { InputStep } from '../../service/step/step-type'
+import { Context } from '../types'
+
+async function DataAccessor(step: InputStep, { logger, data }: Context) {
   var {
     params: { target, accessor }
   } = step

package/server/engine/task/data-mapper.ts

@@ -1,6 +1,9 @@
 import { access } from '@things-factory/utils'
 import { TaskRegistry } from '../task-registry'
 
+import { InputStep } from '../../service/step/step-type'
+import { Context } from '../types'
+
 function mapping(rule, input) {
   if (Array.isArray(input)) {
     return input.map(i => mapping(rule, i))
@@ -12,7 +15,7 @@ function mapping(rule, input) {
   }, {} as any)
 }
 
-async function DataMapper(step, { logger, data }) {
+async function DataMapper(step: InputStep, { logger, data }: Context) {
   var {
     params: { accessor, mappingRule }
   } = step

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

@@ -1,8 +1,10 @@
 import { VM } from 'vm2'
 import { ConnectionManager } from '../connection-manager'
 import { TaskRegistry } from '../task-registry'
+import { InputStep } from '../../service/step/step-type'
+import { Context } from '../types'
 
-async function DatabaseQuery(step, context) {
+async function DatabaseQuery(step: InputStep, context: Context) {
   var { domain, user, data, variables, lng } = context
   var {
     connection: connectionName,

package/server/engine/task/echo-receive.ts

@@ -1,7 +1,10 @@
 import { TaskRegistry } from '../task-registry'
 import { ConnectionManager } from '../connection-manager'
 
-async function EchoReceive(step, { logger, domain }) {
+import { InputStep } from '../../service/step/step-type'
+import { Context } from '../types'
+
+async function EchoReceive(step: InputStep, { logger, domain }: Context) {
   var { connection: connectionName } = step
 
   var connection = ConnectionManager.getConnectionInstanceByName(domain, connectionName)

package/server/engine/task/echo-send.ts

@@ -1,7 +1,9 @@
 import { TaskRegistry } from '../task-registry'
 import { ConnectionManager } from '../connection-manager'
+import { InputStep } from '../../service/step/step-type'
+import { Context } from '../types'
 
-async function EchoSend(step, { logger, domain }) {
+async function EchoSend(step: InputStep, { logger, domain }: Context) {
   var {
     connection: connectionName,
     params: { message }

package/server/engine/task/empty-check.ts

@@ -1,7 +1,10 @@
 import { TaskRegistry } from '../task-registry'
 import { access } from '@things-factory/utils'
 
-async function EmptyCheck(step, { logger, data }) {
+import { InputStep } from '../../service/step/step-type'
+import { Context } from '../types'
+
+async function EmptyCheck(step: InputStep, { logger, data }: Context) {
   var {
     params: { accessor, goto }
   } = step

package/server/engine/task/end.ts

@@ -1,7 +1,10 @@
 import { TaskRegistry } from '../task-registry'
 import { ScenarioInstanceStatus } from '../../service'
 
-async function End(step, { logger }) {
+import { InputStep } from '../../service/step/step-type'
+import { Context } from '../types'
+
+async function End(step: InputStep, { logger }: Context) {
   return {
     state: ScenarioInstanceStatus.STOPPED
   }

package/server/engine/task/floating-point.ts

@@ -2,7 +2,10 @@ import ieee754 from 'ieee754'
 import { access } from '@things-factory/utils'
 import { TaskRegistry } from '../task-registry'
 
-async function FloatingPoint(step, { logger, data }) {
+import { InputStep } from '../../service/step/step-type'
+import { Context } from '../types'
+
+async function FloatingPoint(step: InputStep, { logger, data }: Context) {
   var {
     params: { accessor, operation, endian, floatType }
   } = step

package/server/engine/task/goto.ts

@@ -1,6 +1,9 @@
 import { TaskRegistry } from '../task-registry'
 
-async function Goto(step, { logger }) {
+import { InputStep } from '../../service/step/step-type'
+import { Context } from '../types'
+
+async function Goto(step: InputStep, { logger }: Context) {
   var {
     params: { goto }
   } = step

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

@@ -5,8 +5,10 @@ import { access } from '@things-factory/utils'
 
 import { ConnectionManager } from '../connection-manager'
 import { TaskRegistry } from '../task-registry'
+import { InputStep } from '../../service/step/step-type'
+import { Context } from '../types'
 
-async function GraphqlMutate(step, context) {
+async function GraphqlMutate(step: InputStep, context: Context) {
   var { connection: connectionName, params: stepOptions } = step
   var { mutation, variables: variablesAccessorMap, headers } = stepOptions || {}
 

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

@@ -5,8 +5,10 @@ import { access } from '@things-factory/utils'
 
 import { ConnectionManager } from '../connection-manager'
 import { TaskRegistry } from '../task-registry'
+import { InputStep } from '../../service/step/step-type'
+import { Context } from '../types'
 
-async function GraphqlQuery(step, context) {
+async function GraphqlQuery(step: InputStep, context: Context) {
   var { connection: connectionName, params: stepOptions } = step
   var { query, variables: variablesAccessorMap, headers } = stepOptions || {}
   var { domain, user, data, variables, lng } = context

package/server/engine/task/headless-post.ts

@@ -7,7 +7,10 @@ import { ConnectionManager } from '../connection-manager'
 
 import { getHeadlessPool } from './utils/headless-pool-for-scenario'
 
-async function HeadlessPost(step, { logger, data, domain }) {
+import { InputStep } from '../../service/step/step-type'
+import { Context } from '../types'
+
+async function HeadlessPost(step: InputStep, { logger, data, domain }: Context) {
   var { connection: connectionName, params: stepOptions } = step
   var { headers: requestHeaders, contentType, path, accessor } = stepOptions || {}
 

package/server/engine/task/headless-scrap.ts

@@ -4,8 +4,10 @@ import { TaskRegistry } from '../task-registry'
 import { ConnectionManager } from '../connection-manager'
 
 import { getHeadlessPool } from './utils/headless-pool-for-scenario'
+import { InputStep } from '../../service/step/step-type'
+import { Context } from '../types'
 
-async function HeadlessScrap(step, { logger, data, domain }) {
+async function HeadlessScrap(step: InputStep, { logger, data, domain }: Context) {
   var { connection: connectionName, params: stepOptions } = step
   var { headers: requestHeaders, path, selectors = [] } = stepOptions || {}