package-lock.json

@@ -10,8 +10,7 @@
       "license": "AGPL-3.0",
       "dependencies": {
         "@influxdata/influxdb-client": "^1.20.0",
-        "log4js": "^6.3.0",
+        "log4js": "^6.3.0"
-        "luxon": "^2.1.1"
       }
     },
     "node_modules/@influxdata/influxdb-client": {
@@ -89,14 +88,6 @@
         "node": ">=8.0"
       }
     },
-    "node_modules/luxon": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-2.1.1.tgz",
-      "integrity": "sha512-6VQVNw7+kQu3hL1ZH5GyOhnk8uZm21xS7XJ/6vDZaFNcb62dpFDKcH8TI5NkoZOdMRxr7af7aYGrJlE/Wv0i1w==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -196,11 +187,6 @@
         "streamroller": "^2.2.4"
       }
     },
-    "luxon": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-2.1.1.tgz",
-      "integrity": "sha512-6VQVNw7+kQu3hL1ZH5GyOhnk8uZm21xS7XJ/6vDZaFNcb62dpFDKcH8TI5NkoZOdMRxr7af7aYGrJlE/Wv0i1w=="
-    },
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",

package.json

@@ -15,7 +15,6 @@
   "license": "AGPL-3.0",
   "dependencies": {
     "@influxdata/influxdb-client": "^1.20.0",
-    "log4js": "^6.3.0",
+    "log4js": "^6.3.0"
-    "luxon": "^2.1.1"
   }
 }

src/dto/Packet.js

@@ -3,7 +3,6 @@ const PacketType = {
     ProbeRequest: 'ProbeRequest',
     ProbeResponse: 'ProbeResponse',
     Data: 'Data',
-    MoreData: 'MoreData',
     RequestToSend: 'RequestToSend',
     ClearToSend: 'ClearToSend',
     Acknowledgment: 'Acknowledgment',

src/streamHandler/PacketStreamFactory.js

@@ -1,96 +0,0 @@
-const logger = require.main.require("./helper/logger.js")("PacketStreamFactory");
-const { Transform } = require('stream');
-const { DateTime } = require("luxon");
-const { PacketType, Packet, PacketWithSSID, BeaconPacket, ProbeRequestPacket, ProbeResponsePacket } = require.main.require('./dto/Packet.js');
-
-const PACKET_TYPE_MAP = {
-    "Beacon":           PacketType.Beacon,
-    "Probe Request":    PacketType.ProbeRequest,
-    "Probe Response":   PacketType.ProbeResponse,
-    "Data":             PacketType.Data,
-    "More Data":        PacketType.MoreData,
-    "Request-To-Send":  PacketType.RequestToSend,
-    "Clear-To-Send":    PacketType.ClearToSend,
-    "Acknowledgment":   PacketType.Acknowledgment,
-    "BA":               PacketType.BlockAcknowledgment
-};
-const PACKET_TYPES_REGEX = Object.keys(PACKET_TYPE_MAP).join('|');
-
-/**
- * Read data from text-blocks and convert them to Packet
- */
-class PacketStreamFactory extends Transform{
-    matcher;
-    withholdLastBlock;
-    matchAllOnFlush;
-
-    constructor(){
-        super({
-            readableObjectMode: true,
-            writableObjectMode: true
-        });
-    }
-
-    _transform(chunk, encoding, next){
-        let packet = new Packet();
-
-        const lines = chunk.split('\n');
-        const header = lines.splice(0, 1)[0];       // Grab first line, 'lines' is now the payload
-        this._handleHeader(packet, header);
-        this._handlePayload(packet, lines);
-        
-        logger.debug(packet);
-
-        this.read();
-        next(null, packet);     // Get next chunk
-    }
-
-    _handleHeader(packet, data){
-        // Convert time to epoch-micros         Unfortunately luxon doesnt use micros, but millis as smallest time-unit requiring some "hacks"
-        packet.timestampMicros = DateTime.fromISO(data.slice(0, 12)).toSeconds() + data.slice(12, 15)/1000000;
-
-        packet.dataRate = Number(data.match(/(^| )([0-9]+(\.[0-9]+)?) Mb\/s($| )/i)[2]);
-        packet.frequency = Number(data.match(/(^| )([0-9]{4}) MHz($| )/i)[2]);
-
-        let signalStrMatch = data.match(/(^| )(-[0-9]{2})dBm Signal($| )/i);
-        if(signalStrMatch) packet.signal = Number(signalStrMatch[2]);
-        else packet.signal = -100;
-
-        let packetTypeStrMatch = data.match(new RegExp(`(^|.{80} )(${PACKET_TYPES_REGEX})($| )`, 'i'));
-        let packetTypeStr;
-        if(packetTypeStrMatch) {
-            packetTypeStr = packetTypeStrMatch[2];
-            packet.packetType = PACKET_TYPE_MAP[packetTypeStr];
-        }
-        else
-            packet.packetType = PacketType.Unknown;
-        
-        let srcMacMatch = data.match(/(^| )(SA|TA):(.{17})($| )/i);
-        if(srcMacMatch) packet.srcMac = srcMacMatch[3];
-
-        let dstMacMatch = data.match(/(^| )(DA|RA):(.{17})($| )/i);
-        if(dstMacMatch) packet.dstMac = dstMacMatch[3];
-        
-        let bssidMatch = data.match(/(^| )BSSID:(.{17})($| )/i)
-        if(bssidMatch) packet.bssid = bssidMatch[2];
-
-        // Cover special cases with more data
-        switch(packet.packetType){
-            case PacketType.Beacon:
-            case PacketType.ProbeRequest:
-            case PacketType.ProbeResponse:
-                packet = Object.assign(new PacketWithSSID(), packet);   // Create new, more specific, packet and copy old data over
-                packet.ssid = data.match(new RegExp(`(^| )${packetTypeStr} `+'\\'+`((.{0,32})`+'\\'+`)($| )`, 'i'))[2];
-                break;
-        }
-    }
-
-    _handlePayload(packet, data){
-        
-    }
-}
-
-// Specify exports
-module.exports = {
-    PacketStreamFactory
-};

src/streamHandler/RegexBlockStream.js

@@ -1,4 +1,3 @@
-const logger = require.main.require("./helper/logger.js")("RegexBlockStream");
 const { Transform } = require('stream')
 
 /**
@@ -23,19 +22,20 @@ class RegexBlockStream extends Transform{
         this.matcher = matcher;
         this.withholdLastBlock = withholdLastBlock;
         this.matchAllOnFlush = matchAllOnFlush;
+
+        this._buffer = "";
     }
 
     _transform(chunk, encoding, next){
-        chunk = this.readableBuffer.length? this.readableBuffer.join() + chunk: chunk;     // Add previous buffer to current chunk
+        chunk = this._buffer + chunk;     // Add previous buffer to current chunk
-        this.readableBuffer.length && this.readableBuffer.clear();      // Clear buffer once we read it
 
         let matches = chunk.match(this.matcher);    // Match
         if(matches){
             if(this.withholdLastBlock) matches.pop();       // Remove last if we want to withhold it
-            chunk = this._writeMatches(matches, chunk);
+            chunk = this._writeMatches(chunk, matches);
         }
         
-        this.readableBuffer.push(chunk);   // Store remaining data in buffer
+        this._buffer = chunk;   // Store remaining data in buffer
         next();     // Get next chunk
     }
 
@@ -51,9 +51,8 @@ class RegexBlockStream extends Transform{
 
     _flush(next){
         if(matchAllOnFlush){    // When requested, we'll match one last time over the remaining buffer
-            let chunk = this.readableBuffer.toString();
+            let matches = this._buffer.match(this.matcher);    // Match remaining buffer
-            let matches = chunk.match(this.matcher);    // Match remaining buffer
+            _writeMatches(this._buffer);    // Write matches including last element
-            _writeMatches(matches);    // Write matches including last element
         }
         
         next();     // Tell system we are done