Merge branch 'release-2.1'

Dockerfile

@@ -1,19 +1,29 @@
-FROM node:16-alpine
+# ---- Base ----
+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
-COPY package*.json ./
-RUN npm install
+RUN npm install --only=production
 
-# remove development dependencies
-RUN npm prune --production
 
-# Install required apk-packages & delete cache
-RUN apk update && apk add tcpdump && rm -rf /var/cache/apk/*
+# ---- Release ----
+FROM base AS release
 
+# copy from build image
+COPY --from=dependencies /usr/src/app/ ./
 # Bundle app source
 COPY ./src/ .
 
-CMD ["npm", "run", "start"]
+CMD ["npm", "run", "start"]

build/docker-multiarch.sh

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

build/docker-ownarch.sh

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

src/streamHandler/PacketStreamFactory.js

@@ -47,8 +47,15 @@ class PacketStreamFactory extends Transform{
     }
 
     _transform(chunk, encoding, next){
-        let packet = new Packet();
+        if(!chunk){
+            const err = "Chunk was invalid!";
+            logger.error(err);
+            next(err);
+            return;
+        }
 
+        let packet = new Packet();
+        
         const lines = chunk.split("\n");
         const header = lines.splice(0, 1)[0];       // Grab first line, "lines" is now the payload
         packet = this._handleHeader(packet, header);