Compare commits

..

No commits in common. "dcd0ce8111613025aa3ae9152a62e7c6cff5d1c6" and "cf1b300f6a375bff6e4a865034a91ee02c2e6261" have entirely different histories.

5 changed files with 15 additions and 23 deletions

16
package-lock.json generated
View File

@ -11,8 +11,7 @@
"dependencies": {
"@influxdata/influxdb-client": "^1.20.0",
"log4js": "^6.3.0",
"luxon": "^2.1.1",
"string-argv": "^0.3.1"
"luxon": "^2.1.1"
}
},
"node_modules/@influxdata/influxdb-client": {
@ -129,14 +128,6 @@
"node": ">=4.0"
}
},
"node_modules/string-argv": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
"integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==",
"engines": {
"node": ">=0.6.19"
}
},
"node_modules/universalify": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@ -237,11 +228,6 @@
}
}
},
"string-argv": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
"integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg=="
},
"universalify": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",

View File

@ -16,7 +16,6 @@
"dependencies": {
"@influxdata/influxdb-client": "^1.20.0",
"log4js": "^6.3.0",
"luxon": "^2.1.1",
"string-argv": "^0.3.1"
"luxon": "^2.1.1"
}
}

View File

@ -1,15 +1,20 @@
const logger = require("./logger.js")("exec");
const { spawn } = require("child_process");
const { parseArgsStringToArgv } = require('string-argv');
function exec(cmd, options){
const [bin, ...args] = parseArgsStringToArgv(cmd);
function exec(cmd, stdout, stderr, exit_handler){
const [bin, ...args] = cmd.split(' ')
logger.addContext("binary", "bin");
logger.debug(`Spawn process '${cmd}'`);
return spawn(bin, args, options);
let proc = spawn(bin, args);
return {
"process": proc,
"stdout": proc.stdout,
"stderr": proc.stderr
}
}
// Specify exports

View File

@ -9,6 +9,8 @@ const env = process.env;
{
env.LOGLEVEL ??= "INFO";
env.WIFI_INTERFACE ??= "wlan0";
env.WIFI_CHANNEL ??= [1,6,11];
env.WIFI_CHANNEL_TIME ??= 1;
}
// Required vars
let errorMsg = requireEnvVars([

View File

@ -1,11 +1,11 @@
const logger = require.main.require("./helper/logger.js")("InfluxPointWriter");
const { Writable } = require('stream');
const { Writeable } = require('stream');
const {InfluxDB, Point, HttpError} = require('@influxdata/influxdb-client')
/**
* Get points and write them into influx
*/
class InfluxPointWriter extends Writable{
class InfluxPointWriter extends Writeable{
/**
*
* @param {string} url Influx-Url