Compare commits

..

4 Commits

Author SHA1 Message Date
dcd0ce8111 Added lib string-argv to extract bin and args from cmd 2021-11-25 18:32:43 +01:00
1a9ced0bb8 Changed exec to only wrap spawn 2021-11-25 18:32:07 +01:00
d77e3f8844 Fixed naming 2021-11-25 18:30:50 +01:00
e715cc1cac Removed unused env-vars for now 2021-11-25 13:59:45 +01:00
5 changed files with 23 additions and 15 deletions

16
package-lock.json generated
View File

@ -11,7 +11,8 @@
"dependencies": { "dependencies": {
"@influxdata/influxdb-client": "^1.20.0", "@influxdata/influxdb-client": "^1.20.0",
"log4js": "^6.3.0", "log4js": "^6.3.0",
"luxon": "^2.1.1" "luxon": "^2.1.1",
"string-argv": "^0.3.1"
} }
}, },
"node_modules/@influxdata/influxdb-client": { "node_modules/@influxdata/influxdb-client": {
@ -128,6 +129,14 @@
"node": ">=4.0" "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": { "node_modules/universalify": {
"version": "0.1.2", "version": "0.1.2",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@ -228,6 +237,11 @@
} }
} }
}, },
"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": { "universalify": {
"version": "0.1.2", "version": "0.1.2",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",

View File

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

View File

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

View File

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

View File

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