@things-factory/integration-influxdb 7.0.0-alpha.30 → 7.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-influxdb",
-  "version": "7.0.0-alpha.30",
+  "version": "7.0.0",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -27,7 +27,8 @@
   },
   "dependencies": {
     "@influxdata/influxdb-client": "^1.33.2",
-    "@things-factory/integration-base": "^7.0.0-alpha.30"
+    "@things-factory/integration-base": "^7.0.0",
+    "ses": "^1.5.0"
   },
-  "gitHead": "64f2ff6e284ecb26530d1a456a0627dced03fde7"
+  "gitHead": "00f3917ca132679e3571f3f4fd16f4caf84f488e"
 }

package/server/engine/connector/influxdb.ts

@@ -32,13 +32,16 @@ export class InfluxDBConnector implements Connector {
 
       ConnectionManager.logger.info(`influxdb connection(${connection.name}:${connection.endpoint}) is connected`)
     } catch (ex) {
-      ConnectionManager.logger.info(`influxdb connection(${connection.name}:${connection.endpoint}) failed to connect`)
+      ConnectionManager.logger.info(
+        `influxdb connection(${connection.name}:${connection.endpoint}) failed to connect`,
+        ex
+      )
       throw ex
     }
   }
 
   async disconnect(connection: Connection) {
-    var { client } = ConnectionManager.removeConnectionInstance(connection)
+    var client = ConnectionManager.removeConnectionInstance(connection)
     client.close()
 
     ConnectionManager.logger.info(`influxdb connection(${connection.name}) is disconnected`)

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

@@ -1,6 +1,5 @@
+import 'ses'
 import { InfluxDB, FluxTableMetaData } from '@influxdata/influxdb-client'
-import { VM } from 'vm2'
-
 import { ConnectionManager, Context, TaskRegistry } from '@things-factory/integration-base'
 
 const debug = require('debug')('things-factory:influxdb-query')
@@ -25,8 +24,7 @@ interface InfluxRaw {
 }
 
 function processInfluxData(raws: InfluxRaw[]): InfluxData[] {
-  var current: InfluxData
-  var result: { [time: string]: InfluxData } = {}
+  const result: { [time: string]: InfluxData } = {}
 
   raws.forEach(raw => {
     const { _time, _field, _value, _measurement, _start, _stop, result: _result, table, ...tags } = raw
@@ -56,17 +54,21 @@ async function influxdbQuery(step, { domain, user, data, variables, lng }: Conte
     throw new Error(`no connection : ${connection}`)
   }
 
-  const vm = new VM({
-    sandbox: {
-      domain,
-      user,
-      lng,
-      data,
-      variables
-    }
+  const compartment = new Compartment({
+    domain,
+    user,
+    lng,
+    data,
+    variables,
+    console
   })
 
-  const fluxQuery = vm.run('`' + query + '`')
+  let fluxQuery
+  try {
+    fluxQuery = compartment.evaluate('`' + query + '`')
+  } catch (err) {
+    throw new Error(`Failed to evaluate query: ${err.message}`)
+  }
 
   const queryApi = client.getQueryApi(organization)
 
@@ -86,7 +88,14 @@ influxdbQuery.parameterSpec = [
   {
     type: 'textarea',
     name: 'query',
-    label: 'influxdb.query'
+    label: 'influxdb.query',
+    property: {
+      language: 'text',
+      showLineNumbers: true
+    },
+    styles: {
+      flex: '1'
+    }
   }
 ]