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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "7.0.1-rc.5",
+  "version": "7.0.1-rc.7",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -27,14 +27,14 @@
   "dependencies": {
     "@apollo/client": "^3.6.9",
     "@operato/moment-timezone-es": "^7.0.0-rc",
-    "@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",
+    "@things-factory/api": "^7.0.1-rc.7",
+    "@things-factory/auth-base": "^7.0.1-rc.7",
+    "@things-factory/cache-service": "^7.0.1-rc.7",
+    "@things-factory/env": "^7.0.1-rc.7",
+    "@things-factory/oauth2-client": "^7.0.1-rc.7",
+    "@things-factory/scheduler-client": "^7.0.1-rc.7",
+    "@things-factory/shell": "^7.0.1-rc.7",
+    "@things-factory/utils": "^7.0.1-rc.7",
     "async-mqtt": "^2.5.0",
     "chance": "^1.1.11",
     "cross-fetch": "^3.0.4",
@@ -42,7 +42,7 @@
     "node-fetch": "^2.6.0",
     "promise-socket": "^7.0.0",
     "readline": "^1.3.0",
-    "vm2": "^3.9.11"
+    "ses": "^1.5.0"
   },
-  "gitHead": "7d5d340e80a8efde9be08bb7b1e019d944bc3628"
+  "gitHead": "0e8c627f3fbb83cc1c3fadac3ec342cb8f3f0149"
 }

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

@@ -1,8 +1,8 @@
-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'
+import 'ses'
 
 async function DatabaseQuery(step: InputStep, context: Context) {
   var { domain, user, data, variables, lng } = context
@@ -13,18 +13,23 @@ async function DatabaseQuery(step: InputStep, context: Context) {
 
   var dbconnection = ConnectionManager.getConnectionInstanceByName(domain, connectionName)
 
-  const vm = new VM({
-    sandbox: {
-      domain,
-      user,
-      lng,
-      data,
-      variables
-    }
+  const compartment = new Compartment({
+    domain,
+    user,
+    lng,
+    data,
+    variables,
+    console
   })
 
-  query = vm.run('`' + query + '`')
-  var queryResult = await dbconnection.query(query, [])
+  let evalQuery
+  try {
+    evalQuery = compartment.evaluate('`' + query + '`')
+  } catch (err) {
+    throw new Error(`Failed to evaluate query: ${err.message}`)
+  }
+
+  var queryResult = await dbconnection.query(evalQuery, [])
 
   return {
     data: queryResult

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

@@ -1,8 +1,7 @@
 import gql from 'graphql-tag'
-import { VM } from 'vm2'
+import 'ses'
 
 import { access } from '@things-factory/utils'
-
 import { ConnectionManager } from '../connection-manager'
 import { TaskRegistry } from '../task-registry'
 import { InputStep } from '../../service/step/step-type'
@@ -14,17 +13,21 @@ async function GraphqlMutate(step: InputStep, context: Context) {
 
   var { domain, user, data, variables, lng } = context
 
-  const vm = new VM({
-    sandbox: {
-      domain,
-      user,
-      lng,
-      data,
-      variables
-    }
+  const compartment = new Compartment({
+    domain,
+    user,
+    lng,
+    data,
+    variables,
+    console
   })
 
-  mutation = vm.run('`' + mutation + '`')
+  let evalMutation
+  try {
+    evalMutation = compartment.evaluate('`' + mutation + '`')
+  } catch (err) {
+    throw new Error(`Failed to evaluate mutation: ${err.message}`)
+  }
 
   var client = ConnectionManager.getConnectionInstanceByName(context.domain, connectionName)
 
@@ -36,7 +39,7 @@ async function GraphqlMutate(step: InputStep, context: Context) {
 
   var { data: mutateResult } = await client.mutate({
     mutation: gql`
-      ${mutation}
+      ${evalMutation}
     `,
     variables: queryVariables,
     headers
@@ -70,6 +73,7 @@ GraphqlMutate.parameterSpec = [
     label: 'headers'
   }
 ]
+
 GraphqlMutate.help = 'integration/task/graphql-mutate'
 
 TaskRegistry.registerTaskHandler('graphql-mutate', GraphqlMutate)

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

@@ -1,8 +1,7 @@
 import gql from 'graphql-tag'
-import { VM } from 'vm2'
+import 'ses'
 
 import { access } from '@things-factory/utils'
-
 import { ConnectionManager } from '../connection-manager'
 import { TaskRegistry } from '../task-registry'
 import { InputStep } from '../../service/step/step-type'
@@ -13,17 +12,21 @@ async function GraphqlQuery(step: InputStep, context: Context) {
   var { query, variables: variablesAccessorMap, headers } = stepOptions || {}
   var { domain, user, data, variables, lng } = context
 
-  const vm = new VM({
-    sandbox: {
-      domain,
-      user,
-      lng,
-      data,
-      variables
-    }
+  const compartment = new Compartment({
+    domain,
+    user,
+    lng,
+    data,
+    variables,
+    console
   })
 
-  query = vm.run('`' + query + '`')
+  let evalQuery
+  try {
+    evalQuery = compartment.evaluate('`' + query + '`')
+  } catch (err) {
+    throw new Error(`Failed to evaluate query: ${err.message}`)
+  }
 
   var client = ConnectionManager.getConnectionInstanceByName(domain, connectionName)
 
@@ -35,7 +38,7 @@ async function GraphqlQuery(step: InputStep, context: Context) {
 
   var { data: queryResult } = await client.query({
     query: gql`
-      ${query}
+      ${evalQuery}
     `,
     variables: queryVariables,
     headers

package/server/engine/task/http-get.ts

@@ -1,5 +1,5 @@
 import fetch from 'node-fetch'
-import { VM } from 'vm2'
+import 'ses'
 import { URL } from 'url'
 import https from 'https'
 import { TaskRegistry } from '../task-registry'
@@ -19,29 +19,43 @@ async function HttpGet(step: InputStep, { logger, data, domain, user, variables,
 
   var { endpoint, params: connectionParams, authHeaders = {} } = connection
 
-  const vm = new VM({
-    sandbox: {
-      domain,
-      user,
-      lng,
-      data,
-      variables
-    }
+  const compartment = new Compartment({
+    domain,
+    user,
+    lng,
+    data,
+    variables,
+    console
   })
 
-  path = vm.run('`' + path + '`')
+  let evalPath
+  try {
+    evalPath = compartment.evaluate('`' + path + '`')
+  } catch (err) {
+    throw new Error(`Failed to evaluate path: ${err.message}`)
+  }
+
+  path = evalPath
 
   requestHeaders =
     requestHeaders &&
     Object.entries(requestHeaders as { [key: string]: string }).reduce((sum, [key, value]) => {
-      sum[key] = vm.run('`' + value + '`')
+      try {
+        sum[key] = compartment.evaluate('`' + value + '`')
+      } catch (err) {
+        throw new Error(`Failed to evaluate header value: ${err.message}`)
+      }
       return sum
     }, {})
 
   searchParams =
     searchParams &&
     Object.entries(searchParams as { [key: string]: string }).reduce((sum, [key, value]) => {
-      sum[key] = vm.run('`' + value + '`')
+      try {
+        sum[key] = compartment.evaluate('`' + value + '`')
+      } catch (err) {
+        throw new Error(`Failed to evaluate search param value: ${err.message}`)
+      }
       return sum
     }, {})
 

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

@@ -1,6 +1,6 @@
 import fetch from 'node-fetch'
 import { URL } from 'url'
-import { VM } from 'vm2'
+import 'ses'
 import { access } from '@things-factory/utils'
 import { TaskRegistry } from '../task-registry'
 import { ConnectionManager } from '../connection-manager'
@@ -20,21 +20,32 @@ async function HttpPost(step: InputStep, { logger, data, domain, user, variables
 
   var { endpoint, params: connectionParams, authHeaders = {} } = connection
 
-  const vm = new VM({
-    sandbox: {
-      domain,
-      user,
-      lng,
-      data,
-      variables
-    }
+  const compartment = new Compartment({
+    domain,
+    user,
+    lng,
+    data,
+    variables,
+    console
   })
 
-  path = vm.run('`' + path + '`')
+  let evalPath
+  try {
+    evalPath = compartment.evaluate('`' + path + '`')
+  } catch (err) {
+    throw new Error(`Failed to evaluate path: ${err.message}`)
+  }
+
+  path = evalPath
+
   requestHeaders =
     requestHeaders &&
     Object.entries(requestHeaders as { [key: string]: string }).reduce((sum, [key, value]) => {
-      sum[key] = vm.run('`' + value + '`')
+      try {
+        sum[key] = compartment.evaluate('`' + value + '`')
+      } catch (err) {
+        throw new Error(`Failed to evaluate header value: ${err.message}`)
+      }
       return sum
     }, {})
 

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

@@ -1,5 +1,5 @@
 import gql from 'graphql-tag'
-import { VM } from 'vm2'
+import 'ses'
 
 import { User } from '@things-factory/auth-base'
 import { getRepository } from '@things-factory/shell'
@@ -21,17 +21,23 @@ async function LocalGraphqlMutate(step: InputStep, context: Context) {
       relations: ['domains']
     }))
 
-  const vm = new VM({
-    sandbox: {
-      domain,
-      user,
-      lng,
-      data,
-      variables
-    }
+  const compartment = new Compartment({
+    domain,
+    user,
+    lng,
+    data,
+    variables,
+    console
   })
 
-  mutation = vm.run('`' + mutation + '`')
+  let evalMutation
+  try {
+    evalMutation = compartment.evaluate('`' + mutation + '`')
+  } catch (err) {
+    throw new Error(`Failed to evaluate mutation: ${err.message}`)
+  }
+
+  mutation = evalMutation
 
   const queryVariables = Object.keys(variablesAccessorMap || {}).reduce((variables, key) => {
     const accessor = variablesAccessorMap[key]

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

@@ -1,5 +1,5 @@
 import gql from 'graphql-tag'
-import { VM } from 'vm2'
+import 'ses'
 
 import { User } from '@things-factory/auth-base'
 import { getRepository } from '@things-factory/shell'
@@ -21,17 +21,23 @@ async function LocalGraphqlQuery(step: InputStep, context: Context) {
       relations: ['domains']
     }))
 
-  const vm = new VM({
-    sandbox: {
-      domain,
-      user,
-      lng,
-      data,
-      variables
-    }
+  const compartment = new Compartment({
+    domain,
+    user,
+    lng,
+    data,
+    variables,
+    console
   })
 
-  query = vm.run('`' + query + '`')
+  let evalQuery
+  try {
+    evalQuery = compartment.evaluate('`' + query + '`')
+  } catch (err) {
+    throw new Error(`Failed to evaluate query: ${err.message}`)
+  }
+
+  query = evalQuery
 
   const queryVariables = Object.keys(variablesAccessorMap || {}).reduce((variables, key) => {
     const accessor = variablesAccessorMap[key]

package/server/engine/task/log.ts

@@ -1,5 +1,5 @@
 import { access, hasTemplateExpression } from '@things-factory/utils'
-import { VM } from 'vm2'
+import 'ses'
 import { TaskRegistry } from '../task-registry'
 import { InputStep } from '../../service/step/step-type'
 import { Context } from '../types'
@@ -10,23 +10,26 @@ async function Log(step: InputStep, { logger, data, variables, domain, user, lng
   } = step
 
   if (hasTemplateExpression(message)) {
-    const vm = new VM({
-      sandbox: {
-        domain,
-        user,
-        lng,
-        data,
-        variables
-      }
+    const compartment = new Compartment({
+      domain,
+      user,
+      lng,
+      data,
+      variables,
+      console
     })
 
-    message = vm.run('`' + message + '`')
+    try {
+      message = compartment.evaluate('`' + message + '`')
+    } catch (err) {
+      throw new Error(`Failed to evaluate message: ${err.message}`)
+    }
   }
 
   accessor = access(accessor, data)
 
   if (accessor) {
-    if (accessor !== 'string') {
+    if (typeof accessor !== 'string') {
       accessor = JSON.stringify(accessor, null, 2)
     }
     message += ': ' + accessor

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

@@ -1,10 +1,10 @@
-import { VM } from 'vm2'
 import { logger } from '@things-factory/env'
 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'
+import 'ses'
 
 try {
   var oracledb = require('oracledb')
@@ -51,21 +51,27 @@ async function OracleProcedure(step: InputStep, context: Context) {
 
   var dbconnection = ConnectionManager.getConnectionInstanceByName(domain, connectionName)
 
-  const vm = new VM({
-    sandbox: {
-      domain,
-      user,
-      lng,
-      data,
-      variables
-    }
-  })
-
   if (!code) {
     throw 'procedure code not defined'
   }
 
-  code = vm.run('`' + code + '`')
+  const compartment = new Compartment({
+    domain,
+    user,
+    lng,
+    data,
+    variables,
+    console
+  })
+
+  let evalCode
+  try {
+    evalCode = compartment.evaluate('`' + code + '`')
+  } catch (err) {
+    throw new Error(`Failed to evaluate code: ${err.message}`)
+  }
+
+  code = evalCode
 
   const procedureParameters =
     parameters &&
@@ -79,7 +85,7 @@ async function OracleProcedure(step: InputStep, context: Context) {
 
       if (calculated !== undefined) {
         sum[name].val =
-          type == 'Date'
+          type === 'Date'
             ? new Date(calculated)
             : type == 'Number'
               ? Number(calculated)

package/server/engine/task/script.ts

@@ -1,34 +1,44 @@
 import { TaskRegistry } from '../task-registry'
-import { NodeVM } from 'vm2'
-
 import { InputStep } from '../../service/step/step-type'
 import { Context } from '../types'
+import 'ses'
 
 async function Script(step: InputStep, context: Context) {
-  var {
+  const {
     params: { script }
   } = step
 
   const { domain, user, data, variables, lng, logger } = context
 
-  const vm = new NodeVM({
-    timeout: 5000,
-    wrapper: 'none',
-    console: 'inherit',
-    sandbox: {
-      domain,
-      user,
-      lng,
-      logger,
-      data,
-      variables
-    }
+  const compartment = new Compartment({
+    domain,
+    user,
+    data,
+    variables,
+    logger,
+    lng,
+    console,
+    Math,
+    JSON,
+    Date,
+    setTimeout,
+    setInterval,
+    clearTimeout,
+    clearInterval
   })
 
-  var result = await vm.run(`return (async () => {\n${script}\n})()`)
+  const scriptSource = `
+    (async () => {
+      ${script}
+    })();
+  `
 
-  return {
-    data: result
+  try {
+    return {
+      data: await compartment.evaluate(scriptSource)
+    }
+  } catch (err) {
+    throw new Error(`Script execution failed: ${err.message}`)
   }
 }