Remove screenshot-section, it will be readded later

README.md

@@ -27,12 +27,11 @@ Table of contents
     - [3.3. Metric-Details](#33-metric-details)
     - [3.4. Tag-Overview](#34-tag-overview)
     - [3.5. Tag-Details](#35-tag-details)
-- [4. Screenshots](#4-screenshots)
+- [4. Potential Issues](#4-potential-issues)
-- [5. Potential Issues](#5-potential-issues)
+    - [4.1. Channel/Frequency](#41-channelfrequency)
-    - [5.1. Channel/Frequency](#51-channelfrequency)
+    - [4.2. Technology](#42-technology)
-    - [5.2. Technology](#52-technology)
+    - [4.3. Data protection](#43-data-protection)
-    - [5.3. Data protection](#53-data-protection)
+    - [4.4. Ethical](#44-ethical)
-    - [5.4. Ethical](#54-ethical)
 <!-- /TOC -->
 <br>
 
@@ -308,13 +307,9 @@ Unknown             | -     | Unknown packets not identified into above types
 
 <br>
 
-# 4. Screenshots
+# 4. Potential Issues
 
-<br>
+## 4.1. Channel/Frequency
-
-# 5. Potential Issues
-
-## 5.1. Channel/Frequency
 
 The System can only monitor one channel at a time which might not be enough cover,
 to combat this, more Interfaces and Systems can be deployed.
@@ -323,14 +318,14 @@ This is not entirely unproblematic, as the system cannot currently prevent packa
 
 <br>
 
-## 5.2. Technology
+## 4.2. Technology
 
 Mismatches between sender and receiver-technologies (e.g. MIMO or HT) can cause packets not being logged at all.
 Though this should only be a problem for data-packets.
 
 <br>
 
-## 5.3. Data protection
+## 4.3. Data protection
 
 Because the system collects any data, this can be problematic, specially in countries with strong data-protection laws.
 
@@ -338,7 +333,7 @@ A wifi MAC address is likely to be considered as information of an identifiable
 
 <br>
 
-## 5.4. Ethical
+## 4.4. Ethical
 
 The large-scale collection of data for behavioural or movement analysis, especially without consent of the data subject, is highly controversial.
 

src/main.js

@@ -14,8 +14,6 @@ const { RegexBlockStream } = require("./streamHandler/RegexBlockStream.js");
 const { PacketStreamFactory } = require("./streamHandler/PacketStreamFactory.js");
 const { PacketInfluxPointFactory } = require("./streamHandler/PacketInfluxPointFactory.js");
 const { InfluxPointWriter } = require("./streamHandler/InfluxPointWriter.js");
-const { InfluxDbLineProtocolWriter } = require("./streamHandler/InfluxDbLineProtocolWriter.js");
-const { InfluxPointToLineProtoStream } = require("./streamHandler/InfluxPointToLineProtoStream.js");
 
 const userHelper = require("./helper/userHelper.js");
 
@@ -27,89 +25,43 @@ const env = process.env;
     env.LOGLEVEL            ??= "INFO";
     env.WIFI_INTERFACE      ??= "wlan0";
     env.HOSTNAME            ??= Os.hostname();
-
-    env.USE_INFLUXDB_LINEPROTOCOL   ??= false;
 }
 // Required vars
-let errorMsg = requireEnvVars(
+let errorMsg = requireEnvVars([
-    env.USE_INFLUXDB_LINEPROTOCOL? [    // When lineprotocol is enabled, we need host and port
+    "INFLUX_URL", "INFLUX_TOKEN",
-        "INFLUXDB_LINEPROTOCOL_HOST", "INFLUXDB_LINEPROTOCOL_PORT",
+    "INFLUX_ORG", "INFLUX_BUCKET"
-    ] : [       // When its disabled, influxdb-data
+]);
-        "INFLUX_URL", "INFLUX_TOKEN",
-        "INFLUX_ORG", "INFLUX_BUCKET"
-    ]);
 if(errorMsg){
     logger.fatal(errorMsg);
     exit(1);
 }
 
 (async function() {
-    let pointWriter;
+    logger.info("Setup Influx..");
-    if(!env.USE_INFLUXDB_LINEPROTOCOL){
+    const influxDb = new InfluxDB({url: env.INFLUX_URL, token: env.INFLUX_TOKEN});
-        logger.info("Setup Influx..");
-        const influxDb = new InfluxDB({url: env.INFLUX_URL, token: env.INFLUX_TOKEN});
 
-        await InfluxChecks.checkHealth(influxDb)
+    await InfluxChecks.checkHealth(influxDb)
-            .then((res) => {return InfluxChecks.checkBucket(influxDb, {
+        .then((res) => {return InfluxChecks.checkBucket(influxDb, {
-                org: env.INFLUX_ORG,
+            org: env.INFLUX_ORG,
-                name: env.INFLUX_BUCKET
+            name: env.INFLUX_BUCKET
-            });})
+        });})
-            .then((res) => {return InfluxChecks.checkWriteApi(influxDb, {
+        .then((res) => {return InfluxChecks.checkWriteApi(influxDb, {
-                org: env.INFLUX_ORG,
+            org: env.INFLUX_ORG,
-                bucket: env.INFLUX_BUCKET
+            bucket: env.INFLUX_BUCKET
-            });})
+        });})
-            .catch((err) => {
+        .catch((err) => {
-                if(err) {
+            if(err) {
-                    logger.error("Error whilst checking influx:");
+                logger.error("Error whilst checking influx:");
-                    logger.error(err);
+                logger.error(err);
-                }
+            }
-                logger.fatal("Setup influx failed!");
+            logger.fatal("Setup influx failed!");
-                exit(1);
+            exit(1);
-            });
+        });
 
-        logger.debug("Get WriteApi & set default-hostname to", `'${env.HOSTNAME}'`);
+    logger.debug("Get WriteApi & set default-hostname to", `'${env.HOSTNAME}'`);
-        const influxWriteApi = influxDb.getWriteApi(env.INFLUX_ORG, env.INFLUX_BUCKET, "us");
+    const influxWriteApi = influxDb.getWriteApi(env.INFLUX_ORG, env.INFLUX_BUCKET, "us");
-        //influxWriteApi.useDefaultTags({"hostname": env.HOSTNAME});
+    //influxWriteApi.useDefaultTags({"hostname": env.HOSTNAME});
-
+    logger.info("Influx ok");
-        pointWriter = new InfluxPointWriter(influxWriteApi);
-
-        logger.info("Influx ok");
-    }
-    else {
-        logger.info("Setup Influxdb-LineProtocol..");
-
-        let lineProtocolWriter = new InfluxDbLineProtocolWriter(env.INFLUXDB_LINEPROTOCOL_HOST, env.INFLUXDB_LINEPROTOCOL_PORT);
-
-        logger.debug("Create PointToLineProto and pipe to LineProtocolWriter");
-        pointWriter = new InfluxPointToLineProtoStream();
-        pointWriter
-            .setEncoding("utf8")
-            .pipe(lineProtocolWriter);
-        
-        logger.debug("Waiting for connection..");
-        await new Promise((resolve, reject) => {
-            lineProtocolWriter.once("connect", () => {
-                resolve();
-            });
-            lineProtocolWriter.once("error", (err) => {
-                reject(err);
-            });
-            setTimeout(() => {  // After timeout, reject promise
-                reject("Timeout whilst waiting to connect");
-            }, 6500);
-        })
-            .then(() => {
-                logger.info("Influxdb-LineProtocol ok");
-            })
-            .catch((err) => {
-                if(err) {
-                    logger.error("Error whilst checking Influxdb-LineProtocol:");
-                    logger.error(err);
-                }
-                logger.fatal("Setup Influxdb-LineProtocol failed!");
-                exit(1);
-            });
-    }
 
     logger.info("Starting tcpdump..");
     const TCPDUMP_BASECMD = "tcpdump -vvv -e -n -X -s0 -i";
@@ -120,12 +72,13 @@ if(errorMsg){
     let regexBlockStream = new RegexBlockStream(/^\d{2}:\d{2}:\d{2}.\d{6}.*(\n( {4,8}|\t\t?).*)+\n/gm);
     let packetStreamFactory = new PacketStreamFactory();
     let packetInfluxPointFactory = new PacketInfluxPointFactory();
+    let influxPointWriter = new InfluxPointWriter(influxWriteApi);
     proc.stdout
         .setEncoding("utf8")
         .pipe(regexBlockStream)
         .pipe(packetStreamFactory)
         .pipe(packetInfluxPointFactory)
-        .pipe(pointWriter);
+        .pipe(influxPointWriter);
 
     logger.debug("Attaching error-logger..");
     const loggerTcpdump = logFactory("tcpdump");

src/streamHandler/InfluxDbLineProtocolWriter.js

@@ -1,72 +0,0 @@
-const logger = require.main.require("./helper/logger.js")("InfluxDbLineProtocolWriter");
-const net = require("net");
-
-/**
- * Get points and write them into influx
- */
-class InfluxDbLineProtocolWriter extends net.Socket{
-    /**
-     * 
-     * @param {string} host Host of line-server
-     * @param {string} port Port of line-server
-     * @param {object} options Options for further configuration
-     */
-    constructor(host, port, options = {}) {
-        super();
-
-        this._host = host;
-        this._port = port;
-
-        // options defaults
-        options.autoConnect     ??= true;
-        options.timeout         ??= 5000;
-        options.autoReconnect   ??= true;
-        options.autoReconnectBackoffTime    ??= 3000;
-        this._options = options;
-
-        this._isConnected = false;
-
-        super.setKeepAlive(true, 5000);
-
-        // Register auto-Reconnect if enabled
-        if(this._options.autoReconnect){
-            this.on("connect", () => {
-                logger.debug("Connection established!");
-                this._isConnected = true;
-
-                if(this._autoReconnectTimeout)
-                    clearInterval(this._autoReconnectTimeout);
-                this._autoReconnectTimeout = 0;
-            });
-
-            this.on("error", (err) => {
-                logger.error(err.code, "TCP ERROR");
-                this._isConnected = false;
-                
-                if(!this._autoReconnectTimeout)
-                    this._autoReconnectTimeout = setInterval(() => {
-                        this.connect();
-                    },
-                    this._options.autoReconnectBackoffTime);
-            });
-        }
-
-        // Autoconnect if requested
-        if(this._options.autoConnect) this.connect();
-    }
-
-    get host(){ return this._host; }
-    get port(){ return this._port; }
-
-    get isConnected(){ return this._isConnected; }
-
-    connect(){
-        logger.debug("Connecting..");
-        super.connect(this._port, this._host);
-    }
-}
-
-// Specify exports
-module.exports = {
-    InfluxDbLineProtocolWriter
-};

src/streamHandler/InfluxPointToLineProtoStream.js

@@ -1,22 +0,0 @@
-const logger = require.main.require("./helper/logger.js")("InfluxPointToLineProtoStream");
-const { Transform } = require("stream");
-
-/**
- * Get points and converts them to Line-protocol
- */
-class InfluxPointToLineProtoStream extends Transform{
-    constructor(){
-        super({
-            writableObjectMode: true
-        });
-    }
-
-    _transform(point, encoding, next){
-        next(null, point.toLineProtocol() +"\n");
-    }
-}
-
-// Specify exports
-module.exports = {
-    InfluxPointToLineProtoStream
-};