@things-factory/integration-base 7.0.1-rc.0 → 7.0.1-rc.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "7.0.1-rc.0",
+  "version": "7.0.1-rc.5",
   "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.0",
-    "@things-factory/auth-base": "^7.0.1-rc.0",
-    "@things-factory/cache-service": "^7.0.1-rc.0",
-    "@things-factory/env": "^7.0.1-rc.0",
-    "@things-factory/oauth2-client": "^7.0.1-rc.0",
-    "@things-factory/scheduler-client": "^7.0.1-rc.0",
-    "@things-factory/shell": "^7.0.1-rc.0",
+    "@things-factory/api": "^7.0.1-rc.5",
+    "@things-factory/auth-base": "^7.0.1-rc.5",
+    "@things-factory/cache-service": "^7.0.1-rc.5",
+    "@things-factory/env": "^7.0.1-rc.5",
+    "@things-factory/oauth2-client": "^7.0.1-rc.5",
+    "@things-factory/scheduler-client": "^7.0.1-rc.5",
+    "@things-factory/shell": "^7.0.1-rc.5",
     "@things-factory/utils": "^7.0.1-rc.0",
     "async-mqtt": "^2.5.0",
     "chance": "^1.1.11",
@@ -44,5 +44,5 @@
     "readline": "^1.3.0",
     "vm2": "^3.9.11"
   },
-  "gitHead": "45476b164b69aef2c211d9a5257897f42d8e2f5f"
+  "gitHead": "7d5d340e80a8efde9be08bb7b1e019d944bc3628"
 }

package/server/engine/connection-manager.ts

@@ -7,7 +7,7 @@ import { Connection, ConnectionStatus } from '../service'
 import { Connector } from './types'
 import { ProxyConnector } from './connector/proxy-connector'
 
-const { combine, timestamp, splat, printf } = format
+const { combine, splat, printf, errors } = format
 const debug = require('debug')('things-factory:integration-base:connections')
 
 const SYSTEM_TZ = Intl.DateTimeFormat().resolvedOptions().timeZone
@@ -20,12 +20,12 @@ export class ConnectionManager {
   private static connectors: { [propName: string]: Connector } = {}
   private static connections: { [domainId: string]: { [name: string]: any } } = {}
   private static entities = {}
-  private static logFormat = printf(({ level, message, timestamp }) => {
-    return `${timestamp} ${level}: ${message}`
+  private static logFormat = printf(({ level, message, timestamp, stack }) => {
+    return `${timestamp} ${level}: ${stack || message}`
   })
 
   public static logger = createLogger({
-    format: combine(systemTimestamp({ tz: SYSTEM_TZ }), splat(), ConnectionManager.logFormat),
+    format: combine(errors({ stack: true }), systemTimestamp({ tz: SYSTEM_TZ }), splat(), ConnectionManager.logFormat),
     transports: [
       new (transports as any).DailyRotateFile({
         filename: `logs/connections-%DATE%.log`,
@@ -52,8 +52,7 @@ export class ConnectionManager {
       try {
         params = JSON.parse(connection.params || '{}')
       } catch (ex) {
-        ConnectionManager.logger.error(`connection '${connection.name}' params should be JSON format`)
-        ConnectionManager.logger.error(ex)
+        ConnectionManager.logger.error(`connection '${connection.name}' params should be JSON format`, ex)
       }
 
       return {
@@ -66,7 +65,7 @@ export class ConnectionManager {
 
     return await Promise.all(
       [...Object.keys(ConnectionManager.connectors), 'proxy-connector'].map(type => {
-        const connector = 'proxy-connector' ? ProxyConnector.instance : ConnectionManager.getConnector(type)
+        const connector = type == 'proxy-connector' ? ProxyConnector.instance : ConnectionManager.getConnector(type)
 
         ConnectionManager.logger.info(`Connector '${type}' started to ready`)
 
@@ -81,7 +80,7 @@ export class ConnectionManager {
             }) as any
           )
           .catch(error => {
-            ConnectionManager.logger.error(error.message)
+            ConnectionManager.logger.error(error)
           })
           .then(() => {
             ConnectionManager.logger.info(`All connector for '${type}' ready`)

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

@@ -25,7 +25,8 @@ export class EchoBack implements Connector {
       )
     } catch (e) {
       ConnectionManager.logger.error(
-        `echo-back-connector connection(${connection.name}:${connection.endpoint}) is not connected.\ncause: ${e}`
+        `echo-back-connector connection(${connection.name}:${connection.endpoint}) is not connected.`,
+        e
       )
     }
   }

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

@@ -39,11 +39,14 @@ export class GraphqlConnector implements Connector {
     const ERROR_HANDLER: any = ({ graphQLErrors, networkError }) => {
       if (graphQLErrors)
         graphQLErrors.map(({ message, locations, path }) => {
-          ConnectionManager.logger.error(`[GraphQL error] Message: ${message}, Location: ${locations}, Path: ${path}`)
+          ConnectionManager.logger.error(
+            `[GraphQL error] Message: ${message}, Location: ${locations}, Path: ${path}`,
+            graphQLErrors
+          )
         })
 
       if (networkError) {
-        ConnectionManager.logger.error(`[Network error - ${networkError.statusCode}] ${networkError}`)
+        ConnectionManager.logger.error(`[Network error - ${networkError.statusCode}]`, networkError)
       }
     }
 
@@ -81,7 +84,9 @@ export class GraphqlConnector implements Connector {
       })
     )
 
-    ConnectionManager.logger.info(`graphql-connector connection(${connection.name}:${connection.endpoint}) is connected`)
+    ConnectionManager.logger.info(
+      `graphql-connector connection(${connection.name}:${connection.endpoint}) is connected`
+    )
   }
 
   async disconnect(connection: InputConnection) {

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

@@ -39,7 +39,8 @@ export class MqttConnector implements Connector {
       ConnectionManager.logger.info(`mqtt-connector connection(${connection.name}:${connection.endpoint}) is connected`)
     } catch (err) {
       ConnectionManager.logger.error(
-        `mqtt-connector connection(${connection.name}:${connection.endpoint}) is failed.\ncause: ${err}`
+        `mqtt-connector connection(${connection.name}:${connection.endpoint}) is failed.`,
+        err
       )
     }
   }

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

@@ -7,7 +7,7 @@ import { InputConnection } from '../../service/connection/connection-type'
 try {
   var Client = require('mssql')
 } catch (err) {
-  logger.error('mssql module loading failed')
+  logger.error('mssql module loading failed', err)
 }
 
 export class MssqlConnector implements Connector {

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

@@ -160,14 +160,16 @@ export class OperatoConnector implements Connector {
           await this.runScenario(subscriptions, data?.data?.data)
         },
         error: error => {
-          ConnectionManager.logger.error(`(${connection.name}:${connection.endpoint}) subscription error: ${error}`)
+          ConnectionManager.logger.error(`(${connection.name}:${connection.endpoint}) subscription error`, error)
         },
         complete: () => {
           ConnectionManager.logger.info(`(${connection.name}:${connection.endpoint}) subscription complete`)
         }
       })
 
-      ConnectionManager.logger.info(`(${connection.name}:${connection.endpoint}) subscription closed flag: ${subscriptionObserver.closed}`)
+      ConnectionManager.logger.info(
+        `(${connection.name}:${connection.endpoint}) subscription closed flag: ${subscriptionObserver.closed}`
+      )
 
       subscriptions.push({
         tag,
@@ -180,7 +182,9 @@ export class OperatoConnector implements Connector {
     client['subscriptions'] = subscriptions
     ConnectionManager.addConnectionInstance(connection, client)
 
-    ConnectionManager.logger.info(`operato-connector connection(${connection.name}:${connection.endpoint}) is connected`)
+    ConnectionManager.logger.info(
+      `operato-connector connection(${connection.name}:${connection.endpoint}) is connected`
+    )
   }
 
   async disconnect(connection: InputConnection) {
@@ -208,7 +212,9 @@ export class OperatoConnector implements Connector {
 
     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`)
+      throw new Error(
+        `Unauthorized! ${category && privilege ? category + ':' + privilege + ' privilege' : 'ownership granted'} required`
+      )
     }
 
     /* create a scenario instance */

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

@@ -7,7 +7,7 @@ import { InputConnection } from '../../service/connection/connection-type'
 try {
   var oracledb = require('oracledb')
 } catch (err) {
-  logger.error('oracledb module loading failed')
+  logger.error('oracledb module loading failed', err)
 }
 
 export class OracleConnector implements Connector {
@@ -71,7 +71,7 @@ export class OracleConnector implements Connector {
       poolAlias,
       enableStatistics
     })
-    
+
     ConnectionManager.addConnectionInstance(connection, {
       query: async (query, params) => {
         let dbConnection: any = {}
@@ -89,12 +89,10 @@ export class OracleConnector implements Connector {
             await this.recreatePool(connection)
           }
           throw e
-        }
-        finally {
+        } finally {
           await dbConnection.close()
         }
         return taskResult
-        
       },
       execute: async (procedure, params) => {
         let dbConnection: any = {}
@@ -105,7 +103,7 @@ export class OracleConnector implements Connector {
             ${procedure}
           END;`
           dbConnection = await oracledb.getConnection(poolAlias)
-          
+
           // console.log('\n************* stat after get ****************')
           // await oracledb.getPool(poolAlias).logStatistics()
 
@@ -131,8 +129,7 @@ export class OracleConnector implements Connector {
             await this.recreatePool(connection)
           }
           throw e
-        }
-        finally {
+        } finally {
           await dbConnection.close()
 
           // console.log('\n************* stat after close ****************')

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

@@ -7,7 +7,7 @@ import { InputConnection } from '../../service/connection/connection-type'
 try {
   var { Client } = require('pg')
 } catch (err) {
-  logger.error('postgresql module loading failed')
+  logger.error('postgresql module loading failed', err)
 }
 
 export class PostgresqlConnector implements Connector {
@@ -55,7 +55,8 @@ export class PostgresqlConnector implements Connector {
       ConnectionManager.logger.info(`PostgresSQL Database(${connection.name}:${database}) at ${endpoint} connected.`)
     } catch (e) {
       ConnectionManager.logger.error(
-        `PostgresSQL Database(${connection.name}:${database}) at ${endpoint} not connected.\ncause: ${e}`
+        `PostgresSQL Database(${connection.name}:${database}) at ${endpoint} not connected.`,
+        e
       )
     }
   }

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

@@ -40,7 +40,7 @@ export class SocketServer implements Connector {
           var logger = ConnectionManager.logger
           let message = ex.stack ? ex.stack : ex
           let msg = typeof message == 'object' ? JSON.stringify(message, null, 2) : message
-          logger.error(msg)
+          logger.error(msg, ex)
           reject(ex)
         })
       })

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

@@ -6,11 +6,10 @@ import { ConnectionManager } from '../connection-manager'
 import { Connector } from '../types'
 import { InputConnection } from '../../service/connection/connection-type'
 
-
 try {
   var sqlite3 = require('sqlite3').verbose()
 } catch (err) {
-  logger.error('sqlite3 module loading failed')
+  logger.error('sqlite3 module loading failed', err)
 }
 
 export class SqliteConnector implements Connector {
@@ -29,9 +28,7 @@ export class SqliteConnector implements Connector {
 
     var database = new sqlite3.Database(endpoint, sqlite3.OPEN_READWRITE, err => {
       if (err) {
-        ConnectionManager.logger.error(
-          `SQLite Database(${connection.name}) at ${endpoint} not connected.\ncause: ${err}`
-        )
+        ConnectionManager.logger.error(`SQLite Database(${connection.name}) at ${endpoint} not connected.`, err)
         return
       }
 

package/server/engine/task/oracle-procedure.ts

@@ -9,7 +9,7 @@ import { Context } from '../types'
 try {
   var oracledb = require('oracledb')
 } catch (err) {
-  logger.error('oracledb module loading failed')
+  logger.error('oracledb module loading failed', err)
 }
 
 type ProcedureParameterType = {
@@ -82,10 +82,10 @@ async function OracleProcedure(step: InputStep, context: Context) {
           type == 'Date'
             ? new Date(calculated)
             : type == 'Number'
-            ? Number(calculated)
-            : type == 'String'
-            ? String(calculated)
-            : calculated
+              ? Number(calculated)
+              : type == 'String'
+                ? String(calculated)
+                : calculated
       }
 
       if (maxSize) {

package/server/index.ts

@@ -15,7 +15,6 @@ process.on('bootstrap-module-start' as any, async ({ app, config, client }: any)
 
     console.log('Scenario Engine has just started.')
   } catch (ex) {
-    ConnectionManager.logger.error(ex)
-    console.log('Just has failed to start Scenario Engine.')
+    ConnectionManager.logger.error('Just has failed to start Scenario Engine.', ex)
   }
 })

package/server/service/payload-log/payload-log-mutation.ts

@@ -146,6 +146,6 @@ export async function createPayloadLog(
       updatedAt: new Date()
     })
   } catch (error) {
-    logger.error(`PayloadLog Error: ${error}`)
+    logger.error(`PayloadLog Error`, error)
   }
 }

package/server/service/scenario-instance/scenario-instance-type.ts

@@ -18,10 +18,10 @@ import { Step } from '../step/step-type'
 import { handler as edgeHandler } from '../../engine/edge-client'
 
 const debug = require('debug')('things-factory:integration-base:scenario-instance')
-const { combine, timestamp, splat, printf } = format
+const { combine, errors, splat, printf } = format
 
-const LOGFORMAT = printf(({ level, message, timestamp }) => {
-  return `${timestamp} ${level}: ${message}`
+const LOGFORMAT = printf(({ level, message, timestamp, stack }) => {
+  return `${timestamp} ${level}: ${stack || message}`
 })
 
 const SYSTEM_TZ = Intl.DateTimeFormat().resolvedOptions().timeZone
@@ -228,7 +228,7 @@ export class ScenarioInstance {
       logger:
         context?.logger ||
         createLogger({
-          format: combine(systemTimestamp({ tz: SYSTEM_TZ }), splat(), LOGFORMAT),
+          format: combine(errors({ stack: true }), systemTimestamp({ tz: SYSTEM_TZ }), splat(), LOGFORMAT),
           transports: [
             new (transports as any).DailyRotateFile({
               filename: `logs/${domain.subdomain}/scenario-${scenarioName}-%DATE%.log`,
@@ -320,7 +320,7 @@ export class ScenarioInstance {
       const message = ex.stack ? ex.stack : ex
       const { scenarioName, domain } = this
 
-      this.context.logger.error(ex.message ? ex.message : ex)
+      this.context.logger.error(ex)
 
       debug('failed to run ', `[ Domain: ${domain.name}, Scenario: ${scenarioName} ]\n`, ex)
       this.setState(
@@ -515,7 +515,7 @@ export class ScenarioInstance {
     try {
       step.params = JSON.parse(step.params)
     } catch (ex) {
-      this.context.logger.error(`params(${step.params}) parsing error. params must be a JSON.`)
+      this.context.logger.error(`params(${step.params}) parsing error. params must be a JSON.`, ex)
     }
     step.params = step.params || {}