@things-factory/integration-base 6.0.133 → 6.0.141

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "6.0.133",
+  "version": "6.0.141",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -46,5 +46,5 @@
   "devDependencies": {
     "@types/cron": "^2.0.1"
   },
-  "gitHead": "c08bf83d00cbb66e1338cdfeed8ca91d4e130c97"
+  "gitHead": "d9fe5f28cee1bf8f527688e06d190ae78d6e2b04"
 }

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

@@ -1,11 +1,12 @@
-import { TaskRegistry } from '../task-registry'
-import { ConnectionManager } from '../connection-manager'
 import fetch from 'node-fetch'
+import { VM } from 'vm2'
 import { URL } from 'url'
-import { substitute } from './utils/substitute'
 import https from 'https'
+import { TaskRegistry } from '../task-registry'
+import { ConnectionManager } from '../connection-manager'
+import { substitute } from './utils/substitute'
 
-async function HttpGet(step, { logger, data, domain }) {
+async function HttpGet(step, { logger, data, domain, variables }) {
   var { connection: connectionName, params: stepOptions } = step
   var { headers: requestHeaders, searchParams = {}, path } = stepOptions || {}
   var connection = ConnectionManager.getConnectionInstanceByName(domain, connectionName)
@@ -15,6 +16,17 @@ async function HttpGet(step, { logger, data, domain }) {
   }
 
   var { endpoint, params: connectionParams, authHeaders = {} } = connection
+
+  const vm = new VM({
+    sandbox: {
+      domain,
+      data,
+      variables
+    }
+  })
+
+  path = vm.run('`' + path + '`')
+
   var url = new URL(path, endpoint)
   if (searchParams) {
     Object.keys(searchParams).forEach(key => {

package/server/engine/task/script.ts

@@ -19,7 +19,7 @@ async function Script(step, context) {
     }
   })
 
-  const result = vm.run(script)
+  const result = await vm.run(`(async () => {\n${script}\n})()`)
 
   return {
     data: result