Merge branch 'dev'

Dockerfile

@@ -1,28 +1,18 @@
-# ---- Base ----
+FROM node:16-alpine
-FROM alpine:3 AS base
 
 # Create app directory
 WORKDIR /usr/src/app
 
-# Copy project file
-COPY package.json .
-
-# Install required apk-packages
-RUN apk add --no-cache nodejs npm tcpdump
-
-
-# ---- Dependencies ----
-FROM base AS dependencies
-
 # Install app dependencies
-RUN npm install --only=production
+COPY package*.json ./
+RUN npm install
 
+# remove development dependencies
+RUN npm prune --production
 
-# ---- Release ----
+# Install required apk-packages & delete cache
-FROM base AS release
+RUN apk update && apk add tcpdump && rm -rf /var/cache/apk/*
 
-# copy from build image
-COPY --from=dependencies /usr/src/app/ ./
 # Bundle app source
 COPY ./src/ .
 

build/docker-multiarch.sh

@@ -1,9 +0,0 @@
-TAG="ruakij/rfmon-to-influx"
-PLATFORM="linux/amd64,linux/arm64/v8,linux/arm/v7"
-EXTRA_ARGS="$@"
-
-docker buildx build \
---platform $PLATFORM \
---tag $TAG \
-$EXTRA_ARGS \
-.

build/docker-ownarch.sh

@@ -1,7 +0,0 @@
-TAG="ruakij/rfmon-to-influx"
-EXTRA_ARGS="$@"
-
-docker build \
---tag $TAG \
-$EXTRA_ARGS \
-.

src/streamHandler/PacketStreamFactory.js

@@ -47,6 +47,13 @@ class PacketStreamFactory extends Transform{
     }
 
     _transform(chunk, encoding, next){
+        if(!chunk){
+            const err = "Chunk was invalid!";
+            logger.error(err);
+            next(err);
+            return;
+        }
+
         let packet = new Packet();
         
         const lines = chunk.split("\n");