Merge branch 'release-1.1'

Dockerfile

@@ -7,11 +7,8 @@ WORKDIR /usr/src/app
 COPY package*.json ./
 RUN npm install
 
-# remove development dependencies
+RUN apk update
-RUN npm prune --production
+RUN apk add tcpdump
-
-# Install required apk-packages & delete cache
-RUN apk update && apk add tcpdump && rm -rf /var/cache/apk/*
 
 # Bundle app source
 COPY ./src/ .

src/dto/Packet.js

@@ -1,20 +1,20 @@
 const PacketType = {
-    Beacon: "Beacon",
+    Beacon: 'Beacon',
-    ProbeRequest: "ProbeRequest",
+    ProbeRequest: 'ProbeRequest',
-    ProbeResponse: "ProbeResponse",
+    ProbeResponse: 'ProbeResponse',
-    Data: "Data",
+    Data: 'Data',
-    RequestToSend: "RequestToSend",
+    RequestToSend: 'RequestToSend',
-    ClearToSend: "ClearToSend",
+    ClearToSend: 'ClearToSend',
-    Acknowledgment: "Acknowledgment",
+    Acknowledgment: 'Acknowledgment',
-    BlockAcknowledgment: "BlockAcknowledgment",
+    BlockAcknowledgment: 'BlockAcknowledgment',
-    NoData: "NoData",
+    NoData: 'NoData',
-    Authentication: "Authentication",
+    Authentication: 'Authentication',
-    AssociationRequest: "AssociationRequest",
+    AssociationRequest: 'AssociationRequest',
-    AssociationResponse: "AssociationResponse",
+    AssociationResponse: 'AssociationResponse',
-    Disassociation: "Disassociation",
+    Disassociation: 'Disassociation',
-    Handshake: "Handshake",
+    Handshake: 'Handshake',
-    Unknown: "Unknown"
+    Unknown: 'Unknown'
-};
+}
 
 const FlagType = {
     MoreFragments: "MoreFragments",
@@ -23,7 +23,7 @@ const FlagType = {
     MoreData: "MoreData",
     Protected: "Protected",
     Order: "Order"
-};
+}
 
 class Packet{
     timestampMicros;
@@ -58,10 +58,10 @@ class ProbeRequestPacket extends PacketWithSSID{}
 class ProbeResponsePacket extends PacketWithSSID{}
 
 const AuthenticationType = {
-    OpenSystem_1: "OpenSystem_1",
+    OpenSystem_1: 'OpenSystem_1',
-    OpenSystem_2: "OpenSystem_2",
+    OpenSystem_2: 'OpenSystem_2',
-    Unknown: "Unknown",
+    Unknown: 'Unknown',
-};
+}
 class AuthenticationPacket extends Packet{
     authenticationType;
 }
@@ -77,11 +77,11 @@ class DisassociationPacket extends Packet{
 
 
 const HandshakeStage = {
-    1: "1",
+    1: '1',
-    2: "2",
+    2: '2',
-    3: "3",
+    3: '3',
-    4: "4"
+    4: '4'
-};
+}
 class HandshakePacket extends Packet{
     handshakeStage;
 }

src/main.js

@@ -5,7 +5,6 @@ const logger = logFactory("main");
 const { requireEnvVars } = require("./helper/env.js");
 const { exit } = require("process");
 const { exec } = require("./helper/exec.js");
-const Os = require("os");
 
 const { InfluxDB } = require("@influxdata/influxdb-client");
 const InfluxChecks = require("./helper/influx-checks.js");
@@ -24,7 +23,6 @@ const env = process.env;
 {
     env.LOGLEVEL            ??= "INFO";
     env.WIFI_INTERFACE      ??= "wlan0";
-    env.HOSTNAME            ??= Os.hostname();
 }
 // Required vars
 let errorMsg = requireEnvVars([
@@ -58,9 +56,6 @@ if(errorMsg){
             exit(1);
         });
 
-    logger.debug("Get WriteApi & set default-hostname to", `'${env.HOSTNAME}'`);
-    const influxWriteApi = influxDb.getWriteApi(env.INFLUX_ORG, env.INFLUX_BUCKET, "us");
-    //influxWriteApi.useDefaultTags({"hostname": env.HOSTNAME});
     logger.info("Influx ok");
 
     logger.info("Starting tcpdump..");
@@ -72,7 +67,7 @@ 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);
+    let influxPointWriter = new InfluxPointWriter(influxDb, env.INFLUX_ORG, env.INFLUX_BUCKET);
     proc.stdout
         .setEncoding("utf8")
         .pipe(regexBlockStream)

src/streamHandler/InfluxPointWriter.js

@@ -1,6 +1,6 @@
 const logger = require.main.require("./helper/logger.js")("InfluxPointWriter");
 const { Writable } = require("stream");
-const { WriteApi } = require("@influxdata/influxdb-client");
+const {InfluxDB, Point, HttpError} = require("@influxdata/influxdb-client");
 
 /**
  * Get points and write them into influx
@@ -8,13 +8,16 @@ const { WriteApi } = require("@influxdata/influxdb-client");
 class InfluxPointWriter extends Writable{
     /**
      * 
-     * @param {WriteApi} writeApi WriteAPI from InfluxDB instance
+     * @param {InfluxDB} influxDb InfluxDb
+     * @param {string} org Organization to use
+     * @param {string} bucket Bucket to use
+     * @param {Partial<WriteOptions>} options Options for WriteApi
      */
-    constructor(writeApi){
+    constructor(influxDb, org, bucket, options){
         super({
             objectMode: true
         });
-        this._api = writeApi;
+        this._api = influxDb.getWriteApi(org, bucket, "us", options);
     }
 
     _write(point, encoding, next){

src/streamHandler/PacketInfluxPointFactory.js

@@ -14,14 +14,14 @@ const TAG_LIST = [
 
 /** Measurement-name and corresponding field-key */
 const MEASUREMENT_MAP = new Map([
-    ["rfmon_signal_dbm", "signal"],
+    ["Signal", "signal"],
-    ["rfmon_payloadsize_bytes", "payloadSize"],
+    ["PayloadSize", "payloadSize"],
-    ["rfmon_datarate_bytes", "dataRate"],
+    ["DataRate", "dataRate"],
-    ["rfmon_ssid_names", "ssid"],
+    ["SSID", "ssid"],
-    ["rfmon_authenticationtype_info", "authenticationType"],
+    ["AuthenticationType", "authenticationType"],
-    ["rfmon_associationsuccess_bools", "associationIsSuccessful"],
+    ["AssociationSuccess", "associationIsSuccessful"],
-    ["rfmon_disassociationreason_info", "disassociationReason"],
+    ["DisassociationReason", "disassociationReason"],
-    ["rfmon_handshakestage_info", "handshakeStage"],
+    ["HandshakeStage", "handshakeStage"],
 ]);
 
 
@@ -66,10 +66,7 @@ function tagObjectRecursively(point, tag, field, suffix = ""){
             tagObjectRecursively(point, tag, value, `_${key}${suffix}`);
         });
     }
-    else {
+    else point.tag(tag+suffix, field);
-        const name = (tag+suffix).toLowerCase();
-        point.tag(name, field);
-    }
 }
 
 /** Mapping for type -> field-method */