@things-factory/integration-influxdb 7.0.1-rc.6 → 7.0.1-rc.7

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

@@ -1 +1 @@
-export {};
+import 'ses';

package/dist-server/engine/task/influxdb-query.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const vm2_1 = require("vm2");
+require("ses");
 const integration_base_1 = require("@things-factory/integration-base");
 const debug = require('debug')('things-factory:influxdb-query');
 function processInfluxData(raws) {
-    var current;
-    var result = {};
+    const result = {};
     raws.forEach(raw => {
         const { _time, _field, _value, _measurement, _start, _stop, result: _result, table } = raw, tags = tslib_1.__rest(raw, ["_time", "_field", "_value", "_measurement", "_start", "_stop", "result", "table"]);
         result[_time] || (result[_time] = {
@@ -26,16 +25,21 @@ async function influxdbQuery(step, { domain, user, data, variables, lng }) {
         debug(`no connection : ${connection}`);
         throw new Error(`no connection : ${connection}`);
     }
-    const vm = new vm2_1.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);
     const result = await queryApi.collectRows(fluxQuery);
     return {

package/dist-server/engine/task/influxdb-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"influxdb-query.js","sourceRoot":"","sources":["../../../server/engine/task/influxdb-query.ts"],"names":[],"mappings":";;;AACA,6BAAwB;AAExB,uEAA2F;AAE3F,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,+BAA+B,CAAC,CAAA;AAqB/D,SAAS,iBAAiB,CAAC,IAAiB;IAC1C,IAAI,OAAmB,CAAA;IACvB,IAAI,MAAM,GAAmC,EAAE,CAAA;IAE/C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACjB,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,KAAc,GAAG,EAAZ,IAAI,kBAAK,GAAG,EAA7F,mFAAuF,CAAM,CAAA;QAEnG,MAAM,CAAC,KAAK,MAAZ,MAAM,CAAC,KAAK,IAAM;YAChB,SAAS,EAAE,KAAK;YAChB,WAAW,EAAE,YAAY;YACzB,IAAI;YACJ,MAAM,EAAE,EAAE;SACX,EAAA;QAED,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAA;IACvC,CAAC,CAAC,CAAA;IAEF,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;AAC9B,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAW;IAChF,MAAM,EACJ,UAAU,EACV,MAAM,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,EAChC,GAAG,IAAI,CAAA;IAER,MAAM,MAAM,GAAG,oCAAiB,CAAC,2BAA2B,CAAC,MAAM,EAAE,UAAU,CAAa,CAAA;IAC5F,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,KAAK,CAAC,mBAAmB,UAAU,EAAE,CAAC,CAAA;QACtC,MAAM,IAAI,KAAK,CAAC,mBAAmB,UAAU,EAAE,CAAC,CAAA;IAClD,CAAC;IAED,MAAM,EAAE,GAAG,IAAI,QAAE,CAAC;QAChB,OAAO,EAAE;YACP,MAAM;YACN,IAAI;YACJ,GAAG;YACH,IAAI;YACJ,SAAS;SACV;KACF,CAAC,CAAA;IAEF,MAAM,SAAS,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,GAAG,KAAK,GAAG,GAAG,CAAC,CAAA;IAE3C,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAA;IAEjD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;IAEpD,OAAO;QACL,IAAI,EAAE,iBAAiB,CAAC,MAAqB,CAAC;KAC/C,CAAA;AACH,CAAC;AAED,aAAa,CAAC,aAAa,GAAG;IAC5B;QACE,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,cAAc;QACpB,KAAK,EAAE,uBAAuB;KAC/B;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,gBAAgB;QACvB,QAAQ,EAAE;YACR,QAAQ,EAAE,MAAM;YAChB,eAAe,EAAE,IAAI;SACtB;QACD,MAAM,EAAE;YACN,IAAI,EAAE,GAAG;SACV;KACF;CACF,CAAA;AAED,aAAa,CAAC,IAAI,GAAG,iCAAiC,CAAA;AAEtD,+BAAY,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAA","sourcesContent":["import { InfluxDB, FluxTableMetaData } from '@influxdata/influxdb-client'\nimport { VM } from 'vm2'\n\nimport { ConnectionManager, Context, TaskRegistry } from '@things-factory/integration-base'\n\nconst debug = require('debug')('things-factory:influxdb-query')\n\ninterface InfluxData {\n  measurement: string\n  tags: { [key: string]: string }\n  fields: { [key: string]: number | string | boolean }\n  timestamp: string\n}\n\ninterface InfluxRaw {\n  _time: string\n  _start: string\n  _stop: string\n  _measurement: string\n  _field: string\n  _value: any\n  table: any\n  result: any\n  [tag: string]: string\n}\n\nfunction processInfluxData(raws: InfluxRaw[]): InfluxData[] {\n  var current: InfluxData\n  var result: { [time: string]: InfluxData } = {}\n\n  raws.forEach(raw => {\n    const { _time, _field, _value, _measurement, _start, _stop, result: _result, table, ...tags } = raw\n\n    result[_time] ||= {\n      timestamp: _time,\n      measurement: _measurement,\n      tags,\n      fields: {}\n    }\n\n    result[_time].fields[_field] = _value\n  })\n\n  return Object.values(result)\n}\n\nasync function influxdbQuery(step, { domain, user, data, variables, lng }: Context) {\n  const {\n    connection,\n    params: { organization, query }\n  } = step\n\n  const client = ConnectionManager.getConnectionInstanceByName(domain, connection) as InfluxDB\n  if (!client) {\n    debug(`no connection : ${connection}`)\n    throw new Error(`no connection : ${connection}`)\n  }\n\n  const vm = new VM({\n    sandbox: {\n      domain,\n      user,\n      lng,\n      data,\n      variables\n    }\n  })\n\n  const fluxQuery = vm.run('`' + query + '`')\n\n  const queryApi = client.getQueryApi(organization)\n\n  const result = await queryApi.collectRows(fluxQuery)\n\n  return {\n    data: processInfluxData(result as InfluxRaw[])\n  }\n}\n\ninfluxdbQuery.parameterSpec = [\n  {\n    type: 'string',\n    name: 'organization',\n    label: 'influxdb.organization'\n  },\n  {\n    type: 'textarea',\n    name: 'query',\n    label: 'influxdb.query',\n    property: {\n      language: 'text',\n      showLineNumbers: true\n    },\n    styles: {\n      flex: '1'\n    }\n  }\n]\n\ninfluxdbQuery.help = 'integration/task/influxdb-query'\n\nTaskRegistry.registerTaskHandler('influxdb-query', influxdbQuery)\n"]}
+{"version":3,"file":"influxdb-query.js","sourceRoot":"","sources":["../../../server/engine/task/influxdb-query.ts"],"names":[],"mappings":";;;AAAA,eAAY;AAEZ,uEAA2F;AAE3F,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,+BAA+B,CAAC,CAAA;AAqB/D,SAAS,iBAAiB,CAAC,IAAiB;IAC1C,MAAM,MAAM,GAAmC,EAAE,CAAA;IAEjD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACjB,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,KAAc,GAAG,EAAZ,IAAI,kBAAK,GAAG,EAA7F,mFAAuF,CAAM,CAAA;QAEnG,MAAM,CAAC,KAAK,MAAZ,MAAM,CAAC,KAAK,IAAM;YAChB,SAAS,EAAE,KAAK;YAChB,WAAW,EAAE,YAAY;YACzB,IAAI;YACJ,MAAM,EAAE,EAAE;SACX,EAAA;QAED,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAA;IACvC,CAAC,CAAC,CAAA;IAEF,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;AAC9B,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAW;IAChF,MAAM,EACJ,UAAU,EACV,MAAM,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,EAChC,GAAG,IAAI,CAAA;IAER,MAAM,MAAM,GAAG,oCAAiB,CAAC,2BAA2B,CAAC,MAAM,EAAE,UAAU,CAAa,CAAA;IAC5F,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,KAAK,CAAC,mBAAmB,UAAU,EAAE,CAAC,CAAA;QACtC,MAAM,IAAI,KAAK,CAAC,mBAAmB,UAAU,EAAE,CAAC,CAAA;IAClD,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC;QAClC,MAAM;QACN,IAAI;QACJ,GAAG;QACH,IAAI;QACJ,SAAS;QACT,OAAO;KACR,CAAC,CAAA;IAEF,IAAI,SAAS,CAAA;IACb,IAAI,CAAC;QACH,SAAS,GAAG,WAAW,CAAC,QAAQ,CAAC,GAAG,GAAG,KAAK,GAAG,GAAG,CAAC,CAAA;IACrD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,6BAA6B,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;IAC7D,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAA;IAEjD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;IAEpD,OAAO;QACL,IAAI,EAAE,iBAAiB,CAAC,MAAqB,CAAC;KAC/C,CAAA;AACH,CAAC;AAED,aAAa,CAAC,aAAa,GAAG;IAC5B;QACE,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,cAAc;QACpB,KAAK,EAAE,uBAAuB;KAC/B;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,gBAAgB;QACvB,QAAQ,EAAE;YACR,QAAQ,EAAE,MAAM;YAChB,eAAe,EAAE,IAAI;SACtB;QACD,MAAM,EAAE;YACN,IAAI,EAAE,GAAG;SACV;KACF;CACF,CAAA;AAED,aAAa,CAAC,IAAI,GAAG,iCAAiC,CAAA;AAEtD,+BAAY,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAA","sourcesContent":["import 'ses'\nimport { InfluxDB, FluxTableMetaData } from '@influxdata/influxdb-client'\nimport { ConnectionManager, Context, TaskRegistry } from '@things-factory/integration-base'\n\nconst debug = require('debug')('things-factory:influxdb-query')\n\ninterface InfluxData {\n  measurement: string\n  tags: { [key: string]: string }\n  fields: { [key: string]: number | string | boolean }\n  timestamp: string\n}\n\ninterface InfluxRaw {\n  _time: string\n  _start: string\n  _stop: string\n  _measurement: string\n  _field: string\n  _value: any\n  table: any\n  result: any\n  [tag: string]: string\n}\n\nfunction processInfluxData(raws: InfluxRaw[]): InfluxData[] {\n  const result: { [time: string]: InfluxData } = {}\n\n  raws.forEach(raw => {\n    const { _time, _field, _value, _measurement, _start, _stop, result: _result, table, ...tags } = raw\n\n    result[_time] ||= {\n      timestamp: _time,\n      measurement: _measurement,\n      tags,\n      fields: {}\n    }\n\n    result[_time].fields[_field] = _value\n  })\n\n  return Object.values(result)\n}\n\nasync function influxdbQuery(step, { domain, user, data, variables, lng }: Context) {\n  const {\n    connection,\n    params: { organization, query }\n  } = step\n\n  const client = ConnectionManager.getConnectionInstanceByName(domain, connection) as InfluxDB\n  if (!client) {\n    debug(`no connection : ${connection}`)\n    throw new Error(`no connection : ${connection}`)\n  }\n\n  const compartment = new Compartment({\n    domain,\n    user,\n    lng,\n    data,\n    variables,\n    console\n  })\n\n  let fluxQuery\n  try {\n    fluxQuery = compartment.evaluate('`' + query + '`')\n  } catch (err) {\n    throw new Error(`Failed to evaluate query: ${err.message}`)\n  }\n\n  const queryApi = client.getQueryApi(organization)\n\n  const result = await queryApi.collectRows(fluxQuery)\n\n  return {\n    data: processInfluxData(result as InfluxRaw[])\n  }\n}\n\ninfluxdbQuery.parameterSpec = [\n  {\n    type: 'string',\n    name: 'organization',\n    label: 'influxdb.organization'\n  },\n  {\n    type: 'textarea',\n    name: 'query',\n    label: 'influxdb.query',\n    property: {\n      language: 'text',\n      showLineNumbers: true\n    },\n    styles: {\n      flex: '1'\n    }\n  }\n]\n\ninfluxdbQuery.help = 'integration/task/influxdb-query'\n\nTaskRegistry.registerTaskHandler('influxdb-query', influxdbQuery)\n"]}