From 9d5141457a8024f4d57d3cb04b546339dba0cf95 Mon Sep 17 00:00:00 2001 From: Ray <7869818+rayrrr@users.noreply.github.com> Date: Mon, 9 Dec 2019 22:50:29 -0500 Subject: [PATCH 1/7] Local Docker builds and modernized DHT access * remove Docker directory * always build Docker images locally * move bin dir to fruitnanny dir * get Dockerfiles working * put bin dir back where it was * update relative paths for reorg * fix paths for config * move all JS stuff to fruitnanny dir * stop using volume import for config file * dht sensor working with libgpiod2 etc * bump npm package versions and add pm2 deps --- README.md | 2 +- bin/dht22.py | 12 - docker-compose.local.yml | 6 - docker-compose.yml | 17 +- docker/fruitnanny/Dockerfile | 23 - fruitnanny/Dockerfile | 19 + {bin => fruitnanny/bin}/audio.sh | 0 fruitnanny/bin/dht22.py | 22 + {bin => fruitnanny/bin}/light.sh | 0 {bin => fruitnanny/bin}/video.sh | 0 .../fruitnanny_config.js | 0 gruntfile.js => fruitnanny/gruntfile.js | 0 .../npm-shrinkwrap.json | 1547 +++++++++++++++-- package.json => fruitnanny/package.json | 9 +- .../public}/project/css/fruitnanny.css | 0 .../public}/project/favicon/favicon.ico | Bin .../public}/project/img/baby.png | Bin .../public}/project/img/fn2.jpg | Bin .../public}/project/img/matvei2-160x160.jpg | Bin .../public}/project/img/video-mobile.gif | Bin .../public}/project/js/age-calc.js | 0 .../public}/project/js/audio-widget.js | 0 .../public}/project/js/dht.js | 0 .../public}/project/js/ir-light.js | 0 .../public}/project/js/stream-context.js | 0 .../public}/project/js/video-player.js | 0 .../public}/project/js/webrtc.js | 0 .../public}/thirdparty/css/AdminLTE.css | 0 .../public}/thirdparty/css/AdminLTE.min.css | 0 .../thirdparty/css/bootstrap-slider.min.css | 0 .../public}/thirdparty/css/bootstrap.css | 0 .../public}/thirdparty/css/bootstrap.css.map | 0 .../public}/thirdparty/css/bootstrap.min.css | 0 .../thirdparty/css/bootstrap.min.css.map | 0 .../public}/thirdparty/css/font-awesome.css | 0 .../thirdparty/css/font-awesome.min.css | 0 .../public}/thirdparty/css/ionicons.css | 0 .../public}/thirdparty/css/ionicons.min.css | 0 .../thirdparty/css/skins/_all-skins.css | 0 .../thirdparty/css/skins/_all-skins.min.css | 0 .../thirdparty/css/skins/skin-black-light.css | 0 .../css/skins/skin-black-light.min.css | 0 .../thirdparty/css/skins/skin-black.css | 0 .../thirdparty/css/skins/skin-black.min.css | 0 .../thirdparty/css/skins/skin-blue-light.css | 0 .../css/skins/skin-blue-light.min.css | 0 .../thirdparty/css/skins/skin-blue.css | 0 .../thirdparty/css/skins/skin-blue.min.css | 0 .../thirdparty/css/skins/skin-green-light.css | 0 .../css/skins/skin-green-light.min.css | 0 .../thirdparty/css/skins/skin-green.css | 0 .../thirdparty/css/skins/skin-green.min.css | 0 .../css/skins/skin-purple-light.css | 0 .../css/skins/skin-purple-light.min.css | 0 .../thirdparty/css/skins/skin-purple.css | 0 .../thirdparty/css/skins/skin-purple.min.css | 0 .../thirdparty/css/skins/skin-red-light.css | 0 .../css/skins/skin-red-light.min.css | 0 .../public}/thirdparty/css/skins/skin-red.css | 0 .../thirdparty/css/skins/skin-red.min.css | 0 .../css/skins/skin-yellow-light.css | 0 .../css/skins/skin-yellow-light.min.css | 0 .../thirdparty/css/skins/skin-yellow.css | 0 .../thirdparty/css/skins/skin-yellow.min.css | 0 .../public}/thirdparty/fonts/FontAwesome.otf | Bin .../thirdparty/fonts/fontawesome-webfont.eot | Bin .../thirdparty/fonts/fontawesome-webfont.svg | 0 .../thirdparty/fonts/fontawesome-webfont.ttf | Bin .../thirdparty/fonts/fontawesome-webfont.woff | Bin .../fonts/fontawesome-webfont.woff2 | Bin .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../public}/thirdparty/fonts/ionicons.eot | Bin .../public}/thirdparty/fonts/ionicons.svg | 0 .../public}/thirdparty/fonts/ionicons.ttf | Bin .../public}/thirdparty/fonts/ionicons.woff | Bin .../public}/thirdparty/img/boxed-bg.jpg | Bin .../public}/thirdparty/img/boxed-bg.png | Bin .../public}/thirdparty/img/default-50x50.gif | Bin .../public}/thirdparty/img/icons.png | Bin .../public}/thirdparty/js/adapter.js | 0 .../public}/thirdparty/js/app.js | 0 .../public}/thirdparty/js/app.min.js | 0 .../public}/thirdparty/js/bootbox.min.js | 0 .../thirdparty/js/bootstrap-slider.min.js | 0 .../public}/thirdparty/js/bootstrap.js | 0 .../public}/thirdparty/js/bootstrap.min.js | 0 .../public}/thirdparty/js/janus.js | 0 .../public}/thirdparty/js/jquery-2.2.3.min.js | 0 .../public}/thirdparty/js/justgage.js | 0 .../public}/thirdparty/js/npm.js | 0 .../thirdparty/js/raphael-2.1.4.min.js | 0 .../public}/thirdparty/js/spin.min.js | 0 {server => fruitnanny/server}/app.js | 0 {server => fruitnanny/server}/app.ts | 0 .../server}/routes/custom_button.js | 0 .../server}/routes/custom_button.ts | 0 {server => fruitnanny/server}/routes/dht.js | 4 +- {server => fruitnanny/server}/routes/dht.ts | 4 +- {server => fruitnanny/server}/routes/light.js | 0 {server => fruitnanny/server}/routes/light.ts | 0 tsconfig.json => fruitnanny/tsconfig.json | 0 tslint.json => fruitnanny/tslint.json | 0 {views => fruitnanny/views}/index.ejs | 0 .../views}/partials/common-js.ejs | 0 .../views}/partials/footer.ejs | 0 {views => fruitnanny/views}/partials/head.ejs | 0 .../views}/partials/header.ejs | 0 .../views}/partials/media-js.ejs | 0 .../views}/partials/sidebar.ejs | 0 {views => fruitnanny/views}/settings.ejs | 0 {docker/gstreamer => gstreamer}/Dockerfile | 0 {docker/janus => janus}/Dockerfile | 2 +- {docker/janus => janus}/start.sh | 0 117 files changed, 1511 insertions(+), 156 deletions(-) delete mode 100755 bin/dht22.py delete mode 100644 docker-compose.local.yml delete mode 100644 docker/fruitnanny/Dockerfile create mode 100644 fruitnanny/Dockerfile rename {bin => fruitnanny/bin}/audio.sh (100%) create mode 100755 fruitnanny/bin/dht22.py rename {bin => fruitnanny/bin}/light.sh (100%) rename {bin => fruitnanny/bin}/video.sh (100%) rename fruitnanny_config.js => fruitnanny/fruitnanny_config.js (100%) rename gruntfile.js => fruitnanny/gruntfile.js (100%) rename npm-shrinkwrap.json => fruitnanny/npm-shrinkwrap.json (69%) rename package.json => fruitnanny/package.json (84%) rename {public => fruitnanny/public}/project/css/fruitnanny.css (100%) rename {public => fruitnanny/public}/project/favicon/favicon.ico (100%) rename {public => fruitnanny/public}/project/img/baby.png (100%) rename {public => fruitnanny/public}/project/img/fn2.jpg (100%) rename {public => fruitnanny/public}/project/img/matvei2-160x160.jpg (100%) rename {public => fruitnanny/public}/project/img/video-mobile.gif (100%) rename {public => fruitnanny/public}/project/js/age-calc.js (100%) rename {public => fruitnanny/public}/project/js/audio-widget.js (100%) rename {public => fruitnanny/public}/project/js/dht.js (100%) rename {public => fruitnanny/public}/project/js/ir-light.js (100%) rename {public => fruitnanny/public}/project/js/stream-context.js (100%) rename {public => fruitnanny/public}/project/js/video-player.js (100%) rename {public => fruitnanny/public}/project/js/webrtc.js (100%) rename {public => fruitnanny/public}/thirdparty/css/AdminLTE.css (100%) rename {public => fruitnanny/public}/thirdparty/css/AdminLTE.min.css (100%) rename {public => fruitnanny/public}/thirdparty/css/bootstrap-slider.min.css (100%) rename {public => fruitnanny/public}/thirdparty/css/bootstrap.css (100%) rename {public => fruitnanny/public}/thirdparty/css/bootstrap.css.map (100%) rename {public => fruitnanny/public}/thirdparty/css/bootstrap.min.css (100%) rename {public => fruitnanny/public}/thirdparty/css/bootstrap.min.css.map (100%) rename {public => fruitnanny/public}/thirdparty/css/font-awesome.css (100%) rename {public => fruitnanny/public}/thirdparty/css/font-awesome.min.css (100%) rename {public => fruitnanny/public}/thirdparty/css/ionicons.css (100%) rename {public => fruitnanny/public}/thirdparty/css/ionicons.min.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/_all-skins.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/_all-skins.min.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-black-light.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-black-light.min.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-black.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-black.min.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-blue-light.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-blue-light.min.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-blue.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-blue.min.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-green-light.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-green-light.min.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-green.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-green.min.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-purple-light.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-purple-light.min.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-purple.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-purple.min.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-red-light.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-red-light.min.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-red.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-red.min.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-yellow-light.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-yellow-light.min.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-yellow.css (100%) rename {public => fruitnanny/public}/thirdparty/css/skins/skin-yellow.min.css (100%) rename {public => fruitnanny/public}/thirdparty/fonts/FontAwesome.otf (100%) rename {public => fruitnanny/public}/thirdparty/fonts/fontawesome-webfont.eot (100%) rename {public => fruitnanny/public}/thirdparty/fonts/fontawesome-webfont.svg (100%) rename {public => fruitnanny/public}/thirdparty/fonts/fontawesome-webfont.ttf (100%) rename {public => fruitnanny/public}/thirdparty/fonts/fontawesome-webfont.woff (100%) rename {public => fruitnanny/public}/thirdparty/fonts/fontawesome-webfont.woff2 (100%) rename {public => fruitnanny/public}/thirdparty/fonts/glyphicons-halflings-regular.eot (100%) rename {public => fruitnanny/public}/thirdparty/fonts/glyphicons-halflings-regular.svg (100%) rename {public => fruitnanny/public}/thirdparty/fonts/glyphicons-halflings-regular.ttf (100%) rename {public => fruitnanny/public}/thirdparty/fonts/glyphicons-halflings-regular.woff (100%) rename {public => fruitnanny/public}/thirdparty/fonts/glyphicons-halflings-regular.woff2 (100%) rename {public => fruitnanny/public}/thirdparty/fonts/ionicons.eot (100%) rename {public => fruitnanny/public}/thirdparty/fonts/ionicons.svg (100%) rename {public => fruitnanny/public}/thirdparty/fonts/ionicons.ttf (100%) rename {public => fruitnanny/public}/thirdparty/fonts/ionicons.woff (100%) rename {public => fruitnanny/public}/thirdparty/img/boxed-bg.jpg (100%) rename {public => fruitnanny/public}/thirdparty/img/boxed-bg.png (100%) rename {public => fruitnanny/public}/thirdparty/img/default-50x50.gif (100%) rename {public => fruitnanny/public}/thirdparty/img/icons.png (100%) rename {public => fruitnanny/public}/thirdparty/js/adapter.js (100%) rename {public => fruitnanny/public}/thirdparty/js/app.js (100%) rename {public => fruitnanny/public}/thirdparty/js/app.min.js (100%) rename {public => fruitnanny/public}/thirdparty/js/bootbox.min.js (100%) rename {public => fruitnanny/public}/thirdparty/js/bootstrap-slider.min.js (100%) rename {public => fruitnanny/public}/thirdparty/js/bootstrap.js (100%) rename {public => fruitnanny/public}/thirdparty/js/bootstrap.min.js (100%) rename {public => fruitnanny/public}/thirdparty/js/janus.js (100%) rename {public => fruitnanny/public}/thirdparty/js/jquery-2.2.3.min.js (100%) rename {public => fruitnanny/public}/thirdparty/js/justgage.js (100%) rename {public => fruitnanny/public}/thirdparty/js/npm.js (100%) rename {public => fruitnanny/public}/thirdparty/js/raphael-2.1.4.min.js (100%) rename {public => fruitnanny/public}/thirdparty/js/spin.min.js (100%) rename {server => fruitnanny/server}/app.js (100%) rename {server => fruitnanny/server}/app.ts (100%) rename {server => fruitnanny/server}/routes/custom_button.js (100%) rename {server => fruitnanny/server}/routes/custom_button.ts (100%) rename {server => fruitnanny/server}/routes/dht.js (77%) rename {server => fruitnanny/server}/routes/dht.ts (83%) rename {server => fruitnanny/server}/routes/light.js (100%) rename {server => fruitnanny/server}/routes/light.ts (100%) rename tsconfig.json => fruitnanny/tsconfig.json (100%) rename tslint.json => fruitnanny/tslint.json (100%) rename {views => fruitnanny/views}/index.ejs (100%) rename {views => fruitnanny/views}/partials/common-js.ejs (100%) rename {views => fruitnanny/views}/partials/footer.ejs (100%) rename {views => fruitnanny/views}/partials/head.ejs (100%) rename {views => fruitnanny/views}/partials/header.ejs (100%) rename {views => fruitnanny/views}/partials/media-js.ejs (100%) rename {views => fruitnanny/views}/partials/sidebar.ejs (100%) rename {views => fruitnanny/views}/settings.ejs (100%) rename {docker/gstreamer => gstreamer}/Dockerfile (100%) rename {docker/janus => janus}/Dockerfile (98%) rename {docker/janus => janus}/start.sh (100%) diff --git a/README.md b/README.md index dd6dc85..40e04c4 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ Follow [installation instruction](INSTALLATION.md) # Configuration -Modify [fruitnanny_config](./fruitnanny_config.js) to configure the baby monitor. +Modify [fruitnanny_config](./fruitnanny/fruitnanny_config.js) to configure the baby monitor. Params: * `baby_name` - baby's name to display in UI diff --git a/bin/dht22.py b/bin/dht22.py deleted file mode 100755 index d6e3328..0000000 --- a/bin/dht22.py +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/python -import sys -import Adafruit_DHT - -pin = 24 -humidity, temperature = Adafruit_DHT.read_retry(Adafruit_DHT.DHT22, pin) -if humidity is not None and temperature is not None: - print('{0:0.1f} {1:0.1f}'.format(temperature, humidity)) -else: - print('Failed to get reading. Try again!') - sys.exit(1) - diff --git a/docker-compose.local.yml b/docker-compose.local.yml deleted file mode 100644 index d3f86b2..0000000 --- a/docker-compose.local.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: '3' -services: - fruitnanny: - volumes: - - .:/opt/fruitnanny - command: /bin/bash -c "npm install && node server/app.js" \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 88bbc51..a175d79 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: janus: - image: ivadim/fruitnanny-janus + build: ./janus restart: always privileged: true network_mode: "host" @@ -15,7 +15,7 @@ services: - 5004 # video gstreamer-video: - image: ivadim/fruitnanny-gstreamer + build: ./gstreamer restart: always privileged: true network_mode: "host" @@ -29,7 +29,7 @@ services: command: gst-launch-1.0 -v rpicamsrc name=src preview=0 exposure-mode=night fullscreen=0 bitrate=1000000 annotation-mode=time+date annotation-text-size=20 ! video/x-h264,width=960,height=540,framerate=12/1,profile=constrained-baseline ! queue max-size-bytes=0 max-size-buffers=0 ! h264parse ! rtph264pay config-interval=1 pt=96 ! queue ! udpsink host=127.0.0.1 port=5004 sync=false gstreamer-audio: - image: ivadim/fruitnanny-gstreamer + build: ./gstreamer restart: always privileged: true network_mode: "host" @@ -41,15 +41,16 @@ services: command: "/audio_entry.sh" fruitnanny: - image: ivadim/fruitnanny-app + build: ./fruitnanny restart: always privileged: true - volumes: - - ./fruitnanny_config.js:/opt/fruitnanny/fruitnanny_config.js - - ./bin:/opt/fruitnanny/bin network_mode: "host" depends_on: - janus + devices: + - "/dev/gpiochip0:/dev/gpiochip0" + - "/dev/gpiochip1:/dev/gpiochip1" + - "/dev/gpiomem:/dev/gpiomem" expose: - 7000 @@ -67,4 +68,4 @@ services: - ./configuration/ssl:/etc/fruitnanny-ssl ports: - "80:80" - - "443:443" \ No newline at end of file + - "443:443" diff --git a/docker/fruitnanny/Dockerfile b/docker/fruitnanny/Dockerfile deleted file mode 100644 index 3290d3e..0000000 --- a/docker/fruitnanny/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM balenalib/raspberry-pi-node:12.11-buster - -RUN buildDeps="build-essential python-dev python3-dev python-setuptools python3-setuptools" \ - && echo 'APT::Install-Recommends "false";' >/etc/apt/apt.conf.d/00recommends \ - && echo 'APT::Install-Suggests "false";' >>/etc/apt/apt.conf.d/00recommends \ - && apt-get update \ - && apt-get install -y python-pip python3-pip dos2unix \ - && apt-get install -y $buildDeps \ - && pip install wheel && pip install --install-option="--force-pi2" Adafruit-DHT \ - && pip3 install wheel && pip3 install --install-option="--force-pi2" Adafruit-DHT \ - && apt-get --purge remove -y $buildDeps && apt-get --purge -y autoremove \ - && apt-get clean \ - && rm -rf /tmp/* \ - && rm -rf /var/lib/apt/lists/* - -ADD . /opt/fruitnanny -WORKDIR /opt/fruitnanny - -RUN dos2unix /opt/fruitnanny/bin/* - -RUN npm install -CMD ["node", "server/app.js"] -EXPOSE 7000 diff --git a/fruitnanny/Dockerfile b/fruitnanny/Dockerfile new file mode 100644 index 0000000..302591d --- /dev/null +++ b/fruitnanny/Dockerfile @@ -0,0 +1,19 @@ +FROM balenalib/raspberrypi3-debian-node:12.13-buster + +RUN echo 'APT::Install-Recommends "false";' >/etc/apt/apt.conf.d/00recommends \ + && echo 'APT::Install-Suggests "false";' >>/etc/apt/apt.conf.d/00recommends \ + && apt-get update && apt-get upgrade && apt-get install -y \ + dos2unix \ + libgpiod2 \ + python3 \ + python3-pip \ + && pip3 install --upgrade RPI.GPIO adafruit-blinka adafruit-circuitpython-dht \ + && apt-get --purge -y autoremove && apt-get clean && rm -rf /tmp/* && rm -rf /var/lib/apt/lists/* + +ADD . /opt/fruitnanny +WORKDIR /opt/fruitnanny + +RUN dos2unix /opt/fruitnanny/bin/* && npm install + +CMD ["node", "server/app.js"] +EXPOSE 7000 diff --git a/bin/audio.sh b/fruitnanny/bin/audio.sh similarity index 100% rename from bin/audio.sh rename to fruitnanny/bin/audio.sh diff --git a/fruitnanny/bin/dht22.py b/fruitnanny/bin/dht22.py new file mode 100755 index 0000000..253ccae --- /dev/null +++ b/fruitnanny/bin/dht22.py @@ -0,0 +1,22 @@ +#!/usr/bin/python3 +import sys + +import adafruit_dht +import board + +# choose one or the other +dht = adafruit_dht.DHT22(board.D24) +# dht = adafruit_dht.DHT11(board.D24) + +for i in range(1,10): + try: + t = dht.temperature + h = dht.humidity + if t and h: + print('{0:0.1f} {1:0.1f}'.format(t, h)) + break + except: + pass +if not t or not h: + print('Failed to get reading. Try again!') + sys.exit(1) diff --git a/bin/light.sh b/fruitnanny/bin/light.sh similarity index 100% rename from bin/light.sh rename to fruitnanny/bin/light.sh diff --git a/bin/video.sh b/fruitnanny/bin/video.sh similarity index 100% rename from bin/video.sh rename to fruitnanny/bin/video.sh diff --git a/fruitnanny_config.js b/fruitnanny/fruitnanny_config.js similarity index 100% rename from fruitnanny_config.js rename to fruitnanny/fruitnanny_config.js diff --git a/gruntfile.js b/fruitnanny/gruntfile.js similarity index 100% rename from gruntfile.js rename to fruitnanny/gruntfile.js diff --git a/npm-shrinkwrap.json b/fruitnanny/npm-shrinkwrap.json similarity index 69% rename from npm-shrinkwrap.json rename to fruitnanny/npm-shrinkwrap.json index df589ca..038d8d2 100644 --- a/npm-shrinkwrap.json +++ b/fruitnanny/npm-shrinkwrap.json @@ -4,6 +4,234 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@opencensus/core": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/@opencensus/core/-/core-0.0.9.tgz", + "integrity": "sha512-31Q4VWtbzXpVUd2m9JS6HEaPjlKvNMOiF7lWKNmXF84yUcgfAFL5re7/hjDmdyQbOp32oGc+RFV78jXIldVz6Q==", + "requires": { + "continuation-local-storage": "^3.2.1", + "log-driver": "^1.2.7", + "semver": "^5.5.0", + "shimmer": "^1.2.0", + "uuid": "^3.2.1" + } + }, + "@opencensus/propagation-b3": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/@opencensus/propagation-b3/-/propagation-b3-0.0.8.tgz", + "integrity": "sha512-PffXX2AL8Sh0VHQ52jJC4u3T0H6wDK6N/4bg7xh4ngMYOIi13aR1kzVvX1sVDBgfGwDOkMbl4c54Xm3tlPx/+A==", + "requires": { + "@opencensus/core": "^0.0.8", + "uuid": "^3.2.1" + }, + "dependencies": { + "@opencensus/core": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/@opencensus/core/-/core-0.0.8.tgz", + "integrity": "sha512-yUFT59SFhGMYQgX0PhoTR0LBff2BEhPrD9io1jWfF/VDbakRfs6Pq60rjv0Z7iaTav5gQlttJCX2+VPxFWCuoQ==", + "requires": { + "continuation-local-storage": "^3.2.1", + "log-driver": "^1.2.7", + "semver": "^5.5.0", + "shimmer": "^1.2.0", + "uuid": "^3.2.1" + } + } + } + }, + "@pm2/agent": { + "version": "0.5.26", + "resolved": "https://registry.npmjs.org/@pm2/agent/-/agent-0.5.26.tgz", + "integrity": "sha512-pqiS87IiUprkSR7SG0RKMATuYXl4QjH1tSSUwM4wJcovRT4pD5dvnnu61w9y/4/Ur5V/+a7bqS8bZz51y3U2iA==", + "requires": { + "async": "^2.6.0", + "chalk": "^2.3.2", + "eventemitter2": "^5.0.1", + "fclone": "^1.0.11", + "moment": "^2.21.0", + "nssocket": "^0.6.0", + "pm2-axon": "^3.2.0", + "pm2-axon-rpc": "^0.5.0", + "proxy-agent": "^3.1.0", + "semver": "^5.5.0", + "ws": "^5.1.0" + }, + "dependencies": { + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + }, + "eventemitter2": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-5.0.1.tgz", + "integrity": "sha1-YZegldX7a1folC9v1+qtY6CclFI=" + }, + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + } + } + }, + "@pm2/agent-node": { + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/@pm2/agent-node/-/agent-node-1.1.10.tgz", + "integrity": "sha512-xRcrk7OEwhS3d/227/kKGvxgmbIi6Yyp27FzGlFNermEKhgddmFaRnmd7GRLIsBM/KB28NrwflBZulzk/mma6g==", + "requires": { + "debug": "^3.1.0", + "eventemitter2": "^5.0.1", + "proxy-agent": "^3.0.3", + "ws": "^6.0.0" + }, + "dependencies": { + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "requires": { + "ms": "^2.1.1" + } + }, + "eventemitter2": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-5.0.1.tgz", + "integrity": "sha1-YZegldX7a1folC9v1+qtY6CclFI=" + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "ws": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", + "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", + "requires": { + "async-limiter": "~1.0.0" + } + } + } + }, + "@pm2/io": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/@pm2/io/-/io-4.3.3.tgz", + "integrity": "sha512-ENGsdSVpnwbYMGdeB0/Xy2eZYo7oltzApoCsMD4ssqWNXDg9C4uQZy5J09iPsb0IHFwSDjU5oylXdwKDSoqODw==", + "requires": { + "@opencensus/core": "^0.0.9", + "@opencensus/propagation-b3": "^0.0.8", + "@pm2/agent-node": "^1.1.10", + "async": "~2.6.1", + "debug": "3.1.0", + "eventemitter2": "~5.0.1", + "require-in-the-middle": "^5.0.0", + "semver": "5.5.0", + "shimmer": "~1.2.0", + "signal-exit": "3.0.2", + "tslib": "1.9.3" + }, + "dependencies": { + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + }, + "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" + } + }, + "eventemitter2": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-5.0.1.tgz", + "integrity": "sha1-YZegldX7a1folC9v1+qtY6CclFI=" + }, + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + }, + "semver": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==" + } + } + }, + "@pm2/js-api": { + "version": "0.5.60", + "resolved": "https://registry.npmjs.org/@pm2/js-api/-/js-api-0.5.60.tgz", + "integrity": "sha512-CvAbpIB7ObOuwvqhDBB/E4Z4ANRx2dBk08zYpGPNg+1fDj14FJg2e7DWA8bblSGNC8QarIXPaqPDJBL1e8cRQw==", + "requires": { + "async": "^2.4.1", + "axios": "^0.19.0", + "debug": "^2.6.8", + "eventemitter2": "^4.1.0", + "ws": "^3.0.0" + }, + "dependencies": { + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + }, + "eventemitter2": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-4.1.2.tgz", + "integrity": "sha1-DhqEd6+CGm7zmVsxG/dMI6UkfxU=" + }, + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + }, + "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" + } + } + } + }, + "@pm2/pm2-version-check": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@pm2/pm2-version-check/-/pm2-version-check-1.0.3.tgz", + "integrity": "sha512-SBuYsh+o35knItbRW97vl5/5nEc5c5DYP7PxjyPLOfmm9bMaDsVeATXjXMBy6+KLlyrYWHZxGbfXe003NnHClg==", + "requires": { + "debug": "^4.1.1" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, "@types/babel-types": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.4.tgz", @@ -113,6 +341,14 @@ } } }, + "agent-base": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", + "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", + "requires": { + "es6-promisify": "^5.0.0" + } + }, "align-text": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", @@ -133,11 +369,28 @@ } } }, + "amp": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/amp/-/amp-0.3.1.tgz", + "integrity": "sha1-at+NWKdPNh6CwfqNOJwHnhOfxH0=" + }, + "amp-message": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/amp-message/-/amp-message-0.1.2.tgz", + "integrity": "sha1-p48cmJlQh602GSpBKY5NtJ49/EU=", + "requires": { + "amp": "0.3.1" + } + }, + "ansi-colors": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", + "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==" + }, "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, "ansi-styles": { "version": "3.2.1", @@ -194,7 +447,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", @@ -221,21 +475,57 @@ "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" }, + "ast-types": { + "version": "0.13.2", + "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.2.tgz", + "integrity": "sha512-uWMHxJxtfj/1oZClOxDEV1sQ1HCDkA4MG8Gr69KKeBjEVH0R84WlejZ0y2DcwyBlpAEMltmVYkVgqfLFb2oyiA==" + }, "async": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "dev": true }, "async-each": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=" }, + "async-limiter": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", + "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==" + }, + "async-listener": { + "version": "0.6.10", + "resolved": "https://registry.npmjs.org/async-listener/-/async-listener-0.6.10.tgz", + "integrity": "sha512-gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw==", + "requires": { + "semver": "^5.3.0", + "shimmer": "^1.1.0" + } + }, "atob": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" }, + "axios": { + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz", + "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==", + "requires": { + "follow-redirects": "1.5.10", + "is-buffer": "^2.0.2" + }, + "dependencies": { + "is-buffer": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", + "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==" + } + } + }, "babel-runtime": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", @@ -321,6 +611,16 @@ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.12.0.tgz", "integrity": "sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==" }, + "blessed": { + "version": "0.1.81", + "resolved": "https://registry.npmjs.org/blessed/-/blessed-0.1.81.tgz", + "integrity": "sha1-+WLWh+wsNpVwrnGvhDJW5tDKESk=" + }, + "bodec": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/bodec/-/bodec-0.1.0.tgz", + "integrity": "sha1-vIUVVUMPI8n3ZQp172TGqUw0GMw=" + }, "body": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz", @@ -410,10 +710,10 @@ } } }, - "builtin-modules": { + "buffer-from": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=" + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" }, "bytes": { "version": "3.0.0", @@ -439,12 +739,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" @@ -477,6 +779,11 @@ "is-regex": "^1.0.3" } }, + "charm": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/charm/-/charm-0.1.2.tgz", + "integrity": "sha1-BsIe7RobBq62dVPNxT4jJ0usIpY=" + }, "chokidar": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", @@ -543,6 +850,38 @@ } } }, + "cli-table-redemption": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cli-table-redemption/-/cli-table-redemption-1.0.1.tgz", + "integrity": "sha512-SjVCciRyx01I4azo2K2rcc0NP/wOceXGzG1ZpYkEulbbIxDA/5YWv0oxG2HtQ4v8zPC6bgbRI7SbNaTZCxMNkg==", + "requires": { + "chalk": "^1.1.3" + }, + "dependencies": { + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "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" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + } + } + }, "cliui": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", @@ -553,10 +892,16 @@ "wordwrap": "0.0.2" } }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" + }, "coffeescript": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-1.10.0.tgz", - "integrity": "sha1-56qDAZF+9iGzXYo580jc3R234z4=" + "integrity": "sha1-56qDAZF+9iGzXYo580jc3R234z4=", + "dev": true }, "collection-visit": { "version": "1.0.0", @@ -585,6 +930,11 @@ "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=" }, + "commander": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", + "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==" + }, "component-emitter": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", @@ -622,6 +972,15 @@ "integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=", "dev": true }, + "continuation-local-storage": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz", + "integrity": "sha512-jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA==", + "requires": { + "async-listener": "^0.6.0", + "emitter-listener": "^1.1.1" + } + }, "cookie": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", @@ -647,6 +1006,14 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, + "cron": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/cron/-/cron-1.7.1.tgz", + "integrity": "sha512-gmMB/pJcqUVs/NklR1sCGlNYM7TizEw+1gebz20BMc/8bTm/r7QUp3ZPSPlG8Z5XRlvb7qhjEjq/+bdIfUCL2A==", + "requires": { + "moment-timezone": "^0.5.x" + } + }, "csproj2ts": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/csproj2ts/-/csproj2ts-1.1.0.tgz", @@ -665,18 +1032,35 @@ } } }, + "culvert": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/culvert/-/culvert-0.1.2.tgz", + "integrity": "sha1-lQL18BVKLVoioCPnn3HMk2+m728=" + }, "currently-unhandled": { "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" } }, + "data-uri-to-buffer": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz", + "integrity": "sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ==" + }, + "date-fns": { + "version": "1.30.1", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz", + "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==" + }, "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" @@ -700,6 +1084,11 @@ "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" }, + "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=" + }, "define-property": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", @@ -737,6 +1126,23 @@ } } }, + "degenerator": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz", + "integrity": "sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=", + "requires": { + "ast-types": "0.x.x", + "escodegen": "1.x.x", + "esprima": "3.x.x" + }, + "dependencies": { + "esprima": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", + "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" + } + } + }, "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -785,11 +1191,27 @@ "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz", "integrity": "sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==" }, + "emitter-listener": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/emitter-listener/-/emitter-listener-1.1.2.tgz", + "integrity": "sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==", + "requires": { + "shimmer": "^1.2.0" + } + }, "encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" }, + "enquirer": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.2.tgz", + "integrity": "sha512-PLhTMPUXlnaIv9D3Cq3/Zr1xb7soeDDgunobyCmYLUG19n24dvC8i+ZZgm2DekGpDnx7JvFSHV7lxfM58PMtbA==", + "requires": { + "ansi-colors": "^3.2.1" + } + }, "error": { "version": "7.0.2", "resolved": "https://registry.npmjs.org/error/-/error-7.0.2.tgz", @@ -804,6 +1226,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" } @@ -813,20 +1236,71 @@ "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-0.1.2.tgz", "integrity": "sha1-8RLCn+paCZhTn8tqL9IUQ9KPBfc=" }, + "es6-promisify": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", + "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", + "requires": { + "es6-promise": "^4.0.3" + }, + "dependencies": { + "es6-promise": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", + "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==" + } + } + }, "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" }, + "escape-regexp": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/escape-regexp/-/escape-regexp-0.0.1.tgz", + "integrity": "sha1-9EvaEtRbvfnLf4Yu5+SCez3TIlQ=" + }, "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=" }, + "escodegen": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz", + "integrity": "sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==", + "requires": { + "esprima": "^3.1.3", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" + }, + "dependencies": { + "esprima": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", + "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "optional": true + } + } + }, "esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=" + "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 + }, + "estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" }, "esutils": { "version": "2.0.2", @@ -846,7 +1320,8 @@ "exit": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=" + "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", + "dev": true }, "expand-brackets": { "version": "2.1.4", @@ -1015,6 +1490,11 @@ } } }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" + }, "faye-websocket": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", @@ -1024,12 +1504,22 @@ "websocket-driver": ">=0.5.1" } }, + "fclone": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/fclone/-/fclone-1.0.11.tgz", + "integrity": "sha1-EOhdo4v+p/xZk0HClu4ddyZu5kA=" + }, "file-sync-cmp": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz", "integrity": "sha1-peeo/7+kk7Q7kju9TKiaU7Y7YSs=", "dev": true }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==" + }, "fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", @@ -1076,6 +1566,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" @@ -1120,6 +1611,24 @@ "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz", "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==" }, + "follow-redirects": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", + "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", + "requires": { + "debug": "=3.1.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" + } + } + } + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -1173,7 +1682,8 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true + "bundled": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -1191,11 +1701,13 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true + "bundled": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1208,15 +1720,18 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -1319,7 +1834,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -1329,6 +1845,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -1341,17 +1858,20 @@ "minimatch": { "version": "3.0.4", "bundled": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -1368,6 +1888,7 @@ "mkdirp": { "version": "0.5.1", "bundled": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -1440,7 +1961,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -1450,6 +1972,7 @@ "once": { "version": "1.4.0", "bundled": true, + "optional": true, "requires": { "wrappy": "1" } @@ -1525,7 +2048,8 @@ }, "safe-buffer": { "version": "5.1.1", - "bundled": true + "bundled": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -1555,6 +2079,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -1572,6 +2097,7 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -1610,11 +2136,45 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true + "bundled": true, + "optional": true }, "yallist": { "version": "3.0.2", - "bundled": true + "bundled": true, + "optional": true + } + } + }, + "ftp": { + "version": "0.3.10", + "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz", + "integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=", + "requires": { + "readable-stream": "1.1.x", + "xregexp": "2.0.0" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" } } }, @@ -1635,7 +2195,21 @@ "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-uri": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.4.tgz", + "integrity": "sha512-v7LT/s8kVjs+Tx0ykk1I+H/rbpzkHvuIq87LmeXptcf5sNWm9uQiwjNAt94SJPA1zOlCntmnOlJvVWKmzsxG8Q==", + "requires": { + "data-uri-to-buffer": "1", + "debug": "2", + "extend": "~3.0.2", + "file-uri-to-path": "1", + "ftp": "~0.3.10", + "readable-stream": "2" + } }, "get-value": { "version": "2.0.6", @@ -1645,7 +2219,18 @@ "getobject": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz", - "integrity": "sha1-BHpEl4n6Fg0Bj1SG7ZEyC27HiFw=" + "integrity": "sha1-BHpEl4n6Fg0Bj1SG7ZEyC27HiFw=", + "dev": true + }, + "git-node-fs": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/git-node-fs/-/git-node-fs-1.0.0.tgz", + "integrity": "sha1-SbIV4kLr5Dqkx1Ybu6SZUhdSCA8=" + }, + "git-sha1": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/git-sha1/-/git-sha1-0.1.2.tgz", + "integrity": "sha1-WZrBkrcYdYJeE6RF86bgURjC90U=" }, "glob": { "version": "7.0.6", @@ -1724,9 +2309,10 @@ "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==" }, "grunt": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.0.3.tgz", - "integrity": "sha512-/JzmZNPfKorlCrrmxWqQO4JVodO+DVd5XX4DkocL/1WlLlKVLE9+SdEIempOAxDhWPysLle6afvn/hg7Ck2k9g==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.0.4.tgz", + "integrity": "sha512-PYsMOrOC+MsdGEkFVwMaMyc6Ob7pKmq+deg1Sjr+vvMWp35sztfwKE7qoN51V+UEtHsyNuMcGdgMLFkBHvMxHQ==", + "dev": true, "requires": { "coffeescript": "~1.10.0", "dateformat": "~1.0.12", @@ -1739,7 +2325,7 @@ "grunt-legacy-log": "~2.0.0", "grunt-legacy-util": "~1.1.1", "iconv-lite": "~0.4.13", - "js-yaml": "~3.5.2", + "js-yaml": "~3.13.0", "minimatch": "~3.0.2", "mkdirp": "~0.5.1", "nopt": "~3.0.6", @@ -1751,6 +2337,7 @@ "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", @@ -1862,6 +2449,7 @@ "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", @@ -1873,6 +2461,7 @@ "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" @@ -1882,6 +2471,7 @@ "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", @@ -1934,7 +2524,6 @@ "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" } @@ -1984,12 +2573,14 @@ "hooker": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz", - "integrity": "sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk=" + "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==" + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz", + "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==", + "dev": true }, "http-errors": { "version": "1.6.3", @@ -2008,6 +2599,49 @@ "integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==", "dev": true }, + "http-proxy-agent": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz", + "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==", + "requires": { + "agent-base": "4", + "debug": "3.1.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" + } + } + } + }, + "https-proxy-agent": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz", + "integrity": "sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==", + "requires": { + "agent-base": "^4.3.0", + "debug": "^3.1.0" + }, + "dependencies": { + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, "iconv-lite": { "version": "0.4.23", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", @@ -2020,6 +2654,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" } @@ -2048,6 +2683,11 @@ "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz", "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=" }, + "ip": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", + "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=" + }, "ipaddr.js": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz", @@ -2083,7 +2723,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", @@ -2098,14 +2739,6 @@ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, - "is-builtin-module": { - "version": "1.0.0", - "resolved": "https://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", @@ -2263,18 +2896,30 @@ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" }, + "js-git": { + "version": "0.7.8", + "resolved": "https://registry.npmjs.org/js-git/-/js-git-0.7.8.tgz", + "integrity": "sha1-UvplWrYYd9bxB578ZTS1VPMeVEQ=", + "requires": { + "bodec": "^0.1.0", + "culvert": "^0.1.2", + "git-sha1": "^0.1.2", + "pako": "^0.2.5" + } + }, "js-stringify": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz", "integrity": "sha1-Fzb939lyTyijaCrcYjCufk6Weds=" }, "js-yaml": { - "version": "3.5.5", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.5.5.tgz", - "integrity": "sha1-A3fDgBfKvHMisNH7zSWkkWQfL74=", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "dev": true, "requires": { - "argparse": "^1.0.2", - "esprima": "^2.6.0" + "argparse": "^1.0.7", + "esprima": "^4.0.0" } }, "jsmin2": { @@ -2296,11 +2941,25 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" }, + "lazy": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz", + "integrity": "sha1-2qBoIGKCVCwIgojpdcKXwa53tpA=" + }, "lazy-cache": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=" }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "requires": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + } + }, "liftoff": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz", @@ -2339,6 +2998,7 @@ "version": "1.1.0", "resolved": "https://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", @@ -2348,15 +3008,40 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, "lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" }, + "lodash.findindex": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.findindex/-/lodash.findindex-4.6.0.tgz", + "integrity": "sha1-oyRd7mH7m24GJLU1ElYku2nBEQY=" + }, + "lodash.foreach": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz", + "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=" + }, + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=" + }, + "lodash.last": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash.last/-/lodash.last-3.0.0.tgz", + "integrity": "sha1-JC9mMRLdTG5jcoxgo8kJ0b2tvUw=" + }, + "log-driver": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", + "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==" + }, "longest": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", @@ -2366,11 +3051,20 @@ "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" } }, + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "requires": { + "yallist": "^3.0.2" + } + }, "make-iterator": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz", @@ -2387,7 +3081,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", @@ -2406,6 +3101,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", @@ -2478,12 +3174,13 @@ "minimist": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true }, "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "requires": { "for-in": "^1.0.2", "is-extendable": "^1.0.1" @@ -2514,11 +3211,34 @@ } } }, + "module-details-from-path": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.3.tgz", + "integrity": "sha1-EUyUlnPiqKNenTV4hSeqN7Z52is=" + }, + "moment": { + "version": "2.24.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", + "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" + }, + "moment-timezone": { + "version": "0.5.27", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.27.tgz", + "integrity": "sha512-EIKQs7h5sAsjhPCqN6ggx6cEbs94GK050254TIJySD1bzoM5JTYDwAU1IoVOeTOL6Gm27kYJ51/uuvq1kIlrbw==", + "requires": { + "moment": ">= 2.9.0" + } + }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, + "mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" + }, "nan": { "version": "2.12.1", "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz", @@ -2548,28 +3268,71 @@ "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.5.1.tgz", "integrity": "sha1-dDmFMW49tFkoG1hxaehFc1oFQ58=" }, + "needle": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz", + "integrity": "sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==", + "requires": { + "debug": "^3.2.6", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" + }, + "dependencies": { + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, "negotiator": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=" }, + "netmask": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz", + "integrity": "sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU=" + }, "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==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "dev": true, "requires": { "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", + "resolve": "^1.10.0", "semver": "2 || 3 || 4 || 5", "validate-npm-package-license": "^3.0.1" + }, + "dependencies": { + "resolve": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.13.1.tgz", + "integrity": "sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + } } }, "normalize-path": { @@ -2580,6 +3343,15 @@ "remove-trailing-separator": "^1.0.1" } }, + "nssocket": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/nssocket/-/nssocket-0.6.0.tgz", + "integrity": "sha1-Wflvb/MhVm8zxw99vu7N/cBxVPo=", + "requires": { + "eventemitter2": "~0.4.14", + "lazy": "~1.0.11" + } + }, "number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", @@ -2686,6 +3458,19 @@ } } }, + "optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "requires": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + } + }, "os-homedir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", @@ -2705,6 +3490,53 @@ "os-tmpdir": "^1.0.0" } }, + "pac-proxy-agent": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-3.0.1.tgz", + "integrity": "sha512-44DUg21G/liUZ48dJpUSjZnFfZro/0K5JTyFYLBcmh9+T6Ooi4/i4efwUiEy0+4oQusCBqWdhv16XohIj1GqnQ==", + "requires": { + "agent-base": "^4.2.0", + "debug": "^4.1.1", + "get-uri": "^2.0.0", + "http-proxy-agent": "^2.1.0", + "https-proxy-agent": "^3.0.0", + "pac-resolver": "^3.0.0", + "raw-body": "^2.2.0", + "socks-proxy-agent": "^4.0.1" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, + "pac-resolver": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-3.0.0.tgz", + "integrity": "sha512-tcc38bsjuE3XZ5+4vP96OfhOugrX+JcnpUbhfuc4LuXBLQhoTthOstZeoQJBDnQUDYzYmdImKsbz0xSl1/9qeA==", + "requires": { + "co": "^4.6.0", + "degenerator": "^1.0.4", + "ip": "^1.1.5", + "netmask": "^1.0.6", + "thunkify": "^2.1.2" + } + }, + "pako": { + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", + "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=" + }, "parse-filepath": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", @@ -2719,6 +3551,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" } @@ -2747,6 +3580,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" } @@ -2756,6 +3590,11 @@ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, + "path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" + }, "path-root": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", @@ -2778,35 +3617,310 @@ "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", "pinkie-promise": "^2.0.0" } }, + "picomatch": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.1.1.tgz", + "integrity": "sha512-OYMyqkKzK7blWO/+XZYP6w8hH0LDvkBvdvKukti+7kqYFCiEAk+gI3DWnryapc0Dau05ugGTy0foQ6mqn4AHYA==" + }, + "pidusage": { + "version": "2.0.17", + "resolved": "https://registry.npmjs.org/pidusage/-/pidusage-2.0.17.tgz", + "integrity": "sha512-N8X5v18rBmlBoArfS83vrnD0gIFyZkXEo7a5pAS2aT0i2OLVymFb2AzVg+v8l/QcXnE1JwZcaXR8daJcoJqtjw==", + "requires": { + "safe-buffer": "^5.1.2" + } + }, "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" } }, + "pm2": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/pm2/-/pm2-4.2.1.tgz", + "integrity": "sha512-y75VuMJmMoTgEMSveF4fQGbu3on4YkZXm5Mu4pPW1NlPgdD7yoWu8yfXzAKs94tKCIDrbL54Z5BfFBfUgmFSIw==", + "requires": { + "@pm2/agent": "^0.5.26", + "@pm2/io": "^4.3.2", + "@pm2/js-api": "^0.5.60", + "@pm2/pm2-version-check": "^1.0.3", + "async": "^3.1.0", + "blessed": "0.1.81", + "chalk": "2.4.2", + "chokidar": "^3.2.0", + "cli-table-redemption": "1.0.1", + "commander": "2.15.1", + "cron": "1.7.1", + "date-fns": "1.30.1", + "debug": "4.1.1", + "enquirer": "^2.3.2", + "eventemitter2": "5.0.1", + "fclone": "1.0.11", + "lodash": "4.17.14", + "mkdirp": "0.5.1", + "moment": "2.24.0", + "needle": "2.4.0", + "pidusage": "2.0.17", + "pm2-axon": "3.3.0", + "pm2-axon-rpc": "0.5.1", + "pm2-deploy": "^0.4.0", + "pm2-multimeter": "^0.1.2", + "promptly": "^2", + "ps-list": "6.3.0", + "semver": "^5.5", + "shelljs": "0.8.3", + "source-map-support": "0.5.12", + "sprintf-js": "1.1.2", + "systeminformation": "^4.14.16", + "vizion": "~2.0.2", + "yamljs": "0.3.0" + }, + "dependencies": { + "anymatch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "async": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/async/-/async-3.1.0.tgz", + "integrity": "sha512-4vx/aaY6j/j3Lw3fbCHNWP0pPaTCew3F6F3hYyl/tHs/ndmV1q7NW9T5yuJ2XAGwdQrP+6Wu20x06U4APo/iQQ==" + }, + "binary-extensions": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", + "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==" + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "requires": { + "fill-range": "^7.0.1" + } + }, + "chokidar": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz", + "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==", + "requires": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.1.1", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.2.0" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "eventemitter2": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-5.0.1.tgz", + "integrity": "sha1-YZegldX7a1folC9v1+qtY6CclFI=" + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "fsevents": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", + "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", + "optional": true + }, + "glob-parent": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", + "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", + "requires": { + "is-glob": "^4.0.1" + } + }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "is-glob": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "requires": { + "is-extglob": "^2.1.1" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + }, + "lodash": { + "version": "4.17.14", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz", + "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==" + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + }, + "readdirp": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz", + "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==", + "requires": { + "picomatch": "^2.0.4" + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "requires": { + "is-number": "^7.0.0" + } + } + } + }, + "pm2-axon": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/pm2-axon/-/pm2-axon-3.3.0.tgz", + "integrity": "sha512-dAFlFYRuFbFjX7oAk41zT+dx86EuaFX/TgOp5QpUKRKwxb946IM6ydnoH5sSTkdI2pHSVZ+3Am8n/l0ocr7jdQ==", + "requires": { + "amp": "~0.3.1", + "amp-message": "~0.1.1", + "debug": "^3.0", + "escape-regexp": "0.0.1" + }, + "dependencies": { + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, + "pm2-axon-rpc": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/pm2-axon-rpc/-/pm2-axon-rpc-0.5.1.tgz", + "integrity": "sha512-hT8gN3/j05895QLXpwg+Ws8PjO4AVID6Uf9StWpud9HB2homjc1KKCcI0vg9BNOt56FmrqKDT1NQgheIz35+sA==", + "requires": { + "debug": "^3.0" + }, + "dependencies": { + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, + "pm2-deploy": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/pm2-deploy/-/pm2-deploy-0.4.0.tgz", + "integrity": "sha512-3BdCghcGwMKwl3ffHZhc+j5JY5dldH9nq8m/I9W5wehJuSRZIyO96VOgKTMv3hYp7Yk5E+2lRGm8WFNlp65vOA==", + "requires": { + "async": "^2.6", + "tv4": "^1.3" + }, + "dependencies": { + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + }, + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + } + } + }, + "pm2-multimeter": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/pm2-multimeter/-/pm2-multimeter-0.1.2.tgz", + "integrity": "sha1-Gh5VFT1BoFU0zqI8/oYKuqDrSs4=", + "requires": { + "charm": "~0.1.1" + } + }, "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=" }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" + }, "process-nextick-args": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", @@ -2820,6 +3934,14 @@ "asap": "~2.0.3" } }, + "promptly": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/promptly/-/promptly-2.2.0.tgz", + "integrity": "sha1-KhP6BjaIoqWYOxYf/wEIoH0m/HQ=", + "requires": { + "read": "^1.0.4" + } + }, "proxy-addr": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz", @@ -2829,6 +3951,46 @@ "ipaddr.js": "1.8.0" } }, + "proxy-agent": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.1.1.tgz", + "integrity": "sha512-WudaR0eTsDx33O3EJE16PjBRZWcX8GqCEeERw1W3hZJgH/F2a46g7jty6UGty6NeJ4CKQy8ds2CJPMiyeqaTvw==", + "requires": { + "agent-base": "^4.2.0", + "debug": "4", + "http-proxy-agent": "^2.1.0", + "https-proxy-agent": "^3.0.0", + "lru-cache": "^5.1.1", + "pac-proxy-agent": "^3.0.1", + "proxy-from-env": "^1.0.0", + "socks-proxy-agent": "^4.0.1" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, + "proxy-from-env": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz", + "integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=" + }, + "ps-list": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/ps-list/-/ps-list-6.3.0.tgz", + "integrity": "sha512-qau0czUSB0fzSlBOQt0bo+I2v6R+xiQdj78e1BR/Qjfl5OHWJ/urXi8+ilw1eHe+5hSeDI1wrwVTgDp2wst4oA==" + }, "pug": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/pug/-/pug-2.0.3.tgz", @@ -2964,10 +4126,19 @@ "unpipe": "1.0.0" } }, + "read": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz", + "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=", + "requires": { + "mute-stream": "~0.0.4" + } + }, "read-pkg": { "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", @@ -2978,6 +4149,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" @@ -3019,6 +4191,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" @@ -3061,6 +4234,39 @@ "is-finite": "^1.0.0" } }, + "require-in-the-middle": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-5.0.2.tgz", + "integrity": "sha512-l2r6F9i6t5xp4OE9cw/daB/ooQKHZOOW1AYPADhEvk/Tj/THJDS8gePp76Zyuht6Cj57a0KL+eHK5Dyv7wZnKA==", + "requires": { + "debug": "^4.1.1", + "module-details-from-path": "^1.0.3", + "resolve": "^1.12.0" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "resolve": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.13.1.tgz", + "integrity": "sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==", + "requires": { + "path-parse": "^1.0.6" + } + } + } + }, "resolve": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", @@ -3097,6 +4303,7 @@ "version": "2.6.3", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "dev": true, "requires": { "glob": "^7.1.3" }, @@ -3105,6 +4312,7 @@ "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", @@ -3189,9 +4397,9 @@ } }, "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "requires": { "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", @@ -3214,11 +4422,31 @@ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==" }, + "shelljs": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz", + "integrity": "sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==", + "requires": { + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" + } + }, + "shimmer": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz", + "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==" + }, "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" }, + "smart-buffer": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz", + "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==" + }, "snapdragon": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", @@ -3316,6 +4544,34 @@ } } }, + "socks": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz", + "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==", + "requires": { + "ip": "1.1.5", + "smart-buffer": "^4.1.0" + } + }, + "socks-proxy-agent": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz", + "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==", + "requires": { + "agent-base": "~4.2.1", + "socks": "~2.3.2" + }, + "dependencies": { + "agent-base": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz", + "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==", + "requires": { + "es6-promisify": "^5.0.0" + } + } + } + }, "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", @@ -3333,6 +4589,22 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.12", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz", + "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==", + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -3342,6 +4614,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==", + "dev": true, "requires": { "spdx-expression-parse": "^3.0.0", "spdx-license-ids": "^3.0.0" @@ -3350,21 +4623,24 @@ "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" } }, "spdx-license-ids": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz", - "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==" + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", + "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==", + "dev": true }, "split-string": { "version": "3.1.0", @@ -3421,7 +4697,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, "requires": { "ansi-regex": "^2.0.0" } @@ -3438,6 +4713,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" } @@ -3450,6 +4726,17 @@ "has-flag": "^3.0.0" } }, + "systeminformation": { + "version": "4.16.0", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-4.16.0.tgz", + "integrity": "sha512-1FjxPJSw7ad0zug+1YIQATj6Cn+wM5OBASEpjohEeOD2EGPIf0Cnhthd1L2O1YX+wKgOMuPldGfxYdo8yNHEIg==", + "optional": true + }, + "thunkify": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz", + "integrity": "sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=" + }, "tiny-lr": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz", @@ -3532,7 +4819,13 @@ "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 + }, + "tslib": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", + "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==" }, "tslint": { "version": "3.15.1", @@ -3548,6 +4841,19 @@ "underscore.string": "^3.3.4" } }, + "tv4": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/tv4/-/tv4-1.3.0.tgz", + "integrity": "sha1-0CDIRvrdUMhVq7JeuuzGj8EPeWM=" + }, + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "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", @@ -3578,6 +4884,11 @@ "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", "optional": true }, + "ultron": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", + "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==" + }, "unc-path-regex": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", @@ -3593,35 +4904,14 @@ } }, "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "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=", - "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=", - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } + "set-value": "^2.0.1" } }, "unpipe": { @@ -3690,6 +4980,11 @@ "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" }, + "uuid": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz", + "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==" + }, "v8flags": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.2.tgz", @@ -3702,6 +4997,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" @@ -3712,6 +5008,31 @@ "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" }, + "vizion": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/vizion/-/vizion-2.0.2.tgz", + "integrity": "sha512-UGDB/UdC1iyPkwyQaI9AFMwKcluQyD4FleEXObrlu254MEf16MV8l+AZdpFErY/iVKZVWlQ+OgJlVVJIdeMUYg==", + "requires": { + "async": "2.6.1", + "git-node-fs": "^1.0.0", + "ini": "^1.3.4", + "js-git": "^0.7.8", + "lodash.findindex": "^4.6.0", + "lodash.foreach": "^4.5.0", + "lodash.get": "^4.4.2", + "lodash.last": "^3.0.0" + }, + "dependencies": { + "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" + } + } + } + }, "void-elements": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz", @@ -3755,6 +5076,11 @@ "acorn-globals": "^3.0.0" } }, + "word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==" + }, "wordwrap": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", @@ -3765,6 +5091,14 @@ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, + "ws": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz", + "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==", + "requires": { + "async-limiter": "~1.0.0" + } + }, "xml2js": { "version": "0.4.19", "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", @@ -3779,12 +5113,31 @@ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=" }, + "xregexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz", + "integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=" + }, "xtend": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", "dev": true }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + }, + "yamljs": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/yamljs/-/yamljs-0.3.0.tgz", + "integrity": "sha512-C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ==", + "requires": { + "argparse": "^1.0.7", + "glob": "^7.0.5" + } + }, "yargs": { "version": "3.10.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", diff --git a/package.json b/fruitnanny/package.json similarity index 84% rename from package.json rename to fruitnanny/package.json index df34572..9b2f091 100644 --- a/package.json +++ b/fruitnanny/package.json @@ -5,7 +5,7 @@ "main": "index.js", "scripts": { "grunt": "grunt", - "start": "node server/app.js", + "start": "node fruitnanny/server/app.js", "test": "echo \"Error: no test specified\" && exit 1" }, "author": "Dmitry Ivanov", @@ -19,16 +19,17 @@ "@types/serve-static": "^1.7.31", "body-parser": "^1.15.2", "ejs": "^2.5.2", - "express": "^4.14.0", - "grunt": "^1.0.1", + "express": "^4.16.0", "grunt-cli": "^1.2.0", - "grunt-ts": "^6.0.0-beta.3", + "grunt-ts": "^6.0.0-beta.22", "grunt-tslint": "^3.2.1", + "pm2": "^4.2.1", "pug": "^2.0.3", "tslint": "^3.15.1", "typescript": "^2.0.3" }, "devDependencies": { + "grunt": "^1.0.4", "grunt-contrib-clean": "^1.0.0", "grunt-contrib-copy": "^1.0.0", "grunt-contrib-watch": "^1.0.0" diff --git a/public/project/css/fruitnanny.css b/fruitnanny/public/project/css/fruitnanny.css similarity index 100% rename from public/project/css/fruitnanny.css rename to fruitnanny/public/project/css/fruitnanny.css diff --git a/public/project/favicon/favicon.ico b/fruitnanny/public/project/favicon/favicon.ico similarity index 100% rename from public/project/favicon/favicon.ico rename to fruitnanny/public/project/favicon/favicon.ico diff --git a/public/project/img/baby.png b/fruitnanny/public/project/img/baby.png similarity index 100% rename from public/project/img/baby.png rename to fruitnanny/public/project/img/baby.png diff --git a/public/project/img/fn2.jpg b/fruitnanny/public/project/img/fn2.jpg similarity index 100% rename from public/project/img/fn2.jpg rename to fruitnanny/public/project/img/fn2.jpg diff --git a/public/project/img/matvei2-160x160.jpg b/fruitnanny/public/project/img/matvei2-160x160.jpg similarity index 100% rename from public/project/img/matvei2-160x160.jpg rename to fruitnanny/public/project/img/matvei2-160x160.jpg diff --git a/public/project/img/video-mobile.gif b/fruitnanny/public/project/img/video-mobile.gif similarity index 100% rename from public/project/img/video-mobile.gif rename to fruitnanny/public/project/img/video-mobile.gif diff --git a/public/project/js/age-calc.js b/fruitnanny/public/project/js/age-calc.js similarity index 100% rename from public/project/js/age-calc.js rename to fruitnanny/public/project/js/age-calc.js diff --git a/public/project/js/audio-widget.js b/fruitnanny/public/project/js/audio-widget.js similarity index 100% rename from public/project/js/audio-widget.js rename to fruitnanny/public/project/js/audio-widget.js diff --git a/public/project/js/dht.js b/fruitnanny/public/project/js/dht.js similarity index 100% rename from public/project/js/dht.js rename to fruitnanny/public/project/js/dht.js diff --git a/public/project/js/ir-light.js b/fruitnanny/public/project/js/ir-light.js similarity index 100% rename from public/project/js/ir-light.js rename to fruitnanny/public/project/js/ir-light.js diff --git a/public/project/js/stream-context.js b/fruitnanny/public/project/js/stream-context.js similarity index 100% rename from public/project/js/stream-context.js rename to fruitnanny/public/project/js/stream-context.js diff --git a/public/project/js/video-player.js b/fruitnanny/public/project/js/video-player.js similarity index 100% rename from public/project/js/video-player.js rename to fruitnanny/public/project/js/video-player.js diff --git a/public/project/js/webrtc.js b/fruitnanny/public/project/js/webrtc.js similarity index 100% rename from public/project/js/webrtc.js rename to fruitnanny/public/project/js/webrtc.js diff --git a/public/thirdparty/css/AdminLTE.css b/fruitnanny/public/thirdparty/css/AdminLTE.css similarity index 100% rename from public/thirdparty/css/AdminLTE.css rename to fruitnanny/public/thirdparty/css/AdminLTE.css diff --git a/public/thirdparty/css/AdminLTE.min.css b/fruitnanny/public/thirdparty/css/AdminLTE.min.css similarity index 100% rename from public/thirdparty/css/AdminLTE.min.css rename to fruitnanny/public/thirdparty/css/AdminLTE.min.css diff --git a/public/thirdparty/css/bootstrap-slider.min.css b/fruitnanny/public/thirdparty/css/bootstrap-slider.min.css similarity index 100% rename from public/thirdparty/css/bootstrap-slider.min.css rename to fruitnanny/public/thirdparty/css/bootstrap-slider.min.css diff --git a/public/thirdparty/css/bootstrap.css b/fruitnanny/public/thirdparty/css/bootstrap.css similarity index 100% rename from public/thirdparty/css/bootstrap.css rename to fruitnanny/public/thirdparty/css/bootstrap.css diff --git a/public/thirdparty/css/bootstrap.css.map b/fruitnanny/public/thirdparty/css/bootstrap.css.map similarity index 100% rename from public/thirdparty/css/bootstrap.css.map rename to fruitnanny/public/thirdparty/css/bootstrap.css.map diff --git a/public/thirdparty/css/bootstrap.min.css b/fruitnanny/public/thirdparty/css/bootstrap.min.css similarity index 100% rename from public/thirdparty/css/bootstrap.min.css rename to fruitnanny/public/thirdparty/css/bootstrap.min.css diff --git a/public/thirdparty/css/bootstrap.min.css.map b/fruitnanny/public/thirdparty/css/bootstrap.min.css.map similarity index 100% rename from public/thirdparty/css/bootstrap.min.css.map rename to fruitnanny/public/thirdparty/css/bootstrap.min.css.map diff --git a/public/thirdparty/css/font-awesome.css b/fruitnanny/public/thirdparty/css/font-awesome.css similarity index 100% rename from public/thirdparty/css/font-awesome.css rename to fruitnanny/public/thirdparty/css/font-awesome.css diff --git a/public/thirdparty/css/font-awesome.min.css b/fruitnanny/public/thirdparty/css/font-awesome.min.css similarity index 100% rename from public/thirdparty/css/font-awesome.min.css rename to fruitnanny/public/thirdparty/css/font-awesome.min.css diff --git a/public/thirdparty/css/ionicons.css b/fruitnanny/public/thirdparty/css/ionicons.css similarity index 100% rename from public/thirdparty/css/ionicons.css rename to fruitnanny/public/thirdparty/css/ionicons.css diff --git a/public/thirdparty/css/ionicons.min.css b/fruitnanny/public/thirdparty/css/ionicons.min.css similarity index 100% rename from public/thirdparty/css/ionicons.min.css rename to fruitnanny/public/thirdparty/css/ionicons.min.css diff --git a/public/thirdparty/css/skins/_all-skins.css b/fruitnanny/public/thirdparty/css/skins/_all-skins.css similarity index 100% rename from public/thirdparty/css/skins/_all-skins.css rename to fruitnanny/public/thirdparty/css/skins/_all-skins.css diff --git a/public/thirdparty/css/skins/_all-skins.min.css b/fruitnanny/public/thirdparty/css/skins/_all-skins.min.css similarity index 100% rename from public/thirdparty/css/skins/_all-skins.min.css rename to fruitnanny/public/thirdparty/css/skins/_all-skins.min.css diff --git a/public/thirdparty/css/skins/skin-black-light.css b/fruitnanny/public/thirdparty/css/skins/skin-black-light.css similarity index 100% rename from public/thirdparty/css/skins/skin-black-light.css rename to fruitnanny/public/thirdparty/css/skins/skin-black-light.css diff --git a/public/thirdparty/css/skins/skin-black-light.min.css b/fruitnanny/public/thirdparty/css/skins/skin-black-light.min.css similarity index 100% rename from public/thirdparty/css/skins/skin-black-light.min.css rename to fruitnanny/public/thirdparty/css/skins/skin-black-light.min.css diff --git a/public/thirdparty/css/skins/skin-black.css b/fruitnanny/public/thirdparty/css/skins/skin-black.css similarity index 100% rename from public/thirdparty/css/skins/skin-black.css rename to fruitnanny/public/thirdparty/css/skins/skin-black.css diff --git a/public/thirdparty/css/skins/skin-black.min.css b/fruitnanny/public/thirdparty/css/skins/skin-black.min.css similarity index 100% rename from public/thirdparty/css/skins/skin-black.min.css rename to fruitnanny/public/thirdparty/css/skins/skin-black.min.css diff --git a/public/thirdparty/css/skins/skin-blue-light.css b/fruitnanny/public/thirdparty/css/skins/skin-blue-light.css similarity index 100% rename from public/thirdparty/css/skins/skin-blue-light.css rename to fruitnanny/public/thirdparty/css/skins/skin-blue-light.css diff --git a/public/thirdparty/css/skins/skin-blue-light.min.css b/fruitnanny/public/thirdparty/css/skins/skin-blue-light.min.css similarity index 100% rename from public/thirdparty/css/skins/skin-blue-light.min.css rename to fruitnanny/public/thirdparty/css/skins/skin-blue-light.min.css diff --git a/public/thirdparty/css/skins/skin-blue.css b/fruitnanny/public/thirdparty/css/skins/skin-blue.css similarity index 100% rename from public/thirdparty/css/skins/skin-blue.css rename to fruitnanny/public/thirdparty/css/skins/skin-blue.css diff --git a/public/thirdparty/css/skins/skin-blue.min.css b/fruitnanny/public/thirdparty/css/skins/skin-blue.min.css similarity index 100% rename from public/thirdparty/css/skins/skin-blue.min.css rename to fruitnanny/public/thirdparty/css/skins/skin-blue.min.css diff --git a/public/thirdparty/css/skins/skin-green-light.css b/fruitnanny/public/thirdparty/css/skins/skin-green-light.css similarity index 100% rename from public/thirdparty/css/skins/skin-green-light.css rename to fruitnanny/public/thirdparty/css/skins/skin-green-light.css diff --git a/public/thirdparty/css/skins/skin-green-light.min.css b/fruitnanny/public/thirdparty/css/skins/skin-green-light.min.css similarity index 100% rename from public/thirdparty/css/skins/skin-green-light.min.css rename to fruitnanny/public/thirdparty/css/skins/skin-green-light.min.css diff --git a/public/thirdparty/css/skins/skin-green.css b/fruitnanny/public/thirdparty/css/skins/skin-green.css similarity index 100% rename from public/thirdparty/css/skins/skin-green.css rename to fruitnanny/public/thirdparty/css/skins/skin-green.css diff --git a/public/thirdparty/css/skins/skin-green.min.css b/fruitnanny/public/thirdparty/css/skins/skin-green.min.css similarity index 100% rename from public/thirdparty/css/skins/skin-green.min.css rename to fruitnanny/public/thirdparty/css/skins/skin-green.min.css diff --git a/public/thirdparty/css/skins/skin-purple-light.css b/fruitnanny/public/thirdparty/css/skins/skin-purple-light.css similarity index 100% rename from public/thirdparty/css/skins/skin-purple-light.css rename to fruitnanny/public/thirdparty/css/skins/skin-purple-light.css diff --git a/public/thirdparty/css/skins/skin-purple-light.min.css b/fruitnanny/public/thirdparty/css/skins/skin-purple-light.min.css similarity index 100% rename from public/thirdparty/css/skins/skin-purple-light.min.css rename to fruitnanny/public/thirdparty/css/skins/skin-purple-light.min.css diff --git a/public/thirdparty/css/skins/skin-purple.css b/fruitnanny/public/thirdparty/css/skins/skin-purple.css similarity index 100% rename from public/thirdparty/css/skins/skin-purple.css rename to fruitnanny/public/thirdparty/css/skins/skin-purple.css diff --git a/public/thirdparty/css/skins/skin-purple.min.css b/fruitnanny/public/thirdparty/css/skins/skin-purple.min.css similarity index 100% rename from public/thirdparty/css/skins/skin-purple.min.css rename to fruitnanny/public/thirdparty/css/skins/skin-purple.min.css diff --git a/public/thirdparty/css/skins/skin-red-light.css b/fruitnanny/public/thirdparty/css/skins/skin-red-light.css similarity index 100% rename from public/thirdparty/css/skins/skin-red-light.css rename to fruitnanny/public/thirdparty/css/skins/skin-red-light.css diff --git a/public/thirdparty/css/skins/skin-red-light.min.css b/fruitnanny/public/thirdparty/css/skins/skin-red-light.min.css similarity index 100% rename from public/thirdparty/css/skins/skin-red-light.min.css rename to fruitnanny/public/thirdparty/css/skins/skin-red-light.min.css diff --git a/public/thirdparty/css/skins/skin-red.css b/fruitnanny/public/thirdparty/css/skins/skin-red.css similarity index 100% rename from public/thirdparty/css/skins/skin-red.css rename to fruitnanny/public/thirdparty/css/skins/skin-red.css diff --git a/public/thirdparty/css/skins/skin-red.min.css b/fruitnanny/public/thirdparty/css/skins/skin-red.min.css similarity index 100% rename from public/thirdparty/css/skins/skin-red.min.css rename to fruitnanny/public/thirdparty/css/skins/skin-red.min.css diff --git a/public/thirdparty/css/skins/skin-yellow-light.css b/fruitnanny/public/thirdparty/css/skins/skin-yellow-light.css similarity index 100% rename from public/thirdparty/css/skins/skin-yellow-light.css rename to fruitnanny/public/thirdparty/css/skins/skin-yellow-light.css diff --git a/public/thirdparty/css/skins/skin-yellow-light.min.css b/fruitnanny/public/thirdparty/css/skins/skin-yellow-light.min.css similarity index 100% rename from public/thirdparty/css/skins/skin-yellow-light.min.css rename to fruitnanny/public/thirdparty/css/skins/skin-yellow-light.min.css diff --git a/public/thirdparty/css/skins/skin-yellow.css b/fruitnanny/public/thirdparty/css/skins/skin-yellow.css similarity index 100% rename from public/thirdparty/css/skins/skin-yellow.css rename to fruitnanny/public/thirdparty/css/skins/skin-yellow.css diff --git a/public/thirdparty/css/skins/skin-yellow.min.css b/fruitnanny/public/thirdparty/css/skins/skin-yellow.min.css similarity index 100% rename from public/thirdparty/css/skins/skin-yellow.min.css rename to fruitnanny/public/thirdparty/css/skins/skin-yellow.min.css diff --git a/public/thirdparty/fonts/FontAwesome.otf b/fruitnanny/public/thirdparty/fonts/FontAwesome.otf similarity index 100% rename from public/thirdparty/fonts/FontAwesome.otf rename to fruitnanny/public/thirdparty/fonts/FontAwesome.otf diff --git a/public/thirdparty/fonts/fontawesome-webfont.eot b/fruitnanny/public/thirdparty/fonts/fontawesome-webfont.eot similarity index 100% rename from public/thirdparty/fonts/fontawesome-webfont.eot rename to fruitnanny/public/thirdparty/fonts/fontawesome-webfont.eot diff --git a/public/thirdparty/fonts/fontawesome-webfont.svg b/fruitnanny/public/thirdparty/fonts/fontawesome-webfont.svg similarity index 100% rename from public/thirdparty/fonts/fontawesome-webfont.svg rename to fruitnanny/public/thirdparty/fonts/fontawesome-webfont.svg diff --git a/public/thirdparty/fonts/fontawesome-webfont.ttf b/fruitnanny/public/thirdparty/fonts/fontawesome-webfont.ttf similarity index 100% rename from public/thirdparty/fonts/fontawesome-webfont.ttf rename to fruitnanny/public/thirdparty/fonts/fontawesome-webfont.ttf diff --git a/public/thirdparty/fonts/fontawesome-webfont.woff b/fruitnanny/public/thirdparty/fonts/fontawesome-webfont.woff similarity index 100% rename from public/thirdparty/fonts/fontawesome-webfont.woff rename to fruitnanny/public/thirdparty/fonts/fontawesome-webfont.woff diff --git a/public/thirdparty/fonts/fontawesome-webfont.woff2 b/fruitnanny/public/thirdparty/fonts/fontawesome-webfont.woff2 similarity index 100% rename from public/thirdparty/fonts/fontawesome-webfont.woff2 rename to fruitnanny/public/thirdparty/fonts/fontawesome-webfont.woff2 diff --git a/public/thirdparty/fonts/glyphicons-halflings-regular.eot b/fruitnanny/public/thirdparty/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from public/thirdparty/fonts/glyphicons-halflings-regular.eot rename to fruitnanny/public/thirdparty/fonts/glyphicons-halflings-regular.eot diff --git a/public/thirdparty/fonts/glyphicons-halflings-regular.svg b/fruitnanny/public/thirdparty/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from public/thirdparty/fonts/glyphicons-halflings-regular.svg rename to fruitnanny/public/thirdparty/fonts/glyphicons-halflings-regular.svg diff --git a/public/thirdparty/fonts/glyphicons-halflings-regular.ttf b/fruitnanny/public/thirdparty/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from public/thirdparty/fonts/glyphicons-halflings-regular.ttf rename to fruitnanny/public/thirdparty/fonts/glyphicons-halflings-regular.ttf diff --git a/public/thirdparty/fonts/glyphicons-halflings-regular.woff b/fruitnanny/public/thirdparty/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from public/thirdparty/fonts/glyphicons-halflings-regular.woff rename to fruitnanny/public/thirdparty/fonts/glyphicons-halflings-regular.woff diff --git a/public/thirdparty/fonts/glyphicons-halflings-regular.woff2 b/fruitnanny/public/thirdparty/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from public/thirdparty/fonts/glyphicons-halflings-regular.woff2 rename to fruitnanny/public/thirdparty/fonts/glyphicons-halflings-regular.woff2 diff --git a/public/thirdparty/fonts/ionicons.eot b/fruitnanny/public/thirdparty/fonts/ionicons.eot similarity index 100% rename from public/thirdparty/fonts/ionicons.eot rename to fruitnanny/public/thirdparty/fonts/ionicons.eot diff --git a/public/thirdparty/fonts/ionicons.svg b/fruitnanny/public/thirdparty/fonts/ionicons.svg similarity index 100% rename from public/thirdparty/fonts/ionicons.svg rename to fruitnanny/public/thirdparty/fonts/ionicons.svg diff --git a/public/thirdparty/fonts/ionicons.ttf b/fruitnanny/public/thirdparty/fonts/ionicons.ttf similarity index 100% rename from public/thirdparty/fonts/ionicons.ttf rename to fruitnanny/public/thirdparty/fonts/ionicons.ttf diff --git a/public/thirdparty/fonts/ionicons.woff b/fruitnanny/public/thirdparty/fonts/ionicons.woff similarity index 100% rename from public/thirdparty/fonts/ionicons.woff rename to fruitnanny/public/thirdparty/fonts/ionicons.woff diff --git a/public/thirdparty/img/boxed-bg.jpg b/fruitnanny/public/thirdparty/img/boxed-bg.jpg similarity index 100% rename from public/thirdparty/img/boxed-bg.jpg rename to fruitnanny/public/thirdparty/img/boxed-bg.jpg diff --git a/public/thirdparty/img/boxed-bg.png b/fruitnanny/public/thirdparty/img/boxed-bg.png similarity index 100% rename from public/thirdparty/img/boxed-bg.png rename to fruitnanny/public/thirdparty/img/boxed-bg.png diff --git a/public/thirdparty/img/default-50x50.gif b/fruitnanny/public/thirdparty/img/default-50x50.gif similarity index 100% rename from public/thirdparty/img/default-50x50.gif rename to fruitnanny/public/thirdparty/img/default-50x50.gif diff --git a/public/thirdparty/img/icons.png b/fruitnanny/public/thirdparty/img/icons.png similarity index 100% rename from public/thirdparty/img/icons.png rename to fruitnanny/public/thirdparty/img/icons.png diff --git a/public/thirdparty/js/adapter.js b/fruitnanny/public/thirdparty/js/adapter.js similarity index 100% rename from public/thirdparty/js/adapter.js rename to fruitnanny/public/thirdparty/js/adapter.js diff --git a/public/thirdparty/js/app.js b/fruitnanny/public/thirdparty/js/app.js similarity index 100% rename from public/thirdparty/js/app.js rename to fruitnanny/public/thirdparty/js/app.js diff --git a/public/thirdparty/js/app.min.js b/fruitnanny/public/thirdparty/js/app.min.js similarity index 100% rename from public/thirdparty/js/app.min.js rename to fruitnanny/public/thirdparty/js/app.min.js diff --git a/public/thirdparty/js/bootbox.min.js b/fruitnanny/public/thirdparty/js/bootbox.min.js similarity index 100% rename from public/thirdparty/js/bootbox.min.js rename to fruitnanny/public/thirdparty/js/bootbox.min.js diff --git a/public/thirdparty/js/bootstrap-slider.min.js b/fruitnanny/public/thirdparty/js/bootstrap-slider.min.js similarity index 100% rename from public/thirdparty/js/bootstrap-slider.min.js rename to fruitnanny/public/thirdparty/js/bootstrap-slider.min.js diff --git a/public/thirdparty/js/bootstrap.js b/fruitnanny/public/thirdparty/js/bootstrap.js similarity index 100% rename from public/thirdparty/js/bootstrap.js rename to fruitnanny/public/thirdparty/js/bootstrap.js diff --git a/public/thirdparty/js/bootstrap.min.js b/fruitnanny/public/thirdparty/js/bootstrap.min.js similarity index 100% rename from public/thirdparty/js/bootstrap.min.js rename to fruitnanny/public/thirdparty/js/bootstrap.min.js diff --git a/public/thirdparty/js/janus.js b/fruitnanny/public/thirdparty/js/janus.js similarity index 100% rename from public/thirdparty/js/janus.js rename to fruitnanny/public/thirdparty/js/janus.js diff --git a/public/thirdparty/js/jquery-2.2.3.min.js b/fruitnanny/public/thirdparty/js/jquery-2.2.3.min.js similarity index 100% rename from public/thirdparty/js/jquery-2.2.3.min.js rename to fruitnanny/public/thirdparty/js/jquery-2.2.3.min.js diff --git a/public/thirdparty/js/justgage.js b/fruitnanny/public/thirdparty/js/justgage.js similarity index 100% rename from public/thirdparty/js/justgage.js rename to fruitnanny/public/thirdparty/js/justgage.js diff --git a/public/thirdparty/js/npm.js b/fruitnanny/public/thirdparty/js/npm.js similarity index 100% rename from public/thirdparty/js/npm.js rename to fruitnanny/public/thirdparty/js/npm.js diff --git a/public/thirdparty/js/raphael-2.1.4.min.js b/fruitnanny/public/thirdparty/js/raphael-2.1.4.min.js similarity index 100% rename from public/thirdparty/js/raphael-2.1.4.min.js rename to fruitnanny/public/thirdparty/js/raphael-2.1.4.min.js diff --git a/public/thirdparty/js/spin.min.js b/fruitnanny/public/thirdparty/js/spin.min.js similarity index 100% rename from public/thirdparty/js/spin.min.js rename to fruitnanny/public/thirdparty/js/spin.min.js diff --git a/server/app.js b/fruitnanny/server/app.js similarity index 100% rename from server/app.js rename to fruitnanny/server/app.js diff --git a/server/app.ts b/fruitnanny/server/app.ts similarity index 100% rename from server/app.ts rename to fruitnanny/server/app.ts diff --git a/server/routes/custom_button.js b/fruitnanny/server/routes/custom_button.js similarity index 100% rename from server/routes/custom_button.js rename to fruitnanny/server/routes/custom_button.js diff --git a/server/routes/custom_button.ts b/fruitnanny/server/routes/custom_button.ts similarity index 100% rename from server/routes/custom_button.ts rename to fruitnanny/server/routes/custom_button.ts diff --git a/server/routes/dht.js b/fruitnanny/server/routes/dht.js similarity index 77% rename from server/routes/dht.js rename to fruitnanny/server/routes/dht.js index b05b8e6..46e6d67 100644 --- a/server/routes/dht.js +++ b/fruitnanny/server/routes/dht.js @@ -4,8 +4,8 @@ const express = require("express"); const cp = require("child_process"); let router = express.Router(); router.get("/current", (req, res, next) => { - cp.exec("bin/dht22.py", (err, stdout, stderr) => { - let values = stdout.split(" "); + cp.exec("/opt/fruitnanny/bin/dht22.py", (err, stdout, stderr) => { + let values = stdout.trim().split(" "); let t = values[0]; let h = values[1]; let result = { humidity: h, temperature: t }; diff --git a/server/routes/dht.ts b/fruitnanny/server/routes/dht.ts similarity index 83% rename from server/routes/dht.ts rename to fruitnanny/server/routes/dht.ts index 7193079..6e68cc9 100644 --- a/server/routes/dht.ts +++ b/fruitnanny/server/routes/dht.ts @@ -11,8 +11,8 @@ router.get("/current", (req: express.Request, res: express.Response, next: expre // let result = { humidity: hum, temperature: temp }; // res.json(result); - cp.exec("bin/dht22.py", (err, stdout, stderr) => { - let values = stdout.split(" "); + cp.exec("/opt/fruitnanny/bin/dht22.py", (err, stdout, stderr) => { + let values = stdout.trim().split(" "); let t = values[0]; let h = values[1]; let result = { humidity: h, temperature: t }; diff --git a/server/routes/light.js b/fruitnanny/server/routes/light.js similarity index 100% rename from server/routes/light.js rename to fruitnanny/server/routes/light.js diff --git a/server/routes/light.ts b/fruitnanny/server/routes/light.ts similarity index 100% rename from server/routes/light.ts rename to fruitnanny/server/routes/light.ts diff --git a/tsconfig.json b/fruitnanny/tsconfig.json similarity index 100% rename from tsconfig.json rename to fruitnanny/tsconfig.json diff --git a/tslint.json b/fruitnanny/tslint.json similarity index 100% rename from tslint.json rename to fruitnanny/tslint.json diff --git a/views/index.ejs b/fruitnanny/views/index.ejs similarity index 100% rename from views/index.ejs rename to fruitnanny/views/index.ejs diff --git a/views/partials/common-js.ejs b/fruitnanny/views/partials/common-js.ejs similarity index 100% rename from views/partials/common-js.ejs rename to fruitnanny/views/partials/common-js.ejs diff --git a/views/partials/footer.ejs b/fruitnanny/views/partials/footer.ejs similarity index 100% rename from views/partials/footer.ejs rename to fruitnanny/views/partials/footer.ejs diff --git a/views/partials/head.ejs b/fruitnanny/views/partials/head.ejs similarity index 100% rename from views/partials/head.ejs rename to fruitnanny/views/partials/head.ejs diff --git a/views/partials/header.ejs b/fruitnanny/views/partials/header.ejs similarity index 100% rename from views/partials/header.ejs rename to fruitnanny/views/partials/header.ejs diff --git a/views/partials/media-js.ejs b/fruitnanny/views/partials/media-js.ejs similarity index 100% rename from views/partials/media-js.ejs rename to fruitnanny/views/partials/media-js.ejs diff --git a/views/partials/sidebar.ejs b/fruitnanny/views/partials/sidebar.ejs similarity index 100% rename from views/partials/sidebar.ejs rename to fruitnanny/views/partials/sidebar.ejs diff --git a/views/settings.ejs b/fruitnanny/views/settings.ejs similarity index 100% rename from views/settings.ejs rename to fruitnanny/views/settings.ejs diff --git a/docker/gstreamer/Dockerfile b/gstreamer/Dockerfile similarity index 100% rename from docker/gstreamer/Dockerfile rename to gstreamer/Dockerfile diff --git a/docker/janus/Dockerfile b/janus/Dockerfile similarity index 98% rename from docker/janus/Dockerfile rename to janus/Dockerfile index bc02d9f..f2be5e8 100644 --- a/docker/janus/Dockerfile +++ b/janus/Dockerfile @@ -21,6 +21,6 @@ RUN buildDeps="build-essential git debhelper gobject-introspection gtk-doc-tools && rm -rf /tmp/* \ && rm -rf /var/lib/apt/lists/* -COPY docker/janus/start.sh /start.sh +COPY start.sh /start.sh CMD /start.sh diff --git a/docker/janus/start.sh b/janus/start.sh similarity index 100% rename from docker/janus/start.sh rename to janus/start.sh From 5fa1c029cd85ae9d73233935d0435ca36654a84a Mon Sep 17 00:00:00 2001 From: Ray <7869818+rayrrr@users.noreply.github.com> Date: Fri, 13 Dec 2019 00:11:56 -0500 Subject: [PATCH 2/7] reflect Docker reorg file location --- azure-pipelines.pr.yml | 2 +- azure-pipelines.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.pr.yml b/azure-pipelines.pr.yml index 38a4a45..cd4e9e7 100644 --- a/azure-pipelines.pr.yml +++ b/azure-pipelines.pr.yml @@ -26,7 +26,7 @@ jobs: - script: | docker version docker run --rm --privileged multiarch/qemu-user-static:register --reset - docker build . -f docker/$(stage.name)/Dockerfile -t $(container.name) + docker build . -f $(stage.name)/Dockerfile -t $(container.name) docker images docker inspect $(container.name) displayName: 'Build $(stage.name) Container' diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6942230..6d82ad5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -33,7 +33,7 @@ jobs: - script: | docker version docker run --rm --privileged multiarch/qemu-user-static:register --reset - docker build . -f docker/$(stage.name)/Dockerfile -t $(container.name) + docker build . -f $(stage.name)/Dockerfile -t $(container.name) docker images docker inspect $(container.name) displayName: 'Build $(stage.name) Container' @@ -45,4 +45,4 @@ jobs: - task: PublishBuildArtifacts@1 inputs: pathtoPublish: $(Build.ArtifactStagingDirectory) - artifactName: images \ No newline at end of file + artifactName: images From 6b8de840d5245245fb8e1a5d270614174fefe841 Mon Sep 17 00:00:00 2001 From: Ray <7869818+rayrrr@users.noreply.github.com> Date: Fri, 13 Dec 2019 00:27:16 -0500 Subject: [PATCH 3/7] attempt fruitnanny service Azure fix --- azure-pipelines.pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.pr.yml b/azure-pipelines.pr.yml index cd4e9e7..b4b7986 100644 --- a/azure-pipelines.pr.yml +++ b/azure-pipelines.pr.yml @@ -19,7 +19,7 @@ jobs: container.name: 'ivadim/fruitnanny-gstreamer' Fruitnanny: stage.name: 'fruitnanny' - container.name: 'ivadim/fruitnanny-app' + container.name: 'ivadim/fruitnanny-fruitnanny' maxParallel: 3 steps: From 033106f6ab20f025fb195e9719645fda24d7b67d Mon Sep 17 00:00:00 2001 From: Ray <7869818+rayrrr@users.noreply.github.com> Date: Fri, 13 Dec 2019 00:34:27 -0500 Subject: [PATCH 4/7] Azure fruitnanny container name fix take 2 --- azure-pipelines.pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.pr.yml b/azure-pipelines.pr.yml index b4b7986..72eb993 100644 --- a/azure-pipelines.pr.yml +++ b/azure-pipelines.pr.yml @@ -19,7 +19,7 @@ jobs: container.name: 'ivadim/fruitnanny-gstreamer' Fruitnanny: stage.name: 'fruitnanny' - container.name: 'ivadim/fruitnanny-fruitnanny' + container.name: 'ivadim/fruitnanny' maxParallel: 3 steps: From 4dae4d280234feb8d126d88b26ef7d3ec31e7e1c Mon Sep 17 00:00:00 2001 From: Ray <7869818+rayrrr@users.noreply.github.com> Date: Sat, 21 Dec 2019 13:08:42 -0500 Subject: [PATCH 5/7] add wiringpi dependency for IR LEDs discovered during setup --- fruitnanny/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fruitnanny/Dockerfile b/fruitnanny/Dockerfile index 302591d..ef83ce6 100644 --- a/fruitnanny/Dockerfile +++ b/fruitnanny/Dockerfile @@ -6,7 +6,8 @@ RUN echo 'APT::Install-Recommends "false";' >/etc/apt/apt.conf.d/00recommends \ dos2unix \ libgpiod2 \ python3 \ - python3-pip \ + python3-pip \ + wiringpi \ && pip3 install --upgrade RPI.GPIO adafruit-blinka adafruit-circuitpython-dht \ && apt-get --purge -y autoremove && apt-get clean && rm -rf /tmp/* && rm -rf /var/lib/apt/lists/* From 8e801fb0d47ab4ab50374d037420c6d843ea92f0 Mon Sep 17 00:00:00 2001 From: Ray Riga <4710022-rayrpf@users.noreply.gitlab.com> Date: Tue, 7 Jan 2020 20:52:34 -0500 Subject: [PATCH 6/7] reorg last remnants of `docker` dir and new notifications stuff --- {docker/gstreamer => gstreamer}/audio_entry.sh | 0 {docker/gstreamer => gstreamer}/audio_stream.sh | 0 {docker/notification => notification}/Dockerfile | 0 {bin => notification}/configuration | 0 {bin => notification}/motion.py | 0 {bin => notification}/temperature.py | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename {docker/gstreamer => gstreamer}/audio_entry.sh (100%) rename {docker/gstreamer => gstreamer}/audio_stream.sh (100%) rename {docker/notification => notification}/Dockerfile (100%) rename {bin => notification}/configuration (100%) rename {bin => notification}/motion.py (100%) rename {bin => notification}/temperature.py (100%) diff --git a/docker/gstreamer/audio_entry.sh b/gstreamer/audio_entry.sh similarity index 100% rename from docker/gstreamer/audio_entry.sh rename to gstreamer/audio_entry.sh diff --git a/docker/gstreamer/audio_stream.sh b/gstreamer/audio_stream.sh similarity index 100% rename from docker/gstreamer/audio_stream.sh rename to gstreamer/audio_stream.sh diff --git a/docker/notification/Dockerfile b/notification/Dockerfile similarity index 100% rename from docker/notification/Dockerfile rename to notification/Dockerfile diff --git a/bin/configuration b/notification/configuration similarity index 100% rename from bin/configuration rename to notification/configuration diff --git a/bin/motion.py b/notification/motion.py similarity index 100% rename from bin/motion.py rename to notification/motion.py diff --git a/bin/temperature.py b/notification/temperature.py similarity index 100% rename from bin/temperature.py rename to notification/temperature.py From 7f309e1f6916206019b0f044fa8401c15efb9201 Mon Sep 17 00:00:00 2001 From: Ray Riga <4710022-rayrpf@users.noreply.gitlab.com> Date: Tue, 7 Jan 2020 20:53:44 -0500 Subject: [PATCH 7/7] Docker changes for notification service under reorg --- docker-compose.notification.yml | 15 ++++++--------- fruitnanny/Dockerfile | 10 +++++----- gstreamer/Dockerfile | 4 ++-- notification/Dockerfile | 7 +++++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docker-compose.notification.yml b/docker-compose.notification.yml index 6d4b001..74668b3 100644 --- a/docker-compose.notification.yml +++ b/docker-compose.notification.yml @@ -3,32 +3,29 @@ services: notification-temp: build: context: . - dockerfile: docker/notification/Dockerfile + dockerfile: notification/Dockerfile restart: always network_mode: "host" privileged: true - volumes: - - /opt/fruitnanny/bin:/opt/fruitnanny/bin depends_on: - nginx - janus - fruitnanny #command: /bin/bash #tty: true - command: python3 /opt/fruitnanny/bin/temperature.py + command: python3 /opt/notification/temperature.py notification-motion: - image: fruitnanny_notification-temp + build: + context: . + dockerfile: notification/Dockerfile restart: always network_mode: "host" privileged: true - volumes: - - /opt/fruitnanny/bin:/opt/fruitnanny/bin depends_on: - nginx - janus - fruitnanny - - notification-temp #command: /bin/bash #tty: true - command: python3 /opt/fruitnanny/bin/motion.py \ No newline at end of file + command: python3 /opt/notification/motion.py diff --git a/fruitnanny/Dockerfile b/fruitnanny/Dockerfile index ef83ce6..cefc57c 100644 --- a/fruitnanny/Dockerfile +++ b/fruitnanny/Dockerfile @@ -3,11 +3,11 @@ FROM balenalib/raspberrypi3-debian-node:12.13-buster RUN echo 'APT::Install-Recommends "false";' >/etc/apt/apt.conf.d/00recommends \ && echo 'APT::Install-Suggests "false";' >>/etc/apt/apt.conf.d/00recommends \ && apt-get update && apt-get upgrade && apt-get install -y \ - dos2unix \ - libgpiod2 \ - python3 \ - python3-pip \ - wiringpi \ + dos2unix \ + libgpiod2 \ + python3 \ + python3-pip \ + wiringpi \ && pip3 install --upgrade RPI.GPIO adafruit-blinka adafruit-circuitpython-dht \ && apt-get --purge -y autoremove && apt-get clean && rm -rf /tmp/* && rm -rf /var/lib/apt/lists/* diff --git a/gstreamer/Dockerfile b/gstreamer/Dockerfile index 5aea3b7..cf55fa8 100644 --- a/gstreamer/Dockerfile +++ b/gstreamer/Dockerfile @@ -25,5 +25,5 @@ RUN echo 'APT::Install-Recommends "false";' >/etc/apt/apt.conf.d/00recommends \ && rm -rf /tmp/* RUN useradd -rm -d /home/pi -s /bin/bash -g users -G adm,dialout,sudo,audio,video,plugdev,input,netdev -u 1000 pi -COPY docker/gstreamer/audio_entry.sh / -COPY docker/gstreamer/audio_stream.sh / +COPY audio_entry.sh / +COPY audio_stream.sh / diff --git a/notification/Dockerfile b/notification/Dockerfile index 9181ace..a10d003 100644 --- a/notification/Dockerfile +++ b/notification/Dockerfile @@ -1,4 +1,4 @@ -FROM ivadim/fruitnanny-app +FROM balenalib/raspberrypi3-debian-node:12.13-buster RUN apt-get update \ && apt-get install -y libgpiod2 \ @@ -10,4 +10,7 @@ RUN apt-get update \ && apt-get --purge remove -y $buildDeps && apt-get --purge -y autoremove \ && apt-get clean \ && rm -rf /tmp/* \ - && rm -rf /var/lib/apt/lists/* \ No newline at end of file + && rm -rf /var/lib/apt/lists/* + +ADD . /opt/notification +WORKDIR /opt/notification