From 43cff2fabe18981a42f09a88f6b7c0843f3fa008 Mon Sep 17 00:00:00 2001
From: Jan Stabenow <hello@jan-stabenow.de>
Date: Wed, 23 Aug 2017 13:49:32 +0200
Subject: [PATCH 01/62] ADD v0.1.0

known bug: nginx init-check does not work
---
 CHANGELOG.md                         |  11 ++
 Dockerfile                           | 139 ++++---------------------
 Dockerfile-armhf                     |  38 +++++++
 Dockerfile_aarch64                   | 150 ---------------------------
 Dockerfile_armv6l                    | 148 --------------------------
 Dockerfile_armv7l                    | 148 --------------------------
 README.md                            |  29 ++----
 bower.json                           |  18 ++--
 conf/live.json                       |   4 +-
 conf/nginx.conf                      |   5 +
 package.json                         |  55 +++++-----
 run.sh                               |   2 +-
 src/classes/Restreamer.js            |   4 +-
 src/webserver/public/index.dev.html  |   2 +-
 src/webserver/public/index.prod.html |   2 +-
 15 files changed, 132 insertions(+), 623 deletions(-)
 create mode 100644 Dockerfile-armhf
 delete mode 100644 Dockerfile_aarch64
 delete mode 100644 Dockerfile_armv6l
 delete mode 100644 Dockerfile_armv7l

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b4ca708..4dafb732 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## Changes from 0.1.0-rc7 to 0.1.0
+
+* switched to Alpine-Linux
+* switched Mutlistage Dockerfiles for AMD64 and ARMHF (req. Docker 17.x)
+  * https://hub.docker.com/r/datarhei/ffmpeg/
+  * https://hub.docker.com/r/datarhei/nginx-rtmp/
+* updated to FFmpeg 3.1.10
+* updated NPM/Bower packages
+* fixed public-ip problem
+* disabled FFmpeg "error-detection" for a vlc-like feeling
+
 ## Changes from 0.1.0-rc7 to 0.1.0-rc.7.1
 
 * fixed Kitematic auth failure
diff --git a/Dockerfile b/Dockerfile
index ced5a8c9..a12eeeb7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,133 +1,38 @@
-FROM node:5.9.0-slim
+FROM datarhei/nginx-rtmp:1.9.9-1.1.7.10 as builder
 
-MAINTAINER datarhei <info@datarhei.org>
-
-ENV FFMPEG_VERSION=2.8.6 \
-    YASM_VERSION=1.3.0 \
-    LAME_VERSION=3_99_5 \
-    NGINX_VERSION=1.9.9 \
-    NGINX_RTMP_VERSION=1.1.7.10 \
-
-    SRC="/usr/local"
-
-ENV LD_LIBRARY_PATH="${SRC}/lib" \
-    PKG_CONFIG_PATH="${SRC}/lib/pkgconfig" \
-
-    BUILDDEPS="autoconf automake gcc g++ libtool make nasm zlib1g-dev libssl-dev xz-utils cmake build-essential libpcre3-dev"
-
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes curl git libpcre3 tar perl ca-certificates ${BUILDDEPS} && \
-    rm -rf /var/lib/apt/lists/* && \
-
-    # yasm
-    DIR="$(mktemp -d)" && cd "${DIR}" && \
-    curl -LOks "https://www.tortall.net/projects/yasm/releases/yasm-${YASM_VERSION}.tar.gz" && \
-    tar xzvf "yasm-${YASM_VERSION}.tar.gz" && \
-    cd "yasm-${YASM_VERSION}" && \
-    ./configure \
-        --prefix="${SRC}" \
-        --bindir="${SRC}/bin" && \
-    make -j"$(nproc)" && \
-    make install && \
-    make distclean && \
-    rm -rf "${DIR}" && \
-
-    # x264
-    DIR="$(mktemp -d)" && cd "${DIR}" && \
-    git clone --depth 1 "git://git.videolan.org/x264" && \
-    cd x264 && \
-    ./configure \
-        --prefix="${SRC}" \
-        --bindir="${SRC}/bin" \
-        --enable-static \
-        --disable-cli && \
-    make -j"$(nproc)" && \
-    make install && \
-    make distclean && \
-    rm -rf "${DIR}" && \
+FROM node:8.1-alpine
 
-    # libmp3lame
-    DIR="$(mktemp -d)" && cd "${DIR}" && \
-    curl -LOks "https://github.com/rbrito/lame/archive/RELEASE__${LAME_VERSION}.tar.gz" && \
-    tar xzvf "RELEASE__${LAME_VERSION}.tar.gz" && \
-    cd "lame-RELEASE__${LAME_VERSION}" && \
-    ./configure \
-        --prefix="${SRC}" \
-        --bindir="${SRC}/bin" \
-        --enable-nasm \
-        --disable-shared && \
-    make -j"$(nproc)" && \
-    make install && \
-    make distclean && \
-    rm -rf "${DIR}" && \
-
-    # ffmpeg
-    # patch: andrew-shulgin Ignore invalid sprop-parameter-sets missing PPS
-    DIR="$(mktemp -d)" && cd "${DIR}" && \
-    curl -LOks "https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz" && \
-    tar xzvf "ffmpeg-${FFMPEG_VERSION}.tar.gz" && \
-    cd "ffmpeg-${FFMPEG_VERSION}" && \
-    curl -Lks "https://github.com/FFmpeg/FFmpeg/commit/1c7e2cf9d33968375ee4025d2279c937e147dae2.patch" | patch -p1 && \
-    ./configure \
-        --prefix="${SRC}" \
-        --bindir="${SRC}/bin" \
-        --extra-cflags="-I${SRC}/include" \
-        --extra-ldflags="-L${SRC}/lib" \
-        --extra-libs=-ldl \
-        --enable-nonfree \
-        --enable-gpl \
-        --enable-version3 \
-        --enable-avresample \
-        --enable-libmp3lame \
-        --enable-libx264 \
-        --enable-openssl \
-        --enable-postproc \
-        --enable-small \
-        --disable-debug \
-        --disable-doc \
-        --disable-ffserver && \
-    make -j"$(nproc)" && \
-    make install && \
-    make distclean && \
-    hash -r && \
-    cd tools && \
-    make qt-faststart && \
-    cp qt-faststart "${SRC}/bin" && \
-    rm -rf "${DIR}" && \
-    echo "${SRC}/lib" > "/etc/ld.so.conf.d/libc.conf" && \
-    ffmpeg -buildconf && \
+MAINTAINER datarhei <info@datarhei.org>
 
-    # nginx-rtmp
-    DIR="$(mktemp -d)" && cd "${DIR}" && \
-    curl -LOks "https://github.com/nginx/nginx/archive/release-${NGINX_VERSION}.tar.gz" && \
-    tar xzvf "release-${NGINX_VERSION}.tar.gz" && \
-    curl -LOks "https://github.com/sergey-dryabzhinsky/nginx-rtmp-module/archive/v${NGINX_RTMP_VERSION}.tar.gz" && \
-    tar xzvf "v${NGINX_RTMP_VERSION}.tar.gz" && \
-    cd "nginx-release-${NGINX_VERSION}" && \
-    auto/configure \
-        --with-http_ssl_module \
-        --add-module="../nginx-rtmp-module-${NGINX_RTMP_VERSION}" && \
-    make -j"$(nproc)" && \
-    make install && \
-    rm -rf "${DIR}" && \
+ENV RS_USERNAME=admin \
+    RS_PASSWORD=datarhei \
+    SRC=/usr/local \
+    LD_LIBRARY_PATH=/usr/local/lib \
+    PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
 
-    apt-get purge -y --auto-remove ${BUILDDEPS} && \
-    rm -rf /tmp/*
+COPY --from=builder /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg
+COPY --from=builder /usr/local/bin/ffprobe /usr/local/bin/ffprobe
+COPY --from=builder /usr/local/lib /usr/local/lib
+COPY --from=builder /usr/local/nginx /usr/local/nginx
 
 COPY . /restreamer
 WORKDIR /restreamer
 
-RUN npm install -g bower grunt grunt-cli nodemon public-ip eslint && \
+RUN apk add --no-cache --update git libssl1.0 pcre && \
+    ffmpeg -buildconf && \
+    npm install -g bower grunt grunt-cli nodemon eslint && \
     npm install && \
     grunt build && \
+    bower cache clean --allow-root && \
+    npm uninstall -g bower grunt grunt-cli nodemon eslint && \
     npm prune --production && \
-    npm cache clean && \
-    bower cache clean --allow-root
-
-ENV RS_USERNAME admin
-ENV RS_PASSWORD datarhei
+    npm cache clean --force && \
+    apk del --no-cache --purge git && \
+    rm -rf /var/cache/apk/* && \
+    rm -rf /tmp/*
 
 EXPOSE 8080
+
 VOLUME ["/restreamer/db"]
 
 CMD ["./run.sh"]
diff --git a/Dockerfile-armhf b/Dockerfile-armhf
new file mode 100644
index 00000000..f4ec77e3
--- /dev/null
+++ b/Dockerfile-armhf
@@ -0,0 +1,38 @@
+FROM datarhei/nginx-rtmp:1.9.9-1.1.7.10-armhf as builder
+
+FROM resin/raspberry-pi-alpine-node:8.1-slim
+
+MAINTAINER datarhei <info@datarhei.org>
+
+ENV RS_USERNAME=admin \
+    RS_PASSWORD=datarhei \
+    SRC="/usr/local" \
+    LD_LIBRARY_PATH="/usr/local/lib" \
+    PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
+
+COPY --from=builder /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg
+COPY --from=builder /usr/local/bin/ffprobe /usr/local/bin/ffprobe
+COPY --from=builder /usr/local/lib /usr/local/lib
+COPY --from=builder /usr/local/nginx /usr/local/nginx
+
+COPY . /restreamer
+WORKDIR /restreamer
+
+RUN apk add --no-cache --update git libssl1.0 pcre && \
+    ffmpeg -buildconf && \
+    npm install -g bower grunt grunt-cli nodemon eslint && \
+    npm install && \
+    grunt build && \
+    bower cache clean --allow-root && \
+    npm uninstall -g bower grunt grunt-cli nodemon eslint && \
+    npm prune --production && \
+    npm cache clean --force && \
+    apk del --purge git && \
+    rm -rf /var/cache/apk/* && \
+    rm -rf /tmp/*
+
+EXPOSE 8080
+
+VOLUME ["/restreamer/db"]
+
+CMD ["./run.sh"]
diff --git a/Dockerfile_aarch64 b/Dockerfile_aarch64
deleted file mode 100644
index e48a0918..00000000
--- a/Dockerfile_aarch64
+++ /dev/null
@@ -1,150 +0,0 @@
-FROM aarch64/debian:jessie
-
-MAINTAINER datarhei <info@datarhei.org>
-
-ENV NODE_VERSION=5.9.0 \
-    NPM_VERSION=3.7.3 \
-
-    FFMPEG_VERSION=2.8.6 \
-    YASM_VERSION=1.3.0 \
-    LAME_VERSION=3_99_5 \
-    NGINX_VERSION=1.9.9 \
-    NGINX_RTMP_VERSION=1.1.7.10 \
-
-    SRC="/usr/local"
-
-ENV LD_LIBRARY_PATH="${SRC}/lib" \
-    PKG_CONFIG_PATH="${SRC}/lib/pkgconfig" \
-
-    BUILDDEPS="autoconf automake gcc g++ libtool make nasm zlib1g-dev libssl-dev xz-utils cmake build-essential libpcre3-dev"
-
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes curl git libpcre3 tar perl ca-certificates ${BUILDDEPS} && \
-    rm -rf /var/lib/apt/lists/* && \
-
-    # node
-    DIR="$(mktemp -d)" && cd "${DIR}" && \
-    set -x && \
-    curl -LOks "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-arm64.tar.gz" && \
-    tar xzvf "node-v${NODE_VERSION}-linux-arm64.tar.gz" \
-        -C "${SRC}" \
-        --strip-components=1 && \
-    npm install -g "npm@${NPM_VERSION}" --unsafe-perm && \
-    npm cache clear && \
-    npm config set unsafe-perm true -g --unsafe-perm && \
-    rm -rf "${DIR}" && \
-
-    # yasm
-    DIR="$(mktemp -d)" && cd "${DIR}" && \
-    curl -LOks "https://www.tortall.net/projects/yasm/releases/yasm-${YASM_VERSION}.tar.gz" && \
-    tar xzvf "yasm-${YASM_VERSION}.tar.gz" && \
-    cd "yasm-${YASM_VERSION}" && \
-    cp /usr/share/automake-1.14/config.guess config.guess && \
-    ./configure \
-        --prefix="${SRC}" \
-        --bindir="${SRC}/bin" && \
-    make -j"$(nproc)" && \
-    make install && \
-    make distclean && \
-    rm -rf "${DIR}" && \
-
-    # x264
-    DIR="$(mktemp -d)" && cd "${DIR}" && \
-    git clone --depth 1 "git://git.videolan.org/x264" && \
-    cd x264 && \
-    ./configure \
-        --prefix="${SRC}" \
-        --bindir="${SRC}/bin" \
-        --enable-static \
-        --disable-cli && \
-    make -j"$(nproc)" && \
-    make install && \
-    make distclean && \
-    rm -rf "${DIR}" && \
-
-    # libmp3lame
-    DIR="$(mktemp -d)" && cd "${DIR}" && \
-    curl -LOks "https://github.com/rbrito/lame/archive/RELEASE__${LAME_VERSION}.tar.gz" && \
-    tar xzvf "RELEASE__${LAME_VERSION}.tar.gz" && \
-    cd "lame-RELEASE__${LAME_VERSION}" && \
-    cp /usr/share/automake-1.14/config.guess config.guess && \
-    ./configure \
-        --prefix="${SRC}" \
-        --bindir="${SRC}/bin" \
-        --enable-nasm \
-        --disable-shared && \
-    make -j"$(nproc)" && \
-    make install && \
-    make distclean && \
-    rm -rf "${DIR}" && \
-
-    # ffmpeg
-    # patch: andrew-shulgin Ignore invalid sprop-parameter-sets missing PPS
-    DIR="$(mktemp -d)" && cd "${DIR}" && \
-    curl -LOks "https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz" && \
-    tar xzvf "ffmpeg-${FFMPEG_VERSION}.tar.gz" && \
-    cd "ffmpeg-${FFMPEG_VERSION}" && \
-    curl -Lks "https://github.com/FFmpeg/FFmpeg/commit/1c7e2cf9d33968375ee4025d2279c937e147dae2.patch" | patch -p1 && \
-    ./configure \
-        --prefix="${SRC}" \
-        --bindir="${SRC}/bin" \
-        --extra-cflags="-I${SRC}/include" \
-        --extra-ldflags="-L${SRC}/lib" \
-        --extra-libs=-ldl \
-        --enable-nonfree \
-        --enable-gpl \
-        --enable-version3 \
-        --enable-avresample \
-        --enable-libmp3lame \
-        --enable-libx264 \
-        --enable-openssl \
-        --enable-postproc \
-        --enable-small \
-        --disable-debug \
-        --disable-doc \
-        --disable-ffserver && \
-    make -j"$(nproc)" && \
-    make install && \
-    make distclean && \
-    hash -r && \
-    cd tools && \
-    make qt-faststart && \
-    cp qt-faststart "${SRC}/bin" && \
-    rm -rf "${DIR}" && \
-    echo "${SRC}/lib" > "/etc/ld.so.conf.d/libc.conf" && \
-    ffmpeg -buildconf && \
-
-    # nginx-rtmp
-    DIR="$(mktemp -d)" && cd "${DIR}" && \
-    curl -LOks "https://github.com/nginx/nginx/archive/release-${NGINX_VERSION}.tar.gz" && \
-    tar xzvf "release-${NGINX_VERSION}.tar.gz" && \
-    curl -LOks "https://github.com/sergey-dryabzhinsky/nginx-rtmp-module/archive/v${NGINX_RTMP_VERSION}.tar.gz" && \
-    tar xzvf "v${NGINX_RTMP_VERSION}.tar.gz" && \
-    cd "nginx-release-${NGINX_VERSION}" && \
-    auto/configure \
-        --with-http_ssl_module \
-        --add-module="../nginx-rtmp-module-${NGINX_RTMP_VERSION}" && \
-    make -j"$(nproc)" && \
-    make install && \
-    rm -rf "${DIR}" && \
-
-    apt-get purge -y --auto-remove ${BUILDDEPS} && \
-    rm -rf /tmp/*
-
-COPY . /restreamer
-WORKDIR /restreamer
-
-RUN npm install -g bower grunt grunt-cli nodemon public-ip && \
-    npm install && \
-    grunt build && \
-    npm prune --production && \
-    npm cache clean && \
-    bower cache clean --allow-root
-
-ENV RS_USERNAME admin
-ENV RS_PASSWORD datarhei
-
-EXPOSE 8080
-VOLUME ["/restreamer/db"]
-
-CMD ["./run.sh"]
diff --git a/Dockerfile_armv6l b/Dockerfile_armv6l
deleted file mode 100644
index 12a2a6af..00000000
--- a/Dockerfile_armv6l
+++ /dev/null
@@ -1,148 +0,0 @@
-FROM resin/rpi-raspbian:jessie
-
-MAINTAINER datarhei <info@datarhei.org>
-
-ENV NODE_VERSION=5.9.0 \
-    NPM_VERSION=3.7.3 \
-
-    FFMPEG_VERSION=2.8.6 \
-    YASM_VERSION=1.3.0 \
-    LAME_VERSION=3_99_5 \
-    NGINX_VERSION=1.9.9 \
-    NGINX_RTMP_VERSION=1.1.7.10 \
-
-    SRC="/usr/local"
-
-ENV LD_LIBRARY_PATH="${SRC}/lib" \
-    PKG_CONFIG_PATH="${SRC}/lib/pkgconfig" \
-
-    BUILDDEPS="autoconf automake gcc g++ libtool make nasm zlib1g-dev libssl-dev xz-utils cmake build-essential libpcre3-dev"
-
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes curl git libpcre3 tar perl ca-certificates ${BUILDDEPS} && \
-    rm -rf /var/lib/apt/lists/* && \
-
-    # node
-    DIR="$(mktemp -d)" && cd "${DIR}" && \
-    set -x && \
-    curl -LOks "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-armv6l.tar.gz" && \
-    tar xzvf "node-v${NODE_VERSION}-linux-armv6l.tar.gz" \
-        -C "${SRC}" \
-        --strip-components=1 && \
-    npm install -g "npm@${NPM_VERSION}" --unsafe-perm && \
-    npm cache clear && \
-    npm config set unsafe-perm true -g --unsafe-perm && \
-    rm -rf "${DIR}" && \
-
-    # yasm
-    DIR="$(mktemp -d)" && cd "${DIR}" && \
-    curl -LOks "https://www.tortall.net/projects/yasm/releases/yasm-${YASM_VERSION}.tar.gz" && \
-    tar xzvf "yasm-${YASM_VERSION}.tar.gz" && \
-    cd "yasm-${YASM_VERSION}" && \
-    ./configure \
-        --prefix="${SRC}" \
-        --bindir="${SRC}/bin" && \
-    make -j"$(nproc)" && \
-    make install && \
-    make distclean && \
-    rm -rf "${DIR}" && \
-
-    # x264
-    DIR="$(mktemp -d)" && cd "${DIR}" && \
-    git clone --depth 1 "git://git.videolan.org/x264" && \
-    cd x264 && \
-    ./configure \
-        --prefix="${SRC}" \
-        --bindir="${SRC}/bin" \
-        --enable-static \
-        --disable-cli && \
-    make -j"$(nproc)" && \
-    make install && \
-    make distclean && \
-    rm -rf "${DIR}" && \
-
-    # libmp3lame
-    DIR="$(mktemp -d)" && cd "${DIR}" && \
-    curl -LOks "https://github.com/rbrito/lame/archive/RELEASE__${LAME_VERSION}.tar.gz" && \
-    tar xzvf "RELEASE__${LAME_VERSION}.tar.gz" && \
-    cd "lame-RELEASE__${LAME_VERSION}" && \
-    ./configure \
-        --prefix="${SRC}" \
-        --bindir="${SRC}/bin" \
-        --enable-nasm \
-        --disable-shared && \
-    make -j"$(nproc)" && \
-    make install && \
-    make distclean && \
-    rm -rf "${DIR}" && \
-
-    # ffmpeg
-    # patch: andrew-shulgin Ignore invalid sprop-parameter-sets missing PPS
-    DIR="$(mktemp -d)" && cd "${DIR}" && \
-    curl -LOks "https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz" && \
-    tar xzvf "ffmpeg-${FFMPEG_VERSION}.tar.gz" && \
-    cd "ffmpeg-${FFMPEG_VERSION}" && \
-    curl -Lks "https://github.com/FFmpeg/FFmpeg/commit/1c7e2cf9d33968375ee4025d2279c937e147dae2.patch" | patch -p1 && \
-    ./configure \
-        --prefix="${SRC}" \
-        --bindir="${SRC}/bin" \
-        --extra-cflags="-I${SRC}/include" \
-        --extra-ldflags="-L${SRC}/lib" \
-        --extra-libs=-ldl \
-        --enable-nonfree \
-        --enable-gpl \
-        --enable-version3 \
-        --enable-avresample \
-        --enable-libmp3lame \
-        --enable-libx264 \
-        --enable-openssl \
-        --enable-postproc \
-        --enable-small \
-        --disable-debug \
-        --disable-doc \
-        --disable-ffserver && \
-    make -j"$(nproc)" && \
-    make install && \
-    make distclean && \
-    hash -r && \
-    cd tools && \
-    make qt-faststart && \
-    cp qt-faststart "${SRC}/bin" && \
-    rm -rf "${DIR}" && \
-    echo "${SRC}/lib" > "/etc/ld.so.conf.d/libc.conf" && \
-    ffmpeg -buildconf && \
-
-    # nginx-rtmp
-    DIR="$(mktemp -d)" && cd "${DIR}" && \
-    curl -LOks "https://github.com/nginx/nginx/archive/release-${NGINX_VERSION}.tar.gz" && \
-    tar xzvf "release-${NGINX_VERSION}.tar.gz" && \
-    curl -LOks "https://github.com/sergey-dryabzhinsky/nginx-rtmp-module/archive/v${NGINX_RTMP_VERSION}.tar.gz" && \
-    tar xzvf "v${NGINX_RTMP_VERSION}.tar.gz" && \
-    cd "nginx-release-${NGINX_VERSION}" && \
-    auto/configure \
-        --with-http_ssl_module \
-        --add-module="../nginx-rtmp-module-${NGINX_RTMP_VERSION}" && \
-    make -j"$(nproc)" && \
-    make install && \
-    rm -rf "${DIR}" && \
-
-    apt-get purge -y --auto-remove ${BUILDDEPS} && \
-    rm -rf /tmp/*
-
-COPY . /restreamer
-WORKDIR /restreamer
-
-RUN npm install -g bower grunt grunt-cli nodemon public-ip && \
-    npm install && \
-    grunt build && \
-    npm prune --production && \
-    npm cache clean && \
-    bower cache clean --allow-root
-
-ENV RS_USERNAME admin
-ENV RS_PASSWORD datarhei
-
-EXPOSE 8080
-VOLUME ["/restreamer/db"]
-
-CMD ["./run.sh"]
diff --git a/Dockerfile_armv7l b/Dockerfile_armv7l
deleted file mode 100644
index fef552ac..00000000
--- a/Dockerfile_armv7l
+++ /dev/null
@@ -1,148 +0,0 @@
-FROM resin/rpi-raspbian:jessie
-
-MAINTAINER datarhei <info@datarhei.org>
-
-ENV NODE_VERSION=5.9.0 \
-    NPM_VERSION=3.7.3 \
-
-    FFMPEG_VERSION=2.8.6 \
-    YASM_VERSION=1.3.0 \
-    LAME_VERSION=3_99_5 \
-    NGINX_VERSION=1.9.9 \
-    NGINX_RTMP_VERSION=1.1.7.10 \
-
-    SRC="/usr/local"
-
-ENV LD_LIBRARY_PATH="${SRC}/lib" \
-    PKG_CONFIG_PATH="${SRC}/lib/pkgconfig" \
-
-    BUILDDEPS="autoconf automake gcc g++ libtool make nasm zlib1g-dev libssl-dev xz-utils cmake build-essential libpcre3-dev"
-
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes curl git libpcre3 tar perl ca-certificates ${BUILDDEPS} && \
-    rm -rf /var/lib/apt/lists/* && \
-
-    # node
-    DIR="$(mktemp -d)" && cd "${DIR}" && \
-    set -x && \
-    curl -LOks "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-armv7l.tar.gz" && \
-    tar xzvf "node-v${NODE_VERSION}-linux-armv7l.tar.gz" \
-        -C "${SRC}" \
-        --strip-components=1 && \
-    npm install -g "npm@${NPM_VERSION}" --unsafe-perm && \
-    npm cache clear && \
-    npm config set unsafe-perm true -g --unsafe-perm && \
-    rm -rf "${DIR}" && \
-
-    # yasm
-    DIR="$(mktemp -d)" && cd "${DIR}" && \
-    curl -LOks "https://www.tortall.net/projects/yasm/releases/yasm-${YASM_VERSION}.tar.gz" && \
-    tar xzvf "yasm-${YASM_VERSION}.tar.gz" && \
-    cd "yasm-${YASM_VERSION}" && \
-    ./configure \
-        --prefix="${SRC}" \
-        --bindir="${SRC}/bin" && \
-    make -j"$(nproc)" && \
-    make install && \
-    make distclean && \
-    rm -rf "${DIR}" && \
-
-    # x264
-    DIR="$(mktemp -d)" && cd "${DIR}" && \
-    git clone --depth 1 "git://git.videolan.org/x264" && \
-    cd x264 && \
-    ./configure \
-        --prefix="${SRC}" \
-        --bindir="${SRC}/bin" \
-        --enable-static \
-        --disable-cli && \
-    make -j"$(nproc)" && \
-    make install && \
-    make distclean && \
-    rm -rf "${DIR}" && \
-
-    # libmp3lame
-    DIR="$(mktemp -d)" && cd "${DIR}" && \
-    curl -LOks "https://github.com/rbrito/lame/archive/RELEASE__${LAME_VERSION}.tar.gz" && \
-    tar xzvf "RELEASE__${LAME_VERSION}.tar.gz" && \
-    cd "lame-RELEASE__${LAME_VERSION}" && \
-    ./configure \
-        --prefix="${SRC}" \
-        --bindir="${SRC}/bin" \
-        --enable-nasm \
-        --disable-shared && \
-    make -j"$(nproc)" && \
-    make install && \
-    make distclean && \
-    rm -rf "${DIR}" && \
-
-    # ffmpeg
-    # patch: andrew-shulgin Ignore invalid sprop-parameter-sets missing PPS
-    DIR="$(mktemp -d)" && cd "${DIR}" && \
-    curl -LOks "https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz" && \
-    tar xzvf "ffmpeg-${FFMPEG_VERSION}.tar.gz" && \
-    cd "ffmpeg-${FFMPEG_VERSION}" && \
-    curl -Lks "https://github.com/FFmpeg/FFmpeg/commit/1c7e2cf9d33968375ee4025d2279c937e147dae2.patch" | patch -p1 && \
-    ./configure \
-        --prefix="${SRC}" \
-        --bindir="${SRC}/bin" \
-        --extra-cflags="-I${SRC}/include" \
-        --extra-ldflags="-L${SRC}/lib" \
-        --extra-libs=-ldl \
-        --enable-nonfree \
-        --enable-gpl \
-        --enable-version3 \
-        --enable-avresample \
-        --enable-libmp3lame \
-        --enable-libx264 \
-        --enable-openssl \
-        --enable-postproc \
-        --enable-small \
-        --disable-debug \
-        --disable-doc \
-        --disable-ffserver && \
-    make -j"$(nproc)" && \
-    make install && \
-    make distclean && \
-    hash -r && \
-    cd tools && \
-    make qt-faststart && \
-    cp qt-faststart "${SRC}/bin" && \
-    rm -rf "${DIR}" && \
-    echo "${SRC}/lib" > "/etc/ld.so.conf.d/libc.conf" && \
-    ffmpeg -buildconf && \
-
-    # nginx-rtmp
-    DIR="$(mktemp -d)" && cd "${DIR}" && \
-    curl -LOks "https://github.com/nginx/nginx/archive/release-${NGINX_VERSION}.tar.gz" && \
-    tar xzvf "release-${NGINX_VERSION}.tar.gz" && \
-    curl -LOks "https://github.com/sergey-dryabzhinsky/nginx-rtmp-module/archive/v${NGINX_RTMP_VERSION}.tar.gz" && \
-    tar xzvf "v${NGINX_RTMP_VERSION}.tar.gz" && \
-    cd "nginx-release-${NGINX_VERSION}" && \
-    auto/configure \
-        --with-http_ssl_module \
-        --add-module="../nginx-rtmp-module-${NGINX_RTMP_VERSION}" && \
-    make -j"$(nproc)" && \
-    make install && \
-    rm -rf "${DIR}" && \
-
-    apt-get purge -y --auto-remove ${BUILDDEPS} && \
-    rm -rf /tmp/*
-
-COPY . /restreamer
-WORKDIR /restreamer
-
-RUN npm install -g bower grunt grunt-cli nodemon public-ip && \
-    npm install && \
-    grunt build && \
-    npm prune --production && \
-    npm cache clean && \
-    bower cache clean --allow-root
-
-ENV RS_USERNAME admin
-ENV RS_PASSWORD datarhei
-
-EXPOSE 8080
-VOLUME ["/restreamer/db"]
-
-CMD ["./run.sh"]
diff --git a/README.md b/README.md
index 845a0818..2102df3e 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-#Restreamer
+# Restreamer
 
-Datarhei/Restreamer offers smart free video streaming in real time. Stream H.264 video of IP cameras live to your website. Upload your live video on [YouTube-Live](https://www.youtube.com/), [Ustream](http://www.ustream.tv/), [Twitch](http://www.twitch.tv/), [Livestream.com](http://livestream.com/) or any other streaming solutions e.g. [Wowza-Streaming-Engine](https://www.wowza.com/). Our [Docker-Image](https://hub.docker.com/search/?q=restreamer&page=1&isAutomated=0&isOfficial=0&starCount=0&pullCount=0) is easy to install and runs on Linux, MacOS and Windows. Datarhei/Restreamer can be perfectly combined with single-board computers like [Raspberry Pi](https://www.raspberrypi.org/) and [Odroid](http://www.hardkernel.com/main/main.php). It is free (licensed under Apache 2.0) and you can use it for any purpose, private or commercial.  
+Datarhei/Restreamer offers smart free video streaming. Stream H.264 video of IP cameras live to your website. Upload your live video on [YouTube-Live](https://www.youtube.com/), [Ustream](http://www.ustream.tv/), [Twitch](http://www.twitch.tv/), [Livestream.com](http://livestream.com/) or any other streaming solutions e.g. [Wowza-Streaming-Engine](https://www.wowza.com/). Our [Docker-Image](https://hub.docker.com/search/?q=restreamer&page=1&isAutomated=0&isOfficial=0&starCount=0&pullCount=0) is easy to install and runs on Linux, MacOS and Windows. Datarhei/Restreamer can be perfectly combined with single-board computers like [Raspberry Pi](https://www.raspberrypi.org/) and [Odroid](http://www.hardkernel.com/main/main.php). It is free (licensed under Apache 2.0) and you can use it for any purpose, private or commercial.  
 
-##Features
+## Features
 
 - User-Interface including login-security
 - JSON / HTTP-API
@@ -11,36 +11,25 @@ Datarhei/Restreamer offers smart free video streaming in real time. Stream H.264
 - <a target= "_blank" href="https://github.com/clappr/clappr">Clappr-Player</a> to embed your stream on your website
 - <a target= "_blank" href="https://www.docker.com/">Docker</a> and <a target= "_blank" href="https://kitematic.com/">Kitematic (Docker-Toolbox)</a> optimizations and very easy installation
 
-## Upcomming releases
-
-- rc.8 (next 14 days)
-
-## Roadmap
-
-- backend refactoring 
-- full REST API
-- optimizing FFmpeg handling
-- debugging features
-
-##Documentation
+## Documentation
 
 Documentation is available on [Datarhei/Restreamer GitHub pages](https://datarhei.github.io/restreamer/).
 We give you a lot of of informations from setting up a camera, embedding your player upon your website and streaming to services like e.g. YouTube-Live, Ustream and Livestream.com and many more things. 
 
 More additional informations about streaming, cameras and so on you can find in our [Wiki](https://datarhei.github.com/restreamer/wiki). 
 
-##Help / Bugs
+## Help / Bugs
 
 If you have problems or found a bug feel free to create a new issue upon the <a target= "_blank" href="https://github.com/datarhei/restreamer/issues">Github issue management</a>.
 
-Want to talk to us? Write an email to <a href="mailto:open@datarhei.org?subject=Datarhei/Restreamer">open@datarhei.org</a>, go to [Support](../support.html) or choose a nickname speak to us in IRC: <a href="irc://irc.freenode.net#piwik">irc.freenode.net/#datarhei</a> (<a target= "_blank" href="https://webchat.freenode.net/?channels=datarhei">webchat</a>). You could ask a question in our (<a target= "_blank" href="https://groups.google.com/forum/#!forum/datarhei">Forum</a>) on Google Groups, too.
+Want to talk to us? Write an email to <a href="mailto:open@datarhei.org?subject=Datarhei/Restreamer">open@datarhei.org</a> or ask a question in our (<a target= "_blank" href="https://groups.google.com/forum/#!forum/datarhei">Forum</a>) on Google Groups.
 
-##Authors
+## Authors
 
 The Datarhei/Restreamer was created by [Julius Eitzen](https://github.com/jeitzen), [Sven Erbeck](https://github.com/svenerbeck), [Christoph Johannsdotter](https://github.com/christophjohannsdotter) and [Jan Stabenow](https://github.com/jstabenow).   
 
-Special thanks for supporting this project continuously to [Andrew Shulgin](https://github.com/andrew-shulgin).
+Special thanks for supporting this project [Andrew Shulgin](https://github.com/andrew-shulgin).
 
-##Copyright
+## Copyright
 
 Code released under the [Apache license](LICENSE). Images are copyrighted by datarhei.org
diff --git a/bower.json b/bower.json
index 221c4666..8ac1c9c8 100644
--- a/bower.json
+++ b/bower.json
@@ -1,17 +1,17 @@
 {
-    "name": "Restreamer",
-    "version": "0.1.0-rc.7.1",
+    "name": "restreamer",
+    "version": "0.1.0",
     "license": "Apache-2.0",
     "dependencies": {
-        "bootstrap": "3.3.6",
-        "jquery": "2.2.2",
+        "bootstrap": "3.3.7",
+        "jquery": "3.2.1",
         "html5shiv": "3.7.3",
         "respond": "1.4.2",
-        "angular-bootstrap": "~0.14.3",
-        "angular-animate": "1.5.0",
-        "ui-router": "0.2.18",
-        "angular-translate": "2.9.2",
-        "angular-translate-loader-static-files": "2.9.2"
+        "angular-bootstrap": "2.5.0",
+        "angular-animate": "1.6.6",
+        "angular-ui-router": "1.0.6",
+        "angular-translate": "2.15.2",
+        "angular-translate-loader-static-files": "2.15.2"
     },
     "resolutions": {
         "angular": "1.5.0"
diff --git a/conf/live.json b/conf/live.json
index 175e989a..4f00d294 100644
--- a/conf/live.json
+++ b/conf/live.json
@@ -39,7 +39,9 @@
         "streaming": {
             "ip": "127.0.0.1",
             "rtmp_port": "1935",
-            "rtmp_hls_path": "/hls/"
+            "rtmp_hls_path": "/hls/",
+            "http_port": "8080",
+            "http_health_path": "/ping"
         }
     },
     "envVars": [
diff --git a/conf/nginx.conf b/conf/nginx.conf
index aa2889b9..7346204f 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -51,6 +51,11 @@ http {
             add_header Cache-Control no-cache;
             add_header Access-Control-Allow-Origin *;
         }
+        location = /ping {
+            add_header Content-Type text/plain;
+            return 200 "pong";
+            access_log off;
+        }
     }
 }
 daemon off;
diff --git a/package.json b/package.json
index 9f8e1d8f..fc4049e3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "Restreamer",
-    "version": "0.1.0-rc.7.1",
-    "description": "Allows you to do h.264 real-time video streaming on your website without a streaming provider",
+    "version": "0.1.0",
+    "description": "Allows you to do h.264 video streaming on your website without a streaming provider",
     "author": "datarhei.org",
     "repository": {
         "type": "git",
@@ -12,32 +12,35 @@
         "start": "node ./src/start"
     },
     "dependencies": {
-        "body-parser": "1.15.0",
-        "compression": "~1.6.1",
-        "cookie": "^0.2.3",
-        "cookie-parser": "1.4.1",
-        "express": "4.13.4",
-        "express-session": "^1.13.0",
+        "body-parser": "1.17.2",
+        "compression": "1.7.0",
+        "cookie": "0.3.1",
+        "cookie-parser": "1.4.3",
+        "express": "4.15.4",
+        "express-session": "1.15.5",
         "fluent-ffmpeg": "git://github.com/datarhei/node-fluent-ffmpeg",
-        "jsonschema": "^1.1.0",
-        "moment-timezone": "^0.5.2",
-        "node-json-db": "git://github.com/andrew-shulgin/node-json-db",
-        "semver": "^5.1.0",
-        "ps-find": "^1.1.0",
-        "q": "1.4.1",
-        "socket.io": "1.4.5"
+        "jsonschema": "1.2.0",
+        "moment-timezone": "0.5.13",
+        "node-json-db": "0.7.3",
+        "semver": "5.4.1",
+        "public-ip-cli": "1.1.2",
+        "ps-find": "1.1.0",
+        "q": "1.5.0",
+        "socket.io": "2.0.3"
     },
     "devDependencies": {
-        "eslint": "2.4.0",
-        "babel-preset-es2015": "^6.6.0",
-        "grunt": "0.4.5",
-        "grunt-babel": "^6.0.0",
-        "grunt-contrib-csslint": "^1.0.0",
-        "grunt-contrib-cssmin": "~1.0.1",
-        "grunt-contrib-uglify": "~1.0.1",
-        "grunt-contrib-watch": "^1.0.0",
-        "grunt-ng-annotate": "~2.0.1",
-        "grunt-shell": "1.2.1",
-        "load-grunt-tasks": "~3.4.1"
+        "eslint": "4.5.0",
+        "babel-core": "6.26.0",
+        "babel-loader": "7.1.2",
+        "babel-preset-es2015": "6.24.1",
+        "grunt": "1.0.1",
+        "grunt-babel": "7.0.0",
+        "grunt-contrib-csslint": "2.0.0",
+        "grunt-contrib-cssmin": "2.2.1",
+        "grunt-contrib-uglify": "3.0.1",
+        "grunt-contrib-watch": "1.0.0",
+        "grunt-ng-annotate": "3.0.0",
+        "grunt-shell": "2.1.0",
+        "load-grunt-tasks": "3.5.2"
     }
 }
diff --git a/run.sh b/run.sh
index aa9d4952..838e4796 100755
--- a/run.sh
+++ b/run.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 CPU_TYPE=$(uname -m | cut -c 1-3)
 if [ "${MODE}" == "RASPICAM" ] && [ "$CPU_TYPE" == "arm" ];
 then
diff --git a/src/classes/Restreamer.js b/src/classes/Restreamer.js
index a723d9d6..6e058701 100644
--- a/src/classes/Restreamer.js
+++ b/src/classes/Restreamer.js
@@ -174,7 +174,9 @@ class Restreamer {
         ffmpegCommand.native(); // add -re
         if (streamType === 'repeatToLocalNginx') {
             if (Restreamer.data.options.rtspTcp && Restreamer.data.addresses.srcAddress.indexOf('rtsp') === 0) {
-                ffmpegCommand.inputOptions('-rtsp_transport tcp');
+                ffmpegCommand.inputOptions('-err_detect','ignore_err','-rtsp_transport','tcp');
+            } else {
+                ffmpegCommand.inputOptions('-err_detect','ignore_err');
             }
         }
     }
diff --git a/src/webserver/public/index.dev.html b/src/webserver/public/index.dev.html
index a30385c1..bbccfdf2 100644
--- a/src/webserver/public/index.dev.html
+++ b/src/webserver/public/index.dev.html
@@ -23,7 +23,7 @@
 
     <script src="/socket.io/socket.io.js"></script>
     <script src="/libs/angular/angular.js"></script>
-    <script src="/libs/ui-router/release/angular-ui-router.js"></script>
+    <script src="/libs/angular-ui-router/release/angular-ui-router.js"></script>
     <script src="/libs/angular-animate/angular-animate.js"></script>
     <script src="/libs/angular-bootstrap/ui-bootstrap.js"></script>
     <script src="/libs/angular-bootstrap/ui-bootstrap-tpls.js"></script>
diff --git a/src/webserver/public/index.prod.html b/src/webserver/public/index.prod.html
index 5a5cd28e..afbe7481 100644
--- a/src/webserver/public/index.prod.html
+++ b/src/webserver/public/index.prod.html
@@ -23,7 +23,7 @@
 
     <script src="/socket.io/socket.io.js"></script>
     <script src="/libs/angular/angular.min.js"></script>
-    <script src="/libs/ui-router/release/angular-ui-router.min.js"></script>
+    <script src="/libs/angular-ui-router/release/angular-ui-router.min.js"></script>
     <script src="/libs/angular-animate/angular-animate.min.js"></script>
     <script src="/libs/angular-bootstrap/ui-bootstrap.min.js"></script>
     <script src="/libs/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>

From 4ad62848c072f1f280a6cc3b5796feb63a95d173 Mon Sep 17 00:00:00 2001
From: Jan Stabenow <hello@jan-stabenow.de>
Date: Thu, 24 Aug 2017 22:44:47 +0200
Subject: [PATCH 02/62] MOD updated nginx+module and added rtmp-token-auth

---
 CHANGELOG.md                       |  4 +++-
 Dockerfile                         |  2 +-
 Dockerfile-armhf                   | 10 +++++-----
 conf/live.json                     |  5 +++--
 conf/nginx.conf                    |  4 ++++
 src/classes/Restreamer.js          |  7 ++++++-
 src/webserver/controllers/index.js | 25 +++++++++++++++++++++++++
 7 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4dafb732..d9e682ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,15 @@
 ## Changes from 0.1.0-rc7 to 0.1.0
 
 * switched to Alpine-Linux
-* switched Mutlistage Dockerfiles for AMD64 and ARMHF (req. Docker 17.x)
+* switched to mutlistage Dockerfiles for AMD64 and ARMHF (req. Docker 17.x) and removed old files
   * https://hub.docker.com/r/datarhei/ffmpeg/
   * https://hub.docker.com/r/datarhei/nginx-rtmp/
 * updated to FFmpeg 3.1.10
 * updated NPM/Bower packages
 * fixed public-ip problem
 * disabled FFmpeg "error-detection" for a vlc-like feeling
+* added optional rtmp-token-authentification (default is without token. token can be set with env RS_TOKEN or in the live.json config.)
+* updated NGINX to 1.13.4 and RTMP-Module to latest dev-version
 
 ## Changes from 0.1.0-rc7 to 0.1.0-rc.7.1
 
diff --git a/Dockerfile b/Dockerfile
index a12eeeb7..01dba845 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM datarhei/nginx-rtmp:1.9.9-1.1.7.10 as builder
+FROM datarhei/nginx-rtmp:1.13.4-dev as builder
 
 FROM node:8.1-alpine
 
diff --git a/Dockerfile-armhf b/Dockerfile-armhf
index f4ec77e3..8b9838c8 100644
--- a/Dockerfile-armhf
+++ b/Dockerfile-armhf
@@ -1,4 +1,4 @@
-FROM datarhei/nginx-rtmp:1.9.9-1.1.7.10-armhf as builder
+FROM datarhei/nginx-rtmp:1.13.4-dev-armhf as builder
 
 FROM resin/raspberry-pi-alpine-node:8.1-slim
 
@@ -6,9 +6,9 @@ MAINTAINER datarhei <info@datarhei.org>
 
 ENV RS_USERNAME=admin \
     RS_PASSWORD=datarhei \
-    SRC="/usr/local" \
-    LD_LIBRARY_PATH="/usr/local/lib" \
-    PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
+    SRC=/usr/local \
+    LD_LIBRARY_PATH=/usr/local/lib \
+    PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
 
 COPY --from=builder /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg
 COPY --from=builder /usr/local/bin/ffprobe /usr/local/bin/ffprobe
@@ -27,7 +27,7 @@ RUN apk add --no-cache --update git libssl1.0 pcre && \
     npm uninstall -g bower grunt grunt-cli nodemon eslint && \
     npm prune --production && \
     npm cache clean --force && \
-    apk del --purge git && \
+    apk del --no-cache --purge git && \
     rm -rf /var/cache/apk/* && \
     rm -rf /tmp/*
 
diff --git a/conf/live.json b/conf/live.json
index 4f00d294..d98998e0 100644
--- a/conf/live.json
+++ b/conf/live.json
@@ -3,7 +3,8 @@
     "jsondb": "db/v1",
     "auth": {
         "username": "admin",
-        "password": "datarhei"
+        "password": "datarhei",
+        "token": ""
     },
     "ffmpeg": {
         "options": {
@@ -31,7 +32,7 @@
         },
         "monitor": {
             "restart_wait": "6000",
-            "retries": 10
+            "retries": 100
         }
     },
     "nginx": {
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 7346204f..fdac25cf 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -10,6 +10,8 @@ rtmp {
         application live {
             live on;
             idle_streams off;
+            on_publish http://127.0.0.1:3000/token;
+            notify_method get;
         }
         application hls {
             live on;
@@ -20,6 +22,8 @@ rtmp {
             hls_sync 1ms;
             hls_path /tmp/hls;
             idle_streams off;
+            on_publish http://127.0.0.1:3000/token;
+            notify_method get;
         }
     }
 }
diff --git a/src/classes/Restreamer.js b/src/classes/Restreamer.js
index 6e058701..2b42d109 100644
--- a/src/classes/Restreamer.js
+++ b/src/classes/Restreamer.js
@@ -28,8 +28,13 @@ class Restreamer {
      */
     static generateOutputHLSPath () {
         var nginx = config.nginx.streaming;
+        var token = process.env.RS_TOKEN || config.auth.token;
 
-        return 'rtmp://' + nginx.ip + ':' + nginx.rtmp_port + nginx.rtmp_hls_path + 'live.stream';
+        if (token != '') {
+            return 'rtmp://' + nginx.ip + ':' + nginx.rtmp_port + nginx.rtmp_hls_path + 'live.stream' + '?token=' + token;
+        } else {
+            return 'rtmp://' + nginx.ip + ':' + nginx.rtmp_port + nginx.rtmp_hls_path + 'live.stream';
+        }
     }
 
     /**
diff --git a/src/webserver/controllers/index.js b/src/webserver/controllers/index.js
index 4f03e597..652b83a6 100644
--- a/src/webserver/controllers/index.js
+++ b/src/webserver/controllers/index.js
@@ -37,4 +37,29 @@ module.exports = (app) => {
         req.session.destroy();
         res.end();
     });
+    /* Handle NGINX-RTMP token */
+    app.get('/token', (req, res) => {
+        var token = process.env.RS_TOKEN || auth.token;
+        if (token != '') {
+            if (req.query.token == token) {
+                res.writeHead(200, {
+                    'Content-Type': 'text/plain'
+                });
+                res.end('Authorized');
+            } else {
+                res.writeHead(401, {
+                    'Content-Type': 'text/plain'
+                });
+                res.end('Unauthorized');
+            }
+        } else {
+            res.writeHead(200, {
+                'Content-Type': 'text/plain'
+            });
+            res.end('Authorized');
+        }
+    });
 };
+
+
+

From bfa7fa3d4d75773711791fe9bc5bd149e77d8932 Mon Sep 17 00:00:00 2001
From: Christoph Johannsdotter <christoph.johannsdotter@email.de>
Date: Wed, 30 Aug 2017 22:58:22 +0200
Subject: [PATCH 03/62] optimize healthcheck

---
 package.json             | 90 +++++++++++++++++++-------------------
 src/classes/Nginxrtmp.js | 94 +++++++++++++++++-----------------------
 2 files changed, 85 insertions(+), 99 deletions(-)

diff --git a/package.json b/package.json
index fc4049e3..4210fa0f 100644
--- a/package.json
+++ b/package.json
@@ -1,46 +1,48 @@
 {
-    "name": "Restreamer",
-    "version": "0.1.0",
-    "description": "Allows you to do h.264 video streaming on your website without a streaming provider",
-    "author": "datarhei.org",
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/datarhei/restreamer.git"
-    },
-    "license": "Apache-2.0",
-    "scripts": {
-        "start": "node ./src/start"
-    },
-    "dependencies": {
-        "body-parser": "1.17.2",
-        "compression": "1.7.0",
-        "cookie": "0.3.1",
-        "cookie-parser": "1.4.3",
-        "express": "4.15.4",
-        "express-session": "1.15.5",
-        "fluent-ffmpeg": "git://github.com/datarhei/node-fluent-ffmpeg",
-        "jsonschema": "1.2.0",
-        "moment-timezone": "0.5.13",
-        "node-json-db": "0.7.3",
-        "semver": "5.4.1",
-        "public-ip-cli": "1.1.2",
-        "ps-find": "1.1.0",
-        "q": "1.5.0",
-        "socket.io": "2.0.3"
-    },
-    "devDependencies": {
-        "eslint": "4.5.0",
-        "babel-core": "6.26.0",
-        "babel-loader": "7.1.2",
-        "babel-preset-es2015": "6.24.1",
-        "grunt": "1.0.1",
-        "grunt-babel": "7.0.0",
-        "grunt-contrib-csslint": "2.0.0",
-        "grunt-contrib-cssmin": "2.2.1",
-        "grunt-contrib-uglify": "3.0.1",
-        "grunt-contrib-watch": "1.0.0",
-        "grunt-ng-annotate": "3.0.0",
-        "grunt-shell": "2.1.0",
-        "load-grunt-tasks": "3.5.2"
-    }
+  "name": "Restreamer",
+  "version": "0.1.0",
+  "description": "Allows you to do h.264 video streaming on your website without a streaming provider",
+  "author": "datarhei.org",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/datarhei/restreamer.git"
+  },
+  "license": "Apache-2.0",
+  "scripts": {
+    "start": "node ./src/start"
+  },
+  "dependencies": {
+    "body-parser": "1.17.2",
+    "compression": "1.7.0",
+    "cookie": "0.3.1",
+    "cookie-parser": "1.4.3",
+    "express": "4.15.4",
+    "express-session": "1.15.5",
+    "fluent-ffmpeg": "git://github.com/datarhei/node-fluent-ffmpeg",
+    "jsonschema": "1.2.0",
+    "moment-timezone": "0.5.13",
+    "node-json-db": "0.7.3",
+    "ps-find": "1.1.0",
+    "public-ip-cli": "1.1.2",
+    "q": "1.5.0",
+    "request": "^2.81.0",
+    "request-promise": "^4.2.1",
+    "semver": "5.4.1",
+    "socket.io": "2.0.3"
+  },
+  "devDependencies": {
+    "eslint": "4.5.0",
+    "babel-core": "6.26.0",
+    "babel-loader": "7.1.2",
+    "babel-preset-es2015": "6.24.1",
+    "grunt": "1.0.1",
+    "grunt-babel": "7.0.0",
+    "grunt-contrib-csslint": "2.0.0",
+    "grunt-contrib-cssmin": "2.2.1",
+    "grunt-contrib-uglify": "3.0.1",
+    "grunt-contrib-watch": "1.0.0",
+    "grunt-ng-annotate": "3.0.0",
+    "grunt-shell": "2.1.0",
+    "load-grunt-tasks": "3.5.2"
+  }
 }
diff --git a/src/classes/Nginxrtmp.js b/src/classes/Nginxrtmp.js
index 277cfe25..4b658512 100644
--- a/src/classes/Nginxrtmp.js
+++ b/src/classes/Nginxrtmp.js
@@ -7,9 +7,12 @@
 'use strict';
 
 const Q = require('q');
-const psFind = require('ps-find');
+const config = require("../../conf/live.json");
 const spawn = require('child_process').spawn;
 const logger = require('./Logger')('Nginxrtmp');
+const rp = require('request-promise');
+const RUNNING = "running";
+const NOT_RUNNING = "not_running";
 
 /**
  * class to watch and control the NGINX RTMP server process
@@ -27,30 +30,27 @@ class Nginxrtmp {
     }
 
     /**
-     * generate output hls-path from config-file
-     * @returns {string}
+     * init the nginx rtmp server
+     * @returns {Promise.<boolean>}
      */
-    init () {
-        return this.getState()
-                   .then((state) => {
-                       switch (state) {
-                           case 'not_running':
-                               this.start();
-                               break;
-                           case 'running':
-                               this.logger.info('NGINX already started');
-                               break;
-                           default:
-                               throw new Error('NGINX state could not be detected');
-                       }
-                   });
+    async init () {
+        const currentState = await this.getState();
+        if (currentState === NOT_RUNNING){
+            await this.start();
+        }else{
+            return true;
+        }
     }
 
     /**
-     * start nginx rtmp server
+     * start the nginx rtmp server
+     * @returns {Promise.<boolean>}
      */
-    start () {
+    async start () {
         this.logger.info('Starting NGINX...', 'start.nginx');
+        let state = NOT_RUNNING;
+        let tries = 0;
+        let timeout = 250;
         this.process = spawn('sh', [
             '-c',
             this.config.nginx.exec
@@ -58,22 +58,16 @@ class Nginxrtmp {
         this.bindNginxProcessEvents(this.process);
 
         // todo: code a watcher instead of fix 1s delay for state detection
-        this.getState(1000)
-            .then((state)=> {
-                switch (state) {
-
-                    case 'not_running':
-                        this.logger.info('NGINX could not be started');
-                        break;
-
-                    case 'running':
-                        this.logger.info('NGINX successfully started');
-                        break;
-
-                    default:
-                        throw new Error('NGINX state could not be detected');
-                }
-            });
+        while(state === NOT_RUNNING){
+            state = await this.getState(timeout);
+            tries++;
+        }
+        if (state === RUNNING){
+            this.logger.info(`NGINX successfully started in ${tries * timeout}ms`);
+        }else{
+            this.logger.info('NGINX could not be started');
+        }
+        return true;
     }
 
     /**
@@ -99,27 +93,17 @@ class Nginxrtmp {
      * get current state of nginx rtmp server
      * @returns {*|promise}
      */
-    getState (delayMs) {
-        let delay = typeof delayMs === 'undefined' ? 0 : delayMs;
-        let nginxProcessString = 'nginx: master process ' + this.config.nginx.exec;
-        let state = 'not_running';
-        let deferred = Q.defer();
-
+    async getState (delayMs) {
+        const url = "http://" + config.nginx.streaming.ip + ":" +  config.nginx.streaming.http_port  +  config.nginx.streaming.http_health_path;
+        const delay = typeof delayMs === 'undefined' ? 0 : delayMs;
         // delay the state detection if waiting for process is needed
-        Q.delay(delay)
-         .then(()=> {
-             return Q.nfcall(psFind.find, nginxProcessString);
-         })
-         .then(()=> {
-             state = 'running';
-         })
-         .catch(()=> { // ps-find throws exception in case of 'not found' so we have to handle that
-             state = 'not_running';
-         })
-         .finally(()=> {
-             deferred.resolve(state);
-         });
-        return deferred.promise;
+        try{
+            await Q.delay(delay);
+            const response = (await rp("http://" + config.nginx.streaming.ip + ":" +  config.nginx.streaming.http_port  +  config.nginx.streaming.http_health_path));
+            return response === 'pong' ? RUNNING: NOT_RUNNING;
+        }catch(error){
+            return NOT_RUNNING;
+        }
     }
 }
 

From 7ca690404ce1e0763e5789705a17bfe2a494ef50 Mon Sep 17 00:00:00 2001
From: Jan Stabenow <hello@jan-stabenow.de>
Date: Wed, 30 Aug 2017 23:20:32 +0200
Subject: [PATCH 04/62] MOD allowed http/https/rtmpt/rtmps as source

---
 CHANGELOG.md                                        | 2 ++
 src/webserver/public/scripts/Main/MainController.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9e682ca..90d0bb26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@
 * disabled FFmpeg "error-detection" for a vlc-like feeling
 * added optional rtmp-token-authentification (default is without token. token can be set with env RS_TOKEN or in the live.json config.)
 * updated NGINX to 1.13.4 and RTMP-Module to latest dev-version
+* switched nginx-init-check to an http-call ("ps aux" on Alpine is problematic)
+* allowed http/https (hls) and rtmpt/rtmps addresses as video source 
 
 ## Changes from 0.1.0-rc7 to 0.1.0-rc.7.1
 
diff --git a/src/webserver/public/scripts/Main/MainController.js b/src/webserver/public/scripts/Main/MainController.js
index 3586b7ba..263a2c6e 100755
--- a/src/webserver/public/scripts/Main/MainController.js
+++ b/src/webserver/public/scripts/Main/MainController.js
@@ -125,7 +125,7 @@ window.angular.module('Main').controller('mainController',
         }
 
         $scope.startStream = (streamType) => {
-            const rtmpRegex = /^(?:rtmp:\/\/|rtsp:\/\/)(?:(?:[^:])+:(?:[^@])+@)?(?:(?:(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))|(?:(?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63}))(:?:[0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])?(?:\/.*)?/;
+            const rtmpRegex = /^(?:rtmp:\/\/|rtmps:\/\/|rtmpt:\/\/|rtsp:\/\/|http:\/\/|https:\/\/)(?:(?:[^:])+:(?:[^@])+@)?(?:(?:(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))|(?:(?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63}))(:?:[0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])?(?:\/.*)?/;
             var optionalOutput = '';
 
             if ($scope.activateOptionalOutput === true) {

From 6bc33d8e73aeb2ca7bd3bc4a7d84be1eb3cbb029 Mon Sep 17 00:00:00 2001
From: Jan Stabenow <hello@jan-stabenow.de>
Date: Wed, 30 Aug 2017 23:33:37 +0200
Subject: [PATCH 05/62] MOD added docker build notice

---
 README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/README.md b/README.md
index 2102df3e..d7b6e25c 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,17 @@ We give you a lot of of informations from setting up a camera, embedding your pl
 
 More additional informations about streaming, cameras and so on you can find in our [Wiki](https://datarhei.github.com/restreamer/wiki). 
 
+## Development
+
+#### Building your own Docker-Image:
+
+```sh
+$ git clone https://github.com/datarhei/restreamer
+$ docker build -t restreamer .
+```
+
+*Required Docker version >= 17.x*
+
 ## Help / Bugs
 
 If you have problems or found a bug feel free to create a new issue upon the <a target= "_blank" href="https://github.com/datarhei/restreamer/issues">Github issue management</a>.

From 82660391249fb826c6a8fab65d6b0d96d85c450f Mon Sep 17 00:00:00 2001
From: Jan Stabenow <hello@jan-stabenow.de>
Date: Sat, 2 Sep 2017 15:49:42 +0200
Subject: [PATCH 06/62] MOD reduced processdata + added ffmpeg reporting

---
 .dockerignore                         |  3 +++
 conf/live.json                        | 11 +++++++-
 conf/nginx.conf                       |  4 +++
 src/classes/Restreamer.js             | 17 +++++++++---
 src/start.js                          | 37 +++++++++++++++------------
 src/webserver/public/debug/README.txt |  4 +++
 6 files changed, 55 insertions(+), 21 deletions(-)
 create mode 100644 src/webserver/public/debug/README.txt

diff --git a/.dockerignore b/.dockerignore
index 21e020fd..e89c9475 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,6 +3,8 @@
 Dockerfile
 Dockerfile_armv6l
 Dockerfile_armv7l
+Dockerfile-armhf
+Dockerfile-aarch64
 .git
 .editorconfig
 .gitignore
@@ -12,3 +14,4 @@ bin
 db
 src/webserver/public/libs
 checkDeployment.sh
+*.log
diff --git a/conf/live.json b/conf/live.json
index d98998e0..2663a974 100644
--- a/conf/live.json
+++ b/conf/live.json
@@ -28,7 +28,8 @@
                 "-metadata server=NGINX-RTMP",
                 "-f flv"
             ],
-            "snapshot": "-vframes 1"
+            "snapshot": "-vframes 1",
+            "err_detect": "ignore_err"
         },
         "monitor": {
             "restart_wait": "6000",
@@ -109,6 +110,14 @@
             "defaultValue": "datarhei",
             "required": false,
             "description": "Backend login password"
+        },
+        {
+            "name": "RS_FFMPEG_DEBUG",
+            "alias": "",
+            "type": "string",
+            "defaultValue": "false",
+            "required": false,
+            "description": "Enables FFmpeg reporting"
         }
     ]
 }
diff --git a/conf/nginx.conf b/conf/nginx.conf
index fdac25cf..0e837c21 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,4 +1,5 @@
 error_log stderr;
+
 worker_processes 1;
 events {
     worker_connections 1024;
@@ -55,6 +56,9 @@ http {
             add_header Cache-Control no-cache;
             add_header Access-Control-Allow-Origin *;
         }
+        location /debug {
+            autoindex on;
+        }
         location = /ping {
             add_header Content-Type text/plain;
             return 200 "pong";
diff --git a/src/classes/Restreamer.js b/src/classes/Restreamer.js
index 2b42d109..b1222dbb 100644
--- a/src/classes/Restreamer.js
+++ b/src/classes/Restreamer.js
@@ -176,14 +176,23 @@ class Restreamer {
     }
 
     static applyOptions (ffmpegCommand, streamType) {
-        ffmpegCommand.native(); // add -re
+        var ffmpegOptions = config.ffmpeg.options;
+
+        // reduces process data
+        ffmpegCommand.inputOptions('-hide_banner', '-stats', '-loglevel', 'quiet');
+
+        // for unclean rtsp-sources
+        ffmpegCommand.inputOptions('-err_detect', ffmpegOptions.err_detect);
+
+        // gui option
         if (streamType === 'repeatToLocalNginx') {
             if (Restreamer.data.options.rtspTcp && Restreamer.data.addresses.srcAddress.indexOf('rtsp') === 0) {
-                ffmpegCommand.inputOptions('-err_detect','ignore_err','-rtsp_transport','tcp');
-            } else {
-                ffmpegCommand.inputOptions('-err_detect','ignore_err');
+                ffmpegCommand.inputOptions('-rtsp_transport', 'tcp');
             }
         }
+
+        // read input at native frame rate (-re)
+        ffmpegCommand.native();
     }
 
     /**
diff --git a/src/start.js b/src/start.js
index 2665992b..a9c49a9c 100644
--- a/src/start.js
+++ b/src/start.js
@@ -37,21 +37,26 @@ logger.info('', false);
 // setup environment vars
 EnvVar.init(config);
 
+// ffmpeg reporting
+if (process.env.RS_FFMPEG_DEBUG === 'true') {
+    process.env['FFREPORT'] = 'file=/restreamer/src/webserver/public/debug/%p-%t.log';
+}
+
 // start the app
 nginxrtmp.init()
-         .then(() => {
-             return RestreamerData.checkJSONDb();
-         })
-         .then(() => {
-             Restreamer.checkForUpdates();
-             Restreamer.getPublicIp();
-             Restreamer.bindWebsocketEvents();
-             return restreamerApp.startWebserver();
-         })
-         .then(() => {
-             return Q.fcall(Restreamer.restoreFFMpegProcesses);
-         })
-         .catch((error)=> {
-             let errorMessage = `Error starting webserver and nginx for application: ${error}`;
-             throw new Error(errorMessage);
-         });
+    .then(() => {
+        return RestreamerData.checkJSONDb();
+    })
+    .then(() => {
+        Restreamer.checkForUpdates();
+        Restreamer.getPublicIp();
+        Restreamer.bindWebsocketEvents();
+        return restreamerApp.startWebserver();
+    })
+    .then(() => {
+        return Q.fcall(Restreamer.restoreFFMpegProcesses);
+    })
+    .catch((error)=> {
+        let errorMessage = `Error starting webserver and nginx for application: ${error}`;
+        throw new Error(errorMessage);
+    });
diff --git a/src/webserver/public/debug/README.txt b/src/webserver/public/debug/README.txt
new file mode 100644
index 00000000..fd3a8370
--- /dev/null
+++ b/src/webserver/public/debug/README.txt
@@ -0,0 +1,4 @@
+You can enable FFmpeg reporting by the enviroment variable "RS_FFMPEG_DEBUG=true".
+
+WARNING:
+Logging can consume a lot of disk space! Don not use this option in productive use!

From 29b70af1c847cd8c9dbadf128191a41fb01c354b Mon Sep 17 00:00:00 2001
From: Henry Contreras Velandia <henry@nodolibre.org>
Date: Sat, 2 Sep 2017 15:00:01 -0400
Subject: [PATCH 07/62] Create lang-es_VE.json

Added spanish language file
---
 src/webserver/public/locales/lang-es_VE.json | 26 ++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 src/webserver/public/locales/lang-es_VE.json

diff --git a/src/webserver/public/locales/lang-es_VE.json b/src/webserver/public/locales/lang-es_VE.json
new file mode 100644
index 00000000..c3b9a848
--- /dev/null
+++ b/src/webserver/public/locales/lang-es_VE.json
@@ -0,0 +1,26 @@
+{
+    "help_title": "Ayuda",
+    "issue_tracker": "Reportar problema",
+    "project_page": "Ayuda",
+    "update_btn": "Actualización disponible",
+    "login_username": "Usuario",
+    "login_password": "Contraseña",
+    "login_invalid": "Usuario o contraseña inválidos",
+    "login_btn": "Iniciar sesión",
+    "logout": "Cerrar sesión",
+    "button_start": "Iniciar",
+    "button_stop": "Detener",
+    "input_title": "Fuente de video RTMP/RTSP",
+    "input_example": "ej. rtsp://192.168.57.100/media.amp",
+    "rtsp_tcp": "RTSP sobre TCP",
+    "process_input_invalid": "Dirección del stream inválida, favor revisar la fuente",
+    "process_success": "El streaming ha iniciado con éxito.",
+    "process_failed": "Tu stream no es accesible.",
+    "process_failed_retry": "Número de reintentos",
+    "process_init": "Streaming iniciando. Por favor espera...",
+    "output_optional": "Servidor de streaming RTMP externo",
+    "output_optional_example": "ej. rtmp://live.youtube.com/channelId",
+    "player_link_title": "Abrir reproductor",
+    "player_modal_help_title": "Código iFrame e imagen de la vista previa:",
+    "player_modal_help_content": "Adicionalmente, el puerto de los ejemplos debe ser redrigido del router a la IP de la computadora (Port forwarding)"
+}

From 57898278981e4d5b0057c9b55ca1f473403072fd Mon Sep 17 00:00:00 2001
From: Henry Contreras Velandia <henry@nodolibre.org>
Date: Sat, 2 Sep 2017 15:01:46 -0400
Subject: [PATCH 08/62] Update header.html

Added support for choosing es_VE language
---
 src/webserver/public/views/header.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/webserver/public/views/header.html b/src/webserver/public/views/header.html
index ea7d85c8..fb76e308 100755
--- a/src/webserver/public/views/header.html
+++ b/src/webserver/public/views/header.html
@@ -3,6 +3,8 @@
         <a ng-click="switchLanguage('en_US')" class="locales" ng-class="{'active': langIs('en_US')}">EN</a>
         /
         <a ng-click="switchLanguage('de_DE')" class="locales" ng-class="{'active': langIs('de_DE')}">DE</a>
+        /
+        <a ng-click="switchLanguage('es_VE')" class="locales" ng-class="{'active': langIs('es_VE')}">ES</a>
     </p>
     <h1>Restreamer</h1>
 </div>

From 6898b9028cc8908a4c3426af74bc77875d1e8352 Mon Sep 17 00:00:00 2001
From: Jan Stabenow <hello@jan-stabenow.de>
Date: Sat, 2 Sep 2017 22:49:05 +0200
Subject: [PATCH 09/62] ADD aarch64/arm64 file

---
 Dockerfile-arrch64 | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 Dockerfile-arrch64

diff --git a/Dockerfile-arrch64 b/Dockerfile-arrch64
new file mode 100644
index 00000000..cfaa9a07
--- /dev/null
+++ b/Dockerfile-arrch64
@@ -0,0 +1,39 @@
+FROM datarhei/nginx-rtmp:1.13.4-dev-aarch64 as builder
+
+FROM datarhei/node:8.1-aarch64
+
+MAINTAINER datarhei <info@datarhei.org>
+
+ENV RS_USERNAME=admin \
+    RS_PASSWORD=datarhei \
+    SRC=/usr/local \
+    LD_LIBRARY_PATH=/usr/local/lib \
+    PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
+
+COPY --from=builder /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg
+COPY --from=builder /usr/local/bin/ffprobe /usr/local/bin/ffprobe
+COPY --from=builder /usr/local/lib /usr/local/lib
+COPY --from=builder /usr/local/nginx /usr/local/nginx
+
+COPY . /restreamer
+WORKDIR /restreamer
+
+RUN apk add --no-cache --update git libssl1.0 pcre && \
+    ffmpeg -buildconf && \
+    npm config set unsafe-perm true && \
+    npm install -g bower grunt grunt-cli nodemon eslint && \
+    npm install && \
+    grunt build && \
+    bower cache clean --allow-root && \
+    npm uninstall -g bower grunt grunt-cli nodemon eslint && \
+    npm prune --production && \
+    npm cache clean --force && \
+    apk del --no-cache --purge git && \
+    rm -rf /var/cache/apk/* && \
+    rm -rf /tmp/*
+
+EXPOSE 8080
+
+VOLUME ["/restreamer/db"]
+
+CMD ["./run.sh"]

From 85ab38db76e5c86ef57648d9315d00b172c18910 Mon Sep 17 00:00:00 2001
From: Jan Stabenow <hello@jan-stabenow.de>
Date: Sat, 2 Sep 2017 23:09:36 +0200
Subject: [PATCH 10/62] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d7b6e25c..f44790dd 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ $ git clone https://github.com/datarhei/restreamer
 $ docker build -t restreamer .
 ```
 
-*Required Docker version >= 17.x*
+*Required Docker version >= 17.05*
 
 ## Help / Bugs
 

From e540415065e7eac673c7a6d94c1d7207fa6167b6 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Fri, 5 Oct 2018 17:58:20 +0200
Subject: [PATCH 11/62] Update node.js dependencies

---
 gruntfile.js |  2 +-
 package.json | 26 +++++++++++++++-----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/gruntfile.js b/gruntfile.js
index 332f166e..a67485bb 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -72,7 +72,7 @@ module.exports = function (grunt) {
         babel: {
             options: {
                 sourceMap: true,
-                presets: ['es2015']
+                presets: ['env']
             },
             all: {
                 files: [
diff --git a/package.json b/package.json
index 4210fa0f..856b88e1 100644
--- a/package.json
+++ b/package.json
@@ -12,13 +12,15 @@
     "start": "node ./src/start"
   },
   "dependencies": {
-    "body-parser": "1.17.2",
-    "compression": "1.7.0",
+    "ajv": "^6.5.4",
+    "ajv-keywords": "^3.2.0",
+    "body-parser": "^1.18.3",
+    "compression": "^1.7.3",
     "cookie": "0.3.1",
     "cookie-parser": "1.4.3",
-    "express": "4.15.4",
-    "express-session": "1.15.5",
-    "fluent-ffmpeg": "git://github.com/datarhei/node-fluent-ffmpeg",
+    "express": "^4.16.3",
+    "express-session": "^1.15.6",
+    "fluent-ffmpeg": "git://github.com/datarhei/node-fluent-ffmpeg.git",
     "jsonschema": "1.2.0",
     "moment-timezone": "0.5.13",
     "node-json-db": "0.7.3",
@@ -28,21 +30,23 @@
     "request": "^2.81.0",
     "request-promise": "^4.2.1",
     "semver": "5.4.1",
-    "socket.io": "2.0.3"
+    "socket.io": "^2.1.1"
   },
   "devDependencies": {
-    "eslint": "4.5.0",
     "babel-core": "6.26.0",
     "babel-loader": "7.1.2",
-    "babel-preset-es2015": "6.24.1",
-    "grunt": "1.0.1",
+    "babel-preset-env": "^1.7.0",
+    "coffeescript": "^2.3.2",
+    "eslint": "4.5.0",
+    "grunt": "^1.0.3",
     "grunt-babel": "7.0.0",
     "grunt-contrib-csslint": "2.0.0",
     "grunt-contrib-cssmin": "2.2.1",
     "grunt-contrib-uglify": "3.0.1",
-    "grunt-contrib-watch": "1.0.0",
+    "grunt-contrib-watch": "^1.1.0",
     "grunt-ng-annotate": "3.0.0",
     "grunt-shell": "2.1.0",
-    "load-grunt-tasks": "3.5.2"
+    "load-grunt-tasks": "3.5.2",
+    "webpack": "^3.12.0"
   }
 }

From 04d4fe4b4ccef574d59f8b20275a832f275e06b7 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Sat, 6 Oct 2018 10:21:27 +0200
Subject: [PATCH 12/62] Add lock file for node.js dependencies

---
 package-lock.json | 7737 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 7737 insertions(+)
 create mode 100644 package-lock.json

diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..8cba94ce
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,7737 @@
+{
+  "name": "Restreamer",
+  "version": "0.1.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@sindresorhus/is": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
+      "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="
+    },
+    "abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
+    },
+    "accepts": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
+      "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
+      "requires": {
+        "mime-types": "~2.1.18",
+        "negotiator": "0.6.1"
+      }
+    },
+    "acorn": {
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+      "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+      "dev": true
+    },
+    "acorn-dynamic-import": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
+      "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
+      "dev": true,
+      "requires": {
+        "acorn": "^4.0.3"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "4.0.13",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
+          "dev": true
+        }
+      }
+    },
+    "acorn-jsx": {
+      "version": "3.0.1",
+      "resolved": "http://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
+      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
+      "dev": true,
+      "requires": {
+        "acorn": "^3.0.4"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "3.3.0",
+          "resolved": "http://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
+          "dev": true
+        }
+      }
+    },
+    "after": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
+      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8="
+    },
+    "ajv": {
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.4.tgz",
+      "integrity": "sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==",
+      "requires": {
+        "fast-deep-equal": "^2.0.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ajv-keywords": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz",
+      "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=",
+      "dev": true
+    },
+    "align-text": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
+      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2",
+        "longest": "^1.0.1",
+        "repeat-string": "^1.5.2"
+      }
+    },
+    "alter": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/alter/-/alter-0.2.0.tgz",
+      "integrity": "sha1-x1iICGF1cgNKrmJICvJrHU0cs80=",
+      "dev": true,
+      "requires": {
+        "stable": "~0.1.3"
+      }
+    },
+    "ansi-escapes": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+      "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+      "dev": true
+    },
+    "anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "requires": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true
+    },
+    "array-differ": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
+      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
+      "dev": true
+    },
+    "array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E="
+    },
+    "array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "requires": {
+        "array-uniq": "^1.0.1"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
+    },
+    "array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "dev": true
+    },
+    "arraybuffer.slice": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
+      "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog=="
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "dev": true
+    },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "asn1.js": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "assert": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
+      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+      "dev": true,
+      "requires": {
+        "util": "0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
+        },
+        "util": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.1"
+          }
+        }
+      }
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+    },
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "dev": true
+    },
+    "async": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+      "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+      "requires": {
+        "lodash": "^4.17.10"
+      }
+    },
+    "async-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
+      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
+      "dev": true
+    },
+    "async-limiter": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
+      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+    },
+    "aws4": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
+    },
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "dev": true,
+      "requires": {
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
+      }
+    },
+    "babel-core": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz",
+      "integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "^6.26.0",
+        "babel-generator": "^6.26.0",
+        "babel-helpers": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-register": "^6.26.0",
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "convert-source-map": "^1.5.0",
+        "debug": "^2.6.8",
+        "json5": "^0.5.1",
+        "lodash": "^4.17.4",
+        "minimatch": "^3.0.4",
+        "path-is-absolute": "^1.0.1",
+        "private": "^0.1.7",
+        "slash": "^1.0.0",
+        "source-map": "^0.5.6"
+      }
+    },
+    "babel-generator": {
+      "version": "6.26.1",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
+      "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
+      "dev": true,
+      "requires": {
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "detect-indent": "^4.0.0",
+        "jsesc": "^1.3.0",
+        "lodash": "^4.17.4",
+        "source-map": "^0.5.7",
+        "trim-right": "^1.0.1"
+      }
+    },
+    "babel-helper-builder-binary-assignment-operator-visitor": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
+      "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
+      "dev": true,
+      "requires": {
+        "babel-helper-explode-assignable-expression": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-call-delegate": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
+      "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
+      "dev": true,
+      "requires": {
+        "babel-helper-hoist-variables": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-define-map": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
+      "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "babel-helper-explode-assignable-expression": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
+      "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-function-name": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
+      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
+      "dev": true,
+      "requires": {
+        "babel-helper-get-function-arity": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-get-function-arity": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
+      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-hoist-variables": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
+      "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-optimise-call-expression": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
+      "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-regex": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
+      "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "babel-helper-remap-async-to-generator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
+      "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-replace-supers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
+      "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
+      "dev": true,
+      "requires": {
+        "babel-helper-optimise-call-expression": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helpers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
+      "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-loader": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.2.tgz",
+      "integrity": "sha512-jRwlFbINAeyDStqK6Dd5YuY0k5YuzQUvlz2ZamuXrXmxav3pNqe9vfJ402+2G+OmlJSXxCOpB6Uz0INM7RQe2A==",
+      "dev": true,
+      "requires": {
+        "find-cache-dir": "^1.0.0",
+        "loader-utils": "^1.0.2",
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "babel-messages": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-check-es2015-constants": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
+      "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-syntax-async-functions": {
+      "version": "6.13.0",
+      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
+      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
+      "dev": true
+    },
+    "babel-plugin-syntax-exponentiation-operator": {
+      "version": "6.13.0",
+      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
+      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
+      "dev": true
+    },
+    "babel-plugin-syntax-trailing-function-commas": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
+      "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
+      "dev": true
+    },
+    "babel-plugin-transform-async-to-generator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
+      "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
+      "dev": true,
+      "requires": {
+        "babel-helper-remap-async-to-generator": "^6.24.1",
+        "babel-plugin-syntax-async-functions": "^6.8.0",
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-arrow-functions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
+      "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-block-scoped-functions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
+      "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-block-scoping": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
+      "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "babel-plugin-transform-es2015-classes": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
+      "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
+      "dev": true,
+      "requires": {
+        "babel-helper-define-map": "^6.24.1",
+        "babel-helper-function-name": "^6.24.1",
+        "babel-helper-optimise-call-expression": "^6.24.1",
+        "babel-helper-replace-supers": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-computed-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
+      "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-destructuring": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
+      "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-duplicate-keys": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
+      "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-for-of": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
+      "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-function-name": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
+      "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-literals": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
+      "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-amd": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
+      "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-commonjs": {
+      "version": "6.26.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz",
+      "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-strict-mode": "^6.24.1",
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-types": "^6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-systemjs": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
+      "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
+      "dev": true,
+      "requires": {
+        "babel-helper-hoist-variables": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-umd": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
+      "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-object-super": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
+      "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
+      "dev": true,
+      "requires": {
+        "babel-helper-replace-supers": "^6.24.1",
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-parameters": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
+      "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
+      "dev": true,
+      "requires": {
+        "babel-helper-call-delegate": "^6.24.1",
+        "babel-helper-get-function-arity": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-shorthand-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
+      "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-spread": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
+      "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-sticky-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
+      "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
+      "dev": true,
+      "requires": {
+        "babel-helper-regex": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-template-literals": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
+      "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-typeof-symbol": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
+      "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-unicode-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
+      "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
+      "dev": true,
+      "requires": {
+        "babel-helper-regex": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "regexpu-core": "^2.0.0"
+      }
+    },
+    "babel-plugin-transform-exponentiation-operator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
+      "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
+      "dev": true,
+      "requires": {
+        "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1",
+        "babel-plugin-syntax-exponentiation-operator": "^6.8.0",
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-regenerator": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
+      "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
+      "dev": true,
+      "requires": {
+        "regenerator-transform": "^0.10.0"
+      }
+    },
+    "babel-plugin-transform-strict-mode": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
+      "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-preset-env": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz",
+      "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==",
+      "dev": true,
+      "requires": {
+        "babel-plugin-check-es2015-constants": "^6.22.0",
+        "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
+        "babel-plugin-transform-async-to-generator": "^6.22.0",
+        "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "^6.23.0",
+        "babel-plugin-transform-es2015-classes": "^6.23.0",
+        "babel-plugin-transform-es2015-computed-properties": "^6.22.0",
+        "babel-plugin-transform-es2015-destructuring": "^6.23.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "^6.22.0",
+        "babel-plugin-transform-es2015-for-of": "^6.23.0",
+        "babel-plugin-transform-es2015-function-name": "^6.22.0",
+        "babel-plugin-transform-es2015-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "^6.22.0",
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.23.0",
+        "babel-plugin-transform-es2015-modules-systemjs": "^6.23.0",
+        "babel-plugin-transform-es2015-modules-umd": "^6.23.0",
+        "babel-plugin-transform-es2015-object-super": "^6.22.0",
+        "babel-plugin-transform-es2015-parameters": "^6.23.0",
+        "babel-plugin-transform-es2015-shorthand-properties": "^6.22.0",
+        "babel-plugin-transform-es2015-spread": "^6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "^6.22.0",
+        "babel-plugin-transform-es2015-template-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "^6.23.0",
+        "babel-plugin-transform-es2015-unicode-regex": "^6.22.0",
+        "babel-plugin-transform-exponentiation-operator": "^6.22.0",
+        "babel-plugin-transform-regenerator": "^6.22.0",
+        "browserslist": "^3.2.6",
+        "invariant": "^2.2.2",
+        "semver": "^5.3.0"
+      }
+    },
+    "babel-register": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
+      "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
+      "dev": true,
+      "requires": {
+        "babel-core": "^6.26.0",
+        "babel-runtime": "^6.26.0",
+        "core-js": "^2.5.0",
+        "home-or-tmp": "^2.0.0",
+        "lodash": "^4.17.4",
+        "mkdirp": "^0.5.1",
+        "source-map-support": "^0.4.15"
+      }
+    },
+    "babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "dev": true,
+      "requires": {
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
+      }
+    },
+    "babel-template": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
+      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "babel-traverse": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
+      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "^6.26.0",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "debug": "^2.6.8",
+        "globals": "^9.18.0",
+        "invariant": "^2.2.2",
+        "lodash": "^4.17.4"
+      }
+    },
+    "babel-types": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.4",
+        "to-fast-properties": "^1.0.3"
+      }
+    },
+    "babylon": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+      "dev": true
+    },
+    "backo2": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
+      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc="
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "requires": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        }
+      }
+    },
+    "base64-arraybuffer": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
+      "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg="
+    },
+    "base64-js": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
+      "dev": true
+    },
+    "base64id": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
+      "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY="
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "optional": true,
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "better-assert": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
+      "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
+      "requires": {
+        "callsite": "1.0.0"
+      }
+    },
+    "big.js": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
+      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
+      "dev": true
+    },
+    "binary-extensions": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.12.0.tgz",
+      "integrity": "sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==",
+      "dev": true
+    },
+    "blob": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz",
+      "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE="
+    },
+    "bluebird": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.2.tgz",
+      "integrity": "sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg=="
+    },
+    "bn.js": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+      "dev": true
+    },
+    "body": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
+      "integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
+      "dev": true,
+      "requires": {
+        "continuable-cache": "^0.3.1",
+        "error": "^7.0.0",
+        "raw-body": "~1.1.0",
+        "safe-json-parse": "~1.0.1"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
+          "integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
+          "dev": true
+        },
+        "raw-body": {
+          "version": "1.1.7",
+          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
+          "integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
+          "dev": true,
+          "requires": {
+            "bytes": "1",
+            "string_decoder": "0.10"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "body-parser": {
+      "version": "1.18.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz",
+      "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=",
+      "requires": {
+        "bytes": "3.0.0",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "http-errors": "~1.6.3",
+        "iconv-lite": "0.4.23",
+        "on-finished": "~2.3.0",
+        "qs": "6.5.2",
+        "raw-body": "2.3.3",
+        "type-is": "~1.6.16"
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "requires": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "requires": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "browserify-sign": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.1",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.2",
+        "elliptic": "^6.0.0",
+        "inherits": "^2.0.1",
+        "parse-asn1": "^5.0.0"
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
+      "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
+      "dev": true,
+      "requires": {
+        "pako": "~0.2.0"
+      }
+    },
+    "browserslist": {
+      "version": "3.2.8",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz",
+      "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==",
+      "dev": true,
+      "requires": {
+        "caniuse-lite": "^1.0.30000844",
+        "electron-to-chromium": "^1.3.47"
+      }
+    },
+    "buffer": {
+      "version": "4.9.1",
+      "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+      "dev": true,
+      "requires": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
+    },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "builtin-modules": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
+    },
+    "bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
+    },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "requires": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      }
+    },
+    "cacheable-request": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz",
+      "integrity": "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=",
+      "requires": {
+        "clone-response": "1.0.2",
+        "get-stream": "3.0.0",
+        "http-cache-semantics": "3.8.1",
+        "keyv": "3.0.0",
+        "lowercase-keys": "1.0.0",
+        "normalize-url": "2.0.1",
+        "responselike": "1.0.2"
+      },
+      "dependencies": {
+        "lowercase-keys": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
+          "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY="
+        }
+      }
+    },
+    "caller-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
+      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
+      "dev": true,
+      "requires": {
+        "callsites": "^0.2.0"
+      }
+    },
+    "callsite": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
+      "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA="
+    },
+    "callsites": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
+      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
+      "dev": true
+    },
+    "camelcase": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
+    },
+    "camelcase-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+      "requires": {
+        "camelcase": "^2.0.0",
+        "map-obj": "^1.0.0"
+      }
+    },
+    "caniuse-lite": {
+      "version": "1.0.30000889",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000889.tgz",
+      "integrity": "sha512-MFxcQ6x/LEEoaIhO7Zdb7Eg8YyNONN+WBnS5ERJ0li2yRw51+i4xXUNxnLaveTb/4ZoJqsWKEmlomhG2pYzlQA==",
+      "dev": true
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+    },
+    "center-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
+      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
+      "dev": true,
+      "requires": {
+        "align-text": "^0.1.3",
+        "lazy-cache": "^1.0.3"
+      }
+    },
+    "chalk": {
+      "version": "1.1.3",
+      "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
+      }
+    },
+    "chardet": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
+      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
+      "dev": true
+    },
+    "chokidar": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+      "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+      "dev": true,
+      "requires": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.0",
+        "braces": "^2.3.0",
+        "fsevents": "^1.2.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.1",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "lodash.debounce": "^4.0.8",
+        "normalize-path": "^2.1.1",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.0.0",
+        "upath": "^1.0.5"
+      }
+    },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "circular-json": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
+      "dev": true
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "clean-css": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.11.tgz",
+      "integrity": "sha1-Ls3xRaujj1R0DybO/Q/z4D4SXWo=",
+      "dev": true,
+      "requires": {
+        "source-map": "0.5.x"
+      }
+    },
+    "cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "dev": true,
+      "requires": {
+        "restore-cursor": "^2.0.0"
+      }
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+      "dev": true
+    },
+    "cliui": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+      "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+      "dev": true,
+      "requires": {
+        "center-align": "^0.1.1",
+        "right-align": "^0.1.1",
+        "wordwrap": "0.0.2"
+      },
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+          "dev": true
+        }
+      }
+    },
+    "clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+      "dev": true
+    },
+    "clone-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
+      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+    },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "dev": true
+    },
+    "coffeescript": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.3.2.tgz",
+      "integrity": "sha512-YObiFDoukx7qPBi/K0kUKyntEZDfBQiqs/DbrR1xzASKOBjGT7auD85/DiPeRr9k++lRj7l3uA9TNMLfyfcD/Q==",
+      "dev": true
+    },
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "dev": true,
+      "requires": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "colors": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+      "dev": true
+    },
+    "combined-stream": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
+      "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+      "dev": true
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
+    },
+    "component-bind": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
+      "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E="
+    },
+    "component-emitter": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
+    },
+    "component-inherit": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
+      "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM="
+    },
+    "compressible": {
+      "version": "2.0.15",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz",
+      "integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==",
+      "requires": {
+        "mime-db": ">= 1.36.0 < 2"
+      }
+    },
+    "compression": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz",
+      "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
+      "requires": {
+        "accepts": "~1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "~2.0.14",
+        "debug": "2.6.9",
+        "on-headers": "~1.0.1",
+        "safe-buffer": "5.1.2",
+        "vary": "~1.1.2"
+      }
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "console-browserify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+      "dev": true,
+      "requires": {
+        "date-now": "^0.1.4"
+      }
+    },
+    "constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true
+    },
+    "content-disposition": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
+    },
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
+    },
+    "continuable-cache": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
+      "integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
+      "dev": true
+    },
+    "convert-source-map": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
+      "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "cookie": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
+    },
+    "cookie-parser": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.3.tgz",
+      "integrity": "sha1-D+MfoZ0AC5X0qt8fU/3CuKIDuqU=",
+      "requires": {
+        "cookie": "0.3.1",
+        "cookie-signature": "1.0.6"
+      }
+    },
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "dev": true
+    },
+    "core-js": {
+      "version": "2.5.7",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
+      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==",
+      "dev": true
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "crc": {
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz",
+      "integrity": "sha1-naHpgOO9RPxck79as9ozeNheRms="
+    },
+    "create-ecdh": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.0.0"
+      }
+    },
+    "create-hash": {
+      "version": "1.2.0",
+      "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.7",
+      "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "cross-spawn": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "dev": true,
+      "requires": {
+        "lru-cache": "^4.0.1",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      }
+    },
+    "crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "requires": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      }
+    },
+    "csslint": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/csslint/-/csslint-1.0.5.tgz",
+      "integrity": "sha1-Gcw+2jIhYP0/cjKvHLKjYOiYouk=",
+      "dev": true,
+      "requires": {
+        "clone": "~2.1.0",
+        "parserlib": "~1.1.1"
+      }
+    },
+    "currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "requires": {
+        "array-find-index": "^1.0.1"
+      }
+    },
+    "d": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+      "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+      "dev": true,
+      "requires": {
+        "es5-ext": "^0.10.9"
+      }
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "date-now": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
+      "dev": true
+    },
+    "dateformat": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
+      "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
+      "dev": true,
+      "requires": {
+        "get-stdin": "^4.0.1",
+        "meow": "^3.3.0"
+      }
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+    },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
+    },
+    "decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
+    },
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "requires": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        }
+      }
+    },
+    "del": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+      "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
+      "dev": true,
+      "requires": {
+        "globby": "^5.0.0",
+        "is-path-cwd": "^1.0.0",
+        "is-path-in-cwd": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "rimraf": "^2.2.8"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+    },
+    "des.js": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+    },
+    "detect-indent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+      "dev": true,
+      "requires": {
+        "repeating": "^2.0.0"
+      }
+    },
+    "diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "dns-packet": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
+      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "requires": {
+        "ip": "^1.1.0",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "dns-socket": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/dns-socket/-/dns-socket-1.6.3.tgz",
+      "integrity": "sha512-/mUy3VGqIP69dAZjh2xxHXcpK9wk2Len1Dxz8mWAdrIgFC8tnR/aQAyU4a+UTXzOcTvEvGBdp1zFiwnpWKaXng==",
+      "requires": {
+        "dns-packet": "^1.1.0"
+      }
+    },
+    "doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "dev": true
+    },
+    "duplexer": {
+      "version": "0.1.1",
+      "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
+      "dev": true
+    },
+    "duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "optional": true,
+      "requires": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+    },
+    "electron-to-chromium": {
+      "version": "1.3.73",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.73.tgz",
+      "integrity": "sha512-6PIg7v9zRoVGh6EheRF8h6Plti+3Yo/qtHobS4/Htyt53DNHmKKGFqSae1AIk0k1S4gCQvt7I2WgpbuZNcDY+g==",
+      "dev": true
+    },
+    "elliptic": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
+      "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
+      }
+    },
+    "emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true
+    },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
+    },
+    "engine.io": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.0.tgz",
+      "integrity": "sha512-mRbgmAtQ4GAlKwuPnnAvXXwdPhEx+jkc0OBCLrXuD/CRvwNK3AxRSnqK4FSqmAMRRHryVJP8TopOvmEaA64fKw==",
+      "requires": {
+        "accepts": "~1.3.4",
+        "base64id": "1.0.0",
+        "cookie": "0.3.1",
+        "debug": "~3.1.0",
+        "engine.io-parser": "~2.1.0",
+        "ws": "~3.3.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "engine.io-client": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
+      "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
+      "requires": {
+        "component-emitter": "1.2.1",
+        "component-inherit": "0.0.3",
+        "debug": "~3.1.0",
+        "engine.io-parser": "~2.1.1",
+        "has-cors": "1.1.0",
+        "indexof": "0.0.1",
+        "parseqs": "0.0.5",
+        "parseuri": "0.0.5",
+        "ws": "~3.3.1",
+        "xmlhttprequest-ssl": "~1.5.4",
+        "yeast": "0.1.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "engine.io-parser": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.2.tgz",
+      "integrity": "sha512-dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw==",
+      "requires": {
+        "after": "0.8.2",
+        "arraybuffer.slice": "~0.0.7",
+        "base64-arraybuffer": "0.1.5",
+        "blob": "0.0.4",
+        "has-binary2": "~1.0.2"
+      }
+    },
+    "enhanced-resolve": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
+      "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.4.0",
+        "object-assign": "^4.0.1",
+        "tapable": "^0.2.7"
+      }
+    },
+    "errno": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "dev": true,
+      "requires": {
+        "prr": "~1.0.1"
+      }
+    },
+    "error": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/error/-/error-7.0.2.tgz",
+      "integrity": "sha1-pfdf/02ZJhJt2sDqXcOOaJFTywI=",
+      "dev": true,
+      "requires": {
+        "string-template": "~0.2.1",
+        "xtend": "~4.0.0"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "es5-ext": {
+      "version": "0.10.46",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.46.tgz",
+      "integrity": "sha512-24XxRvJXNFwEMpJb3nOkiRJKRoupmjYmOPVlI65Qy2SrtxwOTB+g6ODjBKOtwEHbYrhWRty9xxOWLNdClT2djw==",
+      "dev": true,
+      "requires": {
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "~3.1.1",
+        "next-tick": "1"
+      }
+    },
+    "es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "es6-map": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
+      "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "~0.10.14",
+        "es6-iterator": "~2.0.1",
+        "es6-set": "~0.1.5",
+        "es6-symbol": "~3.1.1",
+        "event-emitter": "~0.3.5"
+      }
+    },
+    "es6-set": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
+      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "~0.10.14",
+        "es6-iterator": "~2.0.1",
+        "es6-symbol": "3.1.1",
+        "event-emitter": "~0.3.5"
+      }
+    },
+    "es6-symbol": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "~0.10.14"
+      }
+    },
+    "es6-weak-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz",
+      "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "^0.10.14",
+        "es6-iterator": "^2.0.1",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "escope": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
+      "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
+      "dev": true,
+      "requires": {
+        "es6-map": "^0.1.3",
+        "es6-weak-map": "^2.0.1",
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "eslint": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.5.0.tgz",
+      "integrity": "sha1-u3XTuL3pf7XhPvzVOXRGd/6wGcM=",
+      "dev": true,
+      "requires": {
+        "ajv": "^5.2.0",
+        "babel-code-frame": "^6.22.0",
+        "chalk": "^2.1.0",
+        "concat-stream": "^1.6.0",
+        "cross-spawn": "^5.1.0",
+        "debug": "^2.6.8",
+        "doctrine": "^2.0.0",
+        "eslint-scope": "^3.7.1",
+        "espree": "^3.5.0",
+        "esquery": "^1.0.0",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^2.0.0",
+        "functional-red-black-tree": "^1.0.1",
+        "glob": "^7.1.2",
+        "globals": "^9.17.0",
+        "ignore": "^3.3.3",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^3.0.6",
+        "is-resolvable": "^1.0.0",
+        "js-yaml": "^3.9.1",
+        "json-stable-stringify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.4",
+        "minimatch": "^3.0.2",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.2",
+        "path-is-inside": "^1.0.2",
+        "pluralize": "^4.0.0",
+        "progress": "^2.0.0",
+        "require-uncached": "^1.0.3",
+        "semver": "^5.3.0",
+        "strip-ansi": "^4.0.0",
+        "strip-json-comments": "~2.0.1",
+        "table": "^4.0.1",
+        "text-table": "~0.2.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "5.5.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+          "dev": true,
+          "requires": {
+            "co": "^4.6.0",
+            "fast-deep-equal": "^1.0.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.3.0"
+          }
+        },
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+          "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "eslint-scope": {
+      "version": "3.7.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz",
+      "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "espree": {
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
+      "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
+      "dev": true,
+      "requires": {
+        "acorn": "^5.5.0",
+        "acorn-jsx": "^3.0.0"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
+    },
+    "esquery": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
+      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^4.0.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^4.1.0"
+      }
+    },
+    "estraverse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+      "dev": true
+    },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+    },
+    "event-emitter": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "~0.10.14"
+      }
+    },
+    "eventemitter2": {
+      "version": "0.4.14",
+      "resolved": "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz",
+      "integrity": "sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=",
+      "dev": true
+    },
+    "events": {
+      "version": "1.1.1",
+      "resolved": "http://registry.npmjs.org/events/-/events-1.1.1.tgz",
+      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
+      "dev": true
+    },
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "requires": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "execa": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^5.0.1",
+        "get-stream": "^3.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      }
+    },
+    "exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+      "dev": true
+    },
+    "expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "dev": true,
+      "requires": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "express": {
+      "version": "4.16.3",
+      "resolved": "http://registry.npmjs.org/express/-/express-4.16.3.tgz",
+      "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=",
+      "requires": {
+        "accepts": "~1.3.5",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.18.2",
+        "content-disposition": "0.5.2",
+        "content-type": "~1.0.4",
+        "cookie": "0.3.1",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.1.1",
+        "fresh": "0.5.2",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.2",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.3",
+        "qs": "6.5.1",
+        "range-parser": "~1.2.0",
+        "safe-buffer": "5.1.1",
+        "send": "0.16.2",
+        "serve-static": "1.13.2",
+        "setprototypeof": "1.1.0",
+        "statuses": "~1.4.0",
+        "type-is": "~1.6.16",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "body-parser": {
+          "version": "1.18.2",
+          "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz",
+          "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=",
+          "requires": {
+            "bytes": "3.0.0",
+            "content-type": "~1.0.4",
+            "debug": "2.6.9",
+            "depd": "~1.1.1",
+            "http-errors": "~1.6.2",
+            "iconv-lite": "0.4.19",
+            "on-finished": "~2.3.0",
+            "qs": "6.5.1",
+            "raw-body": "2.3.2",
+            "type-is": "~1.6.15"
+          }
+        },
+        "iconv-lite": {
+          "version": "0.4.19",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
+          "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
+        },
+        "qs": {
+          "version": "6.5.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+          "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
+        },
+        "raw-body": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
+          "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
+          "requires": {
+            "bytes": "3.0.0",
+            "http-errors": "1.6.2",
+            "iconv-lite": "0.4.19",
+            "unpipe": "1.0.0"
+          },
+          "dependencies": {
+            "depd": {
+              "version": "1.1.1",
+              "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
+              "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k="
+            },
+            "http-errors": {
+              "version": "1.6.2",
+              "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
+              "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
+              "requires": {
+                "depd": "1.1.1",
+                "inherits": "2.0.3",
+                "setprototypeof": "1.0.3",
+                "statuses": ">= 1.3.1 < 2"
+              }
+            },
+            "setprototypeof": {
+              "version": "1.0.3",
+              "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
+              "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ="
+            }
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+        },
+        "statuses": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
+          "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
+        }
+      }
+    },
+    "express-session": {
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.15.6.tgz",
+      "integrity": "sha512-r0nrHTCYtAMrFwZ0kBzZEXa1vtPVrw0dKvGSrKP4dahwBQ1BJpF2/y1Pp4sCD/0kvxV4zZeclyvfmw0B4RMJQA==",
+      "requires": {
+        "cookie": "0.3.1",
+        "cookie-signature": "1.0.6",
+        "crc": "3.4.4",
+        "debug": "2.6.9",
+        "depd": "~1.1.1",
+        "on-headers": "~1.0.1",
+        "parseurl": "~1.3.2",
+        "uid-safe": "~2.1.5",
+        "utils-merge": "1.0.1"
+      }
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
+    "extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "requires": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "external-editor": {
+      "version": "2.2.0",
+      "resolved": "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
+      "dev": true,
+      "requires": {
+        "chardet": "^0.4.0",
+        "iconv-lite": "^0.4.17",
+        "tmp": "^0.0.33"
+      }
+    },
+    "extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "requires": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        }
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+    },
+    "fast-deep-equal": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "faye-websocket": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+      "dev": true,
+      "requires": {
+        "websocket-driver": ">=0.5.1"
+      }
+    },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
+    "file-entry-cache": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
+      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^1.2.1",
+        "object-assign": "^4.0.1"
+      }
+    },
+    "fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "finalhandler": {
+      "version": "1.1.1",
+      "resolved": "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
+      "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.2",
+        "statuses": "~1.4.0",
+        "unpipe": "~1.0.0"
+      },
+      "dependencies": {
+        "statuses": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
+          "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
+        }
+      }
+    },
+    "find-cache-dir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz",
+      "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
+      "dev": true,
+      "requires": {
+        "commondir": "^1.0.1",
+        "make-dir": "^1.0.0",
+        "pkg-dir": "^2.0.0"
+      }
+    },
+    "find-up": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+      "requires": {
+        "path-exists": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      }
+    },
+    "findup-sync": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
+      "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
+      "dev": true,
+      "requires": {
+        "glob": "~5.0.0"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "5.0.15",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+          "dev": true,
+          "requires": {
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        }
+      }
+    },
+    "flat-cache": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
+      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
+      "dev": true,
+      "requires": {
+        "circular-json": "^0.3.1",
+        "del": "^2.0.2",
+        "graceful-fs": "^4.1.2",
+        "write": "^0.2.1"
+      }
+    },
+    "fluent-ffmpeg": {
+      "version": "git://github.com/datarhei/node-fluent-ffmpeg.git#3469d012d9b76f2c01df48a67f44abeb917b42c9",
+      "from": "git://github.com/datarhei/node-fluent-ffmpeg.git",
+      "requires": {
+        "async": ">=0.2.9",
+        "which": "^1.1.1"
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+    },
+    "form-data": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
+      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "1.0.6",
+        "mime-types": "^2.1.12"
+      },
+      "dependencies": {
+        "combined-stream": {
+          "version": "1.0.6",
+          "resolved": "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
+          "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
+          "requires": {
+            "delayed-stream": "~1.0.0"
+          }
+        }
+      }
+    },
+    "forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
+    },
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "dev": true,
+      "requires": {
+        "map-cache": "^0.2.2"
+      }
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+    },
+    "from2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "requires": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fsevents": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
+      "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nan": "^2.9.2",
+        "node-pre-gyp": "^0.10.0"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "aproba": {
+          "version": "1.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.6"
+          }
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "chownr": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "debug": {
+          "version": "2.6.9",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "deep-extend": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "detect-libc": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "fs-minipass": {
+          "version": "1.2.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "^1.0.3",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.0",
+            "object-assign": "^4.1.0",
+            "signal-exit": "^3.0.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wide-align": "^1.1.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "iconv-lite": {
+          "version": "0.4.21",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safer-buffer": "^2.1.0"
+          }
+        },
+        "ignore-walk": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minimatch": "^3.0.4"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "once": "^1.3.0",
+            "wrappy": "1"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "ini": {
+          "version": "1.3.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true
+        },
+        "minipass": {
+          "version": "2.2.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "^5.1.1",
+            "yallist": "^3.0.0"
+          }
+        },
+        "minizlib": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "needle": {
+          "version": "2.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "^2.1.2",
+            "iconv-lite": "^0.4.4",
+            "sax": "^1.2.4"
+          }
+        },
+        "node-pre-gyp": {
+          "version": "0.10.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "detect-libc": "^1.0.2",
+            "mkdirp": "^0.5.1",
+            "needle": "^2.2.0",
+            "nopt": "^4.0.1",
+            "npm-packlist": "^1.1.6",
+            "npmlog": "^4.0.2",
+            "rc": "^1.1.7",
+            "rimraf": "^2.6.1",
+            "semver": "^5.3.0",
+            "tar": "^4"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1",
+            "osenv": "^0.1.4"
+          }
+        },
+        "npm-bundled": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "npm-packlist": {
+          "version": "1.1.10",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ignore-walk": "^3.0.1",
+            "npm-bundled": "^1.0.1"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "~1.1.2",
+            "console-control-strings": "~1.1.0",
+            "gauge": "~2.7.3",
+            "set-blocking": "~2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "wrappy": "1"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "^1.0.0",
+            "os-tmpdir": "^1.0.0"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.7",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "^0.5.1",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
+            "strip-json-comments": "~2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "glob": "^7.0.5"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sax": {
+          "version": "1.2.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "semver": {
+          "version": "5.5.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "4.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chownr": "^1.0.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.2.4",
+            "minizlib": "^1.1.0",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.1",
+            "yallist": "^3.0.2"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "^1.0.2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "yallist": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true
+        }
+      }
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "gaze": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
+      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+      "dev": true,
+      "requires": {
+        "globule": "^1.0.0"
+      }
+    },
+    "get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+      "dev": true
+    },
+    "get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
+    },
+    "get-stream": {
+      "version": "3.0.0",
+      "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true
+    },
+    "getobject": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz",
+      "integrity": "sha1-BHpEl4n6Fg0Bj1SG7ZEyC27HiFw=",
+      "dev": true
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "glob": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "dev": true,
+      "requires": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      },
+      "dependencies": {
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.0"
+          }
+        }
+      }
+    },
+    "globals": {
+      "version": "9.18.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+      "dev": true
+    },
+    "globby": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+      "dev": true,
+      "requires": {
+        "array-union": "^1.0.1",
+        "arrify": "^1.0.0",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      }
+    },
+    "globule": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
+      "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
+      "dev": true,
+      "requires": {
+        "glob": "~7.1.1",
+        "lodash": "~4.17.10",
+        "minimatch": "~3.0.2"
+      }
+    },
+    "got": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz",
+      "integrity": "sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==",
+      "requires": {
+        "@sindresorhus/is": "^0.7.0",
+        "cacheable-request": "^2.1.1",
+        "decompress-response": "^3.3.0",
+        "duplexer3": "^0.1.4",
+        "get-stream": "^3.0.0",
+        "into-stream": "^3.1.0",
+        "is-retry-allowed": "^1.1.0",
+        "isurl": "^1.0.0-alpha5",
+        "lowercase-keys": "^1.0.0",
+        "mimic-response": "^1.0.0",
+        "p-cancelable": "^0.4.0",
+        "p-timeout": "^2.0.1",
+        "pify": "^3.0.0",
+        "safe-buffer": "^5.1.1",
+        "timed-out": "^4.0.1",
+        "url-parse-lax": "^3.0.0",
+        "url-to-options": "^1.0.1"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+        }
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+    },
+    "grunt": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.0.3.tgz",
+      "integrity": "sha512-/JzmZNPfKorlCrrmxWqQO4JVodO+DVd5XX4DkocL/1WlLlKVLE9+SdEIempOAxDhWPysLle6afvn/hg7Ck2k9g==",
+      "dev": true,
+      "requires": {
+        "coffeescript": "~1.10.0",
+        "dateformat": "~1.0.12",
+        "eventemitter2": "~0.4.13",
+        "exit": "~0.1.1",
+        "findup-sync": "~0.3.0",
+        "glob": "~7.0.0",
+        "grunt-cli": "~1.2.0",
+        "grunt-known-options": "~1.1.0",
+        "grunt-legacy-log": "~2.0.0",
+        "grunt-legacy-util": "~1.1.1",
+        "iconv-lite": "~0.4.13",
+        "js-yaml": "~3.5.2",
+        "minimatch": "~3.0.2",
+        "mkdirp": "~0.5.1",
+        "nopt": "~3.0.6",
+        "path-is-absolute": "~1.0.0",
+        "rimraf": "~2.6.2"
+      },
+      "dependencies": {
+        "coffeescript": {
+          "version": "1.10.0",
+          "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-1.10.0.tgz",
+          "integrity": "sha1-56qDAZF+9iGzXYo580jc3R234z4=",
+          "dev": true
+        },
+        "esprima": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+          "dev": true
+        },
+        "glob": {
+          "version": "7.0.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
+          "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.2",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "grunt-cli": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.2.0.tgz",
+          "integrity": "sha1-VisRnrsGndtGSs4oRVAb6Xs1tqg=",
+          "dev": true,
+          "requires": {
+            "findup-sync": "~0.3.0",
+            "grunt-known-options": "~1.1.0",
+            "nopt": "~3.0.6",
+            "resolve": "~1.1.0"
+          }
+        },
+        "js-yaml": {
+          "version": "3.5.5",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.5.5.tgz",
+          "integrity": "sha1-A3fDgBfKvHMisNH7zSWkkWQfL74=",
+          "dev": true,
+          "requires": {
+            "argparse": "^1.0.2",
+            "esprima": "^2.6.0"
+          }
+        }
+      }
+    },
+    "grunt-babel": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/grunt-babel/-/grunt-babel-7.0.0.tgz",
+      "integrity": "sha512-AFilvH/iPbnIYhL4Wx36AJQCaVEvK55xh0tujAt1DIM5tuxYxRsgUPEpwijBU147B+as/ssGuY9/6JYfTiAWpw==",
+      "dev": true
+    },
+    "grunt-contrib-csslint": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-csslint/-/grunt-contrib-csslint-2.0.0.tgz",
+      "integrity": "sha1-MSnZTf5Qc1fyMzfSSunpqkudV98=",
+      "dev": true,
+      "requires": {
+        "chalk": "^1.0.0",
+        "csslint": "^1.0.0",
+        "lodash": "^4.8.2",
+        "strip-json-comments": "^2.0.1"
+      }
+    },
+    "grunt-contrib-cssmin": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-2.2.1.tgz",
+      "integrity": "sha512-IXNomhQ5ekVZbDbj/ik5YccoD9khU6LT2fDXqO1+/Txjq8cp0tQKjVS8i8EAbHOrSDkL7/UD6A7b+xj98gqh9w==",
+      "dev": true,
+      "requires": {
+        "chalk": "^1.0.0",
+        "clean-css": "~4.1.1",
+        "maxmin": "^2.1.0"
+      }
+    },
+    "grunt-contrib-uglify": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-3.0.1.tgz",
+      "integrity": "sha1-/etfk4pMgEL46Grkb2NVTo6VEcs=",
+      "dev": true,
+      "requires": {
+        "chalk": "^1.0.0",
+        "maxmin": "^1.1.0",
+        "uglify-js": "~3.0.4",
+        "uri-path": "^1.0.0"
+      },
+      "dependencies": {
+        "figures": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+          "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
+          "dev": true,
+          "requires": {
+            "escape-string-regexp": "^1.0.5",
+            "object-assign": "^4.1.0"
+          }
+        },
+        "gzip-size": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-1.0.0.tgz",
+          "integrity": "sha1-Zs+LEBBHInuVus5uodoMF37Vwi8=",
+          "dev": true,
+          "requires": {
+            "browserify-zlib": "^0.1.4",
+            "concat-stream": "^1.4.1"
+          }
+        },
+        "maxmin": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/maxmin/-/maxmin-1.1.0.tgz",
+          "integrity": "sha1-cTZehKmd2Piz99X94vANHn9zvmE=",
+          "dev": true,
+          "requires": {
+            "chalk": "^1.0.0",
+            "figures": "^1.0.1",
+            "gzip-size": "^1.0.0",
+            "pretty-bytes": "^1.0.0"
+          }
+        },
+        "pretty-bytes": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
+          "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
+          "dev": true,
+          "requires": {
+            "get-stdin": "^4.0.1",
+            "meow": "^3.1.0"
+          }
+        }
+      }
+    },
+    "grunt-contrib-watch": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-watch/-/grunt-contrib-watch-1.1.0.tgz",
+      "integrity": "sha512-yGweN+0DW5yM+oo58fRu/XIRrPcn3r4tQx+nL7eMRwjpvk+rQY6R8o94BPK0i2UhTg9FN21hS+m8vR8v9vXfeg==",
+      "dev": true,
+      "requires": {
+        "async": "^2.6.0",
+        "gaze": "^1.1.0",
+        "lodash": "^4.17.10",
+        "tiny-lr": "^1.1.1"
+      }
+    },
+    "grunt-known-options": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.1.tgz",
+      "integrity": "sha512-cHwsLqoighpu7TuYj5RonnEuxGVFnztcUqTqp5rXFGYL4OuPFofwC4Ycg7n9fYwvK6F5WbYgeVOwph9Crs2fsQ==",
+      "dev": true
+    },
+    "grunt-legacy-log": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-2.0.0.tgz",
+      "integrity": "sha512-1m3+5QvDYfR1ltr8hjiaiNjddxGdQWcH0rw1iKKiQnF0+xtgTazirSTGu68RchPyh1OBng1bBUjLmX8q9NpoCw==",
+      "dev": true,
+      "requires": {
+        "colors": "~1.1.2",
+        "grunt-legacy-log-utils": "~2.0.0",
+        "hooker": "~0.2.3",
+        "lodash": "~4.17.5"
+      }
+    },
+    "grunt-legacy-log-utils": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.0.1.tgz",
+      "integrity": "sha512-o7uHyO/J+i2tXG8r2bZNlVk20vlIFJ9IEYyHMCQGfWYru8Jv3wTqKZzvV30YW9rWEjq0eP3cflQ1qWojIe9VFA==",
+      "dev": true,
+      "requires": {
+        "chalk": "~2.4.1",
+        "lodash": "~4.17.10"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "grunt-legacy-util": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-1.1.1.tgz",
+      "integrity": "sha512-9zyA29w/fBe6BIfjGENndwoe1Uy31BIXxTH3s8mga0Z5Bz2Sp4UCjkeyv2tI449ymkx3x26B+46FV4fXEddl5A==",
+      "dev": true,
+      "requires": {
+        "async": "~1.5.2",
+        "exit": "~0.1.1",
+        "getobject": "~0.1.0",
+        "hooker": "~0.2.3",
+        "lodash": "~4.17.10",
+        "underscore.string": "~3.3.4",
+        "which": "~1.3.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.5.2",
+          "resolved": "http://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        }
+      }
+    },
+    "grunt-ng-annotate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/grunt-ng-annotate/-/grunt-ng-annotate-3.0.0.tgz",
+      "integrity": "sha1-dqKiGha6Y+Vve+G3XuXErZMCeTk=",
+      "dev": true,
+      "requires": {
+        "lodash.clonedeep": "^4.5.0",
+        "ng-annotate": "^1.2.1"
+      }
+    },
+    "grunt-shell": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/grunt-shell/-/grunt-shell-2.1.0.tgz",
+      "integrity": "sha1-Q595FZ7RHmSmUaacyKPQK+v17MI=",
+      "dev": true,
+      "requires": {
+        "chalk": "^1.0.0",
+        "npm-run-path": "^2.0.0"
+      }
+    },
+    "gzip-size": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-3.0.0.tgz",
+      "integrity": "sha1-VGGI6b3DN/Zzdy+BZgRks4nc5SA=",
+      "dev": true,
+      "requires": {
+        "duplexer": "^0.1.1"
+      }
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+    },
+    "har-validator": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz",
+      "integrity": "sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==",
+      "requires": {
+        "ajv": "^5.3.0",
+        "har-schema": "^2.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "5.5.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+          "requires": {
+            "co": "^4.6.0",
+            "fast-deep-equal": "^1.0.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.3.0"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
+        },
+        "json-schema-traverse": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+          "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
+        }
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "has-binary2": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
+      "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
+      "requires": {
+        "isarray": "2.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
+        }
+      }
+    },
+    "has-cors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
+      "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
+    "has-symbol-support-x": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
+      "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="
+    },
+    "has-to-string-tag-x": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
+      "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
+      "requires": {
+        "has-symbol-support-x": "^1.4.1"
+      }
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "dev": true,
+      "requires": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "hash-base": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "hash.js": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.5.tgz",
+      "integrity": "sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "home-or-tmp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
+      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.1"
+      }
+    },
+    "hooker": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz",
+      "integrity": "sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk=",
+      "dev": true
+    },
+    "hosted-git-info": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
+      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
+    },
+    "http-cache-semantics": {
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
+      "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="
+    },
+    "http-errors": {
+      "version": "1.6.3",
+      "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+      "requires": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      }
+    },
+    "http-parser-js": {
+      "version": "0.4.13",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.13.tgz",
+      "integrity": "sha1-O9bW/ebjFyyTNMOzO2wZPYD+ETc=",
+      "dev": true
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
+    },
+    "https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+      "dev": true
+    },
+    "iconv-lite": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
+      "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ieee754": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
+      "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
+      "dev": true
+    },
+    "ignore": {
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+      "dev": true
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+      "requires": {
+        "repeating": "^2.0.0"
+      }
+    },
+    "indexof": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "inquirer": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
+      "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "^3.0.0",
+        "chalk": "^2.0.0",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^2.0.4",
+        "figures": "^2.0.0",
+        "lodash": "^4.3.0",
+        "mute-stream": "0.0.7",
+        "run-async": "^2.2.0",
+        "rx-lite": "^4.0.8",
+        "rx-lite-aggregates": "^4.0.8",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^4.0.0",
+        "through": "^2.3.6"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "interpret": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
+      "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
+      "dev": true
+    },
+    "into-stream": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz",
+      "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=",
+      "requires": {
+        "from2": "^2.1.1",
+        "p-is-promise": "^1.1.0"
+      }
+    },
+    "invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "dev": true,
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
+    "invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "dev": true
+    },
+    "ip": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
+    },
+    "ip-regex": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk="
+    },
+    "ipaddr.js": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
+      "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4="
+    },
+    "is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      }
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+    },
+    "is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "^1.0.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "is-builtin-module": {
+      "version": "1.0.0",
+      "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+      "requires": {
+        "builtin-modules": "^1.0.0"
+      }
+    },
+    "is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      }
+    },
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "requires": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
+    },
+    "is-finite": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+      "requires": {
+        "number-is-nan": "^1.0.0"
+      }
+    },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
+      "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-ip": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-ip/-/is-ip-2.0.0.tgz",
+      "integrity": "sha1-aO6gfooKCpTC0IDdZ0xzGrKkYas=",
+      "requires": {
+        "ip-regex": "^2.0.0"
+      }
+    },
+    "is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      }
+    },
+    "is-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
+      "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA="
+    },
+    "is-path-cwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+      "dev": true
+    },
+    "is-path-in-cwd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
+      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
+      "dev": true,
+      "requires": {
+        "is-path-inside": "^1.0.0"
+      }
+    },
+    "is-path-inside": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
+      "dev": true,
+      "requires": {
+        "path-is-inside": "^1.0.1"
+      }
+    },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
+    },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "dev": true
+    },
+    "is-resolvable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
+      "dev": true
+    },
+    "is-retry-allowed": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
+      "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ="
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    },
+    "isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
+    "isurl": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
+      "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
+      "requires": {
+        "has-to-string-tag-x": "^1.2.0",
+        "is-object": "^1.0.1"
+      }
+    },
+    "js-tokens": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
+      "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "optional": true
+    },
+    "jsesc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+      "dev": true
+    },
+    "json-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
+      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
+    },
+    "json-loader": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
+      "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
+      "dev": true
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "json-stable-stringify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+      "dev": true,
+      "requires": {
+        "jsonify": "~0.0.0"
+      }
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
+    "json5": {
+      "version": "0.5.1",
+      "resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+      "dev": true
+    },
+    "jsonify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+      "dev": true
+    },
+    "jsonschema": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.2.0.tgz",
+      "integrity": "sha512-XDJApzBauMg0TinJNP4iVcJl99PQ4JbWKK7nwzpOIkAOVveDKgh/2xm41T3x7Spu4PWMhnnQpNJmUSIUgl6sKg=="
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "keyv": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz",
+      "integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==",
+      "requires": {
+        "json-buffer": "3.0.0"
+      }
+    },
+    "kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "requires": {
+        "is-buffer": "^1.1.5"
+      }
+    },
+    "lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
+      "dev": true
+    },
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "dev": true,
+      "requires": {
+        "invert-kv": "^1.0.0"
+      }
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      }
+    },
+    "livereload-js": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.3.0.tgz",
+      "integrity": "sha512-j1R0/FeGa64Y+NmqfZhyoVRzcFlOZ8sNlKzHjh4VvLULFACZhn68XrX5DFg2FhMvSMJmROuFxRSa560ECWKBMg==",
+      "dev": true
+    },
+    "load-grunt-tasks": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/load-grunt-tasks/-/load-grunt-tasks-3.5.2.tgz",
+      "integrity": "sha1-ByhWEYD9IP+KaSdQWFL8WKrqDIg=",
+      "dev": true,
+      "requires": {
+        "arrify": "^1.0.0",
+        "multimatch": "^2.0.0",
+        "pkg-up": "^1.0.0",
+        "resolve-pkg": "^0.1.0"
+      }
+    },
+    "load-json-file": {
+      "version": "1.1.0",
+      "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      }
+    },
+    "loader-runner": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.1.tgz",
+      "integrity": "sha512-By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw==",
+      "dev": true
+    },
+    "loader-utils": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
+      "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
+      "dev": true,
+      "requires": {
+        "big.js": "^3.1.3",
+        "emojis-list": "^2.0.0",
+        "json5": "^0.5.0"
+      }
+    },
+    "locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
+      "requires": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "dependencies": {
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "dev": true
+        }
+      }
+    },
+    "lodash": {
+      "version": "4.17.11",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+    },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
+    },
+    "lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
+      "dev": true
+    },
+    "longest": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
+      "dev": true
+    },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
+    "loud-rejection": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+      "requires": {
+        "currently-unhandled": "^0.4.1",
+        "signal-exit": "^3.0.0"
+      }
+    },
+    "lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
+    },
+    "lru-cache": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
+      "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
+      "dev": true,
+      "requires": {
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      }
+    },
+    "make-dir": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+      "dev": true,
+      "requires": {
+        "pify": "^3.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        }
+      }
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true
+    },
+    "map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0="
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "dev": true,
+      "requires": {
+        "object-visit": "^1.0.0"
+      }
+    },
+    "maxmin": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/maxmin/-/maxmin-2.1.0.tgz",
+      "integrity": "sha1-TTsiCQPZXu5+t6x/qGTnLcCaMWY=",
+      "dev": true,
+      "requires": {
+        "chalk": "^1.0.0",
+        "figures": "^1.0.1",
+        "gzip-size": "^3.0.0",
+        "pretty-bytes": "^3.0.0"
+      },
+      "dependencies": {
+        "figures": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+          "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
+          "dev": true,
+          "requires": {
+            "escape-string-regexp": "^1.0.5",
+            "object-assign": "^4.1.0"
+          }
+        }
+      }
+    },
+    "md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
+    },
+    "mem": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "^1.0.0"
+      }
+    },
+    "memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "requires": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "meow": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+      "requires": {
+        "camelcase-keys": "^2.0.0",
+        "decamelize": "^1.1.2",
+        "loud-rejection": "^1.0.0",
+        "map-obj": "^1.0.1",
+        "minimist": "^1.1.3",
+        "normalize-package-data": "^2.3.4",
+        "object-assign": "^4.0.1",
+        "read-pkg-up": "^1.0.1",
+        "redent": "^1.0.0",
+        "trim-newlines": "^1.0.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+        }
+      }
+    },
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+    },
+    "micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        }
+      }
+    },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      }
+    },
+    "mime": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
+    },
+    "mime-db": {
+      "version": "1.36.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz",
+      "integrity": "sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw=="
+    },
+    "mime-types": {
+      "version": "2.1.20",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz",
+      "integrity": "sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==",
+      "requires": {
+        "mime-db": "~1.36.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+      "dev": true
+    },
+    "mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
+    },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+    },
+    "mixin-deep": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
+      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "dev": true,
+      "requires": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "moment": {
+      "version": "2.22.2",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz",
+      "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y="
+    },
+    "moment-timezone": {
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz",
+      "integrity": "sha1-mc5cfYJyYusPH3AgRBd/YHRde5A=",
+      "requires": {
+        "moment": ">= 2.9.0"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "multimatch": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz",
+      "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=",
+      "dev": true,
+      "requires": {
+        "array-differ": "^1.0.0",
+        "array-union": "^1.0.1",
+        "arrify": "^1.0.0",
+        "minimatch": "^3.0.0"
+      }
+    },
+    "mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+      "dev": true
+    },
+    "nan": {
+      "version": "2.11.1",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz",
+      "integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==",
+      "dev": true,
+      "optional": true
+    },
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        }
+      }
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "negotiator": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
+      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
+    },
+    "neo-async": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.2.tgz",
+      "integrity": "sha512-vdqTKI9GBIYcAEbFAcpKPErKINfPF5zIuz3/niBfq8WUZjpT2tytLlFVrBgWdOtqI4uaA/Rb6No0hux39XXDuw==",
+      "dev": true
+    },
+    "next-tick": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
+      "dev": true
+    },
+    "ng-annotate": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/ng-annotate/-/ng-annotate-1.2.2.tgz",
+      "integrity": "sha1-3D/FG6Cy+LOF2+BH9NoG9YCh/WE=",
+      "dev": true,
+      "requires": {
+        "acorn": "~2.6.4",
+        "alter": "~0.2.0",
+        "convert-source-map": "~1.1.2",
+        "optimist": "~0.6.1",
+        "ordered-ast-traverse": "~1.1.1",
+        "simple-fmt": "~0.1.0",
+        "simple-is": "~0.2.0",
+        "source-map": "~0.5.3",
+        "stable": "~0.1.5",
+        "stringmap": "~0.2.2",
+        "stringset": "~0.2.1",
+        "tryor": "~0.1.2"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "2.6.4",
+          "resolved": "http://registry.npmjs.org/acorn/-/acorn-2.6.4.tgz",
+          "integrity": "sha1-6x9FtKQ/ox0DcBpexG87Umc+kO4=",
+          "dev": true
+        },
+        "convert-source-map": {
+          "version": "1.1.3",
+          "resolved": "http://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz",
+          "integrity": "sha1-SCnId+n+SbMWHzvzZziI4gRpmGA=",
+          "dev": true
+        }
+      }
+    },
+    "node-json-db": {
+      "version": "0.7.3",
+      "resolved": "http://registry.npmjs.org/node-json-db/-/node-json-db-0.7.3.tgz",
+      "integrity": "sha1-v2Mf9NTPQhHL3/5srmqq/m7lTN8=",
+      "requires": {
+        "mkdirp": "0.5.x"
+      }
+    },
+    "node-libs-browser": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz",
+      "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==",
+      "dev": true,
+      "requires": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^1.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.0",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.10.3",
+        "vm-browserify": "0.0.4"
+      },
+      "dependencies": {
+        "browserify-zlib": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+          "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+          "dev": true,
+          "requires": {
+            "pako": "~1.0.5"
+          }
+        },
+        "pako": {
+          "version": "1.0.6",
+          "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
+          "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==",
+          "dev": true
+        }
+      }
+    },
+    "nopt": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+      "dev": true,
+      "requires": {
+        "abbrev": "1"
+      }
+    },
+    "normalize-package-data": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+      "requires": {
+        "hosted-git-info": "^2.1.4",
+        "is-builtin-module": "^1.0.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
+      "requires": {
+        "remove-trailing-separator": "^1.0.1"
+      }
+    },
+    "normalize-url": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
+      "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
+      "requires": {
+        "prepend-http": "^2.0.0",
+        "query-string": "^5.0.1",
+        "sort-keys": "^2.0.0"
+      }
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "requires": {
+        "path-key": "^2.0.0"
+      }
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+    },
+    "oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
+    "object-component": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
+      "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE="
+    },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dev": true,
+      "requires": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.0"
+      }
+    },
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "on-headers": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
+      "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c="
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "^1.0.0"
+      }
+    },
+    "optimist": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+      "dev": true,
+      "requires": {
+        "minimist": "~0.0.1",
+        "wordwrap": "~0.0.2"
+      },
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+          "dev": true
+        }
+      }
+    },
+    "optionator": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "dev": true,
+      "requires": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.4",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "wordwrap": "~1.0.0"
+      }
+    },
+    "ordered-ast-traverse": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ordered-ast-traverse/-/ordered-ast-traverse-1.1.1.tgz",
+      "integrity": "sha1-aEOhcLwO7otSDMjdwd3TqjD6BXw=",
+      "dev": true,
+      "requires": {
+        "ordered-esprima-props": "~1.1.0"
+      }
+    },
+    "ordered-esprima-props": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ordered-esprima-props/-/ordered-esprima-props-1.1.0.tgz",
+      "integrity": "sha1-qYJwht9fAQqmDpvQK24DNc6i/8s=",
+      "dev": true
+    },
+    "os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+      "dev": true
+    },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "dev": true
+    },
+    "os-locale": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+      "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+      "dev": true,
+      "requires": {
+        "execa": "^0.7.0",
+        "lcid": "^1.0.0",
+        "mem": "^1.1.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
+    },
+    "p-cancelable": {
+      "version": "0.4.1",
+      "resolved": "http://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz",
+      "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ=="
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
+    },
+    "p-is-promise": {
+      "version": "1.1.0",
+      "resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
+      "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4="
+    },
+    "p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dev": true,
+      "requires": {
+        "p-try": "^1.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "requires": {
+        "p-limit": "^1.1.0"
+      }
+    },
+    "p-timeout": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz",
+      "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==",
+      "requires": {
+        "p-finally": "^1.0.0"
+      }
+    },
+    "p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true
+    },
+    "pako": {
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+      "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
+      "dev": true
+    },
+    "parse-asn1": {
+      "version": "5.1.1",
+      "resolved": "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
+      "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
+      "dev": true,
+      "requires": {
+        "asn1.js": "^4.0.0",
+        "browserify-aes": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3"
+      }
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "requires": {
+        "error-ex": "^1.2.0"
+      }
+    },
+    "parseqs": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
+      "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
+      "requires": {
+        "better-assert": "~1.0.0"
+      }
+    },
+    "parserlib": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/parserlib/-/parserlib-1.1.1.tgz",
+      "integrity": "sha1-pkz6ckBiQ0/fw1HJpOwtkrlMBvQ=",
+      "dev": true
+    },
+    "parseuri": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
+      "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
+      "requires": {
+        "better-assert": "~1.0.0"
+      }
+    },
+    "parseurl": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
+      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "dev": true
+    },
+    "path-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
+      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
+      "dev": true
+    },
+    "path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+      "dev": true
+    },
+    "path-exists": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+      "requires": {
+        "pinkie-promise": "^2.0.0"
+      }
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+      "dev": true
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true
+    },
+    "path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+    },
+    "path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      }
+    },
+    "pbkdf2": {
+      "version": "3.0.17",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
+      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
+      "dev": true,
+      "requires": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+    },
+    "pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "requires": {
+        "pinkie": "^2.0.0"
+      }
+    },
+    "pkg-dir": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+      "dev": true,
+      "requires": {
+        "find-up": "^2.1.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        }
+      }
+    },
+    "pkg-up": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-1.0.0.tgz",
+      "integrity": "sha1-Pgj7RhUlxEIWJKM7n35tCvWwWiY=",
+      "dev": true,
+      "requires": {
+        "find-up": "^1.0.0"
+      }
+    },
+    "pluralize": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-4.0.0.tgz",
+      "integrity": "sha1-WbcIwcAZCi9pLxx2GMRGsFL9F2I=",
+      "dev": true
+    },
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+      "dev": true
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true
+    },
+    "prepend-http": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="
+    },
+    "pretty-bytes": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-3.0.1.tgz",
+      "integrity": "sha1-J9AAjXeAY6C0gRuzXHnxvV1fvM8=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "^1.0.0"
+      }
+    },
+    "private": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+      "dev": true
+    },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
+    },
+    "progress": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
+      "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
+      "dev": true
+    },
+    "proxy-addr": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
+      "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
+      "requires": {
+        "forwarded": "~0.1.2",
+        "ipaddr.js": "1.8.0"
+      }
+    },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true
+    },
+    "ps-find": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ps-find/-/ps-find-1.1.0.tgz",
+      "integrity": "sha1-HBPGV9+0cD45TCEZDshLwdEV25I="
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "dev": true
+    },
+    "psl": {
+      "version": "1.1.29",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz",
+      "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ=="
+    },
+    "public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "public-ip": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/public-ip/-/public-ip-2.4.0.tgz",
+      "integrity": "sha512-74cIy+T2cDmt+Z71AfVipH2q6qqZITPyNGszKV86OGDYIRvti1m8zg4GOaiTPCLgEIWnToKYXbhEnMiZWHPEUA==",
+      "requires": {
+        "dns-socket": "^1.6.2",
+        "got": "^8.0.0",
+        "is-ip": "^2.0.0",
+        "pify": "^3.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+        }
+      }
+    },
+    "public-ip-cli": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/public-ip-cli/-/public-ip-cli-1.1.2.tgz",
+      "integrity": "sha1-QgGkXsCk10DWgT2q8kr6/qNU/P8=",
+      "requires": {
+        "meow": "^3.7.0",
+        "public-ip": "^2.3.1"
+      }
+    },
+    "punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+    },
+    "q": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz",
+      "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE="
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+    },
+    "query-string": {
+      "version": "5.1.1",
+      "resolved": "http://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
+      "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
+      "requires": {
+        "decode-uri-component": "^0.2.0",
+        "object-assign": "^4.1.0",
+        "strict-uri-encode": "^1.0.0"
+      }
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "dev": true
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true
+    },
+    "random-bytes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz",
+      "integrity": "sha1-T2ih3Arli9P7lYSMMDJNt11kNgs="
+    },
+    "randombytes": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
+      "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "range-parser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
+      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4="
+    },
+    "raw-body": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz",
+      "integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==",
+      "requires": {
+        "bytes": "3.0.0",
+        "http-errors": "1.6.3",
+        "iconv-lite": "0.4.23",
+        "unpipe": "1.0.0"
+      }
+    },
+    "read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "requires": {
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
+      }
+    },
+    "read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "requires": {
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "readdirp": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "redent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+      "requires": {
+        "indent-string": "^2.1.0",
+        "strip-indent": "^1.0.1"
+      }
+    },
+    "regenerate": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
+      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
+      "dev": true
+    },
+    "regenerator-runtime": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+      "dev": true
+    },
+    "regenerator-transform": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
+      "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.18.0",
+        "babel-types": "^6.19.0",
+        "private": "^0.1.6"
+      }
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "regexpu-core": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
+      "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
+      "dev": true,
+      "requires": {
+        "regenerate": "^1.2.1",
+        "regjsgen": "^0.2.0",
+        "regjsparser": "^0.1.4"
+      }
+    },
+    "regjsgen": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+      "dev": true
+    },
+    "regjsparser": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+      "dev": true,
+      "requires": {
+        "jsesc": "~0.5.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+          "dev": true
+        }
+      }
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "dev": true
+    },
+    "repeat-element": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+      "dev": true
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
+    },
+    "repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "requires": {
+        "is-finite": "^1.0.0"
+      }
+    },
+    "request": {
+      "version": "2.88.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.0",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.4.3",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      }
+    },
+    "request-promise": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.2.tgz",
+      "integrity": "sha1-0epG1lSm7k+O5qT+oQGMIpEZBLQ=",
+      "requires": {
+        "bluebird": "^3.5.0",
+        "request-promise-core": "1.1.1",
+        "stealthy-require": "^1.1.0",
+        "tough-cookie": ">=2.3.3"
+      }
+    },
+    "request-promise-core": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz",
+      "integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=",
+      "requires": {
+        "lodash": "^4.13.1"
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+      "dev": true
+    },
+    "require-uncached": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
+      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
+      "dev": true,
+      "requires": {
+        "caller-path": "^0.1.0",
+        "resolve-from": "^1.0.0"
+      }
+    },
+    "resolve": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+      "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+      "dev": true
+    },
+    "resolve-from": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
+      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
+      "dev": true
+    },
+    "resolve-pkg": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/resolve-pkg/-/resolve-pkg-0.1.0.tgz",
+      "integrity": "sha1-AsyZNBDik2livZcWahsHfalyVTE=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^2.0.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz",
+          "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=",
+          "dev": true
+        }
+      }
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "dev": true
+    },
+    "responselike": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
+      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
+      "requires": {
+        "lowercase-keys": "^1.0.0"
+      }
+    },
+    "restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "dev": true,
+      "requires": {
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true
+    },
+    "right-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
+      "dev": true,
+      "requires": {
+        "align-text": "^0.1.1"
+      }
+    },
+    "rimraf": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.0.5"
+      }
+    },
+    "ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "dev": true,
+      "requires": {
+        "is-promise": "^2.1.0"
+      }
+    },
+    "rx-lite": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
+      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
+      "dev": true
+    },
+    "rx-lite-aggregates": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
+      "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
+      "dev": true,
+      "requires": {
+        "rx-lite": "*"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "safe-json-parse": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz",
+      "integrity": "sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=",
+      "dev": true
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
+      "requires": {
+        "ret": "~0.1.10"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "semver": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
+    },
+    "send": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+      "requires": {
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "~1.6.2",
+        "mime": "1.4.1",
+        "ms": "2.0.0",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.0",
+        "statuses": "~1.4.0"
+      },
+      "dependencies": {
+        "statuses": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
+          "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
+        }
+      }
+    },
+    "serve-static": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
+      "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
+      "requires": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.2",
+        "send": "0.16.2"
+      }
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
+    },
+    "set-value": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
+      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
+    },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+    },
+    "simple-fmt": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/simple-fmt/-/simple-fmt-0.1.0.tgz",
+      "integrity": "sha1-GRv1ZqWeZTBILLJatTtKjchcOms=",
+      "dev": true
+    },
+    "simple-is": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/simple-is/-/simple-is-0.2.0.tgz",
+      "integrity": "sha1-Krt1qt453rXMgVzhDmGRFkhQuvA=",
+      "dev": true
+    },
+    "slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+      "dev": true
+    },
+    "slice-ansi": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+      "dev": true,
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0"
+      }
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "requires": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.2.0"
+      }
+    },
+    "socket.io": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
+      "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
+      "requires": {
+        "debug": "~3.1.0",
+        "engine.io": "~3.2.0",
+        "has-binary2": "~1.0.2",
+        "socket.io-adapter": "~1.1.0",
+        "socket.io-client": "2.1.1",
+        "socket.io-parser": "~3.2.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "socket.io-adapter": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz",
+      "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs="
+    },
+    "socket.io-client": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
+      "integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
+      "requires": {
+        "backo2": "1.0.2",
+        "base64-arraybuffer": "0.1.5",
+        "component-bind": "1.0.0",
+        "component-emitter": "1.2.1",
+        "debug": "~3.1.0",
+        "engine.io-client": "~3.2.0",
+        "has-binary2": "~1.0.2",
+        "has-cors": "1.1.0",
+        "indexof": "0.0.1",
+        "object-component": "0.0.3",
+        "parseqs": "0.0.5",
+        "parseuri": "0.0.5",
+        "socket.io-parser": "~3.2.0",
+        "to-array": "0.1.4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "socket.io-parser": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
+      "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==",
+      "requires": {
+        "component-emitter": "1.2.1",
+        "debug": "~3.1.0",
+        "isarray": "2.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "isarray": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
+        }
+      }
+    },
+    "sort-keys": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
+      "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=",
+      "requires": {
+        "is-plain-obj": "^1.0.0"
+      }
+    },
+    "source-list-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
+      "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
+      "dev": true
+    },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true
+    },
+    "source-map-resolve": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+      "dev": true,
+      "requires": {
+        "atob": "^2.1.1",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "source-map-support": {
+      "version": "0.4.18",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+      "dev": true,
+      "requires": {
+        "source-map": "^0.5.6"
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+      "dev": true
+    },
+    "spdx-correct": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.2.tgz",
+      "integrity": "sha512-q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ==",
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz",
+      "integrity": "sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w=="
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.0"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "sshpk": {
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz",
+      "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=",
+      "requires": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      }
+    },
+    "stable": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+      "dev": true
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "dev": true,
+      "requires": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+    },
+    "stealthy-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
+    },
+    "stream-browserify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
+      "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
+      "dev": true,
+      "requires": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "dev": true,
+      "requires": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
+    },
+    "string-template": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
+      "integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=",
+      "dev": true
+    },
+    "string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dev": true,
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "stringmap": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz",
+      "integrity": "sha1-VWwTeyWPlCuHdvWy71gqoGnX0bE=",
+      "dev": true
+    },
+    "stringset": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/stringset/-/stringset-0.2.1.tgz",
+      "integrity": "sha1-7yWcTjSTRDd/zRyRPdLoSMnAQrU=",
+      "dev": true
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "requires": {
+        "is-utf8": "^0.2.0"
+      }
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true
+    },
+    "strip-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
+      "requires": {
+        "get-stdin": "^4.0.1"
+      }
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+      "dev": true
+    },
+    "table": {
+      "version": "4.0.3",
+      "resolved": "http://registry.npmjs.org/table/-/table-4.0.3.tgz",
+      "integrity": "sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.0.1",
+        "ajv-keywords": "^3.0.0",
+        "chalk": "^2.1.0",
+        "lodash": "^4.17.4",
+        "slice-ansi": "1.0.0",
+        "string-width": "^2.1.1"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.5.4",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.4.tgz",
+          "integrity": "sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "tapable": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz",
+      "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=",
+      "dev": true
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "timed-out": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
+      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8="
+    },
+    "timers-browserify": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
+      "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
+      "dev": true,
+      "requires": {
+        "setimmediate": "^1.0.4"
+      }
+    },
+    "tiny-lr": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
+      "integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
+      "dev": true,
+      "requires": {
+        "body": "^5.1.0",
+        "debug": "^3.1.0",
+        "faye-websocket": "~0.10.0",
+        "livereload-js": "^2.3.0",
+        "object-assign": "^4.1.0",
+        "qs": "^6.4.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.5",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.5.tgz",
+          "integrity": "sha512-D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        }
+      }
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
+    "to-array": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
+      "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA="
+    },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
+    "to-fast-properties": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+      "dev": true
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      }
+    },
+    "tough-cookie": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+      "requires": {
+        "psl": "^1.1.24",
+        "punycode": "^1.4.1"
+      }
+    },
+    "trim-newlines": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
+    },
+    "trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+      "dev": true
+    },
+    "tryor": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/tryor/-/tryor-0.1.2.tgz",
+      "integrity": "sha1-gUXkynyv9ArN48z5Rui4u3W0Fys=",
+      "dev": true
+    },
+    "tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "optional": true
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2"
+      }
+    },
+    "type-is": {
+      "version": "1.6.16",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
+      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.18"
+      }
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "uglify-js": {
+      "version": "3.0.28",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.28.tgz",
+      "integrity": "sha512-0h/qGay016GG2lVav3Kz174F3T2Vjlz2v6HCt+WDQpoXfco0hWwF5gHK9yh88mUYvIC+N7Z8NT8WpjSp1yoqGA==",
+      "dev": true,
+      "requires": {
+        "commander": "~2.11.0",
+        "source-map": "~0.5.1"
+      }
+    },
+    "uglify-to-browserify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+      "dev": true,
+      "optional": true
+    },
+    "uglifyjs-webpack-plugin": {
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
+      "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
+      "dev": true,
+      "requires": {
+        "source-map": "^0.5.6",
+        "uglify-js": "^2.8.29",
+        "webpack-sources": "^1.0.1"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+          "dev": true
+        },
+        "uglify-js": {
+          "version": "2.8.29",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+          "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+          "dev": true,
+          "requires": {
+            "source-map": "~0.5.1",
+            "uglify-to-browserify": "~1.0.0",
+            "yargs": "~3.10.0"
+          }
+        },
+        "yargs": {
+          "version": "3.10.0",
+          "resolved": "http://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^1.0.2",
+            "cliui": "^2.1.0",
+            "decamelize": "^1.0.0",
+            "window-size": "0.1.0"
+          }
+        }
+      }
+    },
+    "uid-safe": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz",
+      "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==",
+      "requires": {
+        "random-bytes": "~1.0.0"
+      }
+    },
+    "ultron": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
+      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="
+    },
+    "underscore.string": {
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.5.tgz",
+      "integrity": "sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "^1.0.3",
+        "util-deprecate": "^1.0.2"
+      }
+    },
+    "union-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
+      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^0.4.3"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "set-value": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
+          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-extendable": "^0.1.1",
+            "is-plain-object": "^2.0.1",
+            "to-object-path": "^0.3.0"
+          }
+        }
+      }
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dev": true,
+      "requires": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "dev": true,
+          "requires": {
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "dev": true,
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+          "dev": true
+        }
+      }
+    },
+    "upath": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
+      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
+      "dev": true
+    },
+    "uri-js": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "requires": {
+        "punycode": "^2.1.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+        }
+      }
+    },
+    "uri-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/uri-path/-/uri-path-1.0.0.tgz",
+      "integrity": "sha1-l0fwGDWJM8Md4PzP2C0TjmcmLjI=",
+      "dev": true
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "dev": true
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+          "dev": true
+        }
+      }
+    },
+    "url-parse-lax": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
+      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
+      "requires": {
+        "prepend-http": "^2.0.0"
+      }
+    },
+    "url-to-options": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
+      "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k="
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true
+    },
+    "util": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
+    },
+    "uuid": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "requires": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "vm-browserify": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+      "dev": true,
+      "requires": {
+        "indexof": "0.0.1"
+      }
+    },
+    "watchpack": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
+      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+      "dev": true,
+      "requires": {
+        "chokidar": "^2.0.2",
+        "graceful-fs": "^4.1.2",
+        "neo-async": "^2.5.0"
+      }
+    },
+    "webpack": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.12.0.tgz",
+      "integrity": "sha512-Sw7MdIIOv/nkzPzee4o0EdvCuPmxT98+vVpIvwtcwcF1Q4SDSNp92vwcKc4REe7NItH9f1S4ra9FuQ7yuYZ8bQ==",
+      "dev": true,
+      "requires": {
+        "acorn": "^5.0.0",
+        "acorn-dynamic-import": "^2.0.0",
+        "ajv": "^6.1.0",
+        "ajv-keywords": "^3.1.0",
+        "async": "^2.1.2",
+        "enhanced-resolve": "^3.4.0",
+        "escope": "^3.6.0",
+        "interpret": "^1.0.0",
+        "json-loader": "^0.5.4",
+        "json5": "^0.5.1",
+        "loader-runner": "^2.3.0",
+        "loader-utils": "^1.1.0",
+        "memory-fs": "~0.4.1",
+        "mkdirp": "~0.5.0",
+        "node-libs-browser": "^2.0.0",
+        "source-map": "^0.5.3",
+        "supports-color": "^4.2.1",
+        "tapable": "^0.2.7",
+        "uglifyjs-webpack-plugin": "^0.4.6",
+        "watchpack": "^1.4.0",
+        "webpack-sources": "^1.0.1",
+        "yargs": "^8.0.2"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.5.4",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.4.tgz",
+          "integrity": "sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "dev": true,
+          "requires": {
+            "has-flag": "^2.0.0"
+          }
+        }
+      }
+    },
+    "webpack-sources": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz",
+      "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==",
+      "dev": true,
+      "requires": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "websocket-driver": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
+      "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
+      "dev": true,
+      "requires": {
+        "http-parser-js": ">=0.4.0",
+        "websocket-extensions": ">=0.1.1"
+      }
+    },
+    "websocket-extensions": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
+      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
+      "dev": true
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
+    "window-size": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
+      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
+      "dev": true
+    },
+    "wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+      "dev": true
+    },
+    "wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "dev": true,
+      "requires": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
+      },
+      "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "dev": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        }
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "write": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
+      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+      "dev": true,
+      "requires": {
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "ws": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+      "requires": {
+        "async-limiter": "~1.0.0",
+        "safe-buffer": "~5.1.0",
+        "ultron": "~1.1.0"
+      }
+    },
+    "xmlhttprequest-ssl": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
+      "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4="
+    },
+    "xtend": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true
+    },
+    "y18n": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+      "dev": true
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+      "dev": true
+    },
+    "yargs": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
+      "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
+      "dev": true,
+      "requires": {
+        "camelcase": "^4.1.0",
+        "cliui": "^3.2.0",
+        "decamelize": "^1.1.1",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^2.0.0",
+        "read-pkg-up": "^2.0.0",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^2.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^3.2.1",
+        "yargs-parser": "^7.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+          "dev": true,
+          "requires": {
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wrap-ansi": "^2.0.0"
+          },
+          "dependencies": {
+            "string-width": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+              "dev": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            }
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "load-json-file": {
+          "version": "2.0.0",
+          "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^2.2.0",
+            "pify": "^2.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "path-type": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+          "dev": true,
+          "requires": {
+            "pify": "^2.0.0"
+          }
+        },
+        "read-pkg": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^2.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^2.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+          "dev": true,
+          "requires": {
+            "find-up": "^2.0.0",
+            "read-pkg": "^2.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        }
+      }
+    },
+    "yargs-parser": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
+      "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
+      "dev": true,
+      "requires": {
+        "camelcase": "^4.1.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        }
+      }
+    },
+    "yeast": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
+      "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk="
+    }
+  }
+}

From 2db2a86f4379cb6e1de5bfe9baaf59cb8eb7995b Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Sat, 6 Oct 2018 10:21:53 +0200
Subject: [PATCH 13/62] Enable autoplay if requested

Autoplay can be enabled by adding ?autoplay=(1|true|yes|on) after
player.html, eg. http://[IP]/player.html?autoplay=1
---
 src/webserver/public/player.html | 37 +++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/webserver/public/player.html b/src/webserver/public/player.html
index f0158b68..6d0009c5 100644
--- a/src/webserver/public/player.html
+++ b/src/webserver/public/player.html
@@ -17,15 +17,36 @@
 <body>
 <div id="player" style="position:absolute;top:0;right:0;bottom:0;left:0"></div>
 <script>
+    function getQueryParam(value, defValue) {
+        var query = window.location.search.substring(1);
+        var vars = query.split("&");
+        for(var i = 0; i < vars.length; i++) {
+            var pair = vars[i].split("=");
+            if(pair[0] == value) {
+                return pair[1];
+            }
+        }
+        return defValue;
+    }
+
+    var autoplay = getQueryParam("autoplay", false);
+    if(autoplay === "1" || autoplay === "true" || autoplay === "yes" || autoplay === "on") {
+        autoplay = true;
+    }
+    else {
+        autoplay = false;
+    }
+
     var player = new window.Clappr.Player({
-        'source': (window.location.protocol === 'https:' ? 'https:' : 'http:') +
-        '//' + window.location.hostname + ':' + window.location.port + '/hls/live.stream.m3u8',
-        'parentId': '#player',
-        'baseUrl': '/libs/clappr/dist/',
-        'poster': 'images/live.jpg?t=' + String(new Date().getTime()),
-        'mediacontrol': {'seekbar': '#3daa48', 'buttons': '#3daa48'},
-        'height': '100%',
-        'width': '100%'
+        source: (window.location.protocol == 'https:' ? 'https:' : 'http:') + '//' + window.location.hostname + ':' + window.location.port + '/hls/live.stream.m3u8',
+        parentId: '#player',
+        baseUrl: '/libs/clappr/dist/',
+        poster: 'images/live.jpg?t=' + String(new Date().getTime()),
+        mediacontrol: {'seekbar': '#3daa48', 'buttons': '#3daa48'},
+        height: '100%',
+        width: '100%',
+        disableCanAutoPlay: true,
+        autoPlay: autoplay
     });
     var posterPlugin = player.core.mediaControl.container.getPlugin('poster');
     player.on(window.Clappr.Events.PLAYER_STOP, function updatePoster () {

From 14c0ceda33a2365f4a70adf7d296406f057afc97 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Mon, 8 Oct 2018 10:18:58 +0200
Subject: [PATCH 14/62] Fix snapshot interval parsing

If the interval was given in ms, then the minimal allowed interval
did not correspond to the minimal allowed interval in seconds. Now
this check is done only in one place and the unit "ms" is also
recognized.
---
 src/classes/Restreamer.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/classes/Restreamer.js b/src/classes/Restreamer.js
index b1222dbb..fee2bab9 100644
--- a/src/classes/Restreamer.js
+++ b/src/classes/Restreamer.js
@@ -73,12 +73,18 @@ class Restreamer {
         let fallbackRefreshInterval = 60000;
         let snapshotRefreshInterval = process.env.RS_SNAPSHOT_REFRESH_INTERVAL.match(/([0-9]+)([a-z]{1,2})?/);
 
-        if (typeof snapshotRefreshInterval[2] === 'undefined' && snapshotRefreshInterval[1] > 30000) {
-            return snapshotRefreshInterval[1];
+        let refreshInterval = fallbackRefreshInterval;
+
+        if (typeof snapshotRefreshInterval[2] === 'undefined' || snapshotRefreshInterval[2] === 'ms') {
+            refreshInterval = snapshotRefreshInterval[1];
+        } else if (snapshotRefreshInterval[2] === 's') {
+            refreshInterval = snapshotRefreshInterval[1] * 1000;
         } else if (snapshotRefreshInterval[2] === 'm') {
-            return snapshotRefreshInterval[1] * 1000 * 60;
-        } else if (snapshotRefreshInterval[2] === 's' && snapshotRefreshInterval[1] >= 10) {
-            return snapshotRefreshInterval[1] * 1000;
+            refreshInterval = snapshotRefreshInterval[1] * 1000 * 60;
+        }
+
+        if (refreshInterval >= 10000) {
+            return refreshInterval;
         }
 
         return fallbackRefreshInterval;

From fc52e35f7f1827c4a7f25422a79dff281da9bc3c Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 9 Oct 2018 16:07:37 +0200
Subject: [PATCH 15/62] Fix handling of audio tracks

Some streams have a different layout as the expected one, where the
video stream is not always the first one. This requires an explicit
mapping from the input to the output.

Regarding the capabilities of the target stream container the audio
track can be passed through or needs to be transcoded.

Introducing a new environment variable for how to handle the audio
track. It can be "auto" for automatic detection and handling,
"none" to remove any audio track, "silence" to add or replace the
audio track with silence, "aac" to force transcoding to AAC.
---
 conf/live.json            | 53 ++++++++++++++++++++++++++++++----
 src/classes/Restreamer.js | 60 +++++++++++++++++++++++++++++++++++----
 2 files changed, 101 insertions(+), 12 deletions(-)

diff --git a/conf/live.json b/conf/live.json
index 2663a974..a84eef60 100644
--- a/conf/live.json
+++ b/conf/live.json
@@ -8,26 +8,59 @@
     },
     "ffmpeg": {
         "options": {
-            "native_h264": [
+            "native_h264_native_audio": [
                 "-codec copy",
+                "-map 0:v",
+                "-map 0:a",
                 "-map_metadata -1",
                 "-metadata application=datarhei/Restreamer",
                 "-metadata server=NGINX-RTMP",
                 "-f flv"
             ],
-            "native_h264_soundless_aac": [
+            "native_h264_no_audio": [
+                "-vcodec copy",
+                "-an",
+                "-map 0:v",
+                "-map_metadata -1",
+                "-metadata application=datarhei/Restreamer",
+                "-metadata server=NGINX-RTMP",
+                "-f flv"
+            ],
+            "native_h264_native_aac": [
+                "-codec copy",
+                "-map 0:v",
+                "-map 0:a",
+                "-bsf:a aac_adtstoasc",
+                "-map_metadata -1",
+                "-metadata application=datarhei/Restreamer",
+                "-metadata server=NGINX-RTMP",
+                "-f flv"
+            ],
+            "native_h264_silence_aac": [
                 "-f lavfi",
-                "-i aevalsrc=0",
+                "-i anullsrc=r=44100:cl=mono",
                 "-vcodec copy",
                 "-acodec aac",
-                "-map 0:0",
-                "-map 1:0",
+                "-b:a 0k",
+                "-map 0:v",
+                "-map 1:a",
                 "-shortest",
                 "-map_metadata -1",
                 "-metadata application=datarhei/Restreamer",
                 "-metadata server=NGINX-RTMP",
                 "-f flv"
             ],
+            "native_h264_transcode_aac": [
+                "-vcodec copy",
+                "-acodec aac",
+                "-b:a 64k",
+                "-map 0:v",
+                "-map 0:a",
+                "-map_metadata -1",
+                "-metadata application=datarhei/Restreamer",
+                "-metadata server=NGINX-RTMP",
+                "-f flv"
+            ],
             "snapshot": "-vframes 1",
             "err_detect": "ignore_err"
         },
@@ -114,10 +147,18 @@
         {
             "name": "RS_FFMPEG_DEBUG",
             "alias": "",
-            "type": "string",
+            "type": "bool",
             "defaultValue": "false",
             "required": false,
             "description": "Enables FFmpeg reporting"
+        },
+        {
+            "name": "RS_AUDIO",
+            "alias": "",
+            "type": "string",
+            "defaultValue": "auto",
+            "required": false,
+            "description": "Handling of audio track: auto, none (force no audio), silence (force silence), aac (force AAC)"
         }
     ]
 }
diff --git a/src/classes/Restreamer.js b/src/classes/Restreamer.js
index fee2bab9..29ee6ffc 100644
--- a/src/classes/Restreamer.js
+++ b/src/classes/Restreamer.js
@@ -215,16 +215,64 @@ class Restreamer {
                 return deferred.reject(err);
             }
 
-            if (data.streams.length > 1) {
-                ffmpegOptions = config.ffmpeg.options.native_h264;
-                logger.debug('Selected ffmpeg.option: native_h264');
-            } else {
-                ffmpegOptions = config.ffmpeg.options.native_h264_soundless_aac;
-                logger.debug('Selected ffmpeg.option: native_h264_soundless_aac');
+            let video = null;
+            let audio = null;
+
+            for(let s of data.streams) {
+                if(s.codec_type == 'video' && video === null) {
+                    video = s;
+                }
+                else if(s.codec_type == 'audio' && audio === null) {
+                    audio = s;
+                }
+
+                if(video !== null && audio !== null) {
+                    break;
+                }
             }
+
+            if(video === null) {
+                return deferred.reject("no video stream detected");
+            }
+
+            if(video.codec_name != 'h264') {
+                return deferred.reject("video stream must be h264, found " + video.codec_name);
+            }
+
+            let option = "native_h264_no_audio";
+
+            if(audio !== null) {
+                switch(audio.codec_name) {  // consider all allowed audio codecs for FLV
+                    case 'mp3':
+                    case 'pcm_alaw':
+                    case 'pcm_mulaw':
+                        option = "native_h264_native_audio"; break;
+                    case 'aac':
+                        option = "native_h264_native_aac"; break;
+                    default:
+                        option = "native_h264_transcode_aac"; break;
+                }
+            }
+
+            if(process.env.RS_AUDIO == "none") {
+                option = "native_h264_no_audio";
+            }
+            else if(process.env.RS_AUDIO == "silence") {
+                option = "native_h264_silence_aac";
+            }
+            else if(process.env.RS_AUDIO == "aac") {
+                if(audio !== null && audio.codec_name != 'aac') {
+                    option = "native_h264_transcode_aac";
+                }
+            }
+
+            logger.debug('Selected ffmpeg.option: ' + option);
+            ffmpegOptions = config.ffmpeg.options[option];
+
             for (let option of ffmpegOptions) {
                 ffmpegCommand.outputOption(option);
             }
+
             return deferred.resolve();
         });
         return deferred.promise;

From e7ed842df60b7b14d5f5c65bb11471e34e54252a Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 9 Oct 2018 17:16:39 +0200
Subject: [PATCH 16/62] Fix wrong syntax in comparison of strings

---
 run.sh | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/run.sh b/run.sh
index 838e4796..2b99faea 100755
--- a/run.sh
+++ b/run.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 CPU_TYPE=$(uname -m | cut -c 1-3)
-if [ "${MODE}" == "RASPICAM" ] && [ "$CPU_TYPE" == "arm" ];
-then
+if [ "${MODE}" = "RASPICAM" ] && [ "$CPU_TYPE" = "arm" ]; then
     echo "/opt/vc/lib" > /etc/ld.so.conf.d/00-vmcs.conf
     ldconfig
     npm start &
@@ -16,37 +15,32 @@ then
         fi
     done
 
-    if [ "$RS_RASPICAM_WIDTH" = "" ]
-    then
+    if [ "$RS_RASPICAM_WIDTH" = "" ]; then
         RASPICAM_WIDTH=1280
     else
         RASPICAM_WIDTH=$RS_RASPICAM_WIDTH
     fi
 
-    if [ "$RS_RASPICAM_HEIGHT" = "" ]
-    then
+    if [ "$RS_RASPICAM_HEIGHT" = "" ]; then
         RASPICAM_HEIGHT=720
     else
         RASPICAM_HEIGHT=$RS_RASPICAM_HEIGHT
     fi
 
-    if [ "$RS_RASPICAM_FPS" = "" ]
-    then
+    if [ "$RS_RASPICAM_FPS" = "" ]; then
         RASPICAM_FPS=25
     else
         RASPICAM_FPS=$RS_RASPICAM_FPS
     fi
 
-    if [ "$RS_RASPICAM_BITRATE" = "" ]
-    then
+    if [ "$RS_RASPICAM_BITRATE" = "" ]; then
         RASPICAM_BITRATE=50000
     else
         RASPICAM_BITRATE=$RS_RASPICAM_BITRATE
     fi
 
     /opt/vc/bin/raspivid -t 0 -w $RASPICAM_WIDTH -h $RASPICAM_HEIGHT -fps $RASPICAM_FPS -b $RASPICAM_BITRATE -o - | ffmpeg -i - -f lavfi -i aevalsrc=0 -vcodec copy -acodec aac -strict experimental -map 0:0 -map 1:0 -shortest -flags +global_header -f flv rtmp://127.0.0.1:1935/live/raspicam.stream > /dev/null 2>&1
-elif [ "${MODE}" == "USBCAM" ];
-then
+elif [ "${MODE}" = "USBCAM" ]; then
     apt-get update && apt-get install -y v4l-utils libv4l-0
     npm start &
     NGINX_RUNNING=0

From 8060296e8af430322db9bc57697825e01c357891 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 9 Oct 2018 17:17:57 +0200
Subject: [PATCH 17/62] Remove native frame rate ingestion

In never ffmpeg versions (>4.0.0) this causes trouble while ingesting
a stream. It is also not recommended when ingesting live streams. This
only makes sense if a VOD file should be streamed.
---
 src/classes/Restreamer.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/classes/Restreamer.js b/src/classes/Restreamer.js
index 29ee6ffc..f88058d5 100644
--- a/src/classes/Restreamer.js
+++ b/src/classes/Restreamer.js
@@ -196,9 +196,6 @@ class Restreamer {
                 ffmpegCommand.inputOptions('-rtsp_transport', 'tcp');
             }
         }
-
-        // read input at native frame rate (-re)
-        ffmpegCommand.native();
     }
 
     /**

From b78cf70d001455328c9e51984af8674afef35955 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 9 Oct 2018 17:20:33 +0200
Subject: [PATCH 18/62] Update dockerfile for amd64

---
 Dockerfile | 147 ++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 130 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 01dba845..acc5fa6a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,38 +1,151 @@
-FROM datarhei/nginx-rtmp:1.13.4-dev as builder
+ARG IMAGE=amd64/debian:stretch-slim
 
-FROM node:8.1-alpine
+FROM $IMAGE as builder
 
 MAINTAINER datarhei <info@datarhei.org>
 
-ENV RS_USERNAME=admin \
-    RS_PASSWORD=datarhei \
-    SRC=/usr/local \
-    LD_LIBRARY_PATH=/usr/local/lib \
-    PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
+ARG NASM_VERSION=2.13.03
+ARG LAME_VERSION=3.100
+# x264 versions from August 2018 onward (> Core 152) seem to have a bug that cuts performance by 50%
+ARG X264_VERSION=20180717-2245-stable
+ARG FFMPEG_VERSION=4.0.2
+ARG NGINX_VERSION=1.14.0
+ARG NGINXRTMP_VERSION=1.2.1
+ARG NODE_VERSION=8.12.0
 
-COPY --from=builder /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg
-COPY --from=builder /usr/local/bin/ffprobe /usr/local/bin/ffprobe
-COPY --from=builder /usr/local/lib /usr/local/lib
+ENV SRC="/usr/local/" \
+    LD_LIBRARY_PATH="/usr/local/lib" \
+    PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
+
+RUN apt-get update && \
+    apt-get install -y \
+        pkg-config \
+        curl \
+        libpcre3-dev \
+        libtool \
+        libssl-dev \
+        zlib1g-dev \
+        build-essential 
+
+# nasm
+RUN mkdir -p /dist && cd /dist && \
+    curl -OL "https://www.nasm.us/pub/nasm/releasebuilds/2.13.03/nasm-${NASM_VERSION}.tar.xz" && \
+    tar -xvJ -f nasm-${NASM_VERSION}.tar.xz && \
+    cd nasm-${NASM_VERSION} && \
+    ./configure && \
+    make -j$(nproc) && \
+    make install
+
+# x264
+RUN mkdir -p /dist && cd /dist && \
+    curl -OL "http://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2" && \
+    tar -xvj -f x264-snapshot-${X264_VERSION}.tar.bz2 && \
+    cd x264-snapshot-${X264_VERSION} && \
+    ./configure --prefix="${SRC}" --bindir="${SRC}/bin" --enable-shared && \
+    make -j$(nproc) && \
+    make install
+
+# libmp3lame
+RUN mkdir -p /dist && cd /dist && \
+    curl -OL "https://kent.dl.sourceforge.net/project/lame/lame/3.100/lame-${LAME_VERSION}.tar.gz" && \
+    tar -xvz -f lame-${LAME_VERSION}.tar.gz && \
+    cd lame-${LAME_VERSION} && \
+    ./configure --prefix="${SRC}" --bindir="${SRC}/bin" --disable-static --enable-nasm && \
+    make -j$(nproc) && \
+    make install
+
+# ffmpeg
+RUN mkdir -p /dist && cd /dist && \
+    curl -OL "https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz" && \
+    tar -xvz -f ffmpeg-${FFMPEG_VERSION}.tar.gz && \
+    cd ffmpeg-${FFMPEG_VERSION} && \
+    ./configure \
+        --bindir="${SRC}/bin" \
+        --extra-cflags="-I${SRC}/include" \
+        --extra-ldflags="-L${SRC}/lib" \
+        --prefix="${SRC}" \
+        --enable-nonfree \
+        --enable-gpl \
+        --enable-version3 \
+        --enable-libmp3lame \
+        --enable-libx264 \
+        --enable-openssl \
+        --enable-postproc \
+        --enable-small \
+        --enable-static \
+        --disable-debug \
+        --disable-doc \
+        --disable-shared && \
+    make -j$(nproc) && \
+    make install
+
+# nginx-rtmp
+RUN mkdir -p /dist && cd /dist && \
+    curl -OL "https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz" && \
+    tar -xvz -f "nginx-${NGINX_VERSION}.tar.gz" && \
+    curl -OL "https://github.com/arut/nginx-rtmp-module/archive/v${NGINXRTMP_VERSION}.tar.gz" && \
+    tar -xvz -f "v${NGINXRTMP_VERSION}.tar.gz" && \
+    cd nginx-${NGINX_VERSION} && \
+    ./configure --prefix=/usr/local/nginx --with-http_ssl_module --add-module=/dist/nginx-rtmp-module-${NGINXRTMP_VERSION} && \
+    make -j$(nproc) && \
+    make install
+
+# node.js
+RUN mkdir -p /dist && cd /dist && \
+    curl -OL "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \
+    tar -xvJ -f "node-v${NODE_VERSION}-linux-x64.tar.xz" && \
+    cd node-v${NODE_VERSION}-linux-x64 && \
+    cp -R bin /usr/local && \
+    cp -R lib /usr/local
+
+RUN rm -r /dist && \
+    apt-get remove -y \
+        pkg-config \
+        curl \
+        libpcre3-dev \
+        libtool \
+        libssl-dev \
+        zlib1g-dev \
+        build-essential && \
+    apt autoremove -y
+
+FROM $IMAGE
+
+COPY --from=builder /usr/local/bin /usr/local/bin
 COPY --from=builder /usr/local/nginx /usr/local/nginx
+COPY --from=builder /usr/local/lib /usr/local/lib
+
+RUN apt-get update && \
+    apt-get install -y \
+        ca-certificates \
+        git \
+        procps \
+        libpcre3 \
+        libssl1.1 \
+        zlib1g
 
 COPY . /restreamer
 WORKDIR /restreamer
 
-RUN apk add --no-cache --update git libssl1.0 pcre && \
-    ffmpeg -buildconf && \
+RUN cd /restreamer && \
     npm install -g bower grunt grunt-cli nodemon eslint && \
     npm install && \
     grunt build && \
+    npm prune --production && \
+    npm cache verify && \
     bower cache clean --allow-root && \
     npm uninstall -g bower grunt grunt-cli nodemon eslint && \
     npm prune --production && \
-    npm cache clean --force && \
-    apk del --no-cache --purge git && \
-    rm -rf /var/cache/apk/* && \
-    rm -rf /tmp/*
+    apt-get remove -y \
+        git \
+        curl && \
+    apt autoremove -y
 
-EXPOSE 8080
+ENV RS_USERNAME admin
+ENV RS_PASSWORD datarhei
 
+EXPOSE 8080
 VOLUME ["/restreamer/db"]
 
 CMD ["./run.sh"]
+

From dfd15f2411de7e56e9bd25952550b3055e007d5e Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 9 Oct 2018 18:49:41 +0200
Subject: [PATCH 19/62] Update arm64v8 (aarch64) dockerfile

---
 Dockerfile-arm64v8 | 141 +++++++++++++++++++++++++++++++++++++++++++++
 Dockerfile-arrch64 |  39 -------------
 2 files changed, 141 insertions(+), 39 deletions(-)
 create mode 100644 Dockerfile-arm64v8
 delete mode 100644 Dockerfile-arrch64

diff --git a/Dockerfile-arm64v8 b/Dockerfile-arm64v8
new file mode 100644
index 00000000..4ad2f078
--- /dev/null
+++ b/Dockerfile-arm64v8
@@ -0,0 +1,141 @@
+ARG IMAGE=arm64v8/debian:stretch-slim
+
+FROM $IMAGE as builder
+
+MAINTAINER datarhei <info@datarhei.org>
+
+ARG LAME_VERSION=3.100
+# x264 versions from August 2018 onward (> Core 152) seem to have a bug that cuts performance by 50%
+ARG X264_VERSION=20180717-2245-stable
+ARG FFMPEG_VERSION=4.0.2
+ARG NGINX_VERSION=1.14.0
+ARG NGINXRTMP_VERSION=1.2.1
+ARG NODE_VERSION=8.12.0
+
+ENV SRC="/usr/local/" \
+    LD_LIBRARY_PATH="/usr/local/lib" \
+    PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
+
+RUN apt-get update && \
+    apt-get install -y \
+        pkg-config \
+        curl \
+        libpcre3-dev \
+        libtool \
+        libssl-dev \
+        zlib1g-dev \
+        build-essential 
+
+# x264
+RUN mkdir -p /dist && cd /dist && \
+    curl -OL "http://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2" && \
+    tar -xvj -f x264-snapshot-${X264_VERSION}.tar.bz2 && \
+    cd x264-snapshot-${X264_VERSION} && \
+    ./configure --prefix="${SRC}" --bindir="${SRC}/bin" --enable-shared && \
+    make -j$(nproc) && \
+    make install
+
+# libmp3lame
+RUN mkdir -p /dist && cd /dist && \
+    curl -OL "https://kent.dl.sourceforge.net/project/lame/lame/3.100/lame-${LAME_VERSION}.tar.gz" && \
+    tar -xvz -f lame-${LAME_VERSION}.tar.gz && \
+    cd lame-${LAME_VERSION} && \
+    ./configure --prefix="${SRC}" --bindir="${SRC}/bin" --disable-static --enable-nasm && \
+    make -j$(nproc) && \
+    make install
+
+# ffmpeg
+RUN mkdir -p /dist && cd /dist && \
+    curl -OL "https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz" && \
+    tar -xvz -f ffmpeg-${FFMPEG_VERSION}.tar.gz && \
+    cd ffmpeg-${FFMPEG_VERSION} && \
+    ./configure \
+        --bindir="${SRC}/bin" \
+        --extra-cflags="-I${SRC}/include" \
+        --extra-ldflags="-L${SRC}/lib" \
+        --prefix="${SRC}" \
+        --enable-nonfree \
+        --enable-gpl \
+        --enable-version3 \
+        --enable-libmp3lame \
+        --enable-libx264 \
+        --enable-openssl \
+        --enable-postproc \
+        --enable-small \
+        --enable-static \
+        --disable-debug \
+        --disable-doc \
+        --disable-shared && \
+    make -j$(nproc) && \
+    make install
+
+# nginx-rtmp
+RUN mkdir -p /dist && cd /dist && \
+    curl -OL "https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz" && \
+    tar -xvz -f "nginx-${NGINX_VERSION}.tar.gz" && \
+    curl -OL "https://github.com/arut/nginx-rtmp-module/archive/v${NGINXRTMP_VERSION}.tar.gz" && \
+    tar -xvz -f "v${NGINXRTMP_VERSION}.tar.gz" && \
+    cd nginx-${NGINX_VERSION} && \
+    ./configure --prefix=/usr/local/nginx --with-http_ssl_module --add-module=/dist/nginx-rtmp-module-${NGINXRTMP_VERSION} && \
+    make -j$(nproc) && \
+    make install
+
+# node.js
+RUN mkdir -p /dist && cd /dist && \
+    curl -OL "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-arm64.tar.xz" && \
+    tar -xvJ -f "node-v${NODE_VERSION}-linux-arm64.tar.xz" && \
+    cd node-v${NODE_VERSION}-linux-arm64 && \
+    cp -R bin /usr/local && \
+    cp -R lib /usr/local
+
+RUN rm -r /dist && \
+    apt-get remove -y \
+        pkg-config \
+        curl \
+        libpcre3-dev \
+        libtool \
+        libssl-dev \
+        zlib1g-dev \
+        build-essential && \
+    apt autoremove -y
+
+FROM $IMAGE
+
+COPY --from=builder /usr/local/bin /usr/local/bin
+COPY --from=builder /usr/local/nginx /usr/local/nginx
+COPY --from=builder /usr/local/lib /usr/local/lib
+
+RUN apt-get update && \
+    apt-get install -y \
+        ca-certificates \
+        git \
+        procps \
+        libpcre3 \
+        libssl1.1 \
+        zlib1g
+
+COPY . /restreamer
+WORKDIR /restreamer
+
+RUN cd /restreamer && \
+    npm install -g bower grunt grunt-cli nodemon eslint && \
+    npm install && \
+    grunt build && \
+    npm prune --production && \
+    npm cache verify && \
+    bower cache clean --allow-root && \
+    npm uninstall -g bower grunt grunt-cli nodemon eslint && \
+    npm prune --production && \
+    apt-get remove -y \
+        git \
+        curl && \
+    apt autoremove -y
+
+ENV RS_USERNAME admin
+ENV RS_PASSWORD datarhei
+
+EXPOSE 8080
+VOLUME ["/restreamer/db"]
+
+CMD ["./run.sh"]
+
diff --git a/Dockerfile-arrch64 b/Dockerfile-arrch64
deleted file mode 100644
index cfaa9a07..00000000
--- a/Dockerfile-arrch64
+++ /dev/null
@@ -1,39 +0,0 @@
-FROM datarhei/nginx-rtmp:1.13.4-dev-aarch64 as builder
-
-FROM datarhei/node:8.1-aarch64
-
-MAINTAINER datarhei <info@datarhei.org>
-
-ENV RS_USERNAME=admin \
-    RS_PASSWORD=datarhei \
-    SRC=/usr/local \
-    LD_LIBRARY_PATH=/usr/local/lib \
-    PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
-
-COPY --from=builder /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg
-COPY --from=builder /usr/local/bin/ffprobe /usr/local/bin/ffprobe
-COPY --from=builder /usr/local/lib /usr/local/lib
-COPY --from=builder /usr/local/nginx /usr/local/nginx
-
-COPY . /restreamer
-WORKDIR /restreamer
-
-RUN apk add --no-cache --update git libssl1.0 pcre && \
-    ffmpeg -buildconf && \
-    npm config set unsafe-perm true && \
-    npm install -g bower grunt grunt-cli nodemon eslint && \
-    npm install && \
-    grunt build && \
-    bower cache clean --allow-root && \
-    npm uninstall -g bower grunt grunt-cli nodemon eslint && \
-    npm prune --production && \
-    npm cache clean --force && \
-    apk del --no-cache --purge git && \
-    rm -rf /var/cache/apk/* && \
-    rm -rf /tmp/*
-
-EXPOSE 8080
-
-VOLUME ["/restreamer/db"]
-
-CMD ["./run.sh"]

From 171703f8f1acd013ed3051232d7ad80587b7501b Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 9 Oct 2018 19:11:51 +0200
Subject: [PATCH 20/62] Update armhf (arm32v7) dockerfile

---
 Dockerfile-armhf | 138 ++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 120 insertions(+), 18 deletions(-)

diff --git a/Dockerfile-armhf b/Dockerfile-armhf
index 8b9838c8..be3b3c23 100644
--- a/Dockerfile-armhf
+++ b/Dockerfile-armhf
@@ -1,38 +1,140 @@
-FROM datarhei/nginx-rtmp:1.13.4-dev-armhf as builder
+FROM FROM arm32v7/debian:stretch-slim
 
-FROM resin/raspberry-pi-alpine-node:8.1-slim
+FROM $IMAGE as builder
 
 MAINTAINER datarhei <info@datarhei.org>
 
-ENV RS_USERNAME=admin \
-    RS_PASSWORD=datarhei \
-    SRC=/usr/local \
-    LD_LIBRARY_PATH=/usr/local/lib \
-    PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
+ARG LAME_VERSION=3.100
+# x264 versions from August 2018 onward (> Core 152) seem to have a bug that cuts performance by 50%
+ARG X264_VERSION=20180717-2245-stable
+ARG FFMPEG_VERSION=4.0.2
+ARG NGINX_VERSION=1.14.0
+ARG NGINXRTMP_VERSION=1.2.1
+ARG NODE_VERSION=8.12.0
 
-COPY --from=builder /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg
-COPY --from=builder /usr/local/bin/ffprobe /usr/local/bin/ffprobe
-COPY --from=builder /usr/local/lib /usr/local/lib
+ENV SRC="/usr/local/" \
+    LD_LIBRARY_PATH="/usr/local/lib" \
+    PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
+
+RUN apt-get update && \
+    apt-get install -y \
+        pkg-config \
+        curl \
+        libpcre3-dev \
+        libtool \
+        libssl-dev \
+        zlib1g-dev \
+        build-essential 
+
+# x264
+RUN mkdir -p /dist && cd /dist && \
+    curl -OL "http://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2" && \
+    tar -xvj -f x264-snapshot-${X264_VERSION}.tar.bz2 && \
+    cd x264-snapshot-${X264_VERSION} && \
+    ./configure --prefix="${SRC}" --bindir="${SRC}/bin" --enable-shared && \
+    make -j$(nproc) && \
+    make install
+
+# libmp3lame
+RUN mkdir -p /dist && cd /dist && \
+    curl -OL "https://kent.dl.sourceforge.net/project/lame/lame/3.100/lame-${LAME_VERSION}.tar.gz" && \
+    tar -xvz -f lame-${LAME_VERSION}.tar.gz && \
+    cd lame-${LAME_VERSION} && \
+    ./configure --prefix="${SRC}" --bindir="${SRC}/bin" --disable-static --enable-nasm && \
+    make -j$(nproc) && \
+    make install
+
+# ffmpeg
+RUN mkdir -p /dist && cd /dist && \
+    curl -OL "https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz" && \
+    tar -xvz -f ffmpeg-${FFMPEG_VERSION}.tar.gz && \
+    cd ffmpeg-${FFMPEG_VERSION} && \
+    ./configure \
+        --bindir="${SRC}/bin" \
+        --extra-cflags="-I${SRC}/include" \
+        --extra-ldflags="-L${SRC}/lib" \
+        --prefix="${SRC}" \
+        --enable-nonfree \
+        --enable-gpl \
+        --enable-version3 \
+        --enable-libmp3lame \
+        --enable-libx264 \
+        --enable-openssl \
+        --enable-postproc \
+        --enable-small \
+        --enable-static \
+        --disable-debug \
+        --disable-doc \
+        --disable-shared && \
+    make -j$(nproc) && \
+    make install
+
+# nginx-rtmp
+RUN mkdir -p /dist && cd /dist && \
+    curl -OL "https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz" && \
+    tar -xvz -f "nginx-${NGINX_VERSION}.tar.gz" && \
+    curl -OL "https://github.com/arut/nginx-rtmp-module/archive/v${NGINXRTMP_VERSION}.tar.gz" && \
+    tar -xvz -f "v${NGINXRTMP_VERSION}.tar.gz" && \
+    cd nginx-${NGINX_VERSION} && \
+    ./configure --prefix=/usr/local/nginx --with-http_ssl_module --add-module=/dist/nginx-rtmp-module-${NGINXRTMP_VERSION} && \
+    make -j$(nproc) && \
+    make install
+
+# node.js
+RUN mkdir -p /dist && cd /dist && \
+    curl -OL "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-armv7l.tar.xz" && \
+    tar -xvJ -f "node-v${NODE_VERSION}-linux-armv7l.tar.xz" && \
+    cd node-v${NODE_VERSION}-linux-armv7l && \
+    cp -R bin /usr/local && \
+    cp -R lib /usr/local
+
+RUN rm -r /dist && \
+    apt-get remove -y \
+        pkg-config \
+        curl \
+        libpcre3-dev \
+        libtool \
+        libssl-dev \
+        zlib1g-dev \
+        build-essential && \
+    apt autoremove -y
+
+FROM $IMAGE
+
+COPY --from=builder /usr/local/bin /usr/local/bin
 COPY --from=builder /usr/local/nginx /usr/local/nginx
+COPY --from=builder /usr/local/lib /usr/local/lib
+
+RUN apt-get update && \
+    apt-get install -y \
+        ca-certificates \
+        git \
+        procps \
+        libpcre3 \
+        libssl1.1 \
+        zlib1g
 
 COPY . /restreamer
 WORKDIR /restreamer
 
-RUN apk add --no-cache --update git libssl1.0 pcre && \
-    ffmpeg -buildconf && \
+RUN cd /restreamer && \
     npm install -g bower grunt grunt-cli nodemon eslint && \
     npm install && \
     grunt build && \
+    npm prune --production && \
+    npm cache verify && \
     bower cache clean --allow-root && \
     npm uninstall -g bower grunt grunt-cli nodemon eslint && \
     npm prune --production && \
-    npm cache clean --force && \
-    apk del --no-cache --purge git && \
-    rm -rf /var/cache/apk/* && \
-    rm -rf /tmp/*
+    apt-get remove -y \
+        git \
+        curl && \
+    apt autoremove -y
 
-EXPOSE 8080
+ENV RS_USERNAME admin
+ENV RS_PASSWORD datarhei
 
+EXPOSE 8080
 VOLUME ["/restreamer/db"]
 
-CMD ["./run.sh"]
+CMD ["./run.sh"]
\ No newline at end of file

From 4ec7eba4864b5e4b43cb5eb24c1cbe986ac539e1 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 9 Oct 2018 21:35:12 +0200
Subject: [PATCH 21/62] Update ffmpeg command line to use 4.x features

---
 run.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/run.sh b/run.sh
index 2b99faea..4e13bac3 100755
--- a/run.sh
+++ b/run.sh
@@ -39,7 +39,7 @@ if [ "${MODE}" = "RASPICAM" ] && [ "$CPU_TYPE" = "arm" ]; then
         RASPICAM_BITRATE=$RS_RASPICAM_BITRATE
     fi
 
-    /opt/vc/bin/raspivid -t 0 -w $RASPICAM_WIDTH -h $RASPICAM_HEIGHT -fps $RASPICAM_FPS -b $RASPICAM_BITRATE -o - | ffmpeg -i - -f lavfi -i aevalsrc=0 -vcodec copy -acodec aac -strict experimental -map 0:0 -map 1:0 -shortest -flags +global_header -f flv rtmp://127.0.0.1:1935/live/raspicam.stream > /dev/null 2>&1
+    /opt/vc/bin/raspivid -t 0 -w $RASPICAM_WIDTH -h $RASPICAM_HEIGHT -fps $RASPICAM_FPS -b $RASPICAM_BITRATE -o - | ffmpeg -i - -f lavfi -i anullsrc=r=44100:cl=mono -vcodec copy -acodec aac -b:a 0k -map 0:v -map 1:a -shortest -f flv rtmp://127.0.0.1:1935/live/raspicam.stream > /dev/null 2>&1
 elif [ "${MODE}" = "USBCAM" ]; then
     apt-get update && apt-get install -y v4l-utils libv4l-0
     npm start &
@@ -53,7 +53,7 @@ elif [ "${MODE}" = "USBCAM" ]; then
             sleep 5
         fi
     done
-    ffmpeg -f v4l2 -r 25 -s 1280x720 -i /dev/video0 -f lavfi -i aevalsrc=0 -vcodec copy -acodec aac -strict experimental -map 0:0 -map 1:0 -shortest -flags +global_header -f flv rtmp://127.0.0.1:1935/live/usb.stream > /dev/null 2>&1
+    ffmpeg -f v4l2 -r 25 -s 1280x720 -i /dev/video0 -f lavfi -i anullsrc=r=44100:cl=mono -vcodec copy -acodec aac -b:a 0k -map 0:v -map 1:a -shortest -f flv rtmp://127.0.0.1:1935/live/usb.stream > /dev/null 2>&1
 else
     npm start
 fi

From f8f8eb334d2836ad33e825adcaac4d9e73cbb214 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 9 Oct 2018 22:12:40 +0200
Subject: [PATCH 22/62] Use public-ip directly

Instead of spawning a process for the public-ip-cli, the public-ip
promise is used directly.
---
 package-lock.json         | 90 ++++++++++++++++++++++++++-------------
 package.json              |  2 +-
 src/classes/Restreamer.js | 14 +++---
 3 files changed, 70 insertions(+), 36 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8cba94ce..6cd4ffa4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -83,8 +83,7 @@
     "ajv-keywords": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz",
-      "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=",
-      "dev": true
+      "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo="
     },
     "align-text": {
       "version": "0.1.4",
@@ -170,7 +169,8 @@
     "array-find-index": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E="
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+      "dev": true
     },
     "array-flatten": {
       "version": "1.1.1",
@@ -1267,7 +1267,8 @@
     "builtin-modules": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+      "dev": true
     },
     "builtin-status-codes": {
       "version": "3.0.0",
@@ -1341,12 +1342,14 @@
     "camelcase": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
+      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+      "dev": true
     },
     "camelcase-keys": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+      "dev": true,
       "requires": {
         "camelcase": "^2.0.0",
         "map-obj": "^1.0.0"
@@ -1794,6 +1797,7 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "dev": true,
       "requires": {
         "array-find-index": "^1.0.1"
       }
@@ -1842,7 +1846,8 @@
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
     },
     "decode-uri-component": {
       "version": "0.2.0",
@@ -2158,6 +2163,7 @@
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
       "requires": {
         "is-arrayish": "^0.2.1"
       }
@@ -2862,6 +2868,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
       "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+      "dev": true,
       "requires": {
         "path-exists": "^2.0.0",
         "pinkie-promise": "^2.0.0"
@@ -3529,7 +3536,8 @@
     "get-stdin": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+      "dev": true
     },
     "get-stream": {
       "version": "3.0.0",
@@ -3656,7 +3664,8 @@
     "graceful-fs": {
       "version": "4.1.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "dev": true
     },
     "grunt": {
       "version": "1.0.3",
@@ -4108,7 +4117,8 @@
     "hosted-git-info": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
-      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
+      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
+      "dev": true
     },
     "http-cache-semantics": {
       "version": "3.8.1",
@@ -4178,6 +4188,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
       "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+      "dev": true,
       "requires": {
         "repeating": "^2.0.0"
       }
@@ -4327,7 +4338,8 @@
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
     },
     "is-binary-path": {
       "version": "1.0.1",
@@ -4348,6 +4360,7 @@
       "version": "1.0.0",
       "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+      "dev": true,
       "requires": {
         "builtin-modules": "^1.0.0"
       }
@@ -4396,6 +4409,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+      "dev": true,
       "requires": {
         "number-is-nan": "^1.0.0"
       }
@@ -4506,7 +4520,8 @@
     "is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "dev": true
     },
     "is-windows": {
       "version": "1.0.2",
@@ -4699,6 +4714,7 @@
       "version": "1.1.0",
       "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+      "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
         "parse-json": "^2.2.0",
@@ -4778,6 +4794,7 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
       "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+      "dev": true,
       "requires": {
         "currently-unhandled": "^0.4.1",
         "signal-exit": "^3.0.0"
@@ -4824,7 +4841,8 @@
     "map-obj": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0="
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+      "dev": true
     },
     "map-visit": {
       "version": "1.0.0",
@@ -4898,6 +4916,7 @@
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+      "dev": true,
       "requires": {
         "camelcase-keys": "^2.0.0",
         "decamelize": "^1.1.2",
@@ -4914,7 +4933,8 @@
         "minimist": {
           "version": "1.2.0",
           "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
         }
       }
     },
@@ -5247,6 +5267,7 @@
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
       "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+      "dev": true,
       "requires": {
         "hosted-git-info": "^2.1.4",
         "is-builtin-module": "^1.0.0",
@@ -5285,7 +5306,8 @@
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "dev": true
     },
     "oauth-sign": {
       "version": "0.9.0",
@@ -5519,6 +5541,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
       "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "dev": true,
       "requires": {
         "error-ex": "^1.2.0"
       }
@@ -5572,6 +5595,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
       "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+      "dev": true,
       "requires": {
         "pinkie-promise": "^2.0.0"
       }
@@ -5603,6 +5627,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
       "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+      "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
         "pify": "^2.0.0",
@@ -5630,17 +5655,20 @@
     "pify": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true
     },
     "pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
     },
     "pinkie-promise": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
       "requires": {
         "pinkie": "^2.0.0"
       }
@@ -5792,15 +5820,6 @@
         }
       }
     },
-    "public-ip-cli": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/public-ip-cli/-/public-ip-cli-1.1.2.tgz",
-      "integrity": "sha1-QgGkXsCk10DWgT2q8kr6/qNU/P8=",
-      "requires": {
-        "meow": "^3.7.0",
-        "public-ip": "^2.3.1"
-      }
-    },
     "punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
@@ -5882,6 +5901,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "dev": true,
       "requires": {
         "load-json-file": "^1.0.0",
         "normalize-package-data": "^2.3.2",
@@ -5892,6 +5912,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "dev": true,
       "requires": {
         "find-up": "^1.0.0",
         "read-pkg": "^1.0.0"
@@ -5926,6 +5947,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
       "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+      "dev": true,
       "requires": {
         "indent-string": "^2.1.0",
         "strip-indent": "^1.0.1"
@@ -6020,6 +6042,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "dev": true,
       "requires": {
         "is-finite": "^1.0.0"
       }
@@ -6339,7 +6362,8 @@
     "signal-exit": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
     },
     "simple-fmt": {
       "version": "0.1.0",
@@ -6606,6 +6630,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.2.tgz",
       "integrity": "sha512-q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ==",
+      "dev": true,
       "requires": {
         "spdx-expression-parse": "^3.0.0",
         "spdx-license-ids": "^3.0.0"
@@ -6614,12 +6639,14 @@
     "spdx-exceptions": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
+      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
+      "dev": true
     },
     "spdx-expression-parse": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
       "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "dev": true,
       "requires": {
         "spdx-exceptions": "^2.1.0",
         "spdx-license-ids": "^3.0.0"
@@ -6628,7 +6655,8 @@
     "spdx-license-ids": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz",
-      "integrity": "sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w=="
+      "integrity": "sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w==",
+      "dev": true
     },
     "split-string": {
       "version": "3.1.0",
@@ -6792,6 +6820,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "dev": true,
       "requires": {
         "is-utf8": "^0.2.0"
       }
@@ -6806,6 +6835,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
       "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
+      "dev": true,
       "requires": {
         "get-stdin": "^4.0.1"
       }
@@ -7023,7 +7053,8 @@
     "trim-newlines": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
+      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
+      "dev": true
     },
     "trim-right": {
       "version": "1.0.1",
@@ -7341,6 +7372,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
       "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
       "requires": {
         "spdx-correct": "^3.0.0",
         "spdx-expression-parse": "^3.0.0"
diff --git a/package.json b/package.json
index 856b88e1..d6105328 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "moment-timezone": "0.5.13",
     "node-json-db": "0.7.3",
     "ps-find": "1.1.0",
-    "public-ip-cli": "1.1.2",
+    "public-ip": "^2.4.0",
     "q": "1.5.0",
     "request": "^2.81.0",
     "request-promise": "^4.2.1",
diff --git a/src/classes/Restreamer.js b/src/classes/Restreamer.js
index f88058d5..ed82dd30 100644
--- a/src/classes/Restreamer.js
+++ b/src/classes/Restreamer.js
@@ -13,6 +13,7 @@ const WebsocketsController = require('./WebsocketsController');
 const FfmpegCommand = require('fluent-ffmpeg');
 const Q = require('q');
 const JsonDB = require('node-json-db');
+const publicIp = require('public-ip');
 const exec = require('child_process').exec;
 const packageJson = require(path.join(global.__base, 'package.json'));
 const https = require('https');
@@ -528,12 +529,13 @@ class Restreamer {
      * get public ip
      */
     static getPublicIp () {
-        logger.info('Getting public ip...', 'start.publicip');
-        exec('public-ip', (err, stdout, stderr) => {
-            if (err) {
-                logger.error(err);
-            }
-            Restreamer.data.publicIp = stdout.split('\n')[0];
+        logger.info('Getting public IP ...', 'start.publicip');
+        publicIp.v4().then(ip => {
+            Restreamer.data.publicIp = ip;
+            logger.info('Found public IP: ' + ip, 'start.publicip');
+        }).catch(err => {
+            logger.warn('Failed to get public IP', 'start.publicip');
+            Restreamer.data.publicIp = '127.0.0.1';
         });
     }
 }

From 60a4ea265bdd1c58344096b41f858edf84a9e7a6 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Wed, 10 Oct 2018 16:53:52 +0200
Subject: [PATCH 23/62] Cleanup NGINX startup and monitoring routine

In case NGINX fails to start during the first startup, make it an
unrecoverable error by throwing an error. The promise will get rejected.
If it was possible to start NGINX successfully try to restart it
inifintely in case it crashes/stops later.
---
 conf/live.json           |   6 +-
 src/classes/Nginxrtmp.js | 134 ++++++++++++++++++++-------------------
 src/start.js             |   7 +-
 3 files changed, 76 insertions(+), 71 deletions(-)

diff --git a/conf/live.json b/conf/live.json
index a84eef60..42246490 100644
--- a/conf/live.json
+++ b/conf/live.json
@@ -70,7 +70,11 @@
         }
     },
     "nginx": {
-        "exec": "/usr/local/nginx/sbin/nginx -c /restreamer/conf/nginx.conf",
+        "command": "/usr/local/nginx/sbin/nginx",
+        "args": [
+            "-c",
+            "/restreamer/conf/nginx.conf"
+        ],
         "streaming": {
             "ip": "127.0.0.1",
             "rtmp_port": "1935",
diff --git a/src/classes/Nginxrtmp.js b/src/classes/Nginxrtmp.js
index 4b658512..cd76dd3d 100644
--- a/src/classes/Nginxrtmp.js
+++ b/src/classes/Nginxrtmp.js
@@ -7,106 +7,108 @@
 'use strict';
 
 const Q = require('q');
-const config = require("../../conf/live.json");
+const config = require('../../conf/live.json');
+const proc = require('process');
 const spawn = require('child_process').spawn;
 const logger = require('./Logger')('Nginxrtmp');
 const rp = require('request-promise');
-const RUNNING = "running";
-const NOT_RUNNING = "not_running";
 
 /**
- * class to watch and control the NGINX RTMP server process
+ * Class to watch and control the NGINX RTMP server process
  */
 class Nginxrtmp {
 
     /**
-     * constructs the Nginx rtmp with injection of config to use
+     * Constructs the NGINX rtmp with injection of config to use
      * @param config
      */
-    constructor (config) {
+    constructor(config) {
         this.config = config;
-        this.process = null;
         this.logger = logger;
-    }
 
-    /**
-     * init the nginx rtmp server
-     * @returns {Promise.<boolean>}
-     */
-    async init () {
-        const currentState = await this.getState();
-        if (currentState === NOT_RUNNING){
-            await this.start();
-        }else{
-            return true;
-        }
+        this.process = null;        // Process handler
+        this.allowRestart = false;  // Whether to allow restarts. Restarts are not allowed until the first successful start
     }
 
     /**
-     * start the nginx rtmp server
+     * Start the NGINX server
      * @returns {Promise.<boolean>}
      */
-    async start () {
-        this.logger.info('Starting NGINX...', 'start.nginx');
-        let state = NOT_RUNNING;
-        let tries = 0;
+    async start() {
+        this.logger.info('Starting NGINX ...');
         let timeout = 250;
-        this.process = spawn('sh', [
-            '-c',
-            this.config.nginx.exec
-        ]);
-        this.bindNginxProcessEvents(this.process);
-
-        // todo: code a watcher instead of fix 1s delay for state detection
-        while(state === NOT_RUNNING){
-            state = await this.getState(timeout);
-            tries++;
-        }
-        if (state === RUNNING){
-            this.logger.info(`NGINX successfully started in ${tries * timeout}ms`);
-        }else{
-            this.logger.info('NGINX could not be started');
-        }
-        return true;
-    }
+        let abort = false;
 
-    /**
-     * bind events on outputs of the nginx process
-     * @param {process} process
-     */
-    bindNginxProcessEvents (process) {
-        process.stdout.on('data', (data) => {
-            this.logger.info(`The NGINX RTMP process created an output: ${data}`);
+        this.process = spawn(this.config.nginx.command, this.config.nginx.args);
+
+        this.process.stdout.on('data', (data) => {
+            this.logger.info(data.toString().trim(), 'NGINX');
         });
 
-        process.stderr.on('data', (data) => {
-            this.logger.error(`The NGINX RTMP process created an error output: ${data}`);
+        this.process.stderr.on('data', (data) => {
+            this.logger.error(data.toString().trim(), 'NGINX');
         });
 
-        process.stderr.on('close', (code) => {
-            this.logger.error(`The NGINX RTMP process exited with code: ${code}`);
-            this.start();
+        this.process.on('close', (code) => {
+            abort = true;
+
+            this.logger.error('NGINX exited with code: ' + code);
+
+            if(code < 0) {
+                return;
+            }
+
+            if(this.allowRestart == true) {
+                let self = this;
+                setTimeout(() => {
+                    self.logger.info('Trying to restart NGINX');
+                    self.start();
+                }, timeout);
+            }
+        });
+
+        this.process.on('error', (err) => {
+            this.logger.error('Failed to spawn NGINX process: ' + err.name + ': ' + err.message);
         });
+
+        let running = false;
+
+        while(running == false){
+            running = await this.isRunning(timeout);
+            if(abort == true) {
+                break;
+            }
+        }
+
+        if(running == false) {
+            this.process = null;
+            throw new Error('NGINX failed to start');
+        }
+        else {
+            this.allowRestart = true;
+            this.logger.info('NGINX successfully started');
+        }
+
+        return true;
     }
 
     /**
-     * get current state of nginx rtmp server
-     * @returns {*|promise}
+     * Get current state of the NGINX server
+     * @returns {Promise.<boolean>}
      */
-    async getState (delayMs) {
+    async isRunning(delay) {
         const url = "http://" + config.nginx.streaming.ip + ":" +  config.nginx.streaming.http_port  +  config.nginx.streaming.http_health_path;
-        const delay = typeof delayMs === 'undefined' ? 0 : delayMs;
-        // delay the state detection if waiting for process is needed
-        try{
-            await Q.delay(delay);
-            const response = (await rp("http://" + config.nginx.streaming.ip + ":" +  config.nginx.streaming.http_port  +  config.nginx.streaming.http_health_path));
-            return response === 'pong' ? RUNNING: NOT_RUNNING;
-        }catch(error){
-            return NOT_RUNNING;
+
+        try {
+            await Q.delay(delay); // delay the state detection by the given amount of milliseconds
+            const response = await rp(url);
+            return (response == 'pong');
+        } catch(error) {
+            return false;
         }
     }
 }
 
-module.exports = (config)=> {
+module.exports = (config) => {
     return new Nginxrtmp(config);
 };
diff --git a/src/start.js b/src/start.js
index a9c49a9c..27ba1e5a 100644
--- a/src/start.js
+++ b/src/start.js
@@ -43,7 +43,7 @@ if (process.env.RS_FFMPEG_DEBUG === 'true') {
 }
 
 // start the app
-nginxrtmp.init()
+nginxrtmp.start()
     .then(() => {
         return RestreamerData.checkJSONDb();
     })
@@ -56,7 +56,6 @@ nginxrtmp.init()
     .then(() => {
         return Q.fcall(Restreamer.restoreFFMpegProcesses);
     })
-    .catch((error)=> {
-        let errorMessage = `Error starting webserver and nginx for application: ${error}`;
-        throw new Error(errorMessage);
+    .catch((error) => {
+        logger.error('Error starting webserver and nginx for application: ' + error);
     });

From 2b3fd18d2f20254ec657acc55d70ec4de59c3e9a Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Mon, 15 Oct 2018 11:11:12 +0200
Subject: [PATCH 24/62] Use fluent-ffmpeg's stdoutLines

---
 src/classes/Restreamer.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/classes/Restreamer.js b/src/classes/Restreamer.js
index ed82dd30..31937528 100644
--- a/src/classes/Restreamer.js
+++ b/src/classes/Restreamer.js
@@ -360,7 +360,7 @@ class Restreamer {
         // repeat to local nginx server
         if (repeatToLocalNginx) {
             command = new FfmpegCommand(src, {
-                'outputLineLimit': 1
+                stdoutLines: 1
             });
 
             // add outputs to the ffmpeg stream
@@ -371,7 +371,7 @@ class Restreamer {
             // repeat to optional output
         } else if (repeatToOptionalOutput) {
             command = new FfmpegCommand(Restreamer.generateOutputHLSPath(), {
-                'outputLineLimit': 1
+                stdoutLines: 1
             });
             Restreamer.data.addresses.optionalOutputAddress = optionalOutput;
             addOutputPromise = Restreamer.addOutput(command, optionalOutput);

From 9d966c5f77e499eca7ef689f57b01984be9a5d83 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Mon, 15 Oct 2018 11:19:16 +0200
Subject: [PATCH 25/62] Exit early from fetchSnapshot()

---
 src/classes/Restreamer.js | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/classes/Restreamer.js b/src/classes/Restreamer.js
index 31937528..7210500e 100644
--- a/src/classes/Restreamer.js
+++ b/src/classes/Restreamer.js
@@ -50,24 +50,25 @@ class Restreamer {
      * receive snapshot by using first frame of repeated video
      */
     static fetchSnapshot () {
-        var command = null;
-        if (Restreamer.data.states.repeatToLocalNginx.type === 'connected') {
-            command = new FfmpegCommand(Restreamer.generateOutputHLSPath());
+        if(Restreamer.data.states.repeatToLocalNginx.type != 'connected') {
+            return;
+        }
 
-            command.output(Restreamer.generateSnapshotPath());
-            command.outputOption(config.ffmpeg.options.snapshot);
-            command.on('error', (error)=> {
-                logger.error('Error on fetching snapshot: ' + error.toString());
-            });
-            command.on('end', () => {
-                logger.info('Updated snapshot');
-                WebsocketsController.emit('snapshot', null);
-                Q.delay(this.calculateSnapshotRefreshInterval()).then(() => {
-                    Restreamer.fetchSnapshot();
-                });
+        let command = new FfmpegCommand(Restreamer.generateOutputHLSPath());
+
+        command.output(Restreamer.generateSnapshotPath());
+        command.outputOption(config.ffmpeg.options.snapshot);
+        command.on('error', (error)=> {
+            logger.error('Error on fetching snapshot: ' + error.toString());
+        });
+        command.on('end', () => {
+            logger.info('Updated snapshot');
+            WebsocketsController.emit('snapshot', null);
+            Q.delay(this.calculateSnapshotRefreshInterval()).then(() => {
+                Restreamer.fetchSnapshot();
             });
-            command.exec();
-        }
+        });
+        command.exec();
     }
 
     static calculateSnapshotRefreshInterval () {

From 9d47ba0a76a48896684a813b7cc68f35ee67f64f Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 16 Oct 2018 15:09:21 +0200
Subject: [PATCH 26/62] Remove retry counts for streams

The restreamer has to retry to connect to a stream as long as until
infinity. So no more retry counter. If an error occurs, a hopefully
helpful message is displayed in the GUI.

Also cleaned up the FFMPEG process management.
---
 src/classes/Restreamer.js                     | 314 ++++++++++--------
 .../public/scripts/Main/MainController.js     |  11 +-
 .../StreamingStatusController.js              |   3 +-
 src/webserver/public/views/status.html        |   5 +-
 4 files changed, 185 insertions(+), 148 deletions(-)

diff --git a/src/classes/Restreamer.js b/src/classes/Restreamer.js
index 7210500e..d1b2b246 100644
--- a/src/classes/Restreamer.js
+++ b/src/classes/Restreamer.js
@@ -28,14 +28,16 @@ class Restreamer {
      * @returns {string}
      */
     static generateOutputHLSPath () {
-        var nginx = config.nginx.streaming;
-        var token = process.env.RS_TOKEN || config.auth.token;
+        let nginx = config.nginx.streaming;
+        let token = process.env.RS_TOKEN || config.auth.token;
 
-        if (token != '') {
-            return 'rtmp://' + nginx.ip + ':' + nginx.rtmp_port + nginx.rtmp_hls_path + 'live.stream' + '?token=' + token;
-        } else {
-            return 'rtmp://' + nginx.ip + ':' + nginx.rtmp_port + nginx.rtmp_hls_path + 'live.stream';
+        let hlspath = 'rtmp://' + nginx.ip + ':' + nginx.rtmp_port + nginx.rtmp_hls_path + 'live.stream';
+
+        if(token != '') {
+            hlspath += '?token=' + token;
         }
+
+        return hlspath;
     }
 
     /**
@@ -103,7 +105,7 @@ class Restreamer {
         logger.info('stopStream ' + processName);
         clearTimeout(Restreamer.data.retryTimeouts[processName]);
         if (processHasBeenSpawned) {
-            Restreamer.data.processes[processName].kill();
+            Restreamer.data.processes[processName].kill('SIGKILL');
             Restreamer.data.processes[processName] = {
                 'state': 'not_connected'
             };
@@ -183,18 +185,16 @@ class Restreamer {
         return Restreamer.appendOutputOptionFromConfig(ffmpegCommand);
     }
 
-    static applyOptions (ffmpegCommand, streamType) {
-        var ffmpegOptions = config.ffmpeg.options;
-
-        // reduces process data
-        ffmpegCommand.inputOptions('-hide_banner', '-stats', '-loglevel', 'quiet');
+    static applyOptions(ffmpegCommand, streamType) {
+        let ffmpegOptions = config.ffmpeg.options.input;
 
-        // for unclean rtsp-sources
-        ffmpegCommand.inputOptions('-err_detect', ffmpegOptions.err_detect);
+        for (let o of ffmpegOptions) {
+            ffmpegCommand.inputOptions(o);
+        }
 
-        // gui option
+        // GUI option
         if (streamType === 'repeatToLocalNginx') {
-            if (Restreamer.data.options.rtspTcp && Restreamer.data.addresses.srcAddress.indexOf('rtsp') === 0) {
+            if(Restreamer.data.options.rtspTcp && Restreamer.data.addresses.srcAddress.indexOf('rtsp') === 0) {
                 ffmpegCommand.inputOptions('-rtsp_transport', 'tcp');
             }
         }
@@ -205,13 +205,18 @@ class Restreamer {
      * @param {FfmpegCommand} ffmpegCommand
      * @return {Promise}
      */
-    static appendOutputOptionFromConfig (ffmpegCommand) {
+    static appendOutputOptionFromConfig(ffmpegCommand, streamType) {
         var deferred = Q.defer();
         var ffmpegOptions = [];
 
         ffmpegCommand.ffprobe((err, data) => {
-            if (err) {
-                return deferred.reject(err);
+            if(err) {
+                let lines = err.toString().split(/\r\n|\r|\n/);
+                lines = lines.filter(function (line) {
+                    return line.length > 0;
+                });
+
+                return deferred.reject(lines[lines.length - 1]);
             }
 
             let video = null;
@@ -240,40 +245,46 @@ class Restreamer {
 
             let option = "native_h264_no_audio";
 
-            if(audio !== null) {
-                switch(audio.codec_name) {  // consider all allowed audio codecs for FLV
-                    case 'mp3':
-                    case 'pcm_alaw':
-                    case 'pcm_mulaw':
-                        option = "native_h264_native_audio"; break;
-                    case 'aac':
-                        option = "native_h264_native_aac"; break;
-                    default:
-                        option = "native_h264_transcode_aac"; break;
+            if(streamType == 'repeatToLocalNginx') {
+                if(audio !== null) {
+                    switch(audio.codec_name) {  // consider all allowed audio codecs for FLV
+                        case 'mp3':
+                        case 'pcm_alaw':
+                        case 'pcm_mulaw':
+                            option = "native_h264_native_audio"; break;
+                        case 'aac':
+                            option = "native_h264_native_aac"; break;
+                        default:
+                            option = "native_h264_transcode_aac"; break;
+                    }
                 }
-            }
 
-            if(process.env.RS_AUDIO == "none") {
-                option = "native_h264_no_audio";
-            }
-            else if(process.env.RS_AUDIO == "silence") {
-                option = "native_h264_silence_aac";
-            }
-            else if(process.env.RS_AUDIO == "aac") {
-                if(audio !== null && audio.codec_name != 'aac') {
-                    option = "native_h264_transcode_aac";
+                if(process.env.RS_AUDIO == "none") {
+                    option = "native_h264_no_audio";
+                }
+                else if(process.env.RS_AUDIO == "silence") {
+                    option = "native_h264_silence_aac";
                 }
+                else if(process.env.RS_AUDIO == "aac") {
+                    if(audio !== null && audio.codec_name != 'aac') {
+                        option = "native_h264_transcode_aac";
+                    }
+                }
+            }
+            else {
+                option = "native_h264_native_audio";
             }
 
             logger.debug('Selected ffmpeg.option: ' + option);
             ffmpegOptions = config.ffmpeg.options[option];
 
-            for (let option of ffmpegOptions) {
-                ffmpegCommand.outputOption(option);
+            for(let o of ffmpegOptions) {
+                ffmpegCommand.outputOptions(o);
             }
 
             return deferred.resolve();
         });
+
         return deferred.promise;
     }
 
@@ -284,31 +295,72 @@ class Restreamer {
      * @param {string=} message
      * @return {string} name of the new state
      */
-    static updateState (processName, state, message) {
-        logger.debug(`Update state of "${processName}" from state "${Restreamer.data.states[processName].type}" to state "${state}"`);
+    static updateState(processName, state, message) {
+        logger.debug('Update state of "' + processName + '" from state "' + Restreamer.data.states[processName].type + '" to state "' + state + '"');
+
         Restreamer.data.states[processName] = {
             'type': state,
             'message': message
         };
-        if (processName === 'repeatToLocalNginx' && state === 'connected') {
+
+        if(processName === 'repeatToLocalNginx' && state === 'connected') {
             Restreamer.fetchSnapshot();
         }
+
         Restreamer.writeToDB();
         Restreamer.updateStreamDataOnGui();
         return state;
     }
 
+    /**
+     * get the state of the stream
+     * @param {string} processName
+     * @return {string} name of the new state
+     */
+    static getState(processName) {
+        return Restreamer.data.states[processName].type;
+    }
+
+    /**
+     * get the current user action
+     * @param {string} processName
+     * @return {string} name of the user action
+     */
+    static getUserAction(processName) {
+        return Restreamer.data.userActions[processName];
+    }
+
+    /**
+     * set the current user action
+     * @param {string} processName
+     * @param {string} action
+     * @return {string} name of the previous user action
+     */
+    static setUserAction(processName, action) {
+        let previousAction = Restreamer.data.userActions[processName];
+        Restreamer.data.userActions[processName] = action;
+        return previousAction;
+    }
+
     /**
      * update the last submitted user action (like click on stop stream, click on start stream)
      * @param {string} processName
      * @param {string} action user action
      * @return {string} name of the new user action
      */
-    static updateUserAction (processName, action) {
-        logger.debug(`Set user action of "${processName}" from "${Restreamer.data.userActions[processName]}" to "${action}"`);
-        Restreamer.data.userActions[processName] = action;
+    static updateUserAction(processName, action) {
+        let previousAction = Restreamer.setUserAction(processName, action);
+
+        if(previousAction == action) {
+            return action;
+        }
+
+        logger.debug('Set user action of "' + processName + '" from "' + previousAction + '" to "' + action +'"');
+
+        Restreamer.setUserAction(processName, action);
         Restreamer.writeToDB();
         Restreamer.updateStreamDataOnGui();
+
         return action;
     }
 
@@ -327,29 +379,17 @@ class Restreamer {
      * @param {string} src src-address of the ffmpeg stream
      * @param {string} streamType repeatToOptionalOutput or repeatToLocalNginx
      * @param {string=} optionalOutput address of the optional output
-     * @param {string=} retryCounter current value of the retry counter (startStream retries automatically if anything fails)
      */
-    static startStream (src, streamType, optionalOutput, retryCounter) {
-        /** @var {FfmpegCommand} instance of FFmpeg command of module fluent-ffmpeg */
-        var command = null;
-
-        /** @var {Promise} Promise to make sure, the add output process has been finished */
-        var addOutputPromise = null;
-
-        logger.info(`Start stream "${streamType}"`);
-
-        // update the retry counter for the streamType
-        Restreamer.data.retryCounter[streamType].current = typeof retryCounter === 'undefined' ? 0 : retryCounter;
-
-        /** @var {Boolean} */
-        const repeatToLocalNginx = streamType === 'repeatToLocalNginx';
-
-        /** @var {Boolean} */
-        const repeatToOptionalOutput = streamType === 'repeatToOptionalOutput';
+    static startStream(src, streamType, optionalOutput) {
+        // check if there's currently no other stream connected or connecting
+        let state = Restreamer.getState(streamType);
+        if(state == 'connected' || state == 'connecting') {
+            return;
+        }
 
         // check if the user has clicked 'stop' meanwhile, so the startStream process has to be skipped
-        if (Restreamer.data.userActions[streamType] === 'stop') {
-            logger.debug('Skipping "startStream" since "stopped" has been clicked');
+        if(Restreamer.getUserAction(streamType) == 'stop') {
+            logger.debug('Skipping "startStream" because "stop" has been clicked');
             return;
         }
 
@@ -357,100 +397,109 @@ class Restreamer {
         Restreamer.data.addresses.srcAddress = src;
         Restreamer.updateState(streamType, 'connecting');
 
+        /** @var {FfmpegCommand} instance of FFmpeg command of module fluent-ffmpeg */
+        var command = null;
+
+        /** @var {Promise} Promise to make sure, the add output process has been finished */
+        var addOutputPromise = null;
+
+        logger.info('Start stream "' + streamType + '"');
 
-        // repeat to local nginx server
-        if (repeatToLocalNginx) {
+        let rtmpPath = Restreamer.generateOutputHLSPath();
+
+        if(streamType == 'repeatToLocalNginx') {
+            // repeat to local nginx server
             command = new FfmpegCommand(src, {
                 stdoutLines: 1
             });
 
             // add outputs to the ffmpeg stream
-            addOutputPromise = Restreamer.addOutput(command, Restreamer.generateOutputHLSPath()).catch((error) => {
-                logger.error(`Error adding one or more outputs: ${error.toString}`);
-            });
-
+            command.output(rtmpPath);
+            addOutputPromise = Restreamer.appendOutputOptionFromConfig(command, streamType)
+        }
+        else {
             // repeat to optional output
-        } else if (repeatToOptionalOutput) {
-            command = new FfmpegCommand(Restreamer.generateOutputHLSPath(), {
+            command = new FfmpegCommand(rtmpPath, {
                 stdoutLines: 1
             });
+
             Restreamer.data.addresses.optionalOutputAddress = optionalOutput;
-            addOutputPromise = Restreamer.addOutput(command, optionalOutput);
+
+            // add outputs to the ffmpeg stream
+            command.output(optionalOutput);
+            addOutputPromise = Restreamer.appendOutputOptionFromConfig(command, streamType)
+        }
+
+        let retry = () => {
+            logger.info('Retrying FFmpeg connection to "' + src + '" after "' + config.ffmpeg.monitor.restart_wait + '" ms');
+            Restreamer.data.retryTimeouts[streamType] = setTimeout(() => {
+                logger.info('Retry FFmpeg connection to "' + src + '"');
+                Restreamer.startStream(src, streamType, optionalOutput);
+            }, config.ffmpeg.monitor.restart_wait);
         }
 
         // after adding outputs, define events on the new FFmpeg stream
         addOutputPromise.then(() => {
-            var progressMethod = (progress) => {
-                if (Restreamer.data.states[streamType].type === 'connecting') {
-                    Restreamer.data.retryCounter[streamType].current = 1;
-                    Restreamer.updateState(streamType, 'connected');
-                }
-                Restreamer.data.progresses[streamType] = progress;
-                Restreamer.updateProgressOnGui();
-                command.removeAllListeners('progress');
-            };
             Restreamer.applyOptions(command, streamType);
             command
                 .on('start', (commandLine) => {
-                    if (Restreamer.data.userActions[streamType] === 'stop') {
-                        logger.debug('Skipping on "start" event of FFmpeg command since "stopped" has been clicked');
+                    logger.info('start for "' + streamType + '"');
+
+                    if(Restreamer.data.userActions[streamType] === 'stop') {
+                        command.kill();
+                        logger.debug('Skipping on "start" event of FFmpeg command because "stop" has been clicked');
                         return;
                     }
-                    logger.debug(`FFmpeg spawned: ${commandLine}`);
+
+                    logger.debug('FFmpeg spawned: ' + commandLine);
                     Restreamer.data.processes[streamType] = command;
                 })
 
                 // stream ended
                 .on('end', ()=> {
+                    logger.info('end for "' + streamType + '"');
+
                     Restreamer.updateState(streamType, 'disconnected');
-                    Restreamer.data.retryCounter[streamType].current++;
-                    if (Restreamer.data.retryCounter[streamType].current <= config.ffmpeg.monitor.retries) {
-                        if (Restreamer.data.userActions[streamType] === 'stop') {
-                            logger.debug('Skipping retry since "stopped" has been clicked');
-                            return;
-                        }
-                        logger.info(`Retrying FFmpeg connection to "${src}" after "${config.ffmpeg.monitor.restart_wait}" ms`);
-                        Restreamer.data.retryTimeouts[streamType] = setTimeout(() => {
-                            logger.info(`Retry FFmpeg connection to "${src}" retry counter: ${Restreamer.data.retryCounter[streamType].current}`);
-                            Restreamer.startStream(src, streamType, optionalOutput, Restreamer.data.retryCounter[streamType].current);
-                        }, config.ffmpeg.monitor.restart_wait);
+                    if(Restreamer.data.userActions[streamType] == 'stop') {
+                        logger.debug('Skipping retry because "stop" has been clicked');
+                        return;
                     }
+
+                    retry();
                 })
 
                 // stream error handler
-                .on('error', (error) => {
-                    if (error.toString().indexOf('SIGKILL') > -1) {
+                .on('error', (error, stdout, stderr) => {
+                    logger.info('error for "' + streamType + '"');
+
+                    if(Restreamer.data.userActions[streamType] == 'stop') {
                         Restreamer.updateState(streamType, 'disconnected');
-                        logger.info(`FFmpeg streaming stopped for "${streamType}"`);
-                    } else {
-                        Restreamer.data.retryCounter[streamType].current++;
-                        if (Restreamer.data.retryCounter[streamType].current <= config.ffmpeg.monitor.retries) {
-                            if (Restreamer.data.userActions[streamType] === 'stop') {
-                                logger.debug('Skipping retry since "stopped" has been clicked');
-                                return;
-                            }
-                            Restreamer.updateState(streamType, 'error', error.toString());
-                            logger.error(`Error on stream ${streamType}: ${error.toString()}`);
-                            logger.info(`Retrying FFmpeg connection to "${src}" after "${config.ffmpeg.monitor.restart_wait}" ms`);
-                            Restreamer.data.retryTimeouts[streamType] = setTimeout(() => {
-                                logger.info(`Retry FFmpeg connection to "${src}" retry counter: ${Restreamer.data.retryCounter[streamType].current}`);
-                                Restreamer.startStream(src, streamType, optionalOutput, Restreamer.data.retryCounter[streamType].current);
-                            }, config.ffmpeg.monitor.restart_wait);
-                        } else {
-                            Restreamer.updateState(streamType, 'error', error.toString());
-                        }
+                        logger.debug('Skipping retry since "stop" has been clicked');
+                        return;
+                    }
+
+                    Restreamer.updateState(streamType, 'error', error.toString());
+
+                    retry();
+                })
+
+                // progress handler
+                .on('progress', (progress) => {
+                    if(Restreamer.data.states[streamType].type == 'connecting') {
+                        Restreamer.updateState(streamType, 'connected');
                     }
+
+                    Restreamer.data.progresses[streamType] = progress;
+                    Restreamer.updateProgressOnGui();
                 });
 
-            command.on('progress', progressMethod);
-            setInterval(()=> {
-                if (command.listeners('progress').length === 0) {
-                    command.on('progress', progressMethod);
-                }
-            }, 1000);
             command.exec();
         }).catch((error) => {
-            logger.error(`Error starting FFmpeg command: ${error.toString()}`);
+            logger.error('Error starting FFmpeg command: ' + error.toString());
+
+            Restreamer.updateState(streamType, 'error', error.toString());
+
+            retry();
         });
     }
 
@@ -483,8 +532,7 @@ class Restreamer {
             'addresses': Restreamer.data.addresses,
             'options': Restreamer.data.options,
             'userActions': Restreamer.data.userActions,
-            'states': Restreamer.data.states,
-            'retryCounter': Restreamer.data.retryCounter
+            'states': Restreamer.data.states
         };
     }
 
@@ -545,16 +593,6 @@ class Restreamer {
  define data structure of Restreamer Data
  */
 Restreamer.data = {
-    'retryCounter': {
-        'repeatToLocalNginx': {
-            'current': 0,
-            'max': config.ffmpeg.monitor.retries
-        },
-        'repeatToOptionalOutput': {
-            'current': 0,
-            'max': config.ffmpeg.monitor.retries
-        }
-    },
     'retryTimeouts': {
         'repeatToLocalNginx': null,
         'repeatToOptionalOutput': null
diff --git a/src/webserver/public/scripts/Main/MainController.js b/src/webserver/public/scripts/Main/MainController.js
index 263a2c6e..d33331d0 100755
--- a/src/webserver/public/scripts/Main/MainController.js
+++ b/src/webserver/public/scripts/Main/MainController.js
@@ -44,19 +44,17 @@ window.angular.module('Main').controller('mainController',
         $scope.nginxRepeatStreamInputInvalid = false;
 
         $scope.reStreamerData = {
-            'retryCounter': {
-                'repeatToLocalNginx': 0,
-                'repeatToOptionalOutput': 0
-            },
             'options': {
                 'rtspTcp': false
             },
             'states': {
                 'repeatToLocalNginx': {
-                    'type': ''
+                    'type': '',
+                    'message': ''
                 },
                 'repeatToOptionalOutput': {
-                    'type': ''
+                    'type': '',
+                    'message': ''
                 }
             },
             'userActions': {
@@ -116,6 +114,7 @@ window.angular.module('Main').controller('mainController',
             });
             ws.on('updateStreamData', (reStreamerData) => {
                 $scope.reStreamerData = reStreamerData;
+                console.log(reStreamerData);
                 if ($scope.showStopButton('repeatToOptionalOutput')) {
                     // checkbox
                     $scope.activateOptionalOutput = true;
diff --git a/src/webserver/public/scripts/StreamingInterface/StreamingStatusController.js b/src/webserver/public/scripts/StreamingInterface/StreamingStatusController.js
index bd82e6a6..0ed148a6 100755
--- a/src/webserver/public/scripts/StreamingInterface/StreamingStatusController.js
+++ b/src/webserver/public/scripts/StreamingInterface/StreamingStatusController.js
@@ -41,8 +41,7 @@ window.angular.module('StreamingInterface').controller('streamingStatusControlle
          * @returns {boolean}
          */
         $scope.error = () => {
-            $scope.retries = $scope.data.retryCounter[$scope.name].current;
-            $scope.maxRetries = $scope.data.retryCounter[$scope.name].max;
+            $scope.message = $scope.data.states[$scope.name].message;
             return statusName() === 'error';
         };
 
diff --git a/src/webserver/public/views/status.html b/src/webserver/public/views/status.html
index 3e8788ba..69cc494a 100755
--- a/src/webserver/public/views/status.html
+++ b/src/webserver/public/views/status.html
@@ -17,8 +17,9 @@
     <!-- Stream has an error -->
     <div class="jumbotron progress-bar-danger progress-bar-striped" ng-if="error()">
         <span>{{'process_failed' | translate}}</span>
-        <span ng-if="maxRetries >= retries">{{'process_failed_retry' | translate}}</span>
-        <span ng-if="maxRetries >= retries">{{retries}} / {{maxRetries}}</span>
+        <div ng-if="message">
+            <span class="message">Error: {{message}}</span>
+        </div>
     </div>
 
     <!-- regex error on input field -->

From e2fac7bef004e59a9340a041cced81a7d65b4b70 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 16 Oct 2018 15:12:14 +0200
Subject: [PATCH 27/62] Add explicit loglevel for FFMPEG

---
 src/start.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/start.js b/src/start.js
index 27ba1e5a..44368601 100644
--- a/src/start.js
+++ b/src/start.js
@@ -38,8 +38,8 @@ logger.info('', false);
 EnvVar.init(config);
 
 // ffmpeg reporting
-if (process.env.RS_FFMPEG_DEBUG === 'true') {
-    process.env['FFREPORT'] = 'file=/restreamer/src/webserver/public/debug/%p-%t.log';
+if(process.env.RS_FFMPEG_DEBUG == true) {
+    process.env['FFREPORT'] = 'file=/restreamer/src/webserver/public/debug/%p-%t.log:level=40';
 }
 
 // start the app

From fa0a7cb8e30afca0769ed88cb048daca4bb09c6e Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 16 Oct 2018 15:12:56 +0200
Subject: [PATCH 28/62] Move FFMPEG input options from code to config

---
 conf/live.json | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/conf/live.json b/conf/live.json
index 42246490..cf733355 100644
--- a/conf/live.json
+++ b/conf/live.json
@@ -61,12 +61,16 @@
                 "-metadata server=NGINX-RTMP",
                 "-f flv"
             ],
-            "snapshot": "-vframes 1",
-            "err_detect": "ignore_err"
+            "input": [
+                "-hide_banner",
+                "-stats",
+                "-loglevel quiet",
+                "-err_detect ignore_err"
+            ],
+            "snapshot": "-vframes 1"
         },
         "monitor": {
-            "restart_wait": "6000",
-            "retries": 100
+            "restart_wait": "6000"
         }
     },
     "nginx": {
@@ -152,7 +156,7 @@
             "name": "RS_FFMPEG_DEBUG",
             "alias": "",
             "type": "bool",
-            "defaultValue": "false",
+            "defaultValue": false,
             "required": false,
             "description": "Enables FFmpeg reporting"
         },

From 724991f248880d4792ffb19e8e1674bc14901a55 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 16 Oct 2018 15:13:29 +0200
Subject: [PATCH 29/62] Enable transport compression and disable caching

---
 conf/nginx.conf | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 0e837c21..7f98a250 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,9 +1,12 @@
+daemon off;
+
 error_log stderr;
 
 worker_processes 1;
 events {
     worker_connections 1024;
 }
+
 rtmp {
     server {
         listen 1935;
@@ -28,9 +31,15 @@ rtmp {
         }
     }
 }
+
 http {
     sendfile off;
     tcp_nopush on;
+    access_log off;
+    gzip on;
+    gzip_vary on;
+    gzip_min_length 1000;
+    gzip_types text/css application/javascript;
     server {
         listen 8080;
         root /restreamer/src/webserver/public;
@@ -38,9 +47,11 @@ http {
         location / {
             try_files $uri @node;
             add_header Access-Control-Allow-Origin *;
+            add_header Cache-Control no-cache;
         }
         location @node {
             add_header Access-Control-Allow-Origin *;
+            add_header Cache-Control no-cache;
             proxy_pass http://127.0.0.1:3000;
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;
@@ -62,8 +73,6 @@ http {
         location = /ping {
             add_header Content-Type text/plain;
             return 200 "pong";
-            access_log off;
         }
     }
 }
-daemon off;

From c70e180ed096ae6c26e156da6fbdde914d08e831 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 16 Oct 2018 20:02:28 +0200
Subject: [PATCH 30/62] Fix automatic restart of streams, add stale stream
 timeout

---
 conf/live.json            |  3 +-
 src/classes/Restreamer.js | 97 +++++++++++++++++++++++++++------------
 2 files changed, 69 insertions(+), 31 deletions(-)

diff --git a/conf/live.json b/conf/live.json
index cf733355..fe0385b7 100644
--- a/conf/live.json
+++ b/conf/live.json
@@ -70,7 +70,8 @@
             "snapshot": "-vframes 1"
         },
         "monitor": {
-            "restart_wait": "6000"
+            "restart_wait": "6000",
+            "stale_wait": "60000"
         }
     },
     "nginx": {
diff --git a/src/classes/Restreamer.js b/src/classes/Restreamer.js
index d1b2b246..a8ae42ba 100644
--- a/src/classes/Restreamer.js
+++ b/src/classes/Restreamer.js
@@ -98,13 +98,14 @@ class Restreamer {
      * stop stream
      * @param {string} processName
      */
-    static stopStream (processName) {
+    static stopStream(processName) {
         var processHasBeenSpawned = typeof Restreamer.data.processes[processName].kill === 'function';
 
         Restreamer.updateState(processName, 'stopped');
         logger.info('stopStream ' + processName);
-        clearTimeout(Restreamer.data.retryTimeouts[processName]);
-        if (processHasBeenSpawned) {
+        Restreamer.setTimeout(processName, 'retry', null);
+
+        if(processHasBeenSpawned) {
             Restreamer.data.processes[processName].kill('SIGKILL');
             Restreamer.data.processes[processName] = {
                 'state': 'not_connected'
@@ -118,35 +119,36 @@ class Restreamer {
      */
     static restoreFFMpegProcesses () {
         var db = new JsonDB(config.jsondb, true, false);
-        var repeatToLocalNginxIsConnected = false;
-        var repeatToLocalNginxIsConnecting = false;
-        var repeatToOptionalOutputIsConnected = false;
-        var repeatToOptionalOutputIsConnecting = false;
 
         Restreamer.data.addresses = db.getData('/addresses');
         Restreamer.data.states = db.getData('/states');
         Restreamer.data.options = db.getData('/options');
         Restreamer.data.userActions = db.getData('/userActions');
 
-        repeatToLocalNginxIsConnected = Restreamer.data.states.repeatToLocalNginx.type === 'connected';
-        repeatToLocalNginxIsConnecting = Restreamer.data.states.repeatToLocalNginx.type === 'connecting';
-        repeatToOptionalOutputIsConnected = Restreamer.data.states.repeatToOptionalOutput.type === 'connected';
-        repeatToOptionalOutputIsConnecting = Restreamer.data.states.repeatToOptionalOutput.type === 'connecting';
+        let state = '';
+
+        state = Restreamer.getState('repeatToLocalNginx');
+        let repeatToLocalNginxReconnecting = (state == 'connected' || state == 'connecting');
+
+        state = Restreamer.getState('repeatToOptionalOutput');
+        let repeatToOptionalOutputReconnecting = (state == 'connected' || state == 'connecting');
 
         // check if the srcAddress has been repeated to Local Nginx
-        if (Restreamer.data.addresses.srcAddress &&
-            (repeatToLocalNginxIsConnected || repeatToLocalNginxIsConnecting)) {
+        if(Restreamer.data.addresses.srcAddress && repeatToLocalNginxReconnecting) {
             Restreamer.startStream(
                 Restreamer.data.addresses.srcAddress,
-                'repeatToLocalNginx'
+                'repeatToLocalNginx',
+                null,
+                true
             );
         }
-        if (Restreamer.data.addresses.optionalOutputAddress &&
-            (repeatToOptionalOutputIsConnected || repeatToOptionalOutputIsConnecting)) {
+
+        if(Restreamer.data.addresses.optionalOutputAddress && repeatToOptionalOutputReconnecting) {
             Restreamer.startStream(
                 Restreamer.data.addresses.srcAddress,
                 'repeatToOptionalOutput',
-                Restreamer.data.addresses.optionalOutputAddress
+                Restreamer.data.addresses.optionalOutputAddress,
+                true
             );
         }
     }
@@ -188,12 +190,12 @@ class Restreamer {
     static applyOptions(ffmpegCommand, streamType) {
         let ffmpegOptions = config.ffmpeg.options.input;
 
-        for (let o of ffmpegOptions) {
+        for(let o of ffmpegOptions) {
             ffmpegCommand.inputOptions(o);
         }
 
         // GUI option
-        if (streamType === 'repeatToLocalNginx') {
+        if(streamType === 'repeatToLocalNginx') {
             if(Restreamer.data.options.rtspTcp && Restreamer.data.addresses.srcAddress.indexOf('rtsp') === 0) {
                 ffmpegCommand.inputOptions('-rtsp_transport', 'tcp');
             }
@@ -378,14 +380,21 @@ class Restreamer {
      *
      * @param {string} src src-address of the ffmpeg stream
      * @param {string} streamType repeatToOptionalOutput or repeatToLocalNginx
-     * @param {string=} optionalOutput address of the optional output
+     * @param {string} optionalOutput address of the optional output
+     * @param {string} force force the start of the stream
      */
-    static startStream(src, streamType, optionalOutput) {
-        // check if there's currently no other stream connected or connecting
-        let state = Restreamer.getState(streamType);
-        if(state == 'connected' || state == 'connecting') {
-            return;
-        }
+    static startStream(src, streamType, optionalOutput, force) {
+        // remove any running timeouts
+        Restreamer.setTimeout(streamType, 'retry', null);
+
+        force = force || false;
+        if(force != true) {
+            // check if there's currently no other stream connected or connecting
+            let state = Restreamer.getState(streamType);
+            if(state == 'connected' || state == 'connecting') {
+                return;
+            }
+        } 
 
         // check if the user has clicked 'stop' meanwhile, so the startStream process has to be skipped
         if(Restreamer.getUserAction(streamType) == 'stop') {
@@ -432,7 +441,7 @@ class Restreamer {
 
         let retry = () => {
             logger.info('Retrying FFmpeg connection to "' + src + '" after "' + config.ffmpeg.monitor.restart_wait + '" ms');
-            Restreamer.data.retryTimeouts[streamType] = setTimeout(() => {
+            Restreamer.setTimeout(streamType, 'retry', () => {
                 logger.info('Retry FFmpeg connection to "' + src + '"');
                 Restreamer.startStream(src, streamType, optionalOutput);
             }, config.ffmpeg.monitor.restart_wait);
@@ -491,6 +500,12 @@ class Restreamer {
 
                     Restreamer.data.progresses[streamType] = progress;
                     Restreamer.updateProgressOnGui();
+
+                    // add a stale timeout
+                    Restreamer.setTimeout(streamType, 'stale', () => {
+                        logger.info('Stale FFmpeg connection for "' + streamType + '"');
+                        Restreamer.stopStream(streamType);
+                    }, config.ffmpeg.monitor.stale_wait);
                 });
 
             command.exec();
@@ -503,6 +518,22 @@ class Restreamer {
         });
     }
 
+    /**
+     * set a timeout
+     * @param {string} streamType Either 'repeatToLocalNginx' or 'repeatToOptionalOutput'
+     * @param {string} target Kind of timeout, either 'retry' or 'stale'
+     * @param {function} func Callback function
+     * @param {int} delay Delay for the timeout
+     * @return {void}
+     */
+    static setTimeout(streamType, target, func, delay) {
+        clearTimeout(Restreamer.data.timeouts[target][streamType]);
+
+        if(typeof func == 'function') {
+            Restreamer.data.timeouts[target][streamType] = setTimeout(func, delay);
+        }
+    }
+
     /**
      * bind websocket events on application start
      */
@@ -593,9 +624,15 @@ class Restreamer {
  define data structure of Restreamer Data
  */
 Restreamer.data = {
-    'retryTimeouts': {
-        'repeatToLocalNginx': null,
-        'repeatToOptionalOutput': null
+    'timeouts': {
+        'retry': {
+            'repeatToLocalNginx': null,
+            'repeatToOptionalOutput': null
+        },
+        'stale': {
+            'repeatToLocalNginx': null,
+            'repeatToOptionalOutput': null
+        }
     },
     'options': {
         'rtspTcp': false

From a177eeb63108bfa25a41a806d67e6e45f028cd96 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 16 Oct 2018 20:06:28 +0200
Subject: [PATCH 31/62] Add HLS to the input stream title

---
 src/classes/Restreamer.js                    | 3 ++-
 src/webserver/public/locales/lang-de_DE.json | 2 +-
 src/webserver/public/locales/lang-en_US.json | 2 +-
 src/webserver/public/locales/lang-es_VE.json | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/classes/Restreamer.js b/src/classes/Restreamer.js
index a8ae42ba..d449c227 100644
--- a/src/classes/Restreamer.js
+++ b/src/classes/Restreamer.js
@@ -133,7 +133,7 @@ class Restreamer {
         state = Restreamer.getState('repeatToOptionalOutput');
         let repeatToOptionalOutputReconnecting = (state == 'connected' || state == 'connecting');
 
-        // check if the srcAddress has been repeated to Local Nginx
+        // check if a stream was repeated locally
         if(Restreamer.data.addresses.srcAddress && repeatToLocalNginxReconnecting) {
             Restreamer.startStream(
                 Restreamer.data.addresses.srcAddress,
@@ -143,6 +143,7 @@ class Restreamer {
             );
         }
 
+        // check if the stream was repeated to an output address
         if(Restreamer.data.addresses.optionalOutputAddress && repeatToOptionalOutputReconnecting) {
             Restreamer.startStream(
                 Restreamer.data.addresses.srcAddress,
diff --git a/src/webserver/public/locales/lang-de_DE.json b/src/webserver/public/locales/lang-de_DE.json
index 0b2a05e8..80c6901a 100755
--- a/src/webserver/public/locales/lang-de_DE.json
+++ b/src/webserver/public/locales/lang-de_DE.json
@@ -10,7 +10,7 @@
     "logout": "Ausloggen",
     "button_start": "Start",
     "button_stop": "Stop",
-    "input_title": "RTMP/RTSP Video Quelle",
+    "input_title": "RTMP/RTSP/HLS Video Quelle",
     "input_example": "z.B. rtsp://192.168.57.100/media.amp",
     "rtsp_tcp": "RTSP über TCP",
     "process_input_invalid": "Die Stream-Adresse ist nicht valide. Bitte überprüfe die Eingabe",
diff --git a/src/webserver/public/locales/lang-en_US.json b/src/webserver/public/locales/lang-en_US.json
index e8082421..be9bd6d4 100644
--- a/src/webserver/public/locales/lang-en_US.json
+++ b/src/webserver/public/locales/lang-en_US.json
@@ -10,7 +10,7 @@
     "logout": "Logout",
     "button_start": "Start",
     "button_stop": "Stop",
-    "input_title": "RTMP/RTSP Video Source",
+    "input_title": "RTMP/RTSP/HLS Video Source",
     "input_example": "e.g. rtsp://192.168.57.100/media.amp",
     "rtsp_tcp": "RTSP over TCP",
     "process_input_invalid": "Invalid stream address, please check your input",
diff --git a/src/webserver/public/locales/lang-es_VE.json b/src/webserver/public/locales/lang-es_VE.json
index c3b9a848..7a654d08 100644
--- a/src/webserver/public/locales/lang-es_VE.json
+++ b/src/webserver/public/locales/lang-es_VE.json
@@ -10,7 +10,7 @@
     "logout": "Cerrar sesión",
     "button_start": "Iniciar",
     "button_stop": "Detener",
-    "input_title": "Fuente de video RTMP/RTSP",
+    "input_title": "Fuente de video RTMP/RTSP/HLS",
     "input_example": "ej. rtsp://192.168.57.100/media.amp",
     "rtsp_tcp": "RTSP sobre TCP",
     "process_input_invalid": "Dirección del stream inválida, favor revisar la fuente",

From 1a365143323a7a52e121b7e333588a5e778f02fb Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 16 Oct 2018 20:23:40 +0200
Subject: [PATCH 32/62] Fix regular expression from hell

---
 .../public/scripts/Main/MainController.js     | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/webserver/public/scripts/Main/MainController.js b/src/webserver/public/scripts/Main/MainController.js
index d33331d0..e73aff25 100755
--- a/src/webserver/public/scripts/Main/MainController.js
+++ b/src/webserver/public/scripts/Main/MainController.js
@@ -124,21 +124,23 @@ window.angular.module('Main').controller('mainController',
         }
 
         $scope.startStream = (streamType) => {
-            const rtmpRegex = /^(?:rtmp:\/\/|rtmps:\/\/|rtmpt:\/\/|rtsp:\/\/|http:\/\/|https:\/\/)(?:(?:[^:])+:(?:[^@])+@)?(?:(?:(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))|(?:(?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63}))(:?:[0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])?(?:\/.*)?/;
-            var optionalOutput = '';
+            const inputRegex = /^(rtmp(s|t)?|rtsp|https?):\/\//;
+            const outputRegex = /^rtmp(s|t)?/;
 
-            if ($scope.activateOptionalOutput === true) {
+            var optionalOutput = '';
+            if($scope.activateOptionalOutput === true) {
                 optionalOutput = $scope.reStreamerData.addresses.optionalOutputAddress;
             }
 
-            if (streamType === 'repeatToOptionalOutput') {
-                $scope.optionalOutputInputInvalid = !rtmpRegex.test(optionalOutput);
-                if ($scope.optionalOutputInputInvalid) {
+            if(streamType == 'repeatToOptionalOutput') {
+                $scope.optionalOutputInputInvalid = !outputRegex.test(optionalOutput);
+                if($scope.optionalOutputInputInvalid) {
                     return;
                 }
-            } else {
-                $scope.nginxRepeatStreamInputInvalid = !rtmpRegex.test($scope.reStreamerData.addresses.srcAddress);
-                if ($scope.nginxRepeatStreamInputInvalid) {
+            }
+            else {
+                $scope.nginxRepeatStreamInputInvalid = !inputRegex.test($scope.reStreamerData.addresses.srcAddress);
+                if($scope.nginxRepeatStreamInputInvalid) {
                     return;
                 }
             }

From b283240356efe604258a489be76548dd956be21b Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 16 Oct 2018 21:51:40 +0200
Subject: [PATCH 33/62] Remove addOutput and applyOptions functions, processes
 cleanup

---
 src/classes/Restreamer.js | 106 ++++++++++++++++----------------------
 1 file changed, 43 insertions(+), 63 deletions(-)

diff --git a/src/classes/Restreamer.js b/src/classes/Restreamer.js
index d449c227..5479f1b2 100644
--- a/src/classes/Restreamer.js
+++ b/src/classes/Restreamer.js
@@ -60,8 +60,8 @@ class Restreamer {
 
         command.output(Restreamer.generateSnapshotPath());
         command.outputOption(config.ffmpeg.options.snapshot);
-        command.on('error', (error)=> {
-            logger.error('Error on fetching snapshot: ' + error.toString());
+        command.on('error', (error) => {
+            logger.error('Error fetching snapshot: ' + error.toString().trim());
         });
         command.on('end', () => {
             logger.info('Updated snapshot');
@@ -96,20 +96,16 @@ class Restreamer {
 
     /**
      * stop stream
-     * @param {string} processName
+     * @param {string} streamType
      */
-    static stopStream(processName) {
-        var processHasBeenSpawned = typeof Restreamer.data.processes[processName].kill === 'function';
-
-        Restreamer.updateState(processName, 'stopped');
-        logger.info('stopStream ' + processName);
-        Restreamer.setTimeout(processName, 'retry', null);
-
-        if(processHasBeenSpawned) {
-            Restreamer.data.processes[processName].kill('SIGKILL');
-            Restreamer.data.processes[processName] = {
-                'state': 'not_connected'
-            };
+    static stopStream(streamType) {
+        Restreamer.updateState(streamType, 'stopped');
+        logger.info('Stopping ' + streamType);
+        Restreamer.setTimeout(streamType, 'retry', null);
+
+        if(Restreamer.data.processes[streamType] != null) {
+            Restreamer.data.processes[streamType].kill('SIGKILL');
+            Restreamer.data.processes[streamType] = null;
         }
     }
 
@@ -177,32 +173,6 @@ class Restreamer {
         WebsocketsController.emit('updateProgress', Restreamer.data.progresses);
     }
 
-    /**
-     * add output to ffmpeg command
-     * @param {FfmpegCommand} ffmpegCommand
-     * @param {string} outputAddress
-     * @return {Promise}
-     */
-    static addOutput (ffmpegCommand, outputAddress) {
-        ffmpegCommand.output(outputAddress);
-        return Restreamer.appendOutputOptionFromConfig(ffmpegCommand);
-    }
-
-    static applyOptions(ffmpegCommand, streamType) {
-        let ffmpegOptions = config.ffmpeg.options.input;
-
-        for(let o of ffmpegOptions) {
-            ffmpegCommand.inputOptions(o);
-        }
-
-        // GUI option
-        if(streamType === 'repeatToLocalNginx') {
-            if(Restreamer.data.options.rtspTcp && Restreamer.data.addresses.srcAddress.indexOf('rtsp') === 0) {
-                ffmpegCommand.inputOptions('-rtsp_transport', 'tcp');
-            }
-        }
-    }
-
     /**
      * append the ffmpeg options of the config file to an output
      * @param {FfmpegCommand} ffmpegCommand
@@ -212,6 +182,11 @@ class Restreamer {
         var deferred = Q.defer();
         var ffmpegOptions = [];
 
+        let stat = Restreamer.getState(streamType);
+        if(state != 'connecting') {
+            return null;
+        }
+
         ffmpegCommand.ffprobe((err, data) => {
             if(err) {
                 let lines = err.toString().split(/\r\n|\r|\n/);
@@ -392,7 +367,7 @@ class Restreamer {
         if(force != true) {
             // check if there's currently no other stream connected or connecting
             let state = Restreamer.getState(streamType);
-            if(state == 'connected' || state == 'connecting') {
+            if(state != 'disconnected') {
                 return;
             }
         } 
@@ -440,6 +415,10 @@ class Restreamer {
             addOutputPromise = Restreamer.appendOutputOptionFromConfig(command, streamType)
         }
 
+        if(addOutputPromise === null) {
+            return;
+        }
+
         let retry = () => {
             logger.info('Retrying FFmpeg connection to "' + src + '" after "' + config.ffmpeg.monitor.restart_wait + '" ms');
             Restreamer.setTimeout(streamType, 'retry', () => {
@@ -450,12 +429,22 @@ class Restreamer {
 
         // after adding outputs, define events on the new FFmpeg stream
         addOutputPromise.then(() => {
-            Restreamer.applyOptions(command, streamType);
+            let ffmpegOptions = config.ffmpeg.options.input;
+
+            for(let o of ffmpegOptions) {
+                command.inputOptions(o);
+            }
+
+            // GUI option
+            if(streamType == 'repeatToLocalNginx') {
+                if(Restreamer.data.options.rtspTcp && Restreamer.data.addresses.srcAddress.indexOf('rtsp') == 0) {
+                    command.inputOptions('-rtsp_transport', 'tcp');
+                }
+            }
+
             command
                 .on('start', (commandLine) => {
-                    logger.info('start for "' + streamType + '"');
-
-                    if(Restreamer.data.userActions[streamType] === 'stop') {
+                    if(Restreamer.data.userActions[streamType] == 'stop') {
                         command.kill();
                         logger.debug('Skipping on "start" event of FFmpeg command because "stop" has been clicked');
                         return;
@@ -466,28 +455,28 @@ class Restreamer {
                 })
 
                 // stream ended
-                .on('end', ()=> {
-                    logger.info('end for "' + streamType + '"');
-
+                .on('end', () => {
                     Restreamer.updateState(streamType, 'disconnected');
                     if(Restreamer.data.userActions[streamType] == 'stop') {
                         logger.debug('Skipping retry because "stop" has been clicked');
                         return;
                     }
 
+                    logger.info(streamType + ': ended normally');
+
                     retry();
                 })
 
                 // stream error handler
                 .on('error', (error, stdout, stderr) => {
-                    logger.info('error for "' + streamType + '"');
-
                     if(Restreamer.data.userActions[streamType] == 'stop') {
                         Restreamer.updateState(streamType, 'disconnected');
                         logger.debug('Skipping retry since "stop" has been clicked');
                         return;
                     }
 
+                    logger.info(streamType + ': ' + error.toString());
+
                     Restreamer.updateState(streamType, 'error', error.toString());
 
                     retry();
@@ -504,7 +493,7 @@ class Restreamer {
 
                     // add a stale timeout
                     Restreamer.setTimeout(streamType, 'stale', () => {
-                        logger.info('Stale FFmpeg connection for "' + streamType + '"');
+                        logger.info('Stale connection for "' + streamType + '"');
                         Restreamer.stopStream(streamType);
                     }, config.ffmpeg.monitor.stale_wait);
                 });
@@ -653,19 +642,10 @@ Restreamer.data = {
         'repeatToOptionalOutput': 'start'
     },
     'processes': {
-
-        // overwritten with ffmpeg process if stream has been started
-        'repeatToLocalNginx': {
-            'state': 'not_connected'
-        },
-
-        // overwritten with ffmpeg process if stream has been started
-        'repeatToOptionalOutput': {
-            'state': 'not_connected'
-        }
+        'repeatToLocalNginx': null,
+        'repeatToOptionalOutput': null
     },
     'progresses': {
-
         // overwritten with ffmpeg process if stream has been started
         'repeatToLocalNginx': {},
 

From 9ac7c854cc2bf3a4498a3ec0058653dd681b1913 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 16 Oct 2018 21:52:12 +0200
Subject: [PATCH 34/62] Fix FFMPEG_DEBUG environment variable

---
 src/start.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/start.js b/src/start.js
index 44368601..f14ddd90 100644
--- a/src/start.js
+++ b/src/start.js
@@ -38,8 +38,8 @@ logger.info('', false);
 EnvVar.init(config);
 
 // ffmpeg reporting
-if(process.env.RS_FFMPEG_DEBUG == true) {
-    process.env['FFREPORT'] = 'file=/restreamer/src/webserver/public/debug/%p-%t.log:level=40';
+if(process.env.RS_FFMPEG_DEBUG == 'true') {
+    process.env['FFREPORT'] = 'file=/restreamer/src/webserver/public/debug/%p-%t.log';
 }
 
 // start the app

From e15bb16005e3aecac609dd8f357fd1d69c6a9f10 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 16 Oct 2018 21:52:30 +0200
Subject: [PATCH 35/62] Remove debugging output

---
 src/webserver/public/scripts/Main/MainController.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/webserver/public/scripts/Main/MainController.js b/src/webserver/public/scripts/Main/MainController.js
index e73aff25..0753e1c9 100755
--- a/src/webserver/public/scripts/Main/MainController.js
+++ b/src/webserver/public/scripts/Main/MainController.js
@@ -114,7 +114,6 @@ window.angular.module('Main').controller('mainController',
             });
             ws.on('updateStreamData', (reStreamerData) => {
                 $scope.reStreamerData = reStreamerData;
-                console.log(reStreamerData);
                 if ($scope.showStopButton('repeatToOptionalOutput')) {
                     // checkbox
                     $scope.activateOptionalOutput = true;

From 2f53ed7036048f25aa1f4814dd07e7e4bbf87002 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Wed, 17 Oct 2018 18:50:46 +0200
Subject: [PATCH 36/62] Introduce the stopped state to the UI

---
 src/classes/Restreamer.js                     | 131 ++++++++++++------
 src/webserver/public/locales/lang-de_DE.json  |   1 +
 src/webserver/public/locales/lang-en_US.json  |   1 +
 src/webserver/public/locales/lang-es_VE.json  |   3 +-
 .../public/scripts/Main/MainController.js     |  12 +-
 .../StreamingStatusController.js              |   8 ++
 src/webserver/public/views/login.html         |   3 +-
 src/webserver/public/views/main.html          |   4 +-
 src/webserver/public/views/status.html        |   9 +-
 9 files changed, 119 insertions(+), 53 deletions(-)

diff --git a/src/classes/Restreamer.js b/src/classes/Restreamer.js
index 5479f1b2..2de9cee4 100644
--- a/src/classes/Restreamer.js
+++ b/src/classes/Restreamer.js
@@ -101,9 +101,8 @@ class Restreamer {
     static stopStream(streamType) {
         Restreamer.updateState(streamType, 'stopped');
         logger.info('Stopping ' + streamType);
-        Restreamer.setTimeout(streamType, 'retry', null);
 
-        if(Restreamer.data.processes[streamType] != null) {
+        if(Restreamer.data.processes[streamType] !== null) {
             Restreamer.data.processes[streamType].kill('SIGKILL');
             Restreamer.data.processes[streamType] = null;
         }
@@ -138,6 +137,9 @@ class Restreamer {
                 true
             );
         }
+        else {
+            Restreamer.updateState('repeatToLocalNginx', 'disconnected')
+        }
 
         // check if the stream was repeated to an output address
         if(Restreamer.data.addresses.optionalOutputAddress && repeatToOptionalOutputReconnecting) {
@@ -148,6 +150,9 @@ class Restreamer {
                 true
             );
         }
+        else {
+            Restreamer.updateState('repeatToOptionalOutput', 'disconnected')
+        }
     }
 
     /**
@@ -182,8 +187,9 @@ class Restreamer {
         var deferred = Q.defer();
         var ffmpegOptions = [];
 
-        let stat = Restreamer.getState(streamType);
+        let state = Restreamer.getState(streamType);
         if(state != 'connecting') {
+            logger.debug('Skipping "startStream" because state is not "connecting". Current state is "' + state + '".', streamType);
             return null;
         }
 
@@ -268,74 +274,86 @@ class Restreamer {
 
     /**
      * update the state of the stream
-     * @param {string} processName
+     * @param {string} streamType
      * @param {string} state
-     * @param {string=} message
+     * @param {string} message
      * @return {string} name of the new state
      */
-    static updateState(processName, state, message) {
-        logger.debug('Update state of "' + processName + '" from state "' + Restreamer.data.states[processName].type + '" to state "' + state + '"');
+    static updateState(streamType, state, message) {
+        let previousState = Restreamer.setState(streamType, state, message);
 
-        Restreamer.data.states[processName] = {
-            'type': state,
-            'message': message
-        };
+        if(previousState == state) {
+            return state;
+        }
 
-        if(processName === 'repeatToLocalNginx' && state === 'connected') {
+        logger.debug('Update state from "' + previousState + '" to "' + state + '"', streamType);
+
+        if(streamType === 'repeatToLocalNginx' && state === 'connected') {
             Restreamer.fetchSnapshot();
         }
 
         Restreamer.writeToDB();
         Restreamer.updateStreamDataOnGui();
+
         return state;
     }
 
+    static setState(streamType, state, message) {
+        let previousState = Restreamer.data.states[streamType].type;
+
+        Restreamer.data.states[streamType] = {
+            'type': state,
+            'message': message
+        };
+
+        return previousState;
+    }
+
     /**
      * get the state of the stream
-     * @param {string} processName
+     * @param {string} streamType
      * @return {string} name of the new state
      */
-    static getState(processName) {
-        return Restreamer.data.states[processName].type;
+    static getState(streamType) {
+        return Restreamer.data.states[streamType].type;
     }
 
     /**
      * get the current user action
-     * @param {string} processName
+     * @param {string} streamType
      * @return {string} name of the user action
      */
-    static getUserAction(processName) {
-        return Restreamer.data.userActions[processName];
+    static getUserAction(streamType) {
+        return Restreamer.data.userActions[streamType];
     }
 
     /**
      * set the current user action
-     * @param {string} processName
+     * @param {string} streamType
      * @param {string} action
      * @return {string} name of the previous user action
      */
-    static setUserAction(processName, action) {
-        let previousAction = Restreamer.data.userActions[processName];
-        Restreamer.data.userActions[processName] = action;
+    static setUserAction(streamType, action) {
+        let previousAction = Restreamer.data.userActions[streamType];
+        Restreamer.data.userActions[streamType] = action;
         return previousAction;
     }
 
     /**
      * update the last submitted user action (like click on stop stream, click on start stream)
-     * @param {string} processName
+     * @param {string} streamType
      * @param {string} action user action
      * @return {string} name of the new user action
      */
-    static updateUserAction(processName, action) {
-        let previousAction = Restreamer.setUserAction(processName, action);
+    static updateUserAction(streamType, action) {
+        let previousAction = Restreamer.setUserAction(streamType, action);
 
         if(previousAction == action) {
             return action;
         }
 
-        logger.debug('Set user action of "' + processName + '" from "' + previousAction + '" to "' + action +'"');
+        logger.debug('Set user action from "' + previousAction + '" to "' + action +'"', streamType);
 
-        Restreamer.setUserAction(processName, action);
         Restreamer.writeToDB();
         Restreamer.updateStreamDataOnGui();
 
@@ -362,19 +380,22 @@ class Restreamer {
     static startStream(src, streamType, optionalOutput, force) {
         // remove any running timeouts
         Restreamer.setTimeout(streamType, 'retry', null);
+        Restreamer.setTimeout(streamType, 'stale', null);
 
         force = force || false;
         if(force != true) {
             // check if there's currently no other stream connected or connecting
             let state = Restreamer.getState(streamType);
-            if(state != 'disconnected') {
+            if(state == 'connected' || state == 'connecting') {
+                logger.debug('Skipping "startStream" because state is "connected" or "connecting". Current state is "' + state + '".', streamType);
                 return;
             }
         } 
 
         // check if the user has clicked 'stop' meanwhile, so the startStream process has to be skipped
         if(Restreamer.getUserAction(streamType) == 'stop') {
-            logger.debug('Skipping "startStream" because "stop" has been clicked');
+            Restreamer.stopStream(streamType);
+            logger.debug('Skipping "startStream" because "stop" has been clicked', streamType);
             return;
         }
 
@@ -388,7 +409,7 @@ class Restreamer {
         /** @var {Promise} Promise to make sure, the add output process has been finished */
         var addOutputPromise = null;
 
-        logger.info('Start stream "' + streamType + '"');
+        logger.info('Start stream', streamType);
 
         let rtmpPath = Restreamer.generateOutputHLSPath();
 
@@ -416,13 +437,21 @@ class Restreamer {
         }
 
         if(addOutputPromise === null) {
+            logger.debug('Skipping "startStream" because promise is null', streamType);
             return;
         }
 
         let retry = () => {
-            logger.info('Retrying FFmpeg connection to "' + src + '" after "' + config.ffmpeg.monitor.restart_wait + '" ms');
+            logger.info('Retry to connect to "' + src + '" in ' + config.ffmpeg.monitor.restart_wait + 'ms', streamType);
             Restreamer.setTimeout(streamType, 'retry', () => {
-                logger.info('Retry FFmpeg connection to "' + src + '"');
+                logger.info('Retry to connect to "' + src + '"', streamType);
+
+                if(Restreamer.data.userActions[streamType] == 'stop') {
+                    logger.debug('Skipping retry because "stop" has been clicked', streamType);
+                    Restreamer.updateState(streamType, 'disconnected');
+                    return;
+                }
+
                 Restreamer.startStream(src, streamType, optionalOutput);
             }, config.ffmpeg.monitor.restart_wait);
         }
@@ -444,21 +473,24 @@ class Restreamer {
 
             command
                 .on('start', (commandLine) => {
+                    Restreamer.data.processes[streamType] = command;
+
                     if(Restreamer.data.userActions[streamType] == 'stop') {
-                        command.kill();
-                        logger.debug('Skipping on "start" event of FFmpeg command because "stop" has been clicked');
+                        Restreamer.stopStream(streamType);
+                        logger.debug('Skipping on "start" event of FFmpeg command because "stop" has been clicked', streamType);
                         return;
                     }
 
                     logger.debug('FFmpeg spawned: ' + commandLine);
-                    Restreamer.data.processes[streamType] = command;
                 })
 
                 // stream ended
                 .on('end', () => {
+                    Restreamer.data.processes[streamType] = null;
                     Restreamer.updateState(streamType, 'disconnected');
+
                     if(Restreamer.data.userActions[streamType] == 'stop') {
-                        logger.debug('Skipping retry because "stop" has been clicked');
+                        logger.debug('Skipping retry because "stop" has been clicked', streamType);
                         return;
                     }
 
@@ -469,14 +501,14 @@ class Restreamer {
 
                 // stream error handler
                 .on('error', (error, stdout, stderr) => {
+                    Restreamer.data.processes[streamType] = null;
+
                     if(Restreamer.data.userActions[streamType] == 'stop') {
                         Restreamer.updateState(streamType, 'disconnected');
-                        logger.debug('Skipping retry since "stop" has been clicked');
+                        logger.debug('Skipping retry since "stop" has been clicked', streamType);
                         return;
                     }
 
-                    logger.info(streamType + ': ' + error.toString());
-
                     Restreamer.updateState(streamType, 'error', error.toString());
 
                     retry();
@@ -493,14 +525,20 @@ class Restreamer {
 
                     // add a stale timeout
                     Restreamer.setTimeout(streamType, 'stale', () => {
-                        logger.info('Stale connection for "' + streamType + '"');
+                        logger.info('Stale connection', streamType);
                         Restreamer.stopStream(streamType);
                     }, config.ffmpeg.monitor.stale_wait);
                 });
 
             command.exec();
         }).catch((error) => {
-            logger.error('Error starting FFmpeg command: ' + error.toString());
+            logger.debug('Failed to probe stream: ' + error.toString(), streamType);
+
+            if(Restreamer.data.userActions[streamType] == 'stop') {
+                Restreamer.updateState(streamType, 'disconnected');
+                logger.debug('Skipping retry since "stop" has been clicked', streamType);
+                return;
+            }
 
             Restreamer.updateState(streamType, 'error', error.toString());
 
@@ -530,16 +568,21 @@ class Restreamer {
     static bindWebsocketEvents () {
         WebsocketsController.setConnectCallback((socket) => {
             socket.emit('publicIp', Restreamer.data.publicIp);
-            socket.on('startStream', (options)=> {
+            socket.on('startStream', (options) => {
+                logger.debug('Got "startStream" event for ' + options.streamType);
                 Restreamer.updateUserAction(options.streamType, 'start');
                 Restreamer.updateOptions(options.options);
                 Restreamer.startStream(options.src, options.streamType, options.optionalOutput);
             });
-            socket.on('stopStream', (streamType)=> {
+            socket.on('stopStream', (streamType) => {
+                logger.debug('Got "stopStream" event for ' + streamType);
                 Restreamer.updateUserAction(streamType, 'stop');
                 Restreamer.stopStream(streamType);
             });
-            socket.on('checkStates', Restreamer.updateStreamDataOnGui);
+            socket.on('checkStates', () => {
+                logger.debug('Got "checkStates" event');
+                Restreamer.updateStreamDataOnGui()
+            });
         });
     }
 
diff --git a/src/webserver/public/locales/lang-de_DE.json b/src/webserver/public/locales/lang-de_DE.json
index 80c6901a..c3e9505d 100755
--- a/src/webserver/public/locales/lang-de_DE.json
+++ b/src/webserver/public/locales/lang-de_DE.json
@@ -18,6 +18,7 @@
     "process_failed": "Auf den Stream konnte nicht zugegriffen werden.",
     "process_failed_retry": "Versuch",
     "process_init": "Der Streaming-Prozess wird erstellt. Bitte warten...",
+    "process_stopped": "Der Streaming-Prozess wird angehalten. Bitte warten ...",
     "output_optional": "Externer RTMP-Streaming-Server",
     "output_optional_example": "z.b. rtmp://live.youtube.com/channelId",
     "player_link_title": "Player öffnen",
diff --git a/src/webserver/public/locales/lang-en_US.json b/src/webserver/public/locales/lang-en_US.json
index be9bd6d4..8f14d7b8 100644
--- a/src/webserver/public/locales/lang-en_US.json
+++ b/src/webserver/public/locales/lang-en_US.json
@@ -18,6 +18,7 @@
     "process_failed": "Your stream wasn't accessible.",
     "process_failed_retry": "Retry count",
     "process_init": "Streaming process is initiating. Please wait...",
+    "process_stopped": "Stopping streaming process. Please wait ...",
     "output_optional": "External RTMP-Streaming-Server",
     "output_optional_example": "e.g. rtmp://live.youtube.com/channelId",
     "player_link_title": "Open player",
diff --git a/src/webserver/public/locales/lang-es_VE.json b/src/webserver/public/locales/lang-es_VE.json
index 7a654d08..d4b96ca3 100644
--- a/src/webserver/public/locales/lang-es_VE.json
+++ b/src/webserver/public/locales/lang-es_VE.json
@@ -17,7 +17,8 @@
     "process_success": "El streaming ha iniciado con éxito.",
     "process_failed": "Tu stream no es accesible.",
     "process_failed_retry": "Número de reintentos",
-    "process_init": "Streaming iniciando. Por favor espera...",
+    "process_init": "Streaming iniciando. Por favor espera ...",
+    "process_stopped": "Streaming detenido. Por favor espera ...",
     "output_optional": "Servidor de streaming RTMP externo",
     "output_optional_example": "ej. rtmp://live.youtube.com/channelId",
     "player_link_title": "Abrir reproductor",
diff --git a/src/webserver/public/scripts/Main/MainController.js b/src/webserver/public/scripts/Main/MainController.js
index 0753e1c9..f73fcb32 100755
--- a/src/webserver/public/scripts/Main/MainController.js
+++ b/src/webserver/public/scripts/Main/MainController.js
@@ -75,12 +75,18 @@ window.angular.module('Main').controller('mainController',
 
         $scope.optionalOutput = '';
 
+        $scope.showStartButton = (streamType) => {
+            return ($scope.reStreamerData.states[streamType].type == 'disconnected');
+        };
+
         $scope.showStopButton = (streamType) => {
-            return $scope.reStreamerData.userActions[streamType] === 'start';
+            let state = $scope.reStreamerData.states[streamType].type;
+
+            return (state == 'connected' || state == 'connecting' || state == 'error');
         };
 
-        $scope.showStartButton = (streamType) => {
-            return $scope.reStreamerData.userActions[streamType] === 'stop';
+        $scope.disableInput = (streamType) => {
+            return ($scope.reStreamerData.states[streamType].type != 'disconnected');
         };
 
         $scope.openPlayer = () => {
diff --git a/src/webserver/public/scripts/StreamingInterface/StreamingStatusController.js b/src/webserver/public/scripts/StreamingInterface/StreamingStatusController.js
index 0ed148a6..f05c750e 100755
--- a/src/webserver/public/scripts/StreamingInterface/StreamingStatusController.js
+++ b/src/webserver/public/scripts/StreamingInterface/StreamingStatusController.js
@@ -36,6 +36,14 @@ window.angular.module('StreamingInterface').controller('streamingStatusControlle
             return statusName() === 'connected';
         };
 
+        /**
+         * check if the status is stopped
+         * @returns {boolean}
+         */
+        $scope.stopped = () => {
+            return statusName() === 'stopped';
+        };
+
         /**
          * check if the status is error
          * @returns {boolean}
diff --git a/src/webserver/public/views/login.html b/src/webserver/public/views/login.html
index 3663bf3d..d49ab2ba 100644
--- a/src/webserver/public/views/login.html
+++ b/src/webserver/public/views/login.html
@@ -5,7 +5,8 @@
                type="text"
                name="user"
                ng-model="user"
-               placeholder="{{'login_username' | translate}}">
+               placeholder="{{'login_username' | translate}}"
+               autofocus>
     </div>
     <div class="form-group ng-scope">
         <input id="input_password"
diff --git a/src/webserver/public/views/main.html b/src/webserver/public/views/main.html
index 33494393..64c31adf 100644
--- a/src/webserver/public/views/main.html
+++ b/src/webserver/public/views/main.html
@@ -11,7 +11,7 @@
     <input type="text" class="form-control input" id="input_uri"
            placeholder="{{'input_example' | translate}}"
            ng-model="reStreamerData.addresses.srcAddress"
-           ng-disabled="showStopButton('repeatToLocalNginx')">
+           ng-disabled="disableInput('repeatToLocalNginx')">
 </div>
 
 <streaming-status name="repeatToLocalNginx" data="reStreamerData"></streaming-status>
@@ -66,7 +66,7 @@ <h4>Optional:</h4>
         <input type="text" class="form-control input" id="output_optional_uri"
                placeholder="{{'output_optional_example' | translate}}"
                ng-model="reStreamerData.addresses.optionalOutputAddress"
-               ng-disabled="showStopButton('repeatToOptionalOutput')">
+               ng-disabled="disableInput('repeatToOptionalOutput')">
     </div>
 </div>
 
diff --git a/src/webserver/public/views/status.html b/src/webserver/public/views/status.html
index 69cc494a..b104eb5c 100755
--- a/src/webserver/public/views/status.html
+++ b/src/webserver/public/views/status.html
@@ -14,14 +14,19 @@
         </div>
     </div>
 
-    <!-- Stream has an error -->
+    <!-- Stream was stopped -->
     <div class="jumbotron progress-bar-danger progress-bar-striped" ng-if="error()">
         <span>{{'process_failed' | translate}}</span>
         <div ng-if="message">
-            <span class="message">Error: {{message}}</span>
+            <span class="message">{{message}}</span>
         </div>
     </div>
 
+    <!-- Stream has an error -->
+    <div class="jumbotron progress-bar-info progress-bar-striped" ng-if="stopped()">
+        <span>{{'process_stopped' | translate}}</span>
+    </div>
+
     <!-- regex error on input field -->
     <div class="jumbotron progress-bar-danger progress-bar-striped" ng-show="nginxRepeatStreamInputInvalid">
         {{'process_input_invalid' | translate}}

From 3e8a120f0fe175e20067bd73caa72cf4c18e3ac7 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Thu, 18 Oct 2018 12:12:35 +0200
Subject: [PATCH 37/62] Add explicit mp3 transcoding

---
 conf/live.json            | 14 ++++++++++++--
 src/classes/Restreamer.js |  5 +++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/conf/live.json b/conf/live.json
index fe0385b7..6549f0a1 100644
--- a/conf/live.json
+++ b/conf/live.json
@@ -61,8 +61,18 @@
                 "-metadata server=NGINX-RTMP",
                 "-f flv"
             ],
+            "native_h264_transcode_mp3": [
+                "-vcodec copy",
+                "-acodec libmp3lame",
+                "-b:a 64k",
+                "-map 0:v",
+                "-map 0:a",
+                "-map_metadata -1",
+                "-metadata application=datarhei/Restreamer",
+                "-metadata server=NGINX-RTMP",
+                "-f flv"
+            ],
             "input": [
-                "-hide_banner",
                 "-stats",
                 "-loglevel quiet",
                 "-err_detect ignore_err"
@@ -167,7 +177,7 @@
             "type": "string",
             "defaultValue": "auto",
             "required": false,
-            "description": "Handling of audio track: auto, none (force no audio), silence (force silence), aac (force AAC)"
+            "description": "Handling of audio track: auto, none (force no audio), silence (force silence), aac (force AAC), mp3 (force MP3)"
         }
     ]
 }
diff --git a/src/classes/Restreamer.js b/src/classes/Restreamer.js
index 2de9cee4..1d8b23a7 100644
--- a/src/classes/Restreamer.js
+++ b/src/classes/Restreamer.js
@@ -254,6 +254,11 @@ class Restreamer {
                         option = "native_h264_transcode_aac";
                     }
                 }
+                else if(process.env.RS_AUDIO == "mp3") {
+                    if(audio !== null && audio.codec_name != 'mp3') {
+                        option = "native_h264_transcode_mp3";
+                    }
+                }
             }
             else {
                 option = "native_h264_native_audio";

From be86e5b1f70bcdb44bfe676ca1a706d8c9dad829 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Thu, 18 Oct 2018 13:04:21 +0200
Subject: [PATCH 38/62] Remove stale timeout when stream finishes

---
 src/classes/Restreamer.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/classes/Restreamer.js b/src/classes/Restreamer.js
index 1d8b23a7..a495222b 100644
--- a/src/classes/Restreamer.js
+++ b/src/classes/Restreamer.js
@@ -492,6 +492,10 @@ class Restreamer {
                 // stream ended
                 .on('end', () => {
                     Restreamer.data.processes[streamType] = null;
+
+                    Restreamer.setTimeout(streamType, 'retry', null);
+                    Restreamer.setTimeout(streamType, 'stale', null);
+
                     Restreamer.updateState(streamType, 'disconnected');
 
                     if(Restreamer.data.userActions[streamType] == 'stop') {
@@ -508,6 +512,9 @@ class Restreamer {
                 .on('error', (error, stdout, stderr) => {
                     Restreamer.data.processes[streamType] = null;
 
+                    Restreamer.setTimeout(streamType, 'retry', null);
+                    Restreamer.setTimeout(streamType, 'stale', null);
+
                     if(Restreamer.data.userActions[streamType] == 'stop') {
                         Restreamer.updateState(streamType, 'disconnected');
                         logger.debug('Skipping retry since "stop" has been clicked', streamType);

From fe1163b6f0e1eab94b884a648b485483d82930ea Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Thu, 18 Oct 2018 18:35:07 +0200
Subject: [PATCH 39/62] Remove dependency from custom fluent-ffmpeg fork

---
 conf/live.json            | 165 ++++++++++++++++++++++----------------
 package-lock.json         |   5 +-
 package.json              |   2 +-
 src/classes/Restreamer.js |  79 +++++++++++-------
 4 files changed, 150 insertions(+), 101 deletions(-)

diff --git a/conf/live.json b/conf/live.json
index 6549f0a1..95ad3f18 100644
--- a/conf/live.json
+++ b/conf/live.json
@@ -8,76 +8,101 @@
     },
     "ffmpeg": {
         "options": {
-            "native_h264_native_audio": [
-                "-codec copy",
-                "-map 0:v",
-                "-map 0:a",
-                "-map_metadata -1",
-                "-metadata application=datarhei/Restreamer",
-                "-metadata server=NGINX-RTMP",
-                "-f flv"
-            ],
-            "native_h264_no_audio": [
-                "-vcodec copy",
-                "-an",
-                "-map 0:v",
-                "-map_metadata -1",
-                "-metadata application=datarhei/Restreamer",
-                "-metadata server=NGINX-RTMP",
-                "-f flv"
-            ],
-            "native_h264_native_aac": [
-                "-codec copy",
-                "-map 0:v",
-                "-map 0:a",
-                "-bsf:a aac_adtstoasc",
-                "-map_metadata -1",
-                "-metadata application=datarhei/Restreamer",
-                "-metadata server=NGINX-RTMP",
-                "-f flv"
-            ],
-            "native_h264_silence_aac": [
-                "-f lavfi",
-                "-i anullsrc=r=44100:cl=mono",
-                "-vcodec copy",
-                "-acodec aac",
-                "-b:a 0k",
-                "-map 0:v",
-                "-map 1:a",
-                "-shortest",
-                "-map_metadata -1",
-                "-metadata application=datarhei/Restreamer",
-                "-metadata server=NGINX-RTMP",
-                "-f flv"
-            ],
-            "native_h264_transcode_aac": [
-                "-vcodec copy",
-                "-acodec aac",
-                "-b:a 64k",
-                "-map 0:v",
-                "-map 0:a",
-                "-map_metadata -1",
-                "-metadata application=datarhei/Restreamer",
-                "-metadata server=NGINX-RTMP",
-                "-f flv"
-            ],
-            "native_h264_transcode_mp3": [
-                "-vcodec copy",
-                "-acodec libmp3lame",
-                "-b:a 64k",
-                "-map 0:v",
-                "-map 0:a",
-                "-map_metadata -1",
-                "-metadata application=datarhei/Restreamer",
-                "-metadata server=NGINX-RTMP",
-                "-f flv"
-            ],
-            "input": [
-                "-stats",
-                "-loglevel quiet",
-                "-err_detect ignore_err"
-            ],
-            "snapshot": "-vframes 1"
+            "native_h264_native_audio": {
+                "outputOptions": [
+                    "-codec copy",
+                    "-map 0:v",
+                    "-map 0:a",
+                    "-map_metadata -1",
+                    "-metadata application=datarhei/Restreamer",
+                    "-metadata server=NGINX-RTMP",
+                    "-f flv"
+                ]
+            },
+            "native_h264_no_audio": {
+                "outputOptions": [
+                    "-vcodec copy",
+                    "-an",
+                    "-map 0:v",
+                    "-map_metadata -1",
+                    "-metadata application=datarhei/Restreamer",
+                    "-metadata server=NGINX-RTMP",
+                    "-f flv"
+                ]
+            },
+            "native_h264_native_aac": {
+                "outputOptions": [
+                    "-codec copy",
+                    "-map 0:v",
+                    "-map 0:a",
+                    "-bsf:a aac_adtstoasc",
+                    "-map_metadata -1",
+                    "-metadata application=datarhei/Restreamer",
+                    "-metadata server=NGINX-RTMP",
+                    "-f flv"
+                ]
+            },
+            "native_h264_silence_aac": {
+                "input": "anullsrc=r=44100:cl=mono",
+                "inputOptions": [
+                    "-f lavfi"
+                ],
+                "outputOptions": [
+                    "-vcodec copy",
+                    "-acodec aac",
+                    "-b:a 0k",
+                    "-map 0:v",
+                    "-map 1:a",
+                    "-shortest",
+                    "-map_metadata -1",
+                    "-metadata application=datarhei/Restreamer",
+                    "-metadata server=NGINX-RTMP",
+                    "-f flv"
+                ]
+            },
+            "native_h264_transcode_aac": {
+                "outputOptions": [
+                    "-vcodec copy",
+                    "-acodec aac",
+                    "-b:a 64k",
+                    "-map 0:v",
+                    "-map 0:a",
+                    "-map_metadata -1",
+                    "-metadata application=datarhei/Restreamer",
+                    "-metadata server=NGINX-RTMP",
+                    "-f flv"
+                ]
+            },
+            "native_h264_transcode_mp3": {
+                "outputOptions": [
+                    "-vcodec copy",
+                    "-acodec libmp3lame",
+                    "-b:a 64k",
+                    "-map 0:v",
+                    "-map 0:a",
+                    "-map_metadata -1",
+                    "-metadata application=datarhei/Restreamer",
+                    "-metadata server=NGINX-RTMP",
+                    "-f flv"
+                ]
+            },
+            "global": {
+                "inputOptions": [
+                    "-stats",
+                    "-loglevel quiet",
+                    "-err_detect ignore_err"
+                ]
+            },
+            "rtsp-tcp": {
+                "inputOptions": [
+                    "-rtsp_transport tcp"
+                ]
+            },
+            "snapshot": {
+                "outputOptions": [
+                    "-vframes 1"
+                ]
+            }
         },
         "monitor": {
             "restart_wait": "6000",
diff --git a/package-lock.json b/package-lock.json
index 6cd4ffa4..c1bb1268 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2911,8 +2911,9 @@
       }
     },
     "fluent-ffmpeg": {
-      "version": "git://github.com/datarhei/node-fluent-ffmpeg.git#3469d012d9b76f2c01df48a67f44abeb917b42c9",
-      "from": "git://github.com/datarhei/node-fluent-ffmpeg.git",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/fluent-ffmpeg/-/fluent-ffmpeg-2.1.2.tgz",
+      "integrity": "sha1-yVLeIkD4EuvaCqgAbXd27irPfXQ=",
       "requires": {
         "async": ">=0.2.9",
         "which": "^1.1.1"
diff --git a/package.json b/package.json
index d6105328..bb3645ac 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "cookie-parser": "1.4.3",
     "express": "^4.16.3",
     "express-session": "^1.15.6",
-    "fluent-ffmpeg": "git://github.com/datarhei/node-fluent-ffmpeg.git",
+    "fluent-ffmpeg": "^2.1.2",
     "jsonschema": "1.2.0",
     "moment-timezone": "0.5.13",
     "node-json-db": "0.7.3",
diff --git a/src/classes/Restreamer.js b/src/classes/Restreamer.js
index a495222b..103c54f8 100644
--- a/src/classes/Restreamer.js
+++ b/src/classes/Restreamer.js
@@ -59,9 +59,15 @@ class Restreamer {
         let command = new FfmpegCommand(Restreamer.generateOutputHLSPath());
 
         command.output(Restreamer.generateSnapshotPath());
-        command.outputOption(config.ffmpeg.options.snapshot);
+
+        Restreamer.addOptions(command, "global");
+        Restreamer.addOptions(command, "snapshot");
+
+        command.on('start', (commandLine) => {
+            logger.debug('Spawned: ' + commandLine, 'snapshot');
+        });
         command.on('error', (error) => {
-            logger.error('Error fetching snapshot: ' + error.toString().trim());
+            logger.error('Error: ' + error.toString().trim(), 'snapshot');
         });
         command.on('end', () => {
             logger.info('Updated snapshot');
@@ -73,6 +79,29 @@ class Restreamer {
         command.exec();
     }
 
+    static addOptions(command, name) {
+        if(!(name in config.ffmpeg.options)) {
+            logger.debug('Unknown option: ' + name);
+            return;
+        }
+
+        logger.debug('Adding option: ' + name);
+
+        let options = config.ffmpeg.options[name];
+
+        if('input' in options) {
+            command.input(options.input);
+        }
+
+        if('inputOptions' in options) {
+            command.inputOptions(options.inputOptions);
+        }
+
+        if('outputOptions' in options) {
+            command.outputOptions(options.outputOptions);
+        }
+    }
+
     static calculateSnapshotRefreshInterval () {
         let fallbackRefreshInterval = 60000;
         let snapshotRefreshInterval = process.env.RS_SNAPSHOT_REFRESH_INTERVAL.match(/([0-9]+)([a-z]{1,2})?/);
@@ -183,9 +212,8 @@ class Restreamer {
      * @param {FfmpegCommand} ffmpegCommand
      * @return {Promise}
      */
-    static appendOutputOptionFromConfig(ffmpegCommand, streamType) {
+    static probeStream(ffmpegCommand, streamType) {
         var deferred = Q.defer();
-        var ffmpegOptions = [];
 
         let state = Restreamer.getState(streamType);
         if(state != 'connecting') {
@@ -265,13 +293,8 @@ class Restreamer {
             }
 
             logger.debug('Selected ffmpeg.option: ' + option);
-            ffmpegOptions = config.ffmpeg.options[option];
-
-            for(let o of ffmpegOptions) {
-                ffmpegCommand.outputOptions(o);
-            }
 
-            return deferred.resolve();
+            return deferred.resolve(option);
         });
 
         return deferred.promise;
@@ -412,7 +435,7 @@ class Restreamer {
         var command = null;
 
         /** @var {Promise} Promise to make sure, the add output process has been finished */
-        var addOutputPromise = null;
+        var probePromise = null;
 
         logger.info('Start stream', streamType);
 
@@ -424,9 +447,18 @@ class Restreamer {
                 stdoutLines: 1
             });
 
+            Restreamer.addOptions(command, 'global');
+
+            // GUI option
+            if(streamType == 'repeatToLocalNginx') {
+                if(Restreamer.data.options.rtspTcp && Restreamer.data.addresses.srcAddress.indexOf('rtsp') == 0) {
+                    Restreamer.addOptions(command, 'rtsp-tcp');
+                }
+            }
+
             // add outputs to the ffmpeg stream
             command.output(rtmpPath);
-            addOutputPromise = Restreamer.appendOutputOptionFromConfig(command, streamType)
+            probePromise = Restreamer.probeStream(command, streamType)
         }
         else {
             // repeat to optional output
@@ -434,14 +466,16 @@ class Restreamer {
                 stdoutLines: 1
             });
 
+            Restreamer.addOptions(command, 'global');
+
             Restreamer.data.addresses.optionalOutputAddress = optionalOutput;
 
             // add outputs to the ffmpeg stream
             command.output(optionalOutput);
-            addOutputPromise = Restreamer.appendOutputOptionFromConfig(command, streamType)
+            probePromise = Restreamer.probeStream(command, streamType)
         }
 
-        if(addOutputPromise === null) {
+        if(probePromise === null) {
             logger.debug('Skipping "startStream" because promise is null', streamType);
             return;
         }
@@ -462,19 +496,8 @@ class Restreamer {
         }
 
         // after adding outputs, define events on the new FFmpeg stream
-        addOutputPromise.then(() => {
-            let ffmpegOptions = config.ffmpeg.options.input;
-
-            for(let o of ffmpegOptions) {
-                command.inputOptions(o);
-            }
-
-            // GUI option
-            if(streamType == 'repeatToLocalNginx') {
-                if(Restreamer.data.options.rtspTcp && Restreamer.data.addresses.srcAddress.indexOf('rtsp') == 0) {
-                    command.inputOptions('-rtsp_transport', 'tcp');
-                }
-            }
+        probePromise.then((option) => {
+            Restreamer.addOptions(command, option);
 
             command
                 .on('start', (commandLine) => {
@@ -486,7 +509,7 @@ class Restreamer {
                         return;
                     }
 
-                    logger.debug('FFmpeg spawned: ' + commandLine);
+                    logger.debug('Spawned: ' + commandLine, streamType);
                 })
 
                 // stream ended

From 05277bc71577d05e285839308b4bb1fb39412648 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Fri, 19 Oct 2018 11:52:20 +0200
Subject: [PATCH 40/62] Make startStream to accept only one URL parameter

The two URL parameter were too confusing and only one was used anyways.
By using the streamType, only one URL parameter is enough. What to do
can be decided by looking at the streamType parameter.
---
 src/classes/Restreamer.js | 53 +++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/src/classes/Restreamer.js b/src/classes/Restreamer.js
index 103c54f8..c4084f22 100644
--- a/src/classes/Restreamer.js
+++ b/src/classes/Restreamer.js
@@ -162,7 +162,6 @@ class Restreamer {
             Restreamer.startStream(
                 Restreamer.data.addresses.srcAddress,
                 'repeatToLocalNginx',
-                null,
                 true
             );
         }
@@ -173,9 +172,8 @@ class Restreamer {
         // check if the stream was repeated to an output address
         if(Restreamer.data.addresses.optionalOutputAddress && repeatToOptionalOutputReconnecting) {
             Restreamer.startStream(
-                Restreamer.data.addresses.srcAddress,
-                'repeatToOptionalOutput',
                 Restreamer.data.addresses.optionalOutputAddress,
+                'repeatToOptionalOutput',
                 true
             );
         }
@@ -405,7 +403,7 @@ class Restreamer {
      * @param {string} optionalOutput address of the optional output
      * @param {string} force force the start of the stream
      */
-    static startStream(src, streamType, optionalOutput, force) {
+    static startStream(streamUrl, streamType, force) {
         // remove any running timeouts
         Restreamer.setTimeout(streamType, 'retry', null);
         Restreamer.setTimeout(streamType, 'stale', null);
@@ -427,23 +425,18 @@ class Restreamer {
             return;
         }
 
-        // update the state and src address on the frontend
-        Restreamer.data.addresses.srcAddress = src;
-        Restreamer.updateState(streamType, 'connecting');
-
-        /** @var {FfmpegCommand} instance of FFmpeg command of module fluent-ffmpeg */
         var command = null;
-
-        /** @var {Promise} Promise to make sure, the add output process has been finished */
         var probePromise = null;
 
         logger.info('Start stream', streamType);
 
+        // update the state on the frontend
+        Restreamer.updateState(streamType, 'connecting');
+
         let rtmpPath = Restreamer.generateOutputHLSPath();
 
-        if(streamType == 'repeatToLocalNginx') {
-            // repeat to local nginx server
-            command = new FfmpegCommand(src, {
+        if(streamType == 'repeatToLocalNginx') {    // repeat to local nginx server
+            command = new FfmpegCommand(streamUrl, {
                 stdoutLines: 1
             });
 
@@ -460,18 +453,15 @@ class Restreamer {
             command.output(rtmpPath);
             probePromise = Restreamer.probeStream(command, streamType)
         }
-        else {
-            // repeat to optional output
+        else {  // repeat to optional output
             command = new FfmpegCommand(rtmpPath, {
                 stdoutLines: 1
             });
 
             Restreamer.addOptions(command, 'global');
 
-            Restreamer.data.addresses.optionalOutputAddress = optionalOutput;
-
             // add outputs to the ffmpeg stream
-            command.output(optionalOutput);
+            command.output(streamUrl);
             probePromise = Restreamer.probeStream(command, streamType)
         }
 
@@ -481,9 +471,9 @@ class Restreamer {
         }
 
         let retry = () => {
-            logger.info('Retry to connect to "' + src + '" in ' + config.ffmpeg.monitor.restart_wait + 'ms', streamType);
+            logger.info('Retry to connect to "' + streamUrl + '" in ' + config.ffmpeg.monitor.restart_wait + 'ms', streamType);
             Restreamer.setTimeout(streamType, 'retry', () => {
-                logger.info('Retry to connect to "' + src + '"', streamType);
+                logger.info('Retry to connect to "' + streamUrl + '"', streamType);
 
                 if(Restreamer.data.userActions[streamType] == 'stop') {
                     logger.debug('Skipping retry because "stop" has been clicked', streamType);
@@ -491,7 +481,7 @@ class Restreamer {
                     return;
                 }
 
-                Restreamer.startStream(src, streamType, optionalOutput);
+                Restreamer.startStream(streamUrl, streamType);
             }, config.ffmpeg.monitor.restart_wait);
         }
 
@@ -519,9 +509,10 @@ class Restreamer {
                     Restreamer.setTimeout(streamType, 'retry', null);
                     Restreamer.setTimeout(streamType, 'stale', null);
 
-                    Restreamer.updateState(streamType, 'disconnected');
+                    Restreamer.updateState(streamType, 'stopped');
 
                     if(Restreamer.data.userActions[streamType] == 'stop') {
+                        Restreamer.updateState(streamType, 'disconnected');
                         logger.debug('Skipping retry because "stop" has been clicked', streamType);
                         return;
                     }
@@ -607,7 +598,21 @@ class Restreamer {
                 logger.debug('Got "startStream" event for ' + options.streamType);
                 Restreamer.updateUserAction(options.streamType, 'start');
                 Restreamer.updateOptions(options.options);
-                Restreamer.startStream(options.src, options.streamType, options.optionalOutput);
+
+                let streamUrl = '';
+                if(options.streamType == 'repeatToLocalNginx') {
+                    Restreamer.data.addresses.srcAddress = options.src;
+                    streamUrl = options.src;
+                }
+                else if(options.streamType == 'repeatToOptionalOutput') {
+                    Restreamer.data.addresses.optionalOutputAddress = options.optionalOutput;
+                    streamUrl = options.optionalOutput;
+                }
+                else {
+                    return;
+                }
+
+                Restreamer.startStream(streamUrl, options.streamType);
             });
             socket.on('stopStream', (streamType) => {
                 logger.debug('Got "stopStream" event for ' + streamType);

From 6cd126b4677f1a01face5a5662f9b2a8f608c6e9 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Fri, 19 Oct 2018 14:31:30 +0200
Subject: [PATCH 41/62] Refactor environment variable checking

More than one alias is now allowed and a message is emitted in case
an alias was used. Aliases denote deprecated names. If an
environment variable is used, then its aliases are not considered.
---
 conf/live.json        | 57 ++++++++++++++++++++++++++--------------
 src/classes/EnvVar.js | 60 +++++++++++++++++++++++++++++--------------
 2 files changed, 79 insertions(+), 38 deletions(-)

diff --git a/conf/live.json b/conf/live.json
index 95ad3f18..0b0401c6 100644
--- a/conf/live.json
+++ b/conf/live.json
@@ -126,7 +126,9 @@
     "envVars": [
         {
             "name": "RS_NODE_PORT",
-            "alias": "NODEJS_PORT",
+            "alias": [
+                "NODEJS_PORT"
+            ],
             "type": "int",
             "defaultValue": "3000",
             "required": false,
@@ -134,39 +136,50 @@
         },
         {
             "name": "RS_NODE_ENV",
-            "alias": "NODE_ENV",
+            "alias": [
+                "NODE_ENV"
+            ],
             "type": "string",
             "defaultValue": "prod",
             "required": false,
-            "description": "Nodejs Environment"
+            "description": "Nodejs Environment ('dev' or 'prod')"
         },
         {
             "name": "RS_LOGGER_LEVEL",
-            "alias": "LOGGER_LEVEL",
+            "alias": [
+                "LOGGER_LEVEL"
+            ],
             "type": "int",
             "defaultValue": "3",
-            "required": true,
-            "description": "Logger level to defined, what should be logged"
+            "required": false,
+            "description": "Logging level (0=no logging, 1=ERROR, 2=WARN, 3=INFO, 4=DEBUG)"
         },
         {
             "name": "RS_TIMEZONE",
-            "alias": "TIMEZONE",
+            "alias": [
+                "TIMEZONE"
+            ],
             "type": "string",
             "defaultValue": "Europe/Berlin",
-            "required": true,
+            "required": false,
             "description": "Set the timezone"
         },
         {
-            "name": "RS_SNAPSHOT_REFRESH_INTERVAL",
-            "alias": "SNAPSHOT_REFRESH_INTERVAL",
+            "name": "RS_SNAPSHOT_INTERVAL",
+            "alias": [
+                "SNAPSHOT_REFRESH_INTERVAL",
+                "RS_SNAPSHOT_REFRESH_INTERVAL"
+            ],
             "type": "string",
             "defaultValue": "1m",
             "required": false,
-            "description": "Interval to create a new Snapshot (in minutes)"
+            "description": "Interval to create a new snapshot (in milliseconds, use suffix 's' for seconds, 'm' for minutes)"
         },
         {
             "name": "RS_CREATE_HEAPDUMPS",
-            "alias": "CREATE_HEAPDUMPS",
+            "alias": [
+                "CREATE_HEAPDUMPS"
+            ],
             "type": "bool",
             "defaultValue": "false",
             "required": false,
@@ -174,23 +187,29 @@
         },
         {
             "name": "RS_USERNAME",
-            "alias": "RESTREAMER_USERNAME",
+            "alias": [
+                "RESTREAMER_USERNAME"
+            ],
             "type": "string",
             "defaultValue": "admin",
             "required": false,
-            "description": "Backend user name"
+            "description": "Username for the backend"
         },
         {
             "name": "RS_PASSWORD",
-            "alias": "RESTREAMER_PASSWORD",
+            "alias": [
+                "RESTREAMER_PASSWORD"
+            ],
             "type": "string",
             "defaultValue": "datarhei",
             "required": false,
-            "description": "Backend login password"
+            "description": "Password for the backend"
         },
         {
-            "name": "RS_FFMPEG_DEBUG",
-            "alias": "",
+            "name": "RS_DEBUG_FFMPEG",
+            "alias": [
+                "RS_FFMPEG_DEBUG"
+            ],
             "type": "bool",
             "defaultValue": false,
             "required": false,
@@ -198,7 +217,7 @@
         },
         {
             "name": "RS_AUDIO",
-            "alias": "",
+            "alias": [],
             "type": "string",
             "defaultValue": "auto",
             "required": false,
diff --git a/src/classes/EnvVar.js b/src/classes/EnvVar.js
index 073d3514..edddff06 100644
--- a/src/classes/EnvVar.js
+++ b/src/classes/EnvVar.js
@@ -5,46 +5,68 @@
  * @license Apache-2.0
  */
 'use strict';
-const logger = require('./Logger')('EnvVar');
+const logger = require('./Logger')('ENV');
 const logBlacklist = ['RS_PASSWORD'];
 
 /**
  * Class for environment variables with default values
  */
 class EnvVar {
-    static init (config) {
+    static init(config) {
         var killProcess = false;
 
-        for (let envVar of config.envVars) {
-            if (typeof process.env[envVar.alias] !== 'undefined') {
-                process.env[envVar.name] = process.env[envVar.alias];
-                delete process.env[envVar.alias];
-            }
-            if (typeof process.env[envVar.name] !== 'undefined') {
-                logger.info(`ENV "${envVar.name} = ${(logBlacklist.indexOf(envVar.name) === -1 ? process.env[envVar.name] : '[hidden]')}"`, envVar.description);
-            } else if (envVar.required === true) {
-                logger.error(`No value set for env "${envVar.name}", but it is required`);
-                killProcess = true;
-            } else {
-                process.env[envVar.name] = envVar.defaultValue;
-                logger.info(`ENV "${envVar.name} = ${(logBlacklist.indexOf(envVar.name) === -1 ? process.env[envVar.name] : '[hidden]')}", set to default value`, envVar.description);
+        // Cycle through all defined environment variables
+        for(let envVar of config.envVars) {
+            // Check if the environment variable is set. If not, cycle through the aliases.
+            if(!(envVar.name in process.env)) {
+                for(let i in envVar.alias) {
+                    let alias = envVar.alias[i];
+                    // If the alias exists, copy it to the actual name and delete it.
+                    if(alias in process.env) {
+                        logger.warn('The use of ' + alias + ' is deprecated. Please use ' + envVar.name + ' instead')
+                        process.env[envVar.name] = process.env[alias];
+                        delete process.env[alias];
+                    }
+                }
             }
 
-            if (typeof process.env[envVar.name] !== 'undefined') {
-                switch (envVar.type) {
+            // Check if the environment variable is set and display it, if it is not set
+            // apply the default value. In case the environment variable is required and
+            // not set, stop the process.
+            if(envVar.name in process.env) {
+                // Adjust the given value to the required type
+                switch(envVar.type) {
                     case 'int':
                         process.env[envVar.name] = parseInt(process.env[envVar.name], 10);
                         break;
                     case 'bool':
-                        process.env[envVar.name] = process.env[envVar.name] === 'true';
+                        process.env[envVar.name] = process.env[envVar.name] == 'true';
                         break;
                     default: // keep strings
                         break;
                 }
+
+                // Cover blacklisted values
+                let value = process.env[envVar.name];
+                if(logBlacklist.indexOf(envVar.name) != -1) {
+                    value = '******';
+                }
+
+                logger.info(envVar.name + ' = ' + value + ' (' + envVar.defaultValue + ') ' + envVar.description);
+            }
+            else {
+                if(envVar.required == true) {
+                    logger.error(envVar.name + ' not set but required');
+                    killProcess = true;
+                }
+                else {
+                    logger.info(envVar.name + ' = ' + envVar.defaultValue + ' (using default) ' + envVar.description);
+                    process.env[envVar.name] = envVar.defaultValue;
+                }
             }
         }
 
-        if (killProcess === true) {
+        if(killProcess == true) {
             setTimeout(()=> {
                 process.exit();
             }, 500);

From 6b778073a12f333fe67a8a76d3e082799ce10a4d Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Fri, 19 Oct 2018 14:55:11 +0200
Subject: [PATCH 42/62] Re-arrange log output and adjust log messages

---
 package-lock.json                         |  5 +++++
 package.json                              |  1 +
 src/classes/Logger.js                     | 15 ++++++++-----
 src/classes/Nginxrtmp.js                  | 18 ++++++++--------
 src/classes/Restreamer.js                 | 26 +++++++++++------------
 src/classes/WebsocketsController.js       |  4 ++--
 src/start.js                              |  2 +-
 src/webserver/app.js                      | 10 ++++-----
 src/webserver/middleware/expressLogger.js | 20 ++++++++---------
 9 files changed, 55 insertions(+), 46 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c1bb1268..0a927101 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5735,6 +5735,11 @@
         "number-is-nan": "^1.0.0"
       }
     },
+    "printf": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/printf/-/printf-0.5.1.tgz",
+      "integrity": "sha512-UaE/jO0hNsrvPGQEb4LyNzcrJv9Z00tsreBduOSxMtrebvoUhxiEJ4YCHX8YHf6akwfKsC2Gyv5zv47UXhMiLg=="
+    },
     "private": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
diff --git a/package.json b/package.json
index bb3645ac..6308f774 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "jsonschema": "1.2.0",
     "moment-timezone": "0.5.13",
     "node-json-db": "0.7.3",
+    "printf": "^0.5.1",
     "ps-find": "1.1.0",
     "public-ip": "^2.4.0",
     "q": "1.5.0",
diff --git a/src/classes/Logger.js b/src/classes/Logger.js
index 5bd01008..f680f113 100644
--- a/src/classes/Logger.js
+++ b/src/classes/Logger.js
@@ -7,6 +7,8 @@
 'use strict';
 
 const moment = require('moment-timezone');
+const printf = require('printf');
+
 const LEVEL_MUTE = 0;
 const LEVEL_ERROR = 1;
 const LEVEL_WARN = 2;
@@ -48,16 +50,19 @@ class Logger {
      */
     stdout (message, context, type) {
         var time = moment().tz(process.env.RS_TIMEZONE).format('DD-MM-YYYY HH:mm:ss.SSS');
-        var loggerContext = `${String(context)}`;
 
-        if (Logger.isMuted()) {
+        if(Logger.isMuted()) {
             return;
         }
-        if (context) {
-            process.stdout.write(`[${time}] [${type}] ${message} [${loggerContext}]\n`);
+
+        let logline = '';
+        if(context) {
+            logline = printf('[%s] [%-5s] [%22s] %s', time, type, context, message);
         } else {
-            process.stdout.write(`[${time}] [${type}] ${message}\n`);
+            logline = printf('[%s] [%-5s] %s', time, type, message);
         }
+
+        process.stdout.write(logline + '\n');
     }
 
     /**
diff --git a/src/classes/Nginxrtmp.js b/src/classes/Nginxrtmp.js
index cd76dd3d..5e5801be 100644
--- a/src/classes/Nginxrtmp.js
+++ b/src/classes/Nginxrtmp.js
@@ -10,7 +10,7 @@ const Q = require('q');
 const config = require('../../conf/live.json');
 const proc = require('process');
 const spawn = require('child_process').spawn;
-const logger = require('./Logger')('Nginxrtmp');
+const logger = require('./Logger')('NGINX');
 const rp = require('request-promise');
 
 /**
@@ -35,24 +35,24 @@ class Nginxrtmp {
      * @returns {Promise.<boolean>}
      */
     async start() {
-        this.logger.info('Starting NGINX ...');
+        this.logger.info('Starting ...');
         let timeout = 250;
         let abort = false;
 
         this.process = spawn(this.config.nginx.command, this.config.nginx.args);
 
         this.process.stdout.on('data', (data) => {
-            this.logger.info(data.toString().trim(), 'NGINX');
+            this.logger.info(data.toString().replace(/^.*\]/, '').trim());
         });
 
         this.process.stderr.on('data', (data) => {
-            this.logger.error(data.toString().trim(), 'NGINX');
+            this.logger.error(data.toString().replace(/^.*\]/, '').trim());
         });
 
         this.process.on('close', (code) => {
             abort = true;
 
-            this.logger.error('NGINX exited with code: ' + code);
+            this.logger.error('Exited with code: ' + code);
 
             if(code < 0) {
                 return;
@@ -61,14 +61,14 @@ class Nginxrtmp {
             if(this.allowRestart == true) {
                 let self = this;
                 setTimeout(() => {
-                    self.logger.info('Trying to restart NGINX');
+                    self.logger.info('Trying to restart ...');
                     self.start();
                 }, timeout);
             }
         });
 
         this.process.on('error', (err) => {
-            this.logger.error('Failed to spawn NGINX process: ' + err.name + ': ' + err.message);
+            this.logger.error('Failed to spawn process: ' + err.name + ': ' + err.message);
         });
 
         let running = false;
@@ -82,11 +82,11 @@ class Nginxrtmp {
 
         if(running == false) {
             this.process = null;
-            throw new Error('NGINX failed to start');
+            throw new Error('Failed to start');
         }
         else {
             this.allowRestart = true;
-            this.logger.info('NGINX successfully started');
+            this.logger.info('Successfully started');
         }
 
         return true;
diff --git a/src/classes/Restreamer.js b/src/classes/Restreamer.js
index c4084f22..369aa0e6 100644
--- a/src/classes/Restreamer.js
+++ b/src/classes/Restreamer.js
@@ -70,7 +70,7 @@ class Restreamer {
             logger.error('Error: ' + error.toString().trim(), 'snapshot');
         });
         command.on('end', () => {
-            logger.info('Updated snapshot');
+            logger.info('Updated snapshot', 'snapshot');
             WebsocketsController.emit('snapshot', null);
             Q.delay(this.calculateSnapshotRefreshInterval()).then(() => {
                 Restreamer.fetchSnapshot();
@@ -102,9 +102,9 @@ class Restreamer {
         }
     }
 
-    static calculateSnapshotRefreshInterval () {
+    static calculateSnapshotRefreshInterval() {
         let fallbackRefreshInterval = 60000;
-        let snapshotRefreshInterval = process.env.RS_SNAPSHOT_REFRESH_INTERVAL.match(/([0-9]+)([a-z]{1,2})?/);
+        let snapshotRefreshInterval = process.env.RS_SNAPSHOT_INTERVAL.match(/([0-9]+)([a-z]{1,2})?/);
 
         let refreshInterval = fallbackRefreshInterval;
 
@@ -129,7 +129,7 @@ class Restreamer {
      */
     static stopStream(streamType) {
         Restreamer.updateState(streamType, 'stopped');
-        logger.info('Stopping ' + streamType);
+        logger.info('Stop streaming', streamType);
 
         if(Restreamer.data.processes[streamType] !== null) {
             Restreamer.data.processes[streamType].kill('SIGKILL');
@@ -141,7 +141,7 @@ class Restreamer {
      * restore the ffmpeg processes from jsondb (called on app start to restore ffmpeg processes
      * after the application has been killed or stuff
      */
-    static restoreFFMpegProcesses () {
+    static restoreFFMpegProcesses() {
         var db = new JsonDB(config.jsondb, true, false);
 
         Restreamer.data.addresses = db.getData('/addresses');
@@ -290,7 +290,7 @@ class Restreamer {
                 option = "native_h264_native_audio";
             }
 
-            logger.debug('Selected ffmpeg.option: ' + option);
+            logger.debug('Selected ffmpeg option: ' + option, streamType);
 
             return deferred.resolve(option);
         });
@@ -428,7 +428,7 @@ class Restreamer {
         var command = null;
         var probePromise = null;
 
-        logger.info('Start stream', streamType);
+        logger.info('Start streaming', streamType);
 
         // update the state on the frontend
         Restreamer.updateState(streamType, 'connecting');
@@ -595,7 +595,7 @@ class Restreamer {
         WebsocketsController.setConnectCallback((socket) => {
             socket.emit('publicIp', Restreamer.data.publicIp);
             socket.on('startStream', (options) => {
-                logger.debug('Got "startStream" event for ' + options.streamType);
+                logger.debug('Got "startStream" event', options.streamType);
                 Restreamer.updateUserAction(options.streamType, 'start');
                 Restreamer.updateOptions(options.options);
 
@@ -615,7 +615,7 @@ class Restreamer {
                 Restreamer.startStream(streamUrl, options.streamType);
             });
             socket.on('stopStream', (streamType) => {
-                logger.debug('Got "stopStream" event for ' + streamType);
+                logger.debug('Got "stopStream" event', streamType);
                 Restreamer.updateUserAction(streamType, 'stop');
                 Restreamer.stopStream(streamType);
             });
@@ -658,7 +658,7 @@ class Restreamer {
      */
     static checkForUpdates () {
         const url = {'host': 'datarhei.org', 'path': '/apps.json'};
-        logger.debug('Checking for updates...');
+        logger.debug('Checking for updates...', 'checkForUpdates');
         https.get(url, (response) => {
             if (response.statusCode === 200) {
                 response.on('data', (body) => {
@@ -682,12 +682,12 @@ class Restreamer {
      * get public ip
      */
     static getPublicIp () {
-        logger.info('Getting public IP ...', 'start.publicip');
+        logger.info('Retrieving public IP ...', 'publicIP');
         publicIp.v4().then(ip => {
             Restreamer.data.publicIp = ip;
-            logger.info('Found public IP: ' + ip, 'start.publicip');
+            logger.info('Found public IP: ' + ip, 'publicIP');
         }).catch(err => {
-            logger.warn('Failed to get public IP', 'start.publicip');
+            logger.warn('Failed to get public IP', 'publicIP');
             Restreamer.data.publicIp = '127.0.0.1';
         });
     }
diff --git a/src/classes/WebsocketsController.js b/src/classes/WebsocketsController.js
index ddb4b59a..733fe362 100644
--- a/src/classes/WebsocketsController.js
+++ b/src/classes/WebsocketsController.js
@@ -6,7 +6,7 @@
  */
 'use strict';
 
-const logger = require.main.require('./classes/Logger')('WebsocketsController');
+const logger = require.main.require('./classes/Logger')('WSController');
 const app = require.main.require('./webserver/app').app;
 
 /**
@@ -22,7 +22,7 @@ class WebsocketsController {
      */
     static emit (event, data) {
         app.get('websocketsReady').promise.then((io) => {
-            logger.debug(`Emitting ${event}`);
+            logger.debug('Emitting ' + event);
             io.sockets.emit(event, data);
         });
     }
diff --git a/src/start.js b/src/start.js
index f14ddd90..d061431d 100644
--- a/src/start.js
+++ b/src/start.js
@@ -38,7 +38,7 @@ logger.info('', false);
 EnvVar.init(config);
 
 // ffmpeg reporting
-if(process.env.RS_FFMPEG_DEBUG == 'true') {
+if(process.env.RS_DEBUG_FFMPEG == 'true') {
     process.env['FFREPORT'] = 'file=/restreamer/src/webserver/public/debug/%p-%t.log';
 }
 
diff --git a/src/webserver/app.js b/src/webserver/app.js
index 1d4293bb..588cafc8 100644
--- a/src/webserver/app.js
+++ b/src/webserver/app.js
@@ -19,7 +19,7 @@ const Q = require('q');
 const crypto = require('crypto');
 
 // modules
-const logger = require.main.require('./classes/Logger')('RestreamerExpressApp');
+const logger = require.main.require('./classes/Logger')('Webserver');
 const indexRouter = require('./controllers/index');
 const apiV1 = require('./controllers/api/v1');
 
@@ -157,7 +157,7 @@ class RestreamerExpressApp {
         var deferred = Q.defer();
         var server = null;
 
-        logger.info('Starting webserver...');
+        logger.info('Starting ...');
         this.app.set('port', process.env.RS_NODE_PORT);
         server = this.app.listen(this.app.get('port'), ()=> {
             this.app.set('io', require('socket.io')(server));
@@ -166,7 +166,7 @@ class RestreamerExpressApp {
 
             // promise to avoid ws binding before the webserver has been started
             this.app.get('websocketsReady').resolve(this.app.get('io'));
-            logger.info(`Webserver running on port ${process.env.RS_NODE_PORT}`);
+            logger.info('Running on port ' + process.env.RS_NODE_PORT);
             deferred.resolve(server.address().port);
         });
 
@@ -190,7 +190,7 @@ class RestreamerExpressApp {
      * prod config for the express app
      */
     initProd () {
-        logger.debug('init webserver with PROD environment');
+        logger.debug('Init webserver with PROD environment');
         this.initAlways();
         this.app.get('/', (req, res)=> {
             res.sendFile(path.join(global.__public, 'index.prod.html'));
@@ -203,7 +203,7 @@ class RestreamerExpressApp {
      * dev config for the express app
      */
     initDev () {
-        logger.debug('init webserver with DEV environment');
+        logger.debug('Init webserver with DEV environment');
         this.initAlways();
         this.app.get('/', (req, res)=> {
             res.sendFile(path.join(global.__public, 'index.dev.html'));
diff --git a/src/webserver/middleware/expressLogger.js b/src/webserver/middleware/expressLogger.js
index ece1ac29..01e99549 100644
--- a/src/webserver/middleware/expressLogger.js
+++ b/src/webserver/middleware/expressLogger.js
@@ -7,24 +7,22 @@
 'use strict';
 /* eslint vars-on-top: 0 */
 
-const logger = require.main.require('./classes/Logger')('webserver');
+const logger = require.main.require('./classes/Logger')('Webserver');
 
-module.exports = (req, res, next)=> {
+module.exports = (req, res, next) => {
     req._startTime = new Date();
     var log = () => {
-        var code = res.statusCode;
-        var len = parseInt(res.getHeader('Content-Length'), 10);
-        var duration = ('new Date' - 'req._startTime');
-        var url = (req.originalUrl || req.url);
-        var method = req.method;
+        let code = res.statusCode;
+        let len = parseInt(res.getHeader('Content-Length'), 10);
+        let duration = new Date() - req._startTime;
+        let url = (req.originalUrl || req.url);
+        let method = req.method;
 
         if (isNaN(len)) {
-            len = '';
-        } else {
-            len = ' - ' + len;
+            len = '-';
         }
 
-        logger.debug(method + ' \'' + url + '\' ' + code + ' ' + duration + ' ' + req.ip + ' ' + len, 'Webserver');
+        logger.debug(method + ' "' + url + '" ' + code + ' ' + duration + 'ms ' + req.ip + ' ' + len);
     };
 
     res.on('finish', log);

From 259e6220ac6b8852c17e8663ebbcf0842aeb781d Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Fri, 19 Oct 2018 15:06:57 +0200
Subject: [PATCH 43/62] Remove unneeded live RTMP application

---
 conf/nginx.conf | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 7f98a250..409116d8 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -11,12 +11,6 @@ rtmp {
     server {
         listen 1935;
         chunk_size 4000;
-        application live {
-            live on;
-            idle_streams off;
-            on_publish http://127.0.0.1:3000/token;
-            notify_method get;
-        }
         application hls {
             live on;
             hls on;

From f88524d9a969beb2edcebd0de94ca3d497c53d56 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Fri, 19 Oct 2018 16:36:43 +0200
Subject: [PATCH 44/62] Refactor snapshots

The snapshot interval parser is now more strict and gives warnings
if the given value is invalid. A value of 0 is now allowed in order
to disable the snapshots. A bug that could lead to multiple snapshots
per interval is fixed.
---
 conf/live.json            | 20 +++++------
 src/classes/Restreamer.js | 76 +++++++++++++++++++++++++++++----------
 2 files changed, 67 insertions(+), 29 deletions(-)

diff --git a/conf/live.json b/conf/live.json
index 0b0401c6..b26c67a7 100644
--- a/conf/live.json
+++ b/conf/live.json
@@ -132,7 +132,7 @@
             "type": "int",
             "defaultValue": "3000",
             "required": false,
-            "description": "Webserver port of application"
+            "description": "Webserver port of application."
         },
         {
             "name": "RS_NODE_ENV",
@@ -142,7 +142,7 @@
             "type": "string",
             "defaultValue": "prod",
             "required": false,
-            "description": "Nodejs Environment ('dev' or 'prod')"
+            "description": "Node.js Environment ('dev' or 'prod')."
         },
         {
             "name": "RS_LOGGER_LEVEL",
@@ -152,7 +152,7 @@
             "type": "int",
             "defaultValue": "3",
             "required": false,
-            "description": "Logging level (0=no logging, 1=ERROR, 2=WARN, 3=INFO, 4=DEBUG)"
+            "description": "Logging level (0=no logging, 1=ERROR, 2=WARN, 3=INFO, 4=DEBUG)."
         },
         {
             "name": "RS_TIMEZONE",
@@ -162,7 +162,7 @@
             "type": "string",
             "defaultValue": "Europe/Berlin",
             "required": false,
-            "description": "Set the timezone"
+            "description": "Set the timezone. Accepts Olson timezone IDs."
         },
         {
             "name": "RS_SNAPSHOT_INTERVAL",
@@ -173,7 +173,7 @@
             "type": "string",
             "defaultValue": "1m",
             "required": false,
-            "description": "Interval to create a new snapshot (in milliseconds, use suffix 's' for seconds, 'm' for minutes)"
+            "description": "Interval for new snapshots (in milliseconds, use suffix 's' for seconds, 'm' for minutes). Use a value of 0 to disable snapshots."
         },
         {
             "name": "RS_CREATE_HEAPDUMPS",
@@ -183,7 +183,7 @@
             "type": "bool",
             "defaultValue": "false",
             "required": false,
-            "description": "Create Heapdumps of application"
+            "description": "Create Heapdumps of application."
         },
         {
             "name": "RS_USERNAME",
@@ -193,7 +193,7 @@
             "type": "string",
             "defaultValue": "admin",
             "required": false,
-            "description": "Username for the backend"
+            "description": "Username for the backend."
         },
         {
             "name": "RS_PASSWORD",
@@ -203,7 +203,7 @@
             "type": "string",
             "defaultValue": "datarhei",
             "required": false,
-            "description": "Password for the backend"
+            "description": "Password for the backend."
         },
         {
             "name": "RS_DEBUG_FFMPEG",
@@ -213,7 +213,7 @@
             "type": "bool",
             "defaultValue": false,
             "required": false,
-            "description": "Enables FFmpeg reporting"
+            "description": "Enables FFmpeg reporting."
         },
         {
             "name": "RS_AUDIO",
@@ -221,7 +221,7 @@
             "type": "string",
             "defaultValue": "auto",
             "required": false,
-            "description": "Handling of audio track: auto, none (force no audio), silence (force silence), aac (force AAC), mp3 (force MP3)"
+            "description": "Audio track handling: auto, none (remove audio), silence (force silence), aac (force AAC), mp3 (force MP3)."
         }
     ]
 }
diff --git a/src/classes/Restreamer.js b/src/classes/Restreamer.js
index 369aa0e6..eb755acf 100644
--- a/src/classes/Restreamer.js
+++ b/src/classes/Restreamer.js
@@ -53,6 +53,13 @@ class Restreamer {
      */
     static fetchSnapshot () {
         if(Restreamer.data.states.repeatToLocalNginx.type != 'connected') {
+            logger.debug('Disabled, because stream is not connected', 'snapshot');
+            return;
+        }
+
+        let interval = Restreamer.getSnapshotInterval();
+        if(interval == 0) {
+            logger.info('Disabled', 'snapshot');
             return;
         }
 
@@ -67,14 +74,14 @@ class Restreamer {
             logger.debug('Spawned: ' + commandLine, 'snapshot');
         });
         command.on('error', (error) => {
-            logger.error('Error: ' + error.toString().trim(), 'snapshot');
+            logger.error(error.toString().trim(), 'snapshot');
         });
         command.on('end', () => {
-            logger.info('Updated snapshot', 'snapshot');
+            logger.info('Updated. Next scheduled update in ' + interval + 'ms.', 'snapshot');
             WebsocketsController.emit('snapshot', null);
-            Q.delay(this.calculateSnapshotRefreshInterval()).then(() => {
+            Restreamer.setTimeout('repeatToLocalNginx', 'snapshot', () => {
                 Restreamer.fetchSnapshot();
-            });
+            }, interval);
         });
         command.exec();
     }
@@ -102,25 +109,43 @@ class Restreamer {
         }
     }
 
-    static calculateSnapshotRefreshInterval() {
-        let fallbackRefreshInterval = 60000;
-        let snapshotRefreshInterval = process.env.RS_SNAPSHOT_INTERVAL.match(/([0-9]+)([a-z]{1,2})?/);
-
-        let refreshInterval = fallbackRefreshInterval;
-
-        if (typeof snapshotRefreshInterval[2] === 'undefined' || snapshotRefreshInterval[2] === 'ms') {
-            refreshInterval = snapshotRefreshInterval[1];
-        } else if (snapshotRefreshInterval[2] === 's') {
-            refreshInterval = snapshotRefreshInterval[1] * 1000;
-        } else if (snapshotRefreshInterval[2] === 'm') {
-            refreshInterval = snapshotRefreshInterval[1] * 1000 * 60;
+    static getSnapshotInterval() {
+        let minimalInterval = 10000;    // 10 seconds
+        let defaultInterval = 60000;    // 60 seconds
+        let parsedInterval = process.env.RS_SNAPSHOT_INTERVAL.match(/^([0-9]+)(m|s|ms)?$/);
+
+        let interval = defaultInterval;
+
+        if(parsedInterval !== null) {
+            interval = parsedInterval[1];
+
+            if(parsedInterval.length == 3) {
+                switch(parsedInterval[2]) {
+                    case 'm':
+                        interval *= 1000 * 60;
+                        break;
+                    case 's':
+                        interval *= 1000;
+                        break;
+                    case 'ms':
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+        else {
+            logger.warn('Invalid value for interval. Using default.', 'snapshot');
         }
 
-        if (refreshInterval >= 10000) {
-            return refreshInterval;
+        if(interval == 0) {
+            return 0;   // disable snapshots
+        }
+        else if(interval < minimalInterval) {
+            interval = minimalInterval;
         }
 
-        return fallbackRefreshInterval;
+        return interval;
     }
 
     /**
@@ -581,6 +606,16 @@ class Restreamer {
      * @return {void}
      */
     static setTimeout(streamType, target, func, delay) {
+        if(!(target in Restreamer.data.timeouts)) {
+            logger.error('Unknown target for timeout', streamType);
+            return;
+        }
+
+        if(!(streamType in Restreamer.data.timeouts[target])) {
+            logger.error('Unknown stream type for timeout target "' + target + '"', streamType);
+            return;
+        }
+
         clearTimeout(Restreamer.data.timeouts[target][streamType]);
 
         if(typeof func == 'function') {
@@ -705,6 +740,9 @@ Restreamer.data = {
         'stale': {
             'repeatToLocalNginx': null,
             'repeatToOptionalOutput': null
+        },
+        'snapshot': {
+            'repeatToLocalNginx': null
         }
     },
     'options': {

From 326068b6428d22bca70c05e6377c550c95be2586 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Fri, 19 Oct 2018 17:31:56 +0200
Subject: [PATCH 45/62] Rename some functions

---
 src/classes/Restreamer.js | 40 +++++++++++++++++++--------------------
 src/start.js              |  2 +-
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/classes/Restreamer.js b/src/classes/Restreamer.js
index eb755acf..e48b5d3f 100644
--- a/src/classes/Restreamer.js
+++ b/src/classes/Restreamer.js
@@ -27,7 +27,7 @@ class Restreamer {
      * generate output hls-path from config-file
      * @returns {string}
      */
-    static generateOutputHLSPath () {
+    static getRTMPStreamUrl() {
         let nginx = config.nginx.streaming;
         let token = process.env.RS_TOKEN || config.auth.token;
 
@@ -44,7 +44,7 @@ class Restreamer {
      * generate output snapshot-path from config-file
      * @returns {string}
      */
-    static generateSnapshotPath () {
+    static getSnapshotPath() {
         return path.join(global.__public, 'images', 'live.jpg');
     }
 
@@ -63,12 +63,12 @@ class Restreamer {
             return;
         }
 
-        let command = new FfmpegCommand(Restreamer.generateOutputHLSPath());
+        let command = new FfmpegCommand(Restreamer.getRTMPStreamUrl());
 
-        command.output(Restreamer.generateSnapshotPath());
+        command.output(Restreamer.getSnapshotPath());
 
-        Restreamer.addOptions(command, "global");
-        Restreamer.addOptions(command, "snapshot");
+        Restreamer.addStreamOptions(command, "global");
+        Restreamer.addStreamOptions(command, "snapshot");
 
         command.on('start', (commandLine) => {
             logger.debug('Spawned: ' + commandLine, 'snapshot');
@@ -86,7 +86,7 @@ class Restreamer {
         command.exec();
     }
 
-    static addOptions(command, name) {
+    static addStreamOptions(command, name) {
         if(!(name in config.ffmpeg.options)) {
             logger.debug('Unknown option: ' + name);
             return;
@@ -166,7 +166,7 @@ class Restreamer {
      * restore the ffmpeg processes from jsondb (called on app start to restore ffmpeg processes
      * after the application has been killed or stuff
      */
-    static restoreFFMpegProcesses() {
+    static restoreProcesses() {
         var db = new JsonDB(config.jsondb, true, false);
 
         Restreamer.data.addresses = db.getData('/addresses');
@@ -458,32 +458,32 @@ class Restreamer {
         // update the state on the frontend
         Restreamer.updateState(streamType, 'connecting');
 
-        let rtmpPath = Restreamer.generateOutputHLSPath();
+        let rtmpUrl = Restreamer.getRTMPStreamUrl();
 
         if(streamType == 'repeatToLocalNginx') {    // repeat to local nginx server
             command = new FfmpegCommand(streamUrl, {
                 stdoutLines: 1
             });
 
-            Restreamer.addOptions(command, 'global');
+            Restreamer.addStreamOptions(command, 'global');
 
             // GUI option
             if(streamType == 'repeatToLocalNginx') {
                 if(Restreamer.data.options.rtspTcp && Restreamer.data.addresses.srcAddress.indexOf('rtsp') == 0) {
-                    Restreamer.addOptions(command, 'rtsp-tcp');
+                    Restreamer.addStreamOptions(command, 'rtsp-tcp');
                 }
             }
 
             // add outputs to the ffmpeg stream
-            command.output(rtmpPath);
+            command.output(rtmpUrl);
             probePromise = Restreamer.probeStream(command, streamType)
         }
         else {  // repeat to optional output
-            command = new FfmpegCommand(rtmpPath, {
+            command = new FfmpegCommand(rtmpUrl, {
                 stdoutLines: 1
             });
 
-            Restreamer.addOptions(command, 'global');
+            Restreamer.addStreamOptions(command, 'global');
 
             // add outputs to the ffmpeg stream
             command.output(streamUrl);
@@ -512,7 +512,7 @@ class Restreamer {
 
         // after adding outputs, define events on the new FFmpeg stream
         probePromise.then((option) => {
-            Restreamer.addOptions(command, option);
+            Restreamer.addStreamOptions(command, option);
 
             command
                 .on('start', (commandLine) => {
@@ -626,7 +626,7 @@ class Restreamer {
     /**
      * bind websocket events on application start
      */
-    static bindWebsocketEvents () {
+    static bindWebsocketEvents() {
         WebsocketsController.setConnectCallback((socket) => {
             socket.emit('publicIp', Restreamer.data.publicIp);
             socket.on('startStream', (options) => {
@@ -666,7 +666,7 @@ class Restreamer {
      * to write it to filesystem
      * @returns {object}
      */
-    static extractDataOfStreams () {
+    static extractDataOfStreams() {
         return {
             'addresses': Restreamer.data.addresses,
             'options': Restreamer.data.options,
@@ -679,7 +679,7 @@ class Restreamer {
      * create with only the data, that is needed by the jsonDb
      * @return {object}
      */
-    static dataForJsonDb () {
+    static dataForJsonDb() {
         return {
             'addresses': Restreamer.data.addresses,
             'options': Restreamer.data.options,
@@ -691,7 +691,7 @@ class Restreamer {
     /**
      * check for updates
      */
-    static checkForUpdates () {
+    static checkForUpdates() {
         const url = {'host': 'datarhei.org', 'path': '/apps.json'};
         logger.debug('Checking for updates...', 'checkForUpdates');
         https.get(url, (response) => {
@@ -716,7 +716,7 @@ class Restreamer {
     /**
      * get public ip
      */
-    static getPublicIp () {
+    static getPublicIp() {
         logger.info('Retrieving public IP ...', 'publicIP');
         publicIp.v4().then(ip => {
             Restreamer.data.publicIp = ip;
diff --git a/src/start.js b/src/start.js
index d061431d..bc145b11 100644
--- a/src/start.js
+++ b/src/start.js
@@ -54,7 +54,7 @@ nginxrtmp.start()
         return restreamerApp.startWebserver();
     })
     .then(() => {
-        return Q.fcall(Restreamer.restoreFFMpegProcesses);
+        return Q.fcall(Restreamer.restoreProcesses);
     })
     .catch((error) => {
         logger.error('Error starting webserver and nginx for application: ' + error);

From e3b2eab196cd0023739f655a10e811bc40322036 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Mon, 22 Oct 2018 08:57:26 +0200
Subject: [PATCH 46/62] Update changelog

---
 CHANGELOG.md | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90d0bb26..f0204ce0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,27 @@
 ## Changes from 0.1.0-rc7 to 0.1.0
 
-* switched to Alpine-Linux
-* switched to mutlistage Dockerfiles for AMD64 and ARMHF (req. Docker 17.x) and removed old files
-  * https://hub.docker.com/r/datarhei/ffmpeg/
-  * https://hub.docker.com/r/datarhei/nginx-rtmp/
-* updated to FFmpeg 3.1.10
-* updated NPM/Bower packages
-* fixed public-ip problem
-* disabled FFmpeg "error-detection" for a vlc-like feeling
-* added optional rtmp-token-authentification (default is without token. token can be set with env RS_TOKEN or in the live.json config.)
-* updated NGINX to 1.13.4 and RTMP-Module to latest dev-version
-* switched nginx-init-check to an http-call ("ps aux" on Alpine is problematic)
-* allowed http/https (hls) and rtmpt/rtmps addresses as video source 
+* Update FFmpeg to 4.0.2
+* Update NGINX to 1.14.0
+* Update NGINXRTMP module to 1.2.1
+* Update node.js to 8.12.0
+* Update NPM packages
+* Fix detection of public IP
+* Disable FFmpeg error detection for a VLC-like behaviour
+* Add optional RTMP token authentification
+* Add health check to NGINX
+* Allow HTTP/HTTPS (HLS) and RTMPT/RTMPS addresses as video source
+* Add optional autostart for the player
+* Add Spanish translation for the GUI
+* Add aarch64/arm64v8 Dockerfile
+* Reduce docker image size
+* Fix snapshot interval parsing
+* Allow to disable snapshot
+* Add RS_SNAPSHOT_INTERVAL environment variable, deprecate RS_SNAPSHOT_REFRESH_INTERVAL
+* Remove stream connection retry limits
+* Add stale stream detection with automatic restart
+* Add RS_DEBUG_FFMPEG environment variable to store FFmpeg debug output to /debug
+* Add RS_AUDIO environment variable to control audio processing
+* Redesign logging output and logging messages
 
 ## Changes from 0.1.0-rc7 to 0.1.0-rc.7.1
 

From bf369415973e34d54b6e5d93660e5bfe7e3808ba Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Mon, 22 Oct 2018 09:50:38 +0200
Subject: [PATCH 47/62] Re-establish live RTMP application

---
 conf/nginx.conf | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 409116d8..d0de6250 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -11,6 +11,14 @@ rtmp {
     server {
         listen 1935;
         chunk_size 4000;
+
+        application live {
+            live on;
+            idle_streams off;
+            on_publish http://127.0.0.1:3000/token;
+            notify_method get;
+        }
+
         application hls {
             live on;
             hls on;

From 3f77caf9f1e7122a20b0e41fdbe1032039198b04 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 23 Oct 2018 17:42:33 +0200
Subject: [PATCH 48/62] Fix IMAGE variable

---
 Dockerfile-armhf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile-armhf b/Dockerfile-armhf
index be3b3c23..4c1e8825 100644
--- a/Dockerfile-armhf
+++ b/Dockerfile-armhf
@@ -1,4 +1,4 @@
-FROM FROM arm32v7/debian:stretch-slim
+ARG IMAGE=arm32v7/debian:stretch-slim
 
 FROM $IMAGE as builder
 

From 40c512fd3061bb6871d37e108f383318ae864fca Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 23 Oct 2018 19:07:44 +0200
Subject: [PATCH 49/62] Change RS_LOGGER_LEVEL to RS_LOGLEVEL

---
 conf/live.json | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/conf/live.json b/conf/live.json
index b26c67a7..958dc2b7 100644
--- a/conf/live.json
+++ b/conf/live.json
@@ -125,7 +125,7 @@
     },
     "envVars": [
         {
-            "name": "RS_NODE_PORT",
+            "name": "RS_NODEJS_PORT",
             "alias": [
                 "NODEJS_PORT"
             ],
@@ -135,7 +135,7 @@
             "description": "Webserver port of application."
         },
         {
-            "name": "RS_NODE_ENV",
+            "name": "RS_NODEJS_ENV",
             "alias": [
                 "NODE_ENV"
             ],
@@ -145,7 +145,7 @@
             "description": "Node.js Environment ('dev' or 'prod')."
         },
         {
-            "name": "RS_LOGGER_LEVEL",
+            "name": "RS_LOGLEVEL",
             "alias": [
                 "LOGGER_LEVEL"
             ],
@@ -175,16 +175,6 @@
             "required": false,
             "description": "Interval for new snapshots (in milliseconds, use suffix 's' for seconds, 'm' for minutes). Use a value of 0 to disable snapshots."
         },
-        {
-            "name": "RS_CREATE_HEAPDUMPS",
-            "alias": [
-                "CREATE_HEAPDUMPS"
-            ],
-            "type": "bool",
-            "defaultValue": "false",
-            "required": false,
-            "description": "Create Heapdumps of application."
-        },
         {
             "name": "RS_USERNAME",
             "alias": [
@@ -206,11 +196,19 @@
             "description": "Password for the backend."
         },
         {
-            "name": "RS_DEBUG_FFMPEG",
+            "name": "RS_DEBUG_HEAPDUMPS",
             "alias": [
-                "RS_FFMPEG_DEBUG"
+                "CREATE_HEAPDUMPS"
             ],
             "type": "bool",
+            "defaultValue": "false",
+            "required": false,
+            "description": "Create heapdumps of application."
+        },
+        {
+            "name": "RS_DEBUG_FFMPEG",
+            "alias": [],
+            "type": "bool",
             "defaultValue": false,
             "required": false,
             "description": "Enables FFmpeg reporting."

From eb12b6998cdf5ec87a5b5986b8858c6d5310c42d Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Wed, 31 Oct 2018 13:48:32 +0100
Subject: [PATCH 50/62] Fix use of wrong environment variables after renaming
 them

---
 src/classes/Logger.js | 14 +++++++-------
 src/webserver/app.js  |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/classes/Logger.js b/src/classes/Logger.js
index f680f113..36162b2a 100644
--- a/src/classes/Logger.js
+++ b/src/classes/Logger.js
@@ -18,7 +18,7 @@ const LEVEL_DEBUG = 4;
 // set default timezone to use the timezone before the default values are
 // @todo: it is really ugly and wrong to log with hardcoded timezone before environment is read
 process.env.RS_TIMEZONE = process.env.RS_TIMEZONE || 'Europe/Berlin';
-process.env.RS_LOGGER_LEVEL = process.env.RS_LOGGER_LEVEL || 3;
+process.env.RS_LOGLEVEL = process.env.RS_LOGLEVEL || 3;
 
 /**
  * Class for logger
@@ -30,7 +30,7 @@ class Logger {
      * @returns {boolean}
      */
     static isMuted () {
-        return process.env.RS_LOGGER_LEVEL === LEVEL_MUTE;
+        return process.env.RS_LOGLEVEL === LEVEL_MUTE;
     }
 
     /**
@@ -38,7 +38,7 @@ class Logger {
      * @param {string} context context of the log message (classname.methodname)
      */
     constructor (context) {
-        process.env.RS_LOGGER_LEVEL = process.env.RS_LOGGER_LEVEL || LEVEL_INFO;
+        process.env.RS_LOGLEVEL = process.env.RS_LOGLEVEL || LEVEL_INFO;
         this.context = context;
     }
 
@@ -83,7 +83,7 @@ class Logger {
             loggerAlertGui = false;
         }
 
-        if (process.env.RS_LOGGER_LEVEL >= LEVEL_INFO) {
+        if (process.env.RS_LOGLEVEL >= LEVEL_INFO) {
             return this.stdout(message, loggerContext, 'INFO');
         }
 
@@ -111,7 +111,7 @@ class Logger {
             loggerAlertGui = false;
         }
 
-        if (process.env.RS_LOGGER_LEVEL >= LEVEL_WARN) {
+        if (process.env.RS_LOGLEVEL >= LEVEL_WARN) {
             return this.stdout(message, loggerContext, 'WARN');
         }
 
@@ -139,7 +139,7 @@ class Logger {
             loggerAlertGui = false;
         }
 
-        if (process.env.RS_LOGGER_LEVEL >= LEVEL_DEBUG) {
+        if (process.env.RS_LOGLEVEL >= LEVEL_DEBUG) {
             return this.stdout(message, loggerContext, 'DEBUG');
         }
 
@@ -168,7 +168,7 @@ class Logger {
             loggerAlertGui = false;
         }
 
-        if (process.env.RS_LOGGER_LEVEL >= LEVEL_ERROR) {
+        if (process.env.RS_LOGLEVEL >= LEVEL_ERROR) {
             return this.stdout(message, loggerContext, 'ERROR');
         }
 
diff --git a/src/webserver/app.js b/src/webserver/app.js
index 588cafc8..c964f93c 100644
--- a/src/webserver/app.js
+++ b/src/webserver/app.js
@@ -40,7 +40,7 @@ class RestreamerExpressApp {
         this.sessionKey = 'restreamer-session';
         this.sessionStore = new session.MemoryStore();
 
-        if (process.env.RS_NODE_ENV === 'dev') {
+        if (process.env.RS_NODEJS_ENV === 'dev') {
             this.initDev();
         } else {
             this.initProd();
@@ -158,7 +158,7 @@ class RestreamerExpressApp {
         var server = null;
 
         logger.info('Starting ...');
-        this.app.set('port', process.env.RS_NODE_PORT);
+        this.app.set('port', process.env.RS_NODEJS_PORT);
         server = this.app.listen(this.app.get('port'), ()=> {
             this.app.set('io', require('socket.io')(server));
             this.secureSockets();
@@ -166,7 +166,7 @@ class RestreamerExpressApp {
 
             // promise to avoid ws binding before the webserver has been started
             this.app.get('websocketsReady').resolve(this.app.get('io'));
-            logger.info('Running on port ' + process.env.RS_NODE_PORT);
+            logger.info('Running on port ' + process.env.RS_NODEJS_PORT);
             deferred.resolve(server.address().port);
         });
 

From 894b3611193d60700443dcbcf3dc869085e4a62e Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Mon, 5 Nov 2018 16:09:37 +0100
Subject: [PATCH 51/62] Add more RASPICAM parameter

Add more parameter to control the raspicam. The raspivid allows
many options to be tweaked in order to get the best result
from the camera. Most of them are now changeable through many
RS_RASPICAM_* environment variables. The defaults mostly
corresponds to the ones from raspivid itself.
---
 run.sh | 132 +++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 115 insertions(+), 17 deletions(-)

diff --git a/run.sh b/run.sh
index 4e13bac3..a1c5e6ee 100755
--- a/run.sh
+++ b/run.sh
@@ -15,31 +15,115 @@ if [ "${MODE}" = "RASPICAM" ] && [ "$CPU_TYPE" = "arm" ]; then
         fi
     done
 
-    if [ "$RS_RASPICAM_WIDTH" = "" ]; then
-        RASPICAM_WIDTH=1280
-    else
-        RASPICAM_WIDTH=$RS_RASPICAM_WIDTH
+    ## options
+
+    RASPIVID_OPTIONS="--timeout 0 --nopreview"
+
+    # flip the image horizontally
+    if [ "$RS_RASPICAM_HFLIP" = "true" ]; then
+        RASPIVID_OPTIONS="$RASPIVID_OPTIONS --hflip"
+    fi
+
+    # flip the image vertically
+    if [ "$RS_RASPICAM_VFLIP" = "true" ]; then
+        RASPIVID_OPTIONS="$RASPIVID_OPTIONS --vflip"
+    fi
+
+    # inline headers (SPS, PPS) -- https://en.wikipedia.org/wiki/X264
+    if [ "$RS_RASPICAM_INLINE" = "true" ]; then
+        RASPIVID_OPTIONS="$RASPIVID_OPTIONS --inline"
     fi
 
-    if [ "$RS_RASPICAM_HEIGHT" = "" ]; then
-        RASPICAM_HEIGHT=720
-    else
-        RASPICAM_HEIGHT=$RS_RASPICAM_HEIGHT
+    # video stabilization
+    if [ "$RS_RASPICAM_STABILIZATION" = "true" ]; then
+        RASPIVID_OPTIONS="$RASPIVID_OPTIONS --vstab"
     fi
 
-    if [ "$RS_RASPICAM_FPS" = "" ]; then
-        RASPICAM_FPS=25
-    else
+    ## FPS and GOP
+
+    RASPICAM_FPS=25
+    RASPICAM_GOP=50
+
+    if [ -n "$RS_RASPICAM_FPS" ]; then
         RASPICAM_FPS=$RS_RASPICAM_FPS
+        RASPICAM_GOP=$((RASPICAM_FPS * 2))
+    fi
+
+    if [ -n "$RS_RASPICAM_GOP" ]; then
+        RASPICAM_GOP=$RASPICAM_GOP
     fi
 
-    if [ "$RS_RASPICAM_BITRATE" = "" ]; then
-        RASPICAM_BITRATE=50000
-    else
-        RASPICAM_BITRATE=$RS_RASPICAM_BITRATE
+    ## bitrate and codec
+
+    RASPICAM_BITRATE=${RS_RASPICAM_BITRATE:=5242880}
+    # h264 profile: baseline (no B-frames), main, high
+    RASPICAM_H264PROFILE=${RS_RASPICAM_H264PROFILE:="high"}
+    # h264 level: 4, 4.1, 4.2 (1080p30, 720p60 and 640 × 480p60/90)
+    RASPICAM_H264LEVEL=${RS_RASPICAM_H264PROFILE:=4}
+    RASPICAM_CODEC=${RS_RASPICAM_CODEC:="H264"}
+
+    ## image parameter
+
+    RASPICAM_WIDTH=${RS_RASPICAM_WIDTH:=1920}
+    RASPICAM_HEIGHT=${RS_RASPICAM_HEIGHT:=1080}
+    # -100 to 100
+    RASPICAM_SHARPNESS=${RS_RASPICAM_SHARPNESS:=0}
+    # -100 to 100
+    RASPICAM_CONTRAST=${RS_RASPICAM_CONTRAST:=0}
+    # 0 to 100
+    RASPICAM_BRIGHTNESS=${RS_RASPICAM_BRIGHTNESS:=50}
+    # -100 to 100
+    RASPICAM_SATURATION=${RS_RASPICAM_SATURATION:=0}
+
+    ## image quality and effects
+
+    # capture ISO
+    RASPICAM_ISO=${RS_RASPICAM_ISO:=0}
+    # EV compensation, steps of 1/6 stop
+    RASPICAM_EV=${RS_RASPICAM_EV:=0}
+    # exposure: off,auto,night,nightpreview,backlight,spotlight,sports,snow,beach,verylong,fixedfps,antishake,fireworks
+    RASPICAM_EXPOSURE=${RS_RASPICAM_EXPOSURE:="auto"}
+    # flicker filter: off,auto,50hz,60hz
+    RASPICAM_FLICKER=${RS_RASPICAM_FLICKER:="off"}
+    # white balance: off,auto,sun,cloud,shade,tungsten,fluorescent,incandescent,flash,horizon
+    RASPICAM_AWB=${RS_RASPICAM_AWB:="auto"}
+    # image effects: none,negative,solarise,sketch,denoise,emboss,oilpaint,hatch,gpen,pastel,watercolour,film,blur,saturation,colourswap,washedout,posterise,colourpoint,colourbalance,cartoon
+    RASPICAM_IMXFX=${RS_RASPICAM_IMXFX:="none"}
+    # metering: average,spot,backlit,matrix
+    RASPICAM_METERING=${RS_RASPICAM_METERING:="average"}
+    # dynamic range compression: off,low,med,high
+    RASPICAM_DRC=${RS_RASPICAM_DRC:="off"}
+
+    ## RTMP URL
+
+    RTMP_URL="rtmp://127.0.0.1:1935/live/raspicam.stream"
+
+    if [ -n "$RS_TOKEN" ]; then
+        RTMP_URL="${RTMP_URL}?token=${RS_TOKEN}"
     fi
 
-    /opt/vc/bin/raspivid -t 0 -w $RASPICAM_WIDTH -h $RASPICAM_HEIGHT -fps $RASPICAM_FPS -b $RASPICAM_BITRATE -o - | ffmpeg -i - -f lavfi -i anullsrc=r=44100:cl=mono -vcodec copy -acodec aac -b:a 0k -map 0:v -map 1:a -shortest -f flv rtmp://127.0.0.1:1935/live/raspicam.stream > /dev/null 2>&1
+    /opt/vc/bin/raspivid \
+        $RASPIVID_OPTIONS \
+        --width $RASPICAM_WIDTH \
+        --height $RASPICAM_HEIGHT \
+        --framerate $RASPICAM_FPS \
+        --bitrate $RASPICAM_BITRATE \
+        --intra $RASPICAM_GOP \
+        --codec $RASPICAM_CODEC \
+        --profile $RASPICAM_H264PROFILE \
+        --level $RASPICAM_H264LEVEL \
+        --sharpness $RASPICAM_SHARPNESS \
+        --contrast $RASPICAM_CONTRAST \
+        --brightness $RASPICAM_BRIGHTNESS \
+        --saturation $RASPICAM_SATURATION \
+        --ISO $RASPICAM_ISO \
+        --exposure $RASPICAM_EXPOSURE \
+        --flicker $RASPICAM_FLICKER \
+        --awb $RASPICAM_AWB \
+        --imxfx $RASPICAM_IMXFX \
+        --metering $RASPICAM_METERING \
+        --drc $RASPICAM_DRC \
+        -o - | ffmpeg -i - -f lavfi -i anullsrc=r=44100:cl=mono -vcodec copy -acodec aac -b:a 0k -map 0:v -map 1:a -shortest -f flv "${RTMP_URL}" > /dev/null 2>&1
 elif [ "${MODE}" = "USBCAM" ]; then
     apt-get update && apt-get install -y v4l-utils libv4l-0
     npm start &
@@ -53,7 +137,21 @@ elif [ "${MODE}" = "USBCAM" ]; then
             sleep 5
         fi
     done
-    ffmpeg -f v4l2 -r 25 -s 1280x720 -i /dev/video0 -f lavfi -i anullsrc=r=44100:cl=mono -vcodec copy -acodec aac -b:a 0k -map 0:v -map 1:a -shortest -f flv rtmp://127.0.0.1:1935/live/usb.stream > /dev/null 2>&1
+
+    # https://trac.ffmpeg.org/wiki/Capture/Webcam
+    # https://www.ffmpeg.org/ffmpeg-devices.html#video4linux2_002c-v4l2
+
+    USBCAM_WIDTH=${RS_USBCAM_WIDTH:=1280}
+    USBCAM_HEIGHT=${RS_USBCAM_HEIGHT:=720}
+    USBCAM_FPS=${RS_USBCAM_FPS:=25}
+
+    RTMP_URL="rtmp://127.0.0.1:1935/live/usb.stream"
+
+    if [ -n "$RS_TOKEN" ]; then
+        RTMP_URL="${RTMP_URL}?token=${RS_TOKEN}"
+    fi
+
+    ffmpeg -f v4l2 -framerate $USBCAM_FPS -video_size "${USBCAM_WIDTH}x${USBCAM_HEIGHT}" -i /dev/video0 -f lavfi -i anullsrc=r=44100:cl=mono -vcodec copy -acodec aac -b:a 0k -map 0:v -map 1:a -shortest -f flv "${RTMP_URL}" > /dev/null 2>&1
 else
     npm start
 fi

From bb16856fa82d6e5922e3138b5117fb2302f94427 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Mon, 5 Nov 2018 16:12:47 +0100
Subject: [PATCH 52/62] Add RS_TOKEN to the listed environment variables

---
 conf/live.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/conf/live.json b/conf/live.json
index 958dc2b7..45e1be3a 100644
--- a/conf/live.json
+++ b/conf/live.json
@@ -195,6 +195,14 @@
             "required": false,
             "description": "Password for the backend."
         },
+        {
+            "name": "RS_TOKEN",
+            "alias": [],
+            "type": "string",
+            "defaultValue": "",
+            "required": false,
+            "description": "Token for pushing an RTMP stream."
+        },
         {
             "name": "RS_DEBUG_HEAPDUMPS",
             "alias": [

From 3b5793e469dff128443733b78bbc6e64f8ba5054 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Mon, 5 Nov 2018 16:37:14 +0100
Subject: [PATCH 53/62] Add device option and h264 encoding for USB cameras

---
 run.sh | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/run.sh b/run.sh
index a1c5e6ee..357aa32c 100755
--- a/run.sh
+++ b/run.sh
@@ -141,9 +141,22 @@ elif [ "${MODE}" = "USBCAM" ]; then
     # https://trac.ffmpeg.org/wiki/Capture/Webcam
     # https://www.ffmpeg.org/ffmpeg-devices.html#video4linux2_002c-v4l2
 
+    USBCAM_DEVICE=${RS_USBCAM_DEVICE:="/dev/video0"}
+
     USBCAM_WIDTH=${RS_USBCAM_WIDTH:=1280}
     USBCAM_HEIGHT=${RS_USBCAM_HEIGHT:=720}
-    USBCAM_FPS=${RS_USBCAM_FPS:=25}
+
+    USBCAM_FPS=25
+    USBCAM_GOP=50
+
+    if [ -n "$RS_USBCAM_FPS" ]; then
+        USBCAM_FPS=$RS_USBCAM_FPS
+        USBCAM_GOP=$((USBCAM_FPS * 2))
+    fi
+
+    if [ -n "$RS_USBCAM_GOP" ]; then
+        USBCAM_GOP=$USBCAM_GOP
+    fi
 
     RTMP_URL="rtmp://127.0.0.1:1935/live/usb.stream"
 
@@ -151,7 +164,7 @@ elif [ "${MODE}" = "USBCAM" ]; then
         RTMP_URL="${RTMP_URL}?token=${RS_TOKEN}"
     fi
 
-    ffmpeg -f v4l2 -framerate $USBCAM_FPS -video_size "${USBCAM_WIDTH}x${USBCAM_HEIGHT}" -i /dev/video0 -f lavfi -i anullsrc=r=44100:cl=mono -vcodec copy -acodec aac -b:a 0k -map 0:v -map 1:a -shortest -f flv "${RTMP_URL}" > /dev/null 2>&1
+    ffmpeg -f v4l2 -framerate $USBCAM_FPS -video_size "${USBCAM_WIDTH}x${USBCAM_HEIGHT}" -i "${USBCAM_DEVICE}" -f lavfi -i anullsrc=r=44100:cl=mono -vcodec libx264 -preset ultrafast -g "${USBCAM_GOP}" -acodec aac -b:a 0k -map 0:v -map 1:a -shortest -f flv "${RTMP_URL}" > /dev/null 2>&1
 else
     npm start
 fi

From 57dd193d900465989e46d98feda920f3519c8898 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 6 Nov 2018 09:47:32 +0100
Subject: [PATCH 54/62] Add QP option for raspicam, add bitrate and preset
 option for USB camera

---
 run.sh | 58 ++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/run.sh b/run.sh
index 357aa32c..5522ee7d 100755
--- a/run.sh
+++ b/run.sh
@@ -17,6 +17,8 @@ if [ "${MODE}" = "RASPICAM" ] && [ "$CPU_TYPE" = "arm" ]; then
 
     ## options
 
+    RS_RASPICAM_INLINE=${RS_RASPICAM_INLINE:="true"}
+
     RASPIVID_OPTIONS="--timeout 0 --nopreview"
 
     # flip the image horizontally
@@ -55,7 +57,7 @@ if [ "${MODE}" = "RASPICAM" ] && [ "$CPU_TYPE" = "arm" ]; then
 
     ## bitrate and codec
 
-    RASPICAM_BITRATE=${RS_RASPICAM_BITRATE:=5242880}
+    RASPICAM_BITRATE=${RS_RASPICAM_BITRATE:=5000000}
     # h264 profile: baseline (no B-frames), main, high
     RASPICAM_H264PROFILE=${RS_RASPICAM_H264PROFILE:="high"}
     # h264 level: 4, 4.1, 4.2 (1080p30, 720p60 and 640 × 480p60/90)
@@ -79,6 +81,8 @@ if [ "${MODE}" = "RASPICAM" ] && [ "$CPU_TYPE" = "arm" ]; then
 
     # capture ISO
     RASPICAM_ISO=${RS_RASPICAM_ISO:=0}
+    # quantization parameter
+    RASPICAM_QP=${RS_RASPICAM_QP:=0}
     # EV compensation, steps of 1/6 stop
     RASPICAM_EV=${RS_RASPICAM_EV:=0}
     # exposure: off,auto,night,nightpreview,backlight,spotlight,sports,snow,beach,verylong,fixedfps,antishake,fireworks
@@ -104,25 +108,26 @@ if [ "${MODE}" = "RASPICAM" ] && [ "$CPU_TYPE" = "arm" ]; then
 
     /opt/vc/bin/raspivid \
         $RASPIVID_OPTIONS \
-        --width $RASPICAM_WIDTH \
-        --height $RASPICAM_HEIGHT \
-        --framerate $RASPICAM_FPS \
-        --bitrate $RASPICAM_BITRATE \
-        --intra $RASPICAM_GOP \
-        --codec $RASPICAM_CODEC \
-        --profile $RASPICAM_H264PROFILE \
-        --level $RASPICAM_H264LEVEL \
-        --sharpness $RASPICAM_SHARPNESS \
-        --contrast $RASPICAM_CONTRAST \
-        --brightness $RASPICAM_BRIGHTNESS \
-        --saturation $RASPICAM_SATURATION \
-        --ISO $RASPICAM_ISO \
-        --exposure $RASPICAM_EXPOSURE \
-        --flicker $RASPICAM_FLICKER \
-        --awb $RASPICAM_AWB \
-        --imxfx $RASPICAM_IMXFX \
-        --metering $RASPICAM_METERING \
-        --drc $RASPICAM_DRC \
+        --width "$RASPICAM_WIDTH" \
+        --height "$RASPICAM_HEIGHT" \
+        --framerate "$RASPICAM_FPS" \
+        --bitrate "$RASPICAM_BITRATE" \
+        --intra "$RASPICAM_GOP" \
+        --codec "$RASPICAM_CODEC" \
+        --profile "$RASPICAM_H264PROFILE" \
+        --level "$RASPICAM_H264LEVEL" \
+        --sharpness "$RASPICAM_SHARPNESS" \
+        --contrast "$RASPICAM_CONTRAST" \
+        --brightness "$RASPICAM_BRIGHTNESS" \
+        --saturation "$RASPICAM_SATURATION" \
+        --ISO "$RASPICAM_ISO" \
+        --qp "$RASPICAM_QP" \
+        --exposure "$RASPICAM_EXPOSURE" \
+        --flicker "$RASPICAM_FLICKER" \
+        --awb "$RASPICAM_AWB" \
+        --imxfx "$RASPICAM_IMXFX" \
+        --metering "$RASPICAM_METERING" \
+        --drc "$RASPICAM_DRC" \
         -o - | ffmpeg -i - -f lavfi -i anullsrc=r=44100:cl=mono -vcodec copy -acodec aac -b:a 0k -map 0:v -map 1:a -shortest -f flv "${RTMP_URL}" > /dev/null 2>&1
 elif [ "${MODE}" = "USBCAM" ]; then
     apt-get update && apt-get install -y v4l-utils libv4l-0
@@ -143,9 +148,6 @@ elif [ "${MODE}" = "USBCAM" ]; then
 
     USBCAM_DEVICE=${RS_USBCAM_DEVICE:="/dev/video0"}
 
-    USBCAM_WIDTH=${RS_USBCAM_WIDTH:=1280}
-    USBCAM_HEIGHT=${RS_USBCAM_HEIGHT:=720}
-
     USBCAM_FPS=25
     USBCAM_GOP=50
 
@@ -158,13 +160,21 @@ elif [ "${MODE}" = "USBCAM" ]; then
         USBCAM_GOP=$USBCAM_GOP
     fi
 
+    USBCAM_BITRATE=${RS_USBCAM_BITRATE:=5000000}
+    USBCAM_H264PRESET=${RS_USBCAM_H264PRESET:="ultrafast"}
+    USBCAM_WIDTH=${RS_USBCAM_WIDTH:=1280}
+    USBCAM_HEIGHT=${RS_USBCAM_HEIGHT:=720}
+
+    USBCAM_BITRATE=$(($USBCAM_BITRATE / 1024))
+    USBCAM_BUFFER=$(($USBCAM_BITRATE * 2))
+
     RTMP_URL="rtmp://127.0.0.1:1935/live/usb.stream"
 
     if [ -n "$RS_TOKEN" ]; then
         RTMP_URL="${RTMP_URL}?token=${RS_TOKEN}"
     fi
 
-    ffmpeg -f v4l2 -framerate $USBCAM_FPS -video_size "${USBCAM_WIDTH}x${USBCAM_HEIGHT}" -i "${USBCAM_DEVICE}" -f lavfi -i anullsrc=r=44100:cl=mono -vcodec libx264 -preset ultrafast -g "${USBCAM_GOP}" -acodec aac -b:a 0k -map 0:v -map 1:a -shortest -f flv "${RTMP_URL}" > /dev/null 2>&1
+    ffmpeg -f v4l2 -framerate "$USBCAM_FPS" -video_size "${USBCAM_WIDTH}x${USBCAM_HEIGHT}" -i "${USBCAM_DEVICE}" -f lavfi -i anullsrc=r=44100:cl=mono -vcodec libx264 -preset "${USBCAM_H264PRESET}" -g "${USBCAM_GOP}" -b:v "${USBCAM_BITRATE}k" -bufsize "${USBCAM_BUFFER}k" -acodec aac -b:a 0k -map 0:v -map 1:a -shortest -f flv "${RTMP_URL}" > /dev/null 2>&1
 else
     npm start
 fi

From c0b4046c78a9f52baaf99b5809d50815321afe8e Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 6 Nov 2018 16:03:30 +0100
Subject: [PATCH 55/62] Add audio support for USB cameras

---
 Dockerfile         |  6 +++++-
 Dockerfile-arm64v8 |  6 +++++-
 Dockerfile-armhf   |  6 +++++-
 run.sh             | 14 +++++++++++---
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index acc5fa6a..dfc53541 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,6 +25,7 @@ RUN apt-get update && \
         libtool \
         libssl-dev \
         zlib1g-dev \
+        libasound2-dev \
         build-essential 
 
 # nasm
@@ -122,7 +123,10 @@ RUN apt-get update && \
         procps \
         libpcre3 \
         libssl1.1 \
-        zlib1g
+        zlib1g \
+        v4l-utils \
+        libv4l-0 \
+        alsa-utils
 
 COPY . /restreamer
 WORKDIR /restreamer
diff --git a/Dockerfile-arm64v8 b/Dockerfile-arm64v8
index 4ad2f078..e7be57fd 100644
--- a/Dockerfile-arm64v8
+++ b/Dockerfile-arm64v8
@@ -24,6 +24,7 @@ RUN apt-get update && \
         libtool \
         libssl-dev \
         zlib1g-dev \
+        libasound2-dev \
         build-essential 
 
 # x264
@@ -112,7 +113,10 @@ RUN apt-get update && \
         procps \
         libpcre3 \
         libssl1.1 \
-        zlib1g
+        zlib1g \
+        v4l-utils \
+        libv4l-0 \
+        alsa-utils
 
 COPY . /restreamer
 WORKDIR /restreamer
diff --git a/Dockerfile-armhf b/Dockerfile-armhf
index 4c1e8825..dffad0d2 100644
--- a/Dockerfile-armhf
+++ b/Dockerfile-armhf
@@ -24,6 +24,7 @@ RUN apt-get update && \
         libtool \
         libssl-dev \
         zlib1g-dev \
+        libasound2-dev \
         build-essential 
 
 # x264
@@ -112,7 +113,10 @@ RUN apt-get update && \
         procps \
         libpcre3 \
         libssl1.1 \
-        zlib1g
+        zlib1g \
+        v4l-utils \
+        libv4l-0 \
+        alsa-utils
 
 COPY . /restreamer
 WORKDIR /restreamer
diff --git a/run.sh b/run.sh
index 5522ee7d..5d9624ee 100755
--- a/run.sh
+++ b/run.sh
@@ -130,7 +130,6 @@ if [ "${MODE}" = "RASPICAM" ] && [ "$CPU_TYPE" = "arm" ]; then
         --drc "$RASPICAM_DRC" \
         -o - | ffmpeg -i - -f lavfi -i anullsrc=r=44100:cl=mono -vcodec copy -acodec aac -b:a 0k -map 0:v -map 1:a -shortest -f flv "${RTMP_URL}" > /dev/null 2>&1
 elif [ "${MODE}" = "USBCAM" ]; then
-    apt-get update && apt-get install -y v4l-utils libv4l-0
     npm start &
     NGINX_RUNNING=0
     until [ "$NGINX_RUNNING" = "1" ]; do
@@ -145,8 +144,11 @@ elif [ "${MODE}" = "USBCAM" ]; then
 
     # https://trac.ffmpeg.org/wiki/Capture/Webcam
     # https://www.ffmpeg.org/ffmpeg-devices.html#video4linux2_002c-v4l2
+    # https://trac.ffmpeg.org/wiki/Capture/ALSA
+    # https://ffmpeg.org/ffmpeg-devices.html#alsa
 
-    USBCAM_DEVICE=${RS_USBCAM_DEVICE:="/dev/video0"}
+    USBCAM_VIDEODEVICE=${RS_USBCAM_VIDEODEVICE:="/dev/video"}
+    USBCAM_AUDIODEVICE=${RS_USBCAM_AUDIODEVICE:="0"}
 
     USBCAM_FPS=25
     USBCAM_GOP=50
@@ -174,7 +176,13 @@ elif [ "${MODE}" = "USBCAM" ]; then
         RTMP_URL="${RTMP_URL}?token=${RS_TOKEN}"
     fi
 
-    ffmpeg -f v4l2 -framerate "$USBCAM_FPS" -video_size "${USBCAM_WIDTH}x${USBCAM_HEIGHT}" -i "${USBCAM_DEVICE}" -f lavfi -i anullsrc=r=44100:cl=mono -vcodec libx264 -preset "${USBCAM_H264PRESET}" -g "${USBCAM_GOP}" -b:v "${USBCAM_BITRATE}k" -bufsize "${USBCAM_BUFFER}k" -acodec aac -b:a 0k -map 0:v -map 1:a -shortest -f flv "${RTMP_URL}" > /dev/null 2>&1
+    USBCAM_AUDIO="-f lavfi -i anullsrc=r=44100:cl=mono -b:a 0k"
+
+    if [ "$RS_USBCAM_AUDIO" = "true" ]; then
+        USBCAM_AUDIO="-thread_queue_size 512 -f alsa -ac 1 -ar 44100 -i hw:${USBCAM_AUDIODEVICE} -b:a 64k"
+    fi
+
+    ffmpeg -thread_queue_size 512 -f v4l2 -framerate "$USBCAM_FPS" -video_size "${USBCAM_WIDTH}x${USBCAM_HEIGHT}" -i "${USBCAM_VIDEODEVICE}" ${USBCAM_AUDIO} -vcodec libx264 -preset "${USBCAM_H264PRESET}" -r "$USBCAM_FPS" -g "${USBCAM_GOP}" -b:v "${USBCAM_BITRATE}k" -bufsize "${USBCAM_BUFFER}k" -acodec aac -map 0:v -map 1:a -shortest -f flv "${RTMP_URL}" > /dev/null 2>&1
 else
     npm start
 fi

From 692f3e917a9c5db3650cd8c8bdd61afbbc03fd5d Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 6 Nov 2018 17:53:26 +0100
Subject: [PATCH 56/62] Fix RTMP push URL for USB camera

---
 run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/run.sh b/run.sh
index 5d9624ee..795f7af5 100755
--- a/run.sh
+++ b/run.sh
@@ -170,7 +170,7 @@ elif [ "${MODE}" = "USBCAM" ]; then
     USBCAM_BITRATE=$(($USBCAM_BITRATE / 1024))
     USBCAM_BUFFER=$(($USBCAM_BITRATE * 2))
 
-    RTMP_URL="rtmp://127.0.0.1:1935/live/usb.stream"
+    RTMP_URL="rtmp://127.0.0.1:1935/live/usbcam.stream"
 
     if [ -n "$RS_TOKEN" ]; then
         RTMP_URL="${RTMP_URL}?token=${RS_TOKEN}"

From f1d2a6d06f4bad1db539dc41c9f02650ce49ab13 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 6 Nov 2018 17:53:37 +0100
Subject: [PATCH 57/62] Update ffmpeg, nginx, node.js

Update ffmpeg to 4.1
Update nginx to 1.14.1
Update node.js to 10.13.0
---
 Dockerfile         | 10 +++++-----
 Dockerfile-arm64v8 |  8 ++++----
 Dockerfile-armhf   |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dfc53541..7304374b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,10 +8,10 @@ ARG NASM_VERSION=2.13.03
 ARG LAME_VERSION=3.100
 # x264 versions from August 2018 onward (> Core 152) seem to have a bug that cuts performance by 50%
 ARG X264_VERSION=20180717-2245-stable
-ARG FFMPEG_VERSION=4.0.2
-ARG NGINX_VERSION=1.14.0
+ARG FFMPEG_VERSION=4.1
+ARG NGINX_VERSION=1.14.1
 ARG NGINXRTMP_VERSION=1.2.1
-ARG NODE_VERSION=8.12.0
+ARG NODE_VERSION=10.13.0
 
 ENV SRC="/usr/local/" \
     LD_LIBRARY_PATH="/usr/local/lib" \
@@ -30,7 +30,7 @@ RUN apt-get update && \
 
 # nasm
 RUN mkdir -p /dist && cd /dist && \
-    curl -OL "https://www.nasm.us/pub/nasm/releasebuilds/2.13.03/nasm-${NASM_VERSION}.tar.xz" && \
+    curl -OL "https://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_VERSION}.tar.xz" && \
     tar -xvJ -f nasm-${NASM_VERSION}.tar.xz && \
     cd nasm-${NASM_VERSION} && \
     ./configure && \
@@ -48,7 +48,7 @@ RUN mkdir -p /dist && cd /dist && \
 
 # libmp3lame
 RUN mkdir -p /dist && cd /dist && \
-    curl -OL "https://kent.dl.sourceforge.net/project/lame/lame/3.100/lame-${LAME_VERSION}.tar.gz" && \
+    curl -OL "https://kent.dl.sourceforge.net/project/lame/lame/${LAME_VERSION}/lame-${LAME_VERSION}.tar.gz" && \
     tar -xvz -f lame-${LAME_VERSION}.tar.gz && \
     cd lame-${LAME_VERSION} && \
     ./configure --prefix="${SRC}" --bindir="${SRC}/bin" --disable-static --enable-nasm && \
diff --git a/Dockerfile-arm64v8 b/Dockerfile-arm64v8
index e7be57fd..7e59a2c1 100644
--- a/Dockerfile-arm64v8
+++ b/Dockerfile-arm64v8
@@ -7,10 +7,10 @@ MAINTAINER datarhei <info@datarhei.org>
 ARG LAME_VERSION=3.100
 # x264 versions from August 2018 onward (> Core 152) seem to have a bug that cuts performance by 50%
 ARG X264_VERSION=20180717-2245-stable
-ARG FFMPEG_VERSION=4.0.2
-ARG NGINX_VERSION=1.14.0
+ARG FFMPEG_VERSION=4.1
+ARG NGINX_VERSION=1.14.1
 ARG NGINXRTMP_VERSION=1.2.1
-ARG NODE_VERSION=8.12.0
+ARG NODE_VERSION=10.13.0
 
 ENV SRC="/usr/local/" \
     LD_LIBRARY_PATH="/usr/local/lib" \
@@ -38,7 +38,7 @@ RUN mkdir -p /dist && cd /dist && \
 
 # libmp3lame
 RUN mkdir -p /dist && cd /dist && \
-    curl -OL "https://kent.dl.sourceforge.net/project/lame/lame/3.100/lame-${LAME_VERSION}.tar.gz" && \
+    curl -OL "https://kent.dl.sourceforge.net/project/lame/lame/${LAME_VERSION}/lame-${LAME_VERSION}.tar.gz" && \
     tar -xvz -f lame-${LAME_VERSION}.tar.gz && \
     cd lame-${LAME_VERSION} && \
     ./configure --prefix="${SRC}" --bindir="${SRC}/bin" --disable-static --enable-nasm && \
diff --git a/Dockerfile-armhf b/Dockerfile-armhf
index dffad0d2..5d2d2ec0 100644
--- a/Dockerfile-armhf
+++ b/Dockerfile-armhf
@@ -7,10 +7,10 @@ MAINTAINER datarhei <info@datarhei.org>
 ARG LAME_VERSION=3.100
 # x264 versions from August 2018 onward (> Core 152) seem to have a bug that cuts performance by 50%
 ARG X264_VERSION=20180717-2245-stable
-ARG FFMPEG_VERSION=4.0.2
-ARG NGINX_VERSION=1.14.0
+ARG FFMPEG_VERSION=4.1
+ARG NGINX_VERSION=1.14.1
 ARG NGINXRTMP_VERSION=1.2.1
-ARG NODE_VERSION=8.12.0
+ARG NODE_VERSION=10.13.0
 
 ENV SRC="/usr/local/" \
     LD_LIBRARY_PATH="/usr/local/lib" \
@@ -38,7 +38,7 @@ RUN mkdir -p /dist && cd /dist && \
 
 # libmp3lame
 RUN mkdir -p /dist && cd /dist && \
-    curl -OL "https://kent.dl.sourceforge.net/project/lame/lame/3.100/lame-${LAME_VERSION}.tar.gz" && \
+    curl -OL "https://kent.dl.sourceforge.net/project/lame/lame/${LAME_VERSION}/lame-${LAME_VERSION}.tar.gz" && \
     tar -xvz -f lame-${LAME_VERSION}.tar.gz && \
     cd lame-${LAME_VERSION} && \
     ./configure --prefix="${SRC}" --bindir="${SRC}/bin" --disable-static --enable-nasm && \

From 90d31565c8c2f9d31dadf8dba1be729b20476d7a Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Tue, 6 Nov 2018 19:02:14 +0100
Subject: [PATCH 58/62] Rename MODE to RS_MODE

---
 run.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/run.sh b/run.sh
index 795f7af5..8d8da603 100755
--- a/run.sh
+++ b/run.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 CPU_TYPE=$(uname -m | cut -c 1-3)
-if [ "${MODE}" = "RASPICAM" ] && [ "$CPU_TYPE" = "arm" ]; then
+if [ "${RS_MODE}" = "RASPICAM" ] && [ "$CPU_TYPE" = "arm" ]; then
     echo "/opt/vc/lib" > /etc/ld.so.conf.d/00-vmcs.conf
     ldconfig
     npm start &
@@ -129,7 +129,7 @@ if [ "${MODE}" = "RASPICAM" ] && [ "$CPU_TYPE" = "arm" ]; then
         --metering "$RASPICAM_METERING" \
         --drc "$RASPICAM_DRC" \
         -o - | ffmpeg -i - -f lavfi -i anullsrc=r=44100:cl=mono -vcodec copy -acodec aac -b:a 0k -map 0:v -map 1:a -shortest -f flv "${RTMP_URL}" > /dev/null 2>&1
-elif [ "${MODE}" = "USBCAM" ]; then
+elif [ "${RS_MODE}" = "USBCAM" ]; then
     npm start &
     NGINX_RUNNING=0
     until [ "$NGINX_RUNNING" = "1" ]; do

From b329a5687fd1c12ac0cd5e4a5ed8850bc573d34e Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Wed, 7 Nov 2018 12:08:26 +0100
Subject: [PATCH 59/62] Rename RS_DEBUG_FFMPEG to RS_DEBUG and enable logging
 of GUI messages as well

---
 conf/live.json                        |  4 +-
 run.sh                                |  9 ++++
 src/classes/Logger.js                 | 78 ++++++++++++++++++++++++---
 src/start.js                          |  9 ++--
 src/webserver/public/debug/README.txt |  2 +-
 5 files changed, 86 insertions(+), 16 deletions(-)

diff --git a/conf/live.json b/conf/live.json
index 45e1be3a..60df4659 100644
--- a/conf/live.json
+++ b/conf/live.json
@@ -214,12 +214,12 @@
             "description": "Create heapdumps of application."
         },
         {
-            "name": "RS_DEBUG_FFMPEG",
+            "name": "RS_DEBUG",
             "alias": [],
             "type": "bool",
             "defaultValue": false,
             "required": false,
-            "description": "Enables FFmpeg reporting."
+            "description": "Enables debug reporting."
         },
         {
             "name": "RS_AUDIO",
diff --git a/run.sh b/run.sh
index 8d8da603..f3bd9245 100755
--- a/run.sh
+++ b/run.sh
@@ -1,4 +1,13 @@
 #!/bin/sh
+MODE=${MODE:="default"}
+RS_MODE=${RS_MODE:=$MODE}
+
+# debug reporting
+RS_DEBUG=${RS_DEBUG:="false"}
+if [ "$RS_DEBUG" = "true" ]; then
+    export FFREPORT="file=/restreamer/src/webserver/public/debug/%p-%t.log:level=48"
+fi
+
 CPU_TYPE=$(uname -m | cut -c 1-3)
 if [ "${RS_MODE}" = "RASPICAM" ] && [ "$CPU_TYPE" = "arm" ]; then
     echo "/opt/vc/lib" > /etc/ld.so.conf.d/00-vmcs.conf
diff --git a/src/classes/Logger.js b/src/classes/Logger.js
index 36162b2a..52cd92a2 100644
--- a/src/classes/Logger.js
+++ b/src/classes/Logger.js
@@ -8,6 +8,7 @@
 
 const moment = require('moment-timezone');
 const printf = require('printf');
+const fs = require('fs');
 
 const LEVEL_MUTE = 0;
 const LEVEL_ERROR = 1;
@@ -40,6 +41,33 @@ class Logger {
     constructor (context) {
         process.env.RS_LOGLEVEL = process.env.RS_LOGLEVEL || LEVEL_INFO;
         this.context = context;
+
+        this.debuglog = null;
+
+        if(process.env.RS_DEBUG == 'true') {
+            let identifier = process.pid + '-' + process.platform + '-' + process.arch;
+            try {
+                this.debuglog = fs.openSync('/restreamer/src/webserver/public/debug/Restreamer-' + identifier + '.txt', 'a');
+            } catch(err) {
+                this.debuglog = null;
+                this.stdout('Error opening debug file ' + identifier + ': ' + err, false, 'INFO');
+            } finally {
+                this.stdout('Enabled logging to ' + identifier, context, 'INFO');
+            }
+        }
+    }
+
+    logline(message, context, type) {
+        let time = moment().tz(process.env.RS_TIMEZONE).format('DD-MM-YYYY HH:mm:ss.SSS');
+
+        let logline = '';
+        if(context) {
+            logline = printf('[%s] [%-5s] [%22s] %s', time, type, context, message);
+        } else {
+            logline = printf('[%s] [%-5s] %s', time, type, message);
+        }
+
+        return logline;
     }
 
     /**
@@ -49,22 +77,40 @@ class Logger {
      * @param {string} type
      */
     stdout (message, context, type) {
-        var time = moment().tz(process.env.RS_TIMEZONE).format('DD-MM-YYYY HH:mm:ss.SSS');
-
         if(Logger.isMuted()) {
             return;
         }
 
-        let logline = '';
-        if(context) {
-            logline = printf('[%s] [%-5s] [%22s] %s', time, type, context, message);
-        } else {
-            logline = printf('[%s] [%-5s] %s', time, type, message);
-        }
+        let logline = this.logline(message, context, type);
 
         process.stdout.write(logline + '\n');
     }
 
+    /**
+     * print a message to a file
+     * @param {string} message
+     * @param {string} context
+     * @param {string} type
+     */
+    file (message, context, type) {
+        let logline = this.logline(message, context, type);
+
+        if(this.debuglog !== null) {
+            fs.appendFile(this.debuglog, logline + '\n', 'utf8', (err) => {
+                // ignore errors
+                if(err) {
+                    return;
+                }
+
+                fs.fsync(this.debuglog, (err) => {
+                    return;
+                });
+
+                return;
+            });
+        }
+    }
+
     /**
      * print an info message if LOG_LEVEL >= LEVEL_INFO
      * @param {string} message
@@ -83,6 +129,10 @@ class Logger {
             loggerAlertGui = false;
         }
 
+        if(process.env.RS_DEBUG == 'true') {
+            this.file(message, loggerContext, 'INFO');
+        }
+
         if (process.env.RS_LOGLEVEL >= LEVEL_INFO) {
             return this.stdout(message, loggerContext, 'INFO');
         }
@@ -111,6 +161,10 @@ class Logger {
             loggerAlertGui = false;
         }
 
+        if(process.env.RS_DEBUG == 'true') {
+            this.file(message, loggerContext, 'WARN');
+        }
+
         if (process.env.RS_LOGLEVEL >= LEVEL_WARN) {
             return this.stdout(message, loggerContext, 'WARN');
         }
@@ -139,6 +193,10 @@ class Logger {
             loggerAlertGui = false;
         }
 
+        if(process.env.RS_DEBUG == 'true') {
+            this.file(message, loggerContext, 'DEBUG');
+        }
+
         if (process.env.RS_LOGLEVEL >= LEVEL_DEBUG) {
             return this.stdout(message, loggerContext, 'DEBUG');
         }
@@ -168,6 +226,10 @@ class Logger {
             loggerAlertGui = false;
         }
 
+        if(process.env.RS_DEBUG == 'true') {
+            this.file(message, loggerContext, 'ERROR');
+        }
+
         if (process.env.RS_LOGLEVEL >= LEVEL_ERROR) {
             return this.stdout(message, loggerContext, 'ERROR');
         }
diff --git a/src/start.js b/src/start.js
index bc145b11..80b909c2 100644
--- a/src/start.js
+++ b/src/start.js
@@ -21,6 +21,10 @@ const Restreamer = require('./classes/Restreamer');
 const RestreamerData = require('./classes/RestreamerData');
 const restreamerApp = require('./webserver/app');
 
+if(process.env.RS_DEBUG == "true") {
+    logger.info('Debugging enabled. Check the /debug path in the web interface.', false);
+}
+
 // show start message
 logger.info('     _       _             _           _ ', false);
 logger.info('  __| | __ _| |_ __ _ _ __| |___   ___(_)', false);
@@ -37,11 +41,6 @@ logger.info('', false);
 // setup environment vars
 EnvVar.init(config);
 
-// ffmpeg reporting
-if(process.env.RS_DEBUG_FFMPEG == 'true') {
-    process.env['FFREPORT'] = 'file=/restreamer/src/webserver/public/debug/%p-%t.log';
-}
-
 // start the app
 nginxrtmp.start()
     .then(() => {
diff --git a/src/webserver/public/debug/README.txt b/src/webserver/public/debug/README.txt
index fd3a8370..1f458f05 100644
--- a/src/webserver/public/debug/README.txt
+++ b/src/webserver/public/debug/README.txt
@@ -1,4 +1,4 @@
-You can enable FFmpeg reporting by the enviroment variable "RS_FFMPEG_DEBUG=true".
+You can enable debug reporting by the enviroment variable "RS_DEBUG=true".
 
 WARNING:
 Logging can consume a lot of disk space! Don not use this option in productive use!

From ee997f0ed3efa06dd1f6850c08e2cfa6508ce6dc Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Wed, 7 Nov 2018 12:08:37 +0100
Subject: [PATCH 60/62] Update changes

---
 CHANGELOG.md | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0204ce0..28411b28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,13 @@
 ## Changes from 0.1.0-rc7 to 0.1.0
 
-* Update FFmpeg to 4.0.2
-* Update NGINX to 1.14.0
+* Update FFmpeg to 4.1
+* Update NGINX to 1.14.1
 * Update NGINXRTMP module to 1.2.1
-* Update node.js to 8.12.0
+* Update node.js to 10.13.0
 * Update NPM packages
 * Fix detection of public IP
 * Disable FFmpeg error detection for a VLC-like behaviour
-* Add optional RTMP token authentification
+* Add optional RTMP (RS_TOKEN environment variable) token authentification
 * Add health check to NGINX
 * Allow HTTP/HTTPS (HLS) and RTMPT/RTMPS addresses as video source
 * Add optional autostart for the player
@@ -16,12 +16,19 @@
 * Reduce docker image size
 * Fix snapshot interval parsing
 * Allow to disable snapshot
-* Add RS_SNAPSHOT_INTERVAL environment variable, deprecate RS_SNAPSHOT_REFRESH_INTERVAL
 * Remove stream connection retry limits
 * Add stale stream detection with automatic restart
-* Add RS_DEBUG_FFMPEG environment variable to store FFmpeg debug output to /debug
+* Add RS_DEBUG environment variable to store debug output to /debug
 * Add RS_AUDIO environment variable to control audio processing
 * Redesign logging output and logging messages
+* Rename environment variables (old environment variables are still supported but will be deprecated in the future)
+  * RS_NODE_PORT to RS_NODEJS_PORT
+  * RS_NODE_ENV to RS_NODEJS_ENV
+  * RS_LOGGER_LEVEL to RS_LOGLEVEL
+  * MODE to RS_MDOE
+  * RS_SNAPSHOT_REFRESH_INTERVAL to RS_SNAPSHOT_INTERVAL
+* Add options to control Raspberry Pi cameras (RS_MODE=RASPICAM)
+* Add options to control USB cameras (RS_MODE=USBCAM)
 
 ## Changes from 0.1.0-rc7 to 0.1.0-rc.7.1
 

From 5e1c6bb80f24ed5f581f17ed9cdbcbb5936e998c Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Wed, 7 Nov 2018 14:00:18 +0100
Subject: [PATCH 61/62] Add context to log message

---
 src/classes/Logger.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/classes/Logger.js b/src/classes/Logger.js
index 52cd92a2..d0c7d49b 100644
--- a/src/classes/Logger.js
+++ b/src/classes/Logger.js
@@ -50,7 +50,7 @@ class Logger {
                 this.debuglog = fs.openSync('/restreamer/src/webserver/public/debug/Restreamer-' + identifier + '.txt', 'a');
             } catch(err) {
                 this.debuglog = null;
-                this.stdout('Error opening debug file ' + identifier + ': ' + err, false, 'INFO');
+                this.stdout('Error opening debug file ' + identifier + ': ' + err, context, 'INFO');
             } finally {
                 this.stdout('Enabled logging to ' + identifier, context, 'INFO');
             }

From 3051db8849fee55ea2bbc4503e256cb5611c3b1f Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@oppermann.ch>
Date: Fri, 9 Nov 2018 17:44:18 +0100
Subject: [PATCH 62/62] Fix audio handling for output stream

---
 src/classes/Restreamer.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/classes/Restreamer.js b/src/classes/Restreamer.js
index e48b5d3f..1cc8d4c8 100644
--- a/src/classes/Restreamer.js
+++ b/src/classes/Restreamer.js
@@ -312,7 +312,9 @@ class Restreamer {
                 }
             }
             else {
-                option = "native_h264_native_audio";
+                if(audio !== null) {
+                    option = "native_h264_native_audio";
+                }
             }
 
             logger.debug('Selected ffmpeg option: ' + option, streamType);