diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..d53771c
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,12 @@
+node_modules
+.nvmrc
+.prettierrc
+ecosystem.config.js
+LICENSE
+README.md
+CODE_OF_CONDUCT.md
+.gitignore
+.git
+.eslintrc.js
+index.html
+.idea
\ No newline at end of file
diff --git a/.nvmrc b/.nvmrc
index da9495b..c91434a 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-14.15.3
\ No newline at end of file
+14.15.4
diff --git a/README.md b/README.md
index ecd73e0..7388092 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,82 @@
A simple example of using a user defined function (UDF) in mysql to make real-time notifications on a table change. This project consists of a mysql plugin that setups a server socket that receives messages from a trigger connected to INSERT, UPDATE, DELETE operations on a specific table in the database. The server will then send a message to a nodejs server that in turn will bounce this notification to any connected http client over a websocket.
+## Docker
+
+The project has two Dockerfiles that can be used to build and start two services.
+One running the node application, which includes the http server, websocket server and also the socket server
+acting as a bridge for data sent from the second container.
+The second container runs the mysql server and uses a small bootstrap script to compile the mysql plugin and then
+install the database and setup the needed triggers.
+
+### docker-compose
+
+ docker-compose build
+ # or
+ npm run build
+
+Build the containers:
+
+ docker-compose up -d
+ # or
+ npm run up
+
+Runs both services.
+
+ docker-compose down
+ # or
+ npm run down
+
+Terminate both containers.
+
+ docker-compose logs node
+ # or
+ npm run logs:node
+
+Show logs for the node service.
+
+ docker-compose logs mysql
+ # or
+ npm run logs:mysql
+
+Show logs for the mysql service.
+
+ docker-compose exec node /bin/bash
+ # or
+ npm run exec:node
+
+Executes a shell in the node container.
+
+ docker-compose exec mysql /bin/bash
+ # or
+ npm run exec:mysql
+
+Executes a shell in the mysql container.
+
+ docker-compose exec node node scripts/insert.js [--] [--title=text] [--content=text] [--image=text]
+ # or
+ npm run insert:node [--] [--title=text] [--content=text] [--image=text]
+
+Inserts a record into the database.
+
+ docker-compose exec node node scripts/update.js -- --id=ID [--title=text] [--content=text] [--image=text]
+ # or
+ npm run update:node -- --id=ID [--title=text] [--content=text] [--image=text]
+
+Updates a record in the database.
+
+ docker-compose exec node node scripts/delete.js [-- --id=ID]
+ # or
+ npm run delete:node [-- --id=ID]
+
+Deletes all or a single record from the database.
+
+ docker-compose exec node node scripts/select.js [-- --id=ID]
+ # or
+ npm run select:node [-- --id=ID]
+
+Selects all or a single record from the database.
+
## Compiling
### Manually
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..50af381
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,56 @@
+version: '3'
+services:
+ node:
+ build:
+ context: .
+ dockerfile: docker/Dockerfile
+ args:
+ - SERVER_ADDRESS=$SERVER_ADDRESS
+ - SERVER_PORT=$SERVER_PORT
+ - WEBSOCKET_PORT=$WEBSOCKET_PORT
+ container_name: mysqlnote_node
+ ports:
+ - "$WEBSOCKET_PORT:$WEBSOCKET_PORT"
+ - "$SERVER_PORT:$SERVER_PORT"
+ environment:
+ - WEBSOCKET_PORT=$WEBSOCKET_PORT
+ - MYSQL_HOSTNAME=mysql
+ - SERVER_ADDRESS=$SERVER_ADDRESS
+ - SERVER_PORT=$SERVER_PORT
+ depends_on:
+ - mysql
+ networks:
+ main:
+ aliases:
+ - node
+ mysql:
+ build:
+ context: .
+ dockerfile: docker/Dockerfile.mysql
+ args:
+ - SERVER_ADDRESS=$SERVER_ADDRESS
+ - SERVER_PORT=$SERVER_PORT
+ container_name: mysqlnote_mysql
+ ports:
+ - "$MYSQL_PORT:$MYSQL_PORT"
+ restart: always
+ environment:
+ - MYSQL_ROOT_PASSWORD=secret
+ - MYSQL_USER=$MYSQL_USERNAME
+ - MYSQL_PASSWORD=$MYSQL_PASSWORD
+ - MYSQL_DATABASE=$MYSQL_DATABASE
+ - MYSQL_PORT=$MYSQL_PORT
+ - SERVER_PORT=$SERVER_PORT
+ - SERVER_ADDRESS=node
+ # command: --innodb-use-native-aio=0
+ volumes:
+ - ./docker/my.cnf:/etc/mysql/mysql.conf.d/my.cnf
+ - ./mysql-plugin:/mysql-plugin
+ - ./docker/bootstrap:/docker-entrypoint-initdb.d
+ - ./bin/test.sql:/data/application/test.sql
+ networks:
+ main:
+ aliases:
+ - mysql
+networks:
+ main:
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000..fe6f8d4
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,22 @@
+FROM node:14.15.4
+
+ARG WEBSOCKET_PORT=8080
+ARG SERVER_PORT=2048
+ARG SERVER_ADDRESS=127.0.0.1
+ARG MYSQL_HOSTNAME=127.0.0.1
+
+ENV WEBSOCKET_PORT=$WEBSOCKET_PORT
+ENV SERVER_ADDRESS=$SERVER_ADDRESS
+ENV SERVER_PORT=$SERVER_PORT
+ENV MYSQL_HOSTNAME=$MYSQL_HOSTNAME
+
+EXPOSE $WEBSOCKET_PORT
+EXPOSE $SERVER_PORT
+
+# This thing first installs npm packages and then it copies the committed files as an overlay
+WORKDIR /usr/src/app
+COPY package*json ./
+
+RUN npm install --production --no-optional
+COPY . .
+CMD ["node", "scripts/server.js"]
\ No newline at end of file
diff --git a/docker/Dockerfile.mysql b/docker/Dockerfile.mysql
new file mode 100644
index 0000000..2584ec0
--- /dev/null
+++ b/docker/Dockerfile.mysql
@@ -0,0 +1,17 @@
+FROM mysql:5.7
+
+ARG SERVER_ADDRESS=127.0.0.1
+ARG SERVER_PORT=2048
+
+ENV SERVER_ADDRESS=$SERVER_ADDRESS
+ENV SERVER_PORT=$SERVER_PORT
+
+RUN apt-get update && apt-get install -y sudo gcc make libmysqlclient-dev
+RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
+USER root
+ADD docker/sudo.txt /etc/sudoers
+RUN chmod 440 /etc/sudoers
+USER docker
+WORKDIR /tmp
+COPY mysql-plugin/src src
+COPY x.c .
diff --git a/docker/bootstrap/bootstrap.sh b/docker/bootstrap/bootstrap.sh
new file mode 100755
index 0000000..98dead2
--- /dev/null
+++ b/docker/bootstrap/bootstrap.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+cd /tmp/src
+sudo -E make
+sudo cp mysql-notification.so `mysql_config --plugindir`
+mysql -uroot -p$MYSQL_ROOT_PASSWORD < /data/application/test.sql
diff --git a/docker/my.cnf b/docker/my.cnf
new file mode 100644
index 0000000..d44f72a
--- /dev/null
+++ b/docker/my.cnf
@@ -0,0 +1,30 @@
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+#
+# The MySQL Server configuration file.
+#
+# For explanations see
+# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
+
+[mysqld]
+pid-file = /var/run/mysqld/mysqld.pid
+socket = /var/run/mysqld/mysqld.sock
+datadir = /var/lib/mysql
+#log-error = /var/log/mysql/error.log
+# By default we only accept connections from localhost
+bind-address = 0.0.0.0
+# Disabling symbolic-links is recommended to prevent assorted security risks
+symbolic-links=0
\ No newline at end of file
diff --git a/docker/sudo.txt b/docker/sudo.txt
new file mode 100644
index 0000000..b6d9a75
--- /dev/null
+++ b/docker/sudo.txt
@@ -0,0 +1,2 @@
+root ALL=(ALL) ALL
+docker ALL=(ALL) NOPASSWD: ALL
diff --git a/mysql-plugin/src/makefile b/mysql-plugin/src/makefile
index b53305f..aafeb5d 100644
--- a/mysql-plugin/src/makefile
+++ b/mysql-plugin/src/makefile
@@ -1,17 +1,18 @@
MYSQL_INCLUDE_DIR?=/usr/include/mysql
MYSQL_PLUGIN_DIR?=/usr/lib/mysql/plugin
-TARGET_FILE?=mysql-notification
+TARGET?=mysql-notification
SERVER_PORT?=2048
-SERVER_ADDRESS?="127.0.0.1"
-WEBSOCKET_PORT?=8080
+SERVER_ADDRESS?=127.0.0.1
-mysql-notification : mysql-notification.c
- ${CC} -c -D SERVER_PORT=${SERVER_PORT} -D SERVER_ADDRESS='${SERVER_ADDRESS}' -D WEBSOCKET_PORT=${WEBSOCKET_PORT} -Wall -fpic ${CCFLAGS} -o $@.o -I${MYSQL_INCLUDE_DIR} $?
+${TARGET} : ${TARGET}.c
+ ${CC} -c -D SERVER_PORT=${SERVER_PORT} -D SERVER_ADDRESS=\"${SERVER_ADDRESS}\" -Wall -fpic ${CFLAGS} -o $@.o -I${MYSQL_INCLUDE_DIR} $?
${CC} -shared -o $@.so $@.o
-install : mysql-notification.so
- cp $? ${MYSQL_PLUGIN_DIR}/${TARGET_FILE}.so
+# ${TARGET}.so : ${TARGET}.o
+# ${CC} -shared -o $@ $?
+
+install : ${TARGET}.so
+ cp $? ${MYSQL_PLUGIN_DIR}/${TARGET}.so
clean:
- unlink *.o
- unlink *.so
+ rm -f *.o *.so
diff --git a/mysql-plugin/src/mysql-notification.c b/mysql-plugin/src/mysql-notification.c
index 85d508e..16b2762 100644
--- a/mysql-plugin/src/mysql-notification.c
+++ b/mysql-plugin/src/mysql-notification.c
@@ -19,6 +19,7 @@ typedef long long longlong;
#include <ctype.h>
#include <sys/socket.h>
#include <netinet/in.h>
+#include <netdb.h>
#include <arpa/inet.h>
#ifndef LOCAL_ADDRESS
@@ -48,6 +49,7 @@ my_bool MySQLNotification_init(UDF_INIT *initid,
// longlong* i = malloc(sizeof(*i));
//initid->ptr = (char*)i;
struct sockaddr_in remote, saddr;
+ struct hostent* phe;
// check the arguments format
if (args->arg_count != 2) {
@@ -71,7 +73,9 @@ my_bool MySQLNotification_init(UDF_INIT *initid,
memset(&saddr, 0, sizeof(saddr));
saddr.sin_family = AF_INET;
saddr.sin_port = htons(0);
- saddr.sin_addr.s_addr = inet_addr(LOCAL_ADDRESS);
+ // saddr.sin_addr.s_addr = inet_addr(LOCAL_ADDRESS);
+ // We need this to if running in a container.
+ saddr.sin_addr.s_addr = htonl(INADDR_ANY);
if (bind(_server, (struct sockaddr*)&saddr, sizeof(saddr)) != 0) {
sprintf(message, "Failed to bind to %s", LOCAL_ADDRESS);
return 0;
@@ -81,11 +85,17 @@ my_bool MySQLNotification_init(UDF_INIT *initid,
memset(&remote, 0, sizeof(remote));
remote.sin_family = AF_INET;
remote.sin_port = htons(SERVER_PORT);
- remote.sin_addr.s_addr = inet_addr(SERVER_ADDRESS);
+ phe = gethostbyname(SERVER_ADDRESS);
+ if (phe) {
+ remote.sin_addr.s_addr = *((unsigned long*) phe->h_addr);
+ } else {
+ remote.sin_addr.s_addr = inet_addr(SERVER_ADDRESS);
+ }
if (connect(_server, (struct sockaddr*)&remote, sizeof(remote)) != 0) {
sprintf(message, "Failed to connect to server %s:%d", SERVER_ADDRESS, SERVER_PORT);
return 0;
}
+ sprintf(message, "Conntected to server %s:%d\n", SERVER_ADDRESS, SERVER_PORT);
return 0;
}
diff --git a/package-lock.json b/package-lock.json
index 15aedc5..67f89aa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "mysql-notification",
- "version": "1.2.3",
+ "version": "1.2.4",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -119,20 +119,20 @@
}
},
"@pm2/agent": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/@pm2/agent/-/agent-1.0.4.tgz",
- "integrity": "sha512-cZLwaoLa45FRuetKCcoI3kHnnQ7VMLpZnmVom04MoK0cpY/RxcSarkCHSCu9V+pdARwxx96QrWdrtAJdw97dng==",
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/@pm2/agent/-/agent-1.0.8.tgz",
+ "integrity": "sha512-r8mud8BhBz+a2yjlgtk+PBXUR5EQ9UKSJCs232OxfCmuBr1MZw0Mo+Kfog6WJ8OmVk99r1so9yTUK4IyrgGcMQ==",
"requires": {
"async": "~3.2.0",
"chalk": "~3.0.0",
"dayjs": "~1.8.24",
- "debug": "~4.1.1",
+ "debug": "~4.3.1",
"eventemitter2": "~5.0.1",
"fclone": "~1.0.11",
"nssocket": "0.6.0",
- "pm2-axon": "^3.2.0",
- "pm2-axon-rpc": "^0.5.0",
- "proxy-agent": "~3.1.1",
+ "pm2-axon": "~4.0.1",
+ "pm2-axon-rpc": "~0.7.0",
+ "proxy-agent": "~4.0.1",
"semver": "~7.2.0",
"ws": "~7.2.0"
},
@@ -168,11 +168,11 @@
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"debug": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
- "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+ "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
"requires": {
- "ms": "^2.1.1"
+ "ms": "2.1.2"
}
},
"has-flag": {
@@ -180,45 +180,6 @@
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
- "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"
- }
- }
- }
- },
- "pm2-axon-rpc": {
- "version": "0.5.2",
- "resolved": "https://registry.npmjs.org/pm2-axon-rpc/-/pm2-axon-rpc-0.5.2.tgz",
- "integrity": "sha512-o4u1jO1EYBgBUVlraE1aeGWB5DvClJFB2+v7ytqLypNfgYeT6eJ/B+WMh5NcvRnexAYL5kblcRgNgSbgGEobvA==",
- "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"
- }
- }
- }
- },
"semver": {
"version": "7.2.3",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.2.3.tgz",
@@ -234,45 +195,15 @@
}
}
},
- "@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"
- }
- },
- "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.5",
- "resolved": "https://registry.npmjs.org/@pm2/io/-/io-4.3.5.tgz",
- "integrity": "sha512-CY/a6Nw72vrlp/FPx38l4jfEHp4gNEbo8i+WlSJ2cnWO6VE6CKmnC1zb4yQLvdP8f3EuzzoOBZVq6aGN20M82Q==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/@pm2/io/-/io-5.0.0.tgz",
+ "integrity": "sha512-3rToDVJaRoob5Lq8+7Q2TZFruoEkdORxwzFpZaqF4bmH6Bkd7kAbdPrI/z8X6k1Meq5rTtScM7MmDgppH6aLlw==",
"requires": {
"@opencensus/core": "0.0.9",
"@opencensus/propagation-b3": "0.0.8",
- "@pm2/agent-node": "^1.1.10",
"async": "~2.6.1",
- "debug": "4.1.1",
+ "debug": "~4.3.1",
"eventemitter2": "^6.3.1",
"require-in-the-middle": "^5.0.0",
"semver": "6.3.0",
@@ -290,17 +221,22 @@
}
},
"debug": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
- "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+ "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
"requires": {
- "ms": "^2.1.1"
+ "ms": "2.1.2"
}
},
"eventemitter2": {
- "version": "6.4.3",
- "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.3.tgz",
- "integrity": "sha512-t0A2msp6BzOf+QAcI6z9XMktLj52OjGQg+8SJH6v5+3uxNpWYRR3wQmfA+6xtMU9kOC59qk9licus5dYcrYkMQ=="
+ "version": "6.4.4",
+ "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.4.tgz",
+ "integrity": "sha512-HLU3NDY6wARrLCEwyGKRBvuWYyvW6mHYv72SJJAH3iJN3a6eVUvkjFkcxah1bcTgGVBBrFdIopBJPhCQFMLyXw=="
+ },
+ "semver": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
},
"tslib": {
"version": "1.9.3",
@@ -310,13 +246,13 @@
}
},
"@pm2/js-api": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/@pm2/js-api/-/js-api-0.6.0.tgz",
- "integrity": "sha512-ZgM/0yI8s3FRyxP01wI5UzDrVTecS/SmD98z25C9fsHo2Wz3JB1DtS4uIBlPopq2/R5HIQynTUJPDNn4qo1d/Q==",
+ "version": "0.6.7",
+ "resolved": "https://registry.npmjs.org/@pm2/js-api/-/js-api-0.6.7.tgz",
+ "integrity": "sha512-jiJUhbdsK+5C4zhPZNnyA3wRI01dEc6a2GhcQ9qI38DyIk+S+C8iC3fGjcjUbt/viLYKPjlAaE+hcT2/JMQPXw==",
"requires": {
"async": "^2.6.3",
- "axios": "^0.19.0",
- "debug": "~3.2.6",
+ "axios": "^0.21.0",
+ "debug": "~4.3.1",
"eventemitter2": "^6.3.1",
"ws": "^7.0.0"
},
@@ -330,28 +266,43 @@
}
},
"debug": {
- "version": "3.2.6",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
- "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+ "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
"requires": {
- "ms": "^2.1.1"
+ "ms": "2.1.2"
}
},
"eventemitter2": {
- "version": "6.4.3",
- "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.3.tgz",
- "integrity": "sha512-t0A2msp6BzOf+QAcI6z9XMktLj52OjGQg+8SJH6v5+3uxNpWYRR3wQmfA+6xtMU9kOC59qk9licus5dYcrYkMQ=="
+ "version": "6.4.4",
+ "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.4.tgz",
+ "integrity": "sha512-HLU3NDY6wARrLCEwyGKRBvuWYyvW6mHYv72SJJAH3iJN3a6eVUvkjFkcxah1bcTgGVBBrFdIopBJPhCQFMLyXw=="
}
}
},
"@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==",
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/@pm2/pm2-version-check/-/pm2-version-check-1.0.4.tgz",
+ "integrity": "sha512-SXsM27SGH3yTWKc2fKR4SYNxsmnvuBQ9dd6QHtEWmiZ/VqaOYPAIlS8+vMcn27YLtAEBGvNRSh3TPNvtjZgfqA==",
"requires": {
- "debug": "^4.1.1"
+ "debug": "^4.3.1"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+ "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+ "requires": {
+ "ms": "2.1.2"
+ }
+ }
}
},
+ "@tootallnate/once": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+ "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="
+ },
"acorn": {
"version": "7.4.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
@@ -365,11 +316,11 @@
"dev": true
},
"agent-base": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
- "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+ "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
"requires": {
- "es6-promisify": "^5.0.0"
+ "debug": "4"
}
},
"ajv": {
@@ -442,18 +393,11 @@
}
},
"ast-types": {
- "version": "0.14.2",
- "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.14.2.tgz",
- "integrity": "sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==",
+ "version": "0.13.4",
+ "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+ "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
"requires": {
"tslib": "^2.0.1"
- },
- "dependencies": {
- "tslib": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
- "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
- }
}
},
"astral-regex": {
@@ -467,11 +411,6 @@
"resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz",
"integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="
},
- "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",
@@ -489,11 +428,11 @@
}
},
"axios": {
- "version": "0.19.2",
- "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
- "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
+ "version": "0.21.1",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+ "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
"requires": {
- "follow-redirects": "1.5.10"
+ "follow-redirects": "^1.10.0"
}
},
"balanced-match": {
@@ -507,15 +446,20 @@
"integrity": "sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A=="
},
"binary-extensions": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
- "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ=="
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+ "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="
},
"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="
+ },
"brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -614,13 +558,13 @@
"integrity": "sha1-BsIe7RobBq62dVPNxT4jJ0usIpY="
},
"chokidar": {
- "version": "3.4.3",
- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz",
- "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==",
+ "version": "3.5.1",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
+ "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
"requires": {
"anymatch": "~3.1.1",
"braces": "~3.0.2",
- "fsevents": "~2.1.2",
+ "fsevents": "~2.3.1",
"glob-parent": "~5.1.0",
"is-binary-path": "~2.1.0",
"is-glob": "~4.0.1",
@@ -681,11 +625,6 @@
}
}
},
- "co": {
- "version": "4.6.0",
- "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
- "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
- },
"color": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz",
@@ -820,6 +759,11 @@
"which": "^2.0.1"
}
},
+ "culvert": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/culvert/-/culvert-0.1.2.tgz",
+ "integrity": "sha1-lQL18BVKLVoioCPnn3HMk2+m728="
+ },
"d": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
@@ -830,9 +774,9 @@
}
},
"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=="
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz",
+ "integrity": "sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og=="
},
"dayjs": {
"version": "1.8.36",
@@ -853,20 +797,13 @@
"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
},
"degenerator": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz",
- "integrity": "sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-2.2.0.tgz",
+ "integrity": "sha512-aiQcQowF01RxFI4ZLFMpzyotbQonhNpBao6dkI8JPk5a+hmSjR5ErHp2CQySmQe8os3VBqLCIh87nDBgZXvsmg==",
"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="
- }
+ "ast-types": "^0.13.2",
+ "escodegen": "^1.8.1",
+ "esprima": "^4.0.0"
}
},
"depd": {
@@ -935,19 +872,6 @@
"es6-symbol": "^3.1.1"
}
},
- "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=="
- },
- "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"
- }
- },
"es6-symbol": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
@@ -957,11 +881,6 @@
"ext": "^1.1.2"
}
},
- "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",
@@ -1193,11 +1112,6 @@
}
}
},
- "extend": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
- "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
- },
"fast-deep-equal": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -1240,9 +1154,9 @@
}
},
"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=="
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz",
+ "integrity": "sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg=="
},
"fill-range": {
"version": "7.0.1",
@@ -1275,26 +1189,18 @@
"integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="
},
"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==",
+ "version": "1.13.3",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz",
+ "integrity": "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA=="
+ },
+ "fs-extra": {
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+ "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
"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"
- }
- },
- "ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
- }
+ "graceful-fs": "^4.2.0",
+ "jsonfile": "^4.0.0",
+ "universalify": "^0.1.0"
}
},
"fs.realpath": {
@@ -1303,9 +1209,9 @@
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
},
"fsevents": {
- "version": "2.1.3",
- "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
- "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+ "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"optional": true
},
"ftp": {
@@ -1342,33 +1248,28 @@
"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"
- },
- "dependencies": {
- "debug": {
- "version": "2.6.9",
- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
- "requires": {
- "ms": "2.0.0"
- }
- },
- "ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
- }
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-3.0.2.tgz",
+ "integrity": "sha512-+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg==",
+ "requires": {
+ "@tootallnate/once": "1",
+ "data-uri-to-buffer": "3",
+ "debug": "4",
+ "file-uri-to-path": "2",
+ "fs-extra": "^8.1.0",
+ "ftp": "^0.3.10"
}
},
+ "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.1.6",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
@@ -1399,6 +1300,11 @@
"type-fest": "^0.8.1"
}
},
+ "graceful-fs": {
+ "version": "4.2.6",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+ "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="
+ },
"has": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -1426,46 +1332,22 @@
}
},
"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==",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+ "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
"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"
- }
- },
- "ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
- }
+ "@tootallnate/once": "1",
+ "agent-base": "6",
+ "debug": "4"
}
},
"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==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+ "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
"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"
- }
- }
+ "agent-base": "6",
+ "debug": "4"
}
},
"iconv-lite": {
@@ -1512,6 +1394,11 @@
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
},
+ "ini": {
+ "version": "1.3.8",
+ "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+ },
"ip": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
@@ -1531,9 +1418,9 @@
}
},
"is-core-module": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz",
- "integrity": "sha512-jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
+ "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
"requires": {
"has": "^1.0.3"
}
@@ -1582,6 +1469,17 @@
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
},
+ "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-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -1610,6 +1508,14 @@
"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
"dev": true
},
+ "jsonfile": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+ "requires": {
+ "graceful-fs": "^4.1.6"
+ }
+ },
"kuler": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz",
@@ -1692,9 +1598,9 @@
"integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
},
"moment-timezone": {
- "version": "0.5.31",
- "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.31.tgz",
- "integrity": "sha512-+GgHNg8xRhMXfEbv81iDtrVeTcWt0kWmTEY1XQK14dICTXnWJnT0dxdlPspwqF3keKMVPXwayEsk1DI0AA/jdA==",
+ "version": "0.5.33",
+ "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.33.tgz",
+ "integrity": "sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w==",
"requires": {
"moment": ">= 2.9.0"
}
@@ -1771,9 +1677,9 @@
},
"dependencies": {
"debug": {
- "version": "3.2.6",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
- "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+ "version": "3.2.7",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
"requires": {
"ms": "^2.1.1"
}
@@ -1781,9 +1687,9 @@
}
},
"netmask": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz",
- "integrity": "sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU="
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+ "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg=="
},
"next-tick": {
"version": "1.0.0",
@@ -1846,32 +1752,36 @@
}
},
"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==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-4.1.0.tgz",
+ "integrity": "sha512-ejNgYm2HTXSIYX9eFlkvqFp8hyJ374uDf0Zq5YUAifiSh1D6fo+iBivQZirGvVv8dCYUsLhmLBRhlAYvBKI5+Q==",
"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",
+ "@tootallnate/once": "1",
+ "agent-base": "6",
+ "debug": "4",
+ "get-uri": "3",
+ "http-proxy-agent": "^4.0.1",
+ "https-proxy-agent": "5",
+ "pac-resolver": "^4.1.0",
"raw-body": "^2.2.0",
- "socks-proxy-agent": "^4.0.1"
+ "socks-proxy-agent": "5"
}
},
"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==",
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-4.2.0.tgz",
+ "integrity": "sha512-rPACZdUyuxT5Io/gFKUeeZFfE5T7ve7cAkE5TUZRRfuKP0u5Hocwe48X7ZEm6mYB+bTB0Qf+xlVlA/RM/i6RCQ==",
"requires": {
- "co": "^4.6.0",
- "degenerator": "^1.0.4",
+ "degenerator": "^2.2.0",
"ip": "^1.1.5",
- "netmask": "^1.0.6",
- "thunkify": "^2.1.2"
+ "netmask": "^2.0.1"
}
},
+ "pako": {
+ "version": "0.2.9",
+ "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+ "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU="
+ },
"parent-module": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -1918,31 +1828,31 @@
}
},
"pm2": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/pm2/-/pm2-4.5.0.tgz",
- "integrity": "sha512-sXKn0Qsrqj++qgsdGTASEsWfURhM6vSPIqFPwSwk3bK5/QPLxuRmVDW1y82M9wEnlgEjiIryaLhZUp5saLuhPA==",
- "requires": {
- "@pm2/agent": "~1.0.2",
- "@pm2/io": "~4.3.5",
- "@pm2/js-api": "~0.6.0",
- "@pm2/pm2-version-check": "^1.0.3",
+ "version": "4.5.6",
+ "resolved": "https://registry.npmjs.org/pm2/-/pm2-4.5.6.tgz",
+ "integrity": "sha512-4J5q704Xl6VmpmQhXFGMJL4kXyyQw3AZM1FE9vRxhS3LiDI/+WVBtOM6pqJ4g/RKW+AUjEkc23i/DCC4BVenDA==",
+ "requires": {
+ "@pm2/agent": "~1.0.8",
+ "@pm2/io": "~5.0.0",
+ "@pm2/js-api": "~0.6.7",
+ "@pm2/pm2-version-check": "^1.0.4",
"async": "~3.2.0",
"blessed": "0.1.81",
"chalk": "3.0.0",
- "chokidar": "^3.3.0",
+ "chokidar": "^3.5.1",
"cli-tableau": "^2.0.0",
"commander": "2.15.1",
"cron": "1.8.2",
"dayjs": "~1.8.25",
- "debug": "^4.2.0",
+ "debug": "^4.3.1",
"enquirer": "2.3.6",
"eventemitter2": "5.0.1",
"fclone": "1.0.11",
"mkdirp": "1.0.4",
"needle": "2.4.0",
"pidusage": "2.0.21",
- "pm2-axon": "4.0.0",
- "pm2-axon-rpc": "0.6.0",
+ "pm2-axon": "~4.0.1",
+ "pm2-axon-rpc": "~0.7.0",
"pm2-deploy": "~1.0.2",
"pm2-multimeter": "^0.1.2",
"promptly": "^2",
@@ -1950,8 +1860,7 @@
"semver": "^7.2",
"source-map-support": "0.5.19",
"sprintf-js": "1.1.2",
- "systeminformation": "^4.23.3",
- "vizion": "0.2.13",
+ "vizion": "2.2.1",
"yamljs": "0.3.0"
},
"dependencies": {
@@ -1985,6 +1894,14 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
+ "debug": {
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+ "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+ "requires": {
+ "ms": "2.1.2"
+ }
+ },
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -1995,11 +1912,6 @@
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
},
- "semver": {
- "version": "7.3.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
- "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="
- },
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -2011,16 +1923,24 @@
}
},
"pm2-axon": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/pm2-axon/-/pm2-axon-4.0.0.tgz",
- "integrity": "sha512-A8dy0C57cRIm+kX58HrMcnvUdg8EdwCuCmavDdmFE4eoUE+5zfwGbDfZKCBVLNpDwjXPuXQQYZi3wQt/5xC8DQ==",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/pm2-axon/-/pm2-axon-4.0.1.tgz",
+ "integrity": "sha512-kES/PeSLS8orT8dR5jMlNl+Yu4Ty3nbvZRmaAtROuVm9nYYGiaoXqqKQqQYzWQzMYWUKHMQTvBlirjE5GIIxqg==",
"requires": {
"amp": "~0.3.1",
"amp-message": "~0.1.1",
- "debug": "^4.2",
+ "debug": "^4.3.1",
"escape-string-regexp": "^4.0.0"
},
"dependencies": {
+ "debug": {
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+ "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+ "requires": {
+ "ms": "2.1.2"
+ }
+ },
"escape-string-regexp": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -2029,19 +1949,19 @@
}
},
"pm2-axon-rpc": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/pm2-axon-rpc/-/pm2-axon-rpc-0.6.0.tgz",
- "integrity": "sha512-xjYR0y1HpOopJ09VL2Qd5H1LajVN+QLPVZ1G+GesbORJDAZiStMhwECtOzm/Gx5ANQxL0usW8WZsElMfQq2hbw==",
+ "version": "0.7.1",
+ "resolved": "https://registry.npmjs.org/pm2-axon-rpc/-/pm2-axon-rpc-0.7.1.tgz",
+ "integrity": "sha512-FbLvW60w+vEyvMjP/xom2UPhUN/2bVpdtLfKJeYM3gwzYhoTEEChCOICfFzxkxuoEleOlnpjie+n1nue91bDQw==",
"requires": {
- "debug": "^3.0"
+ "debug": "^4.3.1"
},
"dependencies": {
"debug": {
- "version": "3.2.6",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
- "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+ "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
"requires": {
- "ms": "^2.1.1"
+ "ms": "2.1.2"
}
}
}
@@ -2094,18 +2014,18 @@
}
},
"proxy-agent": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.1.1.tgz",
- "integrity": "sha512-WudaR0eTsDx33O3EJE16PjBRZWcX8GqCEeERw1W3hZJgH/F2a46g7jty6UGty6NeJ4CKQy8ds2CJPMiyeqaTvw==",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-4.0.1.tgz",
+ "integrity": "sha512-ODnQnW2jc/FUVwHHuaZEfN5otg/fMbvMxz9nMSUQfJ9JU7q2SZvSULSsjLloVgJOiv9yhc8GlNMKc4GkFmcVEA==",
"requires": {
- "agent-base": "^4.2.0",
+ "agent-base": "^6.0.0",
"debug": "4",
- "http-proxy-agent": "^2.1.0",
- "https-proxy-agent": "^3.0.0",
+ "http-proxy-agent": "^4.0.0",
+ "https-proxy-agent": "^5.0.0",
"lru-cache": "^5.1.1",
- "pac-proxy-agent": "^3.0.1",
+ "pac-proxy-agent": "^4.1.0",
"proxy-from-env": "^1.0.0",
- "socks-proxy-agent": "^4.0.1"
+ "socks-proxy-agent": "^5.0.0"
}
},
"proxy-from-env": {
@@ -2187,9 +2107,9 @@
"dev": true
},
"require-in-the-middle": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-5.0.3.tgz",
- "integrity": "sha512-p/ICV8uMlqC4tjOYabLMxAWCIKa0YUQgZZ6KDM0xgXJNgdGQ1WmL2A07TwmrZw+wi6ITUFKzH5v3n+ENEyXVkA==",
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-5.1.0.tgz",
+ "integrity": "sha512-M2rLKVupQfJ5lf9OvqFGIT+9iVLnTmjgbOmpil12hiSQNn5zJTKGPoIisETNjfK+09vP3rpm1zJajmErpr2sEQ==",
"requires": {
"debug": "^4.1.1",
"module-details-from-path": "^1.0.3",
@@ -2197,11 +2117,11 @@
}
},
"resolve": {
- "version": "1.18.1",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz",
- "integrity": "sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==",
+ "version": "1.20.0",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+ "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
"requires": {
- "is-core-module": "^2.0.0",
+ "is-core-module": "^2.2.0",
"path-parse": "^1.0.6"
}
},
@@ -2221,9 +2141,9 @@
}
},
"run-series": {
- "version": "1.1.8",
- "resolved": "https://registry.npmjs.org/run-series/-/run-series-1.1.8.tgz",
- "integrity": "sha512-+GztYEPRpIsQoCSraWHDBs9WVy4eVME16zhOtDB4H9J4xN0XRhknnmLOl+4gRgZtu8dpp9N/utSPjKH/xmDzXg=="
+ "version": "1.1.9",
+ "resolved": "https://registry.npmjs.org/run-series/-/run-series-1.1.9.tgz",
+ "integrity": "sha512-Arc4hUN896vjkqCYrUXquBFtRZdv1PfLbTYP71efP6butxyQ0kWpiNJyAgsxscmQg1cqvHY32/UCBzXedTpU2g=="
},
"safe-buffer": {
"version": "5.1.2",
@@ -2241,9 +2161,27 @@
"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
},
"semver": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
- "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+ "version": "7.3.5",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+ "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+ "requires": {
+ "lru-cache": "^6.0.0"
+ },
+ "dependencies": {
+ "lru-cache": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+ "requires": {
+ "yallist": "^4.0.0"
+ }
+ },
+ "yallist": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+ }
+ }
},
"setprototypeof": {
"version": "1.1.1",
@@ -2300,31 +2238,22 @@
"integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw=="
},
"socks": {
- "version": "2.3.3",
- "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz",
- "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==",
+ "version": "2.6.0",
+ "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.0.tgz",
+ "integrity": "sha512-mNmr9owlinMplev0Wd7UHFlqI4ofnBnNzFuzrm63PPaHgbkqCFe4T5LzwKmtQ/f2tX0NTpcdVLyD/FHxFBstYw==",
"requires": {
- "ip": "1.1.5",
+ "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==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
+ "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
"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"
- }
- }
+ "agent-base": "6",
+ "debug": "4",
+ "socks": "^2.3.3"
}
},
"source-map": {
@@ -2418,12 +2347,6 @@
"has-flag": "^3.0.0"
}
},
- "systeminformation": {
- "version": "4.33.5",
- "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-4.33.5.tgz",
- "integrity": "sha512-LxsyvCB4uYqzjEQUH5cNt8TCNZsEc5oHV5LfT96huYAj3w9U0TGQtg7CiTWYzU4aBnBAejXWct6O0nlZhzzaqQ==",
- "optional": true
- },
"table": {
"version": "5.4.6",
"resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
@@ -2447,11 +2370,6 @@
"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
"dev": true
},
- "thunkify": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz",
- "integrity": "sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0="
- },
"to-regex-range": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -2470,6 +2388,11 @@
"resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz",
"integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="
},
+ "tslib": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
+ "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="
+ },
"tv4": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/tv4/-/tv4-1.3.0.tgz",
@@ -2502,6 +2425,11 @@
"is-typedarray": "^1.0.0"
}
},
+ "universalify": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+ },
"unpipe": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
@@ -2541,17 +2469,23 @@
"dev": true
},
"vizion": {
- "version": "0.2.13",
- "resolved": "https://registry.npmjs.org/vizion/-/vizion-0.2.13.tgz",
- "integrity": "sha1-ExTN7is0EW+fWxJIU2+V2/zW718=",
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/vizion/-/vizion-2.2.1.tgz",
+ "integrity": "sha512-sfAcO2yeSU0CSPFI/DmZp3FsFE9T+8913nv1xWBOyzODv13fwkn6Vl7HqxGpkr9F608M+8SuFId3s+BlZqfXww==",
"requires": {
- "async": "1.5"
+ "async": "^2.6.3",
+ "git-node-fs": "^1.0.0",
+ "ini": "^1.3.5",
+ "js-git": "^0.7.8"
},
"dependencies": {
"async": {
- "version": "1.5.2",
- "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
- "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
+ "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"
+ }
}
}
},
diff --git a/package.json b/package.json
index 694f82b..3c10077 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
{
"name": "mysql-notification",
- "version": "1.2.3",
+ "version": "1.2.4",
"description": "Example of a user defined function (UDF) in MySQL",
"engines": {
- "node": ">= 14.15.3",
+ "node": ">= 14.15.4",
"npm": ">= 6.0.0"
},
"dependencies": {
@@ -11,7 +11,7 @@
"dotenv": "^8.2.0",
"minimist": "^1.2.5",
"mysql": "^2.18.1",
- "pm2": "^4.5.0",
+ "pm2": "^4.5.6",
"websocket": "^1.0.32",
"winston": "^3.3.3"
},
@@ -32,7 +32,19 @@
"insert": "node scripts/insert.js",
"update": "node scripts/update.js",
"delete": "node scripts/delete.js",
- "select": "node scripts/select.js"
+ "select": "node scripts/select.js",
+ "build": "docker-compose build",
+ "up": "docker-compose up -d",
+ "down": "docker-compose down",
+ "restart": "docker-compose restart",
+ "logs:node": "docker-compose logs -f node || true",
+ "logs:mysql": "docker-compose logs -f mysql || true",
+ "exec:node": "docker-compose exec node /bin/bash",
+ "exec:mysql": "docker-compose exec mysql /bin/bash",
+ "insert:node": "docker-compose exec node node scripts/insert.js",
+ "update:node": "docker-compose exec node node scripts/update.js",
+ "delete:node": "docker-compose exec node node scripts/delete.js",
+ "select:node": "docker-compose exec node node scripts/select.js"
},
"repository": {
"type": "git",
diff --git a/scripts/server.js b/scripts/server.js
index d4ae188..70c2e3b 100644
--- a/scripts/server.js
+++ b/scripts/server.js
@@ -11,11 +11,14 @@ let connections = [];
// load configuration
const config = Object.assign({}, process.env);
-const http = require(parseInt(config.SSL_ENABLED) ? 'https' : 'http');
-const SERVER_PORT = parseInt(config.SERVER_PORT || 2048);
-const WEBSOCKET_PORT = parseInt(config.WEBSOCKET_PORT || 8080);
-const SERVER_ADDR = (config.SERVER_ADDR || '127.0.0.1').replace(/['"]+/g, '');
-const AUTO_ACCEPT_CONNECTION = parseInt(config.AUTO_ACCEPT_CONNECTION);
+const http = require(parseInt(config.SSL_ENABLED, 10) ? 'https' : 'http');
+const SERVER_PORT = parseInt(config.SERVER_PORT || 2048, 10);
+const WEBSOCKET_PORT = parseInt(config.WEBSOCKET_PORT || 8080, 10);
+const SERVER_ADDRESS = (config.SERVER_ADDRESS || '127.0.0.1').replace(
+ /['"]+/g,
+ '',
+);
+const AUTO_ACCEPT_CONNECTION = parseInt(config.AUTO_ACCEPT_CONNECTION, 10);
const ALLOWED_ORIGINS = config.ALLOWED_ORIGINS
? config.ALLOWED_ORIGINS.replace(/\s/g, '')
.toLowerCase()
@@ -44,7 +47,6 @@ net
sock.on('data', (data) => {
sock.end();
sock.destroy();
-
// send data to all connected clients
for (let i = 0; i < connections.length; i++) {
connections[i].sendUTF(data);
@@ -52,11 +54,11 @@ net
});
sock.on('close', (data) => {});
})
- .listen(SERVER_PORT);
+ .listen(SERVER_PORT, SERVER_ADDRESS);
// create a http server
const server = http.createServer(credentials, (req, res) => {
- fs.readFile(__dirname + '/../' + req.url, function (err,data) {
+ fs.readFile(__dirname + '/../' + req.url, function (err, data) {
if (err) {
res.writeHead(404);
res.end(JSON.stringify(err));
@@ -66,9 +68,9 @@ const server = http.createServer(credentials, (req, res) => {
res.end(data);
});
});
-server.listen(WEBSOCKET_PORT, () => {
+server.listen(WEBSOCKET_PORT, SERVER_ADDRESS, () => {
logger.info(
- new Date() + ` Server is listening ${SERVER_ADDR}:${WEBSOCKET_PORT}`,
+ new Date() + ` Server is listening ${SERVER_ADDRESS}:${WEBSOCKET_PORT}`,
);
});
@@ -107,7 +109,7 @@ function originIsAllowed(origin) {
" var ws = new WebSocket('" +
protocol +
'://' +
- SERVER_ADDR +
+ SERVER_ADDRESS +
':' +
WEBSOCKET_PORT +
"', 'echo-protocol');\n" +
@@ -134,9 +136,7 @@ wsServer.on('request', (req) => {
if (!originIsAllowed(url.hostname)) {
// Make sure we only accept requests from an allowed origin
req.reject();
- logger.warn(
- new Date() + ` Connection from origin ${req.origin} rejected.`,
- );
+ logger.warn(new Date() + ` Connection from origin ${req.origin} rejected.`);
return;
}
const connection = req.accept('echo-protocol', req.origin);