Merge branch 'louislam:master' into logging

3 years ago · e684712a77
parent dcc7856b5d 76611ecaca
commit e684712a77
12 changed files with 259 additions and 367 deletions
--- a/docker/alpine-base.dockerfile
+++ b/docker/alpine-base.dockerfile
@ -4,5 +4,5 @@ WORKDIR /app

 # Install apprise, iputils for non-root ping, setpriv
 RUN apk add --no-cache iputils setpriv dumb-init python3 py3-cryptography py3-pip py3-six py3-yaml py3-click py3-markdown py3-requests py3-requests-oauthlib && \
-    pip3 --no-cache-dir install apprise && \
+    pip3 --no-cache-dir install apprise==0.9.6 && \
    rm -rf /root/.cache
--- a/docker/debian-base.dockerfile
+++ b/docker/debian-base.dockerfile
@ -4,9 +4,9 @@ FROM node:14-buster-slim
 WORKDIR /app

 # Install Apprise, add sqlite3 cli for debugging in the future, iputils-ping for ping, util-linux for setpriv
-# Stupid python3 and python3-pip actually install a lot of useless things into Debian, specific --no-install-recommends to skip them, make the base even smaller than alpine!
+# Stupid python3 and python3-pip actually install a lot of useless things into Debian, specify --no-install-recommends to skip them, make the base even smaller than alpine!
 RUN apt update && \
    apt --yes --no-install-recommends install python3 python3-pip python3-cryptography python3-six python3-yaml python3-click python3-markdown python3-requests python3-requests-oauthlib \
        sqlite3 iputils-ping util-linux dumb-init && \
-    pip3 --no-cache-dir install apprise && \
+    pip3 --no-cache-dir install apprise==0.9.6 && \
    rm -rf /var/lib/apt/lists/*
--- a/package-lock.json
+++ b/package-lock.json
@ -19,7 +19,7 @@
                "axios": "~0.21.4",
                "bcryptjs": "~2.4.3",
                "bootstrap": "5.1.3",
-                "bree": "~6.3.1",
+                "bree": "~7.1.0",
                "chardet": "^1.3.0",
                "chart.js": "~3.6.0",
                "chartjs-adapter-dayjs": "~1.0.0",
@ -42,7 +42,7 @@
                "postcss-scss": "~4.0.2",
                "prom-client": "~13.2.0",
                "prometheus-api-metrics": "~3.2.0",
-                "qrcode": "~1.4.4",
+                "qrcode": "~1.5.0",
                "redbean-node": "0.1.3",
                "socket.io": "~4.2.0",
                "socket.io-client": "~4.2.0",
@ -86,7 +86,7 @@
                "vite": "~2.6.14"
            },
            "engines": {
-                "node": "14.*"
+                "node": "14.* || >=16.*"
            }
        },
        "node_modules/@babel/code-frame": {
@ -3437,6 +3437,7 @@
            "version": "3.2.1",
            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+            "dev": true,
            "dependencies": {
                "color-convert": "^1.9.0"
            },
@ -3891,6 +3892,7 @@
            "version": "1.5.1",
            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
            "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+            "dev": true,
            "funding": [
                {
                    "type": "github",
@ -4044,27 +4046,24 @@
            }
        },
        "node_modules/bree": {
-            "version": "6.3.1",
-            "resolved": "https://registry.npmjs.org/bree/-/bree-6.3.1.tgz",
-            "integrity": "sha512-FADpEV5c+3ZuFIBothyyRUxZClJD2PetIo0lmqAFJ3ZMI9WsSmQmmstZ86Dy0G4Gyw3nPNdfYTjV7+9pPtlB8g==",
-            "deprecated": "bree@7.0.0 drops support for the browser, Node <12.11.0, and removes bthreads entirely. Either upgrade to v7.0.0 or lock your bree version to v6.5.0.",
-            "dependencies": {
-                "@babel/runtime": "^7.12.5",
-                "@breejs/later": "^4.0.2",
-                "boolean": "^3.0.2",
-                "bthreads": "^0.5.1",
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/bree/-/bree-7.1.0.tgz",
+            "integrity": "sha512-1bKJDODePYjIIUvt/ImO5PnitRQjZnTfMnsXq64LAWf2muXn9lCju0PnKoayIHdYzEMKepXr+YYY+Y+cmaVkHA==",
+            "dependencies": {
+                "@breejs/later": "^4.1.0",
+                "boolean": "^3.1.4",
                "combine-errors": "^3.0.3",
-                "cron-validate": "^1.4.1",
-                "debug": "^4.3.1",
-                "human-interval": "^2.0.0",
+                "cron-validate": "^1.4.3",
+                "debug": "^4.3.2",
+                "human-interval": "^2.0.1",
                "is-string-and-not-blank": "^0.0.2",
                "is-valid-path": "^0.1.1",
-                "ms": "^2.1.2",
-                "p-wait-for": "3.1.0",
+                "ms": "^2.1.3",
+                "p-wait-for": "3",
                "safe-timers": "^1.1.0"
            },
            "engines": {
-                "node": ">= 10"
+                "node": ">= 12.11.0"
            }
        },
        "node_modules/browser-process-hrtime": {
@ -4105,21 +4104,11 @@
                "node-int64": "^0.4.0"
            }
        },
-        "node_modules/bthreads": {
-            "version": "0.5.1",
-            "resolved": "https://registry.npmjs.org/bthreads/-/bthreads-0.5.1.tgz",
-            "integrity": "sha512-nK7Jo9ll+r1FRMNPWEFRTZMQrX6HhX8JjPAofxmbTNILHqWVIJPmWzCi9JlX/K0DL5AKZTFZg2Qser5C6gVs9A==",
-            "dependencies": {
-                "bufio": "~1.0.5"
-            },
-            "engines": {
-                "node": ">=8.0.0"
-            }
-        },
        "node_modules/buffer": {
            "version": "5.7.1",
            "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
            "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+            "dev": true,
            "funding": [
                {
                    "type": "github",
@ -4139,20 +4128,6 @@
                "ieee754": "^1.1.13"
            }
        },
-        "node_modules/buffer-alloc": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
-            "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
-            "dependencies": {
-                "buffer-alloc-unsafe": "^1.1.0",
-                "buffer-fill": "^1.0.0"
-            }
-        },
-        "node_modules/buffer-alloc-unsafe": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-            "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
-        },
        "node_modules/buffer-crc32": {
            "version": "0.2.13",
            "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
@ -4167,23 +4142,11 @@
            "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
            "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
        },
-        "node_modules/buffer-fill": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
-            "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw="
-        },
        "node_modules/buffer-from": {
            "version": "1.1.2",
            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
-        },
-        "node_modules/bufio": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/bufio/-/bufio-1.0.7.tgz",
-            "integrity": "sha512-bd1dDQhiC+bEbEfg56IdBv7faWa6OipMs/AFFFvtFnB3wAYjlwQpQRZ0pm6ZkgtfL0pILRXhKxOiQj6UzoMR7A==",
-            "engines": {
-                "node": ">=8.0.0"
-            }
+            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+            "dev": true
        },
        "node_modules/bytes": {
            "version": "3.1.0",
@ -4465,6 +4428,7 @@
            "version": "1.9.3",
            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+            "dev": true,
            "dependencies": {
                "color-name": "1.1.3"
            }
@ -4472,7 +4436,8 @@
        "node_modules/color-name": {
            "version": "1.1.3",
            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+            "dev": true
        },
        "node_modules/color-support": {
            "version": "1.1.3",
@ -5061,6 +5026,11 @@
            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
        },
+        "node_modules/encode-utf8": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/encode-utf8/-/encode-utf8-1.0.3.tgz",
+            "integrity": "sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw=="
+        },
        "node_modules/encodeurl": {
            "version": "1.0.2",
            "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
@ -6384,7 +6354,6 @@
            "version": "4.1.0",
            "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
            "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-            "dev": true,
            "dependencies": {
                "locate-path": "^5.0.0",
                "path-exists": "^4.0.0"
@ -6976,6 +6945,7 @@
            "version": "1.2.1",
            "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
            "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+            "dev": true,
            "funding": [
                {
                    "type": "github",
@ -7380,11 +7350,6 @@
                "node": ">=0.10.0"
            }
        },
-        "node_modules/isarray": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-            "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
-        },
        "node_modules/isexe": {
            "version": "2.0.0",
            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@ -9713,7 +9678,6 @@
            "version": "5.0.0",
            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
            "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-            "dev": true,
            "dependencies": {
                "p-locate": "^4.1.0"
            },
@ -10783,7 +10747,6 @@
            "version": "4.1.0",
            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
            "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-            "dev": true,
            "dependencies": {
                "p-limit": "^2.2.0"
            },
@ -11033,11 +10996,11 @@
            }
        },
        "node_modules/pngjs": {
-            "version": "3.4.0",
-            "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz",
-            "integrity": "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==",
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz",
+            "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==",
            "engines": {
-                "node": ">=4.0.0"
+                "node": ">=10.13.0"
            }
        },
        "node_modules/postcss": {
@ -11516,133 +11479,73 @@
            }
        },
        "node_modules/qrcode": {
-            "version": "1.4.4",
-            "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.4.4.tgz",
-            "integrity": "sha512-oLzEC5+NKFou9P0bMj5+v6Z40evexeE29Z9cummZXZ9QXyMr3lphkURzxjXgPJC5azpxcshoDWV1xE46z+/c3Q==",
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.0.tgz",
+            "integrity": "sha512-9MgRpgVc+/+47dFvQeD6U2s0Z92EsKzcHogtum4QB+UNd025WOJSHvn/hjk9xmzj7Stj95CyUAs31mrjxliEsQ==",
            "dependencies": {
-                "buffer": "^5.4.3",
-                "buffer-alloc": "^1.2.0",
-                "buffer-from": "^1.1.1",
                "dijkstrajs": "^1.0.1",
-                "isarray": "^2.0.1",
-                "pngjs": "^3.3.0",
-                "yargs": "^13.2.4"
+                "encode-utf8": "^1.0.3",
+                "pngjs": "^5.0.0",
+                "yargs": "^15.3.1"
            },
            "bin": {
                "qrcode": "bin/qrcode"
            },
            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/qrcode/node_modules/ansi-regex": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-            "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/qrcode/node_modules/cliui": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-            "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-            "dependencies": {
-                "string-width": "^3.1.0",
-                "strip-ansi": "^5.2.0",
-                "wrap-ansi": "^5.1.0"
+                "node": ">=10.13.0"
            }
        },
-        "node_modules/qrcode/node_modules/emoji-regex": {
-            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-            "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-        },
-        "node_modules/qrcode/node_modules/find-up": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-            "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+        "node_modules/qrcode/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
            "dependencies": {
-                "locate-path": "^3.0.0"
+                "color-convert": "^2.0.1"
            },
            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/qrcode/node_modules/is-fullwidth-code-point": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-            "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/qrcode/node_modules/locate-path": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-            "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-            "dependencies": {
-                "p-locate": "^3.0.0",
-                "path-exists": "^3.0.0"
+                "node": ">=8"
            },
-            "engines": {
-                "node": ">=6"
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
            }
        },
-        "node_modules/qrcode/node_modules/p-locate": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-            "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+        "node_modules/qrcode/node_modules/cliui": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+            "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
            "dependencies": {
-                "p-limit": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/qrcode/node_modules/path-exists": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-            "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-            "engines": {
-                "node": ">=4"
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.0",
+                "wrap-ansi": "^6.2.0"
            }
        },
-        "node_modules/qrcode/node_modules/string-width": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-            "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+        "node_modules/qrcode/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
            "dependencies": {
-                "emoji-regex": "^7.0.1",
-                "is-fullwidth-code-point": "^2.0.0",
-                "strip-ansi": "^5.1.0"
+                "color-name": "~1.1.4"
            },
            "engines": {
-                "node": ">=6"
+                "node": ">=7.0.0"
            }
        },
-        "node_modules/qrcode/node_modules/strip-ansi": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-            "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-            "dependencies": {
-                "ansi-regex": "^4.1.0"
-            },
-            "engines": {
-                "node": ">=6"
-            }
+        "node_modules/qrcode/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
        },
        "node_modules/qrcode/node_modules/wrap-ansi": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-            "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+            "version": "6.2.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+            "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
            "dependencies": {
-                "ansi-styles": "^3.2.0",
-                "string-width": "^3.0.0",
-                "strip-ansi": "^5.0.0"
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
            },
            "engines": {
-                "node": ">=6"
+                "node": ">=8"
            }
        },
        "node_modules/qrcode/node_modules/y18n": {
@ -11651,29 +11554,36 @@
            "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
        },
        "node_modules/qrcode/node_modules/yargs": {
-            "version": "13.3.2",
-            "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-            "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+            "version": "15.4.1",
+            "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+            "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
            "dependencies": {
-                "cliui": "^5.0.0",
-                "find-up": "^3.0.0",
+                "cliui": "^6.0.0",
+                "decamelize": "^1.2.0",
+                "find-up": "^4.1.0",
                "get-caller-file": "^2.0.1",
                "require-directory": "^2.1.1",
                "require-main-filename": "^2.0.0",
                "set-blocking": "^2.0.0",
-                "string-width": "^3.0.0",
+                "string-width": "^4.2.0",
                "which-module": "^2.0.0",
                "y18n": "^4.0.0",
-                "yargs-parser": "^13.1.2"
+                "yargs-parser": "^18.1.2"
+            },
+            "engines": {
+                "node": ">=8"
            }
        },
        "node_modules/qrcode/node_modules/yargs-parser": {
-            "version": "13.1.2",
-            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-            "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+            "version": "18.1.3",
+            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+            "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
            "dependencies": {
                "camelcase": "^5.0.0",
                "decamelize": "^1.2.0"
+            },
+            "engines": {
+                "node": ">=6"
            }
        },
        "node_modules/qs": {
@ -17087,6 +16997,7 @@
            "version": "3.2.1",
            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+            "dev": true,
            "requires": {
                "color-convert": "^1.9.0"
            }
@ -17447,7 +17358,8 @@
        "base64-js": {
            "version": "1.5.1",
            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-            "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
+            "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+            "dev": true
        },
        "base64id": {
            "version": "2.0.0",
@ -17567,22 +17479,20 @@
            }
        },
        "bree": {
-            "version": "6.3.1",
-            "resolved": "https://registry.npmjs.org/bree/-/bree-6.3.1.tgz",
-            "integrity": "sha512-FADpEV5c+3ZuFIBothyyRUxZClJD2PetIo0lmqAFJ3ZMI9WsSmQmmstZ86Dy0G4Gyw3nPNdfYTjV7+9pPtlB8g==",
-            "requires": {
-                "@babel/runtime": "^7.12.5",
-                "@breejs/later": "^4.0.2",
-                "boolean": "^3.0.2",
-                "bthreads": "^0.5.1",
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/bree/-/bree-7.1.0.tgz",
+            "integrity": "sha512-1bKJDODePYjIIUvt/ImO5PnitRQjZnTfMnsXq64LAWf2muXn9lCju0PnKoayIHdYzEMKepXr+YYY+Y+cmaVkHA==",
+            "requires": {
+                "@breejs/later": "^4.1.0",
+                "boolean": "^3.1.4",
                "combine-errors": "^3.0.3",
-                "cron-validate": "^1.4.1",
-                "debug": "^4.3.1",
-                "human-interval": "^2.0.0",
+                "cron-validate": "^1.4.3",
+                "debug": "^4.3.2",
+                "human-interval": "^2.0.1",
                "is-string-and-not-blank": "^0.0.2",
                "is-valid-path": "^0.1.1",
-                "ms": "^2.1.2",
-                "p-wait-for": "3.1.0",
+                "ms": "^2.1.3",
+                "p-wait-for": "3",
                "safe-timers": "^1.1.0"
            }
        },
@ -17614,37 +17524,16 @@
                "node-int64": "^0.4.0"
            }
        },
-        "bthreads": {
-            "version": "0.5.1",
-            "resolved": "https://registry.npmjs.org/bthreads/-/bthreads-0.5.1.tgz",
-            "integrity": "sha512-nK7Jo9ll+r1FRMNPWEFRTZMQrX6HhX8JjPAofxmbTNILHqWVIJPmWzCi9JlX/K0DL5AKZTFZg2Qser5C6gVs9A==",
-            "requires": {
-                "bufio": "~1.0.5"
-            }
-        },
        "buffer": {
            "version": "5.7.1",
            "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
            "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+            "dev": true,
            "requires": {
                "base64-js": "^1.3.1",
                "ieee754": "^1.1.13"
            }
        },
-        "buffer-alloc": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
-            "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
-            "requires": {
-                "buffer-alloc-unsafe": "^1.1.0",
-                "buffer-fill": "^1.0.0"
-            }
-        },
-        "buffer-alloc-unsafe": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-            "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
-        },
        "buffer-crc32": {
            "version": "0.2.13",
            "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
@ -17656,20 +17545,11 @@
            "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
            "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
        },
-        "buffer-fill": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
-            "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw="
-        },
        "buffer-from": {
            "version": "1.1.2",
            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
-        },
-        "bufio": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/bufio/-/bufio-1.0.7.tgz",
-            "integrity": "sha512-bd1dDQhiC+bEbEfg56IdBv7faWa6OipMs/AFFFvtFnB3wAYjlwQpQRZ0pm6ZkgtfL0pILRXhKxOiQj6UzoMR7A=="
+            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+            "dev": true
        },
        "bytes": {
            "version": "3.1.0",
@ -17884,6 +17764,7 @@
            "version": "1.9.3",
            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+            "dev": true,
            "requires": {
                "color-name": "1.1.3"
            }
@ -17891,7 +17772,8 @@
        "color-name": {
            "version": "1.1.3",
            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+            "dev": true
        },
        "color-support": {
            "version": "1.1.3",
@ -18361,6 +18243,11 @@
            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
        },
+        "encode-utf8": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/encode-utf8/-/encode-utf8-1.0.3.tgz",
+            "integrity": "sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw=="
+        },
        "encodeurl": {
            "version": "1.0.2",
            "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
@ -19330,7 +19217,6 @@
            "version": "4.1.0",
            "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
            "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-            "dev": true,
            "requires": {
                "locate-path": "^5.0.0",
                "path-exists": "^4.0.0"
@ -19769,7 +19655,8 @@
        "ieee754": {
            "version": "1.2.1",
            "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-            "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
+            "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+            "dev": true
        },
        "ignore": {
            "version": "4.0.6",
@ -20053,11 +19940,6 @@
            "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=",
            "dev": true
        },
-        "isarray": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-            "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
-        },
        "isexe": {
            "version": "2.0.0",
            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@ -21809,7 +21691,6 @@
            "version": "5.0.0",
            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
            "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-            "dev": true,
            "requires": {
                "p-locate": "^4.1.0"
            }
@ -22630,7 +22511,6 @@
            "version": "4.1.0",
            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
            "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-            "dev": true,
            "requires": {
                "p-limit": "^2.2.0"
            }
@ -22810,9 +22690,9 @@
            "integrity": "sha1-tUGO8EOd5UJfxJlQQtztFPsqhP8="
        },
        "pngjs": {
-            "version": "3.4.0",
-            "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz",
-            "integrity": "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w=="
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz",
+            "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="
        },
        "postcss": {
            "version": "8.3.11",
@ -23170,100 +23050,55 @@
            }
        },
        "qrcode": {
-            "version": "1.4.4",
-            "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.4.4.tgz",
-            "integrity": "sha512-oLzEC5+NKFou9P0bMj5+v6Z40evexeE29Z9cummZXZ9QXyMr3lphkURzxjXgPJC5azpxcshoDWV1xE46z+/c3Q==",
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.0.tgz",
+            "integrity": "sha512-9MgRpgVc+/+47dFvQeD6U2s0Z92EsKzcHogtum4QB+UNd025WOJSHvn/hjk9xmzj7Stj95CyUAs31mrjxliEsQ==",
            "requires": {
-                "buffer": "^5.4.3",
-                "buffer-alloc": "^1.2.0",
-                "buffer-from": "^1.1.1",
                "dijkstrajs": "^1.0.1",
-                "isarray": "^2.0.1",
-                "pngjs": "^3.3.0",
-                "yargs": "^13.2.4"
+                "encode-utf8": "^1.0.3",
+                "pngjs": "^5.0.0",
+                "yargs": "^15.3.1"
            },
            "dependencies": {
-                "ansi-regex": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-                    "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
-                },
-                "cliui": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-                    "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-                    "requires": {
-                        "string-width": "^3.1.0",
-                        "strip-ansi": "^5.2.0",
-                        "wrap-ansi": "^5.1.0"
-                    }
-                },
-                "emoji-regex": {
-                    "version": "7.0.3",
-                    "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-                    "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-                },
-                "find-up": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-                    "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-                    "requires": {
-                        "locate-path": "^3.0.0"
-                    }
-                },
-                "is-fullwidth-code-point": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-                    "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-                },
-                "locate-path": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-                    "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
                    "requires": {
-                        "p-locate": "^3.0.0",
-                        "path-exists": "^3.0.0"
+                        "color-convert": "^2.0.1"
                    }
                },
-                "p-locate": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-                    "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+                "cliui": {
+                    "version": "6.0.0",
+                    "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+                    "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
                    "requires": {
-                        "p-limit": "^2.0.0"
+                        "string-width": "^4.2.0",
+                        "strip-ansi": "^6.0.0",
+                        "wrap-ansi": "^6.2.0"
                    }
                },
-                "path-exists": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-                    "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
-                },
-                "string-width": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-                    "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
                    "requires": {
-                        "emoji-regex": "^7.0.1",
-                        "is-fullwidth-code-point": "^2.0.0",
-                        "strip-ansi": "^5.1.0"
+                        "color-name": "~1.1.4"
                    }
                },
-                "strip-ansi": {
-                    "version": "5.2.0",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-                    "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-                    "requires": {
-                        "ansi-regex": "^4.1.0"
-                    }
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
                },
                "wrap-ansi": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-                    "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+                    "version": "6.2.0",
+                    "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+                    "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
                    "requires": {
-                        "ansi-styles": "^3.2.0",
-                        "string-width": "^3.0.0",
-                        "strip-ansi": "^5.0.0"
+                        "ansi-styles": "^4.0.0",
+                        "string-width": "^4.1.0",
+                        "strip-ansi": "^6.0.0"
                    }
                },
                "y18n": {
@ -23272,26 +23107,27 @@
                    "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
                },
                "yargs": {
-                    "version": "13.3.2",
-                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-                    "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+                    "version": "15.4.1",
+                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+                    "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
                    "requires": {
-                        "cliui": "^5.0.0",
-                        "find-up": "^3.0.0",
+                        "cliui": "^6.0.0",
+                        "decamelize": "^1.2.0",
+                        "find-up": "^4.1.0",
                        "get-caller-file": "^2.0.1",
                        "require-directory": "^2.1.1",
                        "require-main-filename": "^2.0.0",
                        "set-blocking": "^2.0.0",
-                        "string-width": "^3.0.0",
+                        "string-width": "^4.2.0",
                        "which-module": "^2.0.0",
                        "y18n": "^4.0.0",
-                        "yargs-parser": "^13.1.2"
+                        "yargs-parser": "^18.1.2"
                    }
                },
                "yargs-parser": {
-                    "version": "13.1.2",
-                    "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-                    "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+                    "version": "18.1.3",
+                    "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+                    "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
                    "requires": {
                        "camelcase": "^5.0.0",
                        "decamelize": "^1.2.0"
--- a/package.json
+++ b/package.json
@ -64,7 +64,7 @@
        "axios": "~0.21.4",
        "bcryptjs": "~2.4.3",
        "bootstrap": "5.1.3",
-        "bree": "~6.3.1",
+        "bree": "~7.1.0",
        "chardet": "^1.3.0",
        "chart.js": "~3.6.0",
        "chartjs-adapter-dayjs": "~1.0.0",
@ -87,7 +87,7 @@
        "postcss-scss": "~4.0.2",
        "prom-client": "~13.2.0",
        "prometheus-api-metrics": "~3.2.0",
-        "qrcode": "~1.4.4",
+        "qrcode": "~1.5.0",
        "redbean-node": "0.1.3",
        "socket.io": "~4.2.0",
        "socket.io-client": "~4.2.0",
--- a/server/notification-providers/stackfield.js
+++ b/server/notification-providers/stackfield.js
@ -0,0 +1,41 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+const { setting } = require("../util-server");
+const { getMonitorRelativeURL } = require("../../src/util");
+
+class Stackfield extends NotificationProvider {
+
+    name = "stackfield";
+
+    async send(notification, msg, monitorJSON = null) {
+        let okMsg = "Sent Successfully.";
+        try {
+            // Stackfield message formatting: https://www.stackfield.com/help/formatting-messages-2001
+
+            let textMsg = "+Uptime Kuma Alert+";
+
+            if (monitorJSON && monitorJSON.name) {
+                textMsg += `\n*${monitorJSON.name}*`;
+            }
+
+            textMsg += `\n${msg}`;
+
+            const baseURL = await setting("primaryBaseURL");
+            if (baseURL) {
+                textMsg += `\n${baseURL + getMonitorRelativeURL(monitorJSON.id)}`;
+            }
+
+            const data = {
+                "Title": textMsg,
+            };
+
+            await axios.post(notification.stackfieldwebhookURL, data);
+            return okMsg;
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+
+    }
+}
+
+module.exports = Stackfield;
--- a/server/notification.js
+++ b/server/notification.js
@ -25,6 +25,7 @@ const DingDing = require("./notification-providers/dingding");
 const Bark = require("./notification-providers/bark");
 const { log_info } = require("../src/util");
 const SerwerSMS = require("./notification-providers/serwersms");
+const Stackfield = require("./notification-providers/stackfield");

 class Notification {

@ -61,6 +62,7 @@ class Notification {
            new Webhook(),
            new Bark(),
            new SerwerSMS(),
+            new Stackfield(),
        ];

        for (let item of list) {
--- a/src/components/notifications/Stackfield.vue
+++ b/src/components/notifications/Stackfield.vue
@ -0,0 +1,13 @@
+<template>
+    <div class="mb-3">
+        <label for="stackfield-webhook-url" class="form-label">{{ $t("Webhook URL") }}<span style="color: red;"><sup>*</sup></span></label>
+        <input id="stackfield-webhook-url" v-model="$parent.notification.stackfieldwebhookURL" type="text" class="form-control" required>
+
+        <div class="form-text">
+            <span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}
+            <i18n-t tag="p" keypath="aboutWebhooks" style="margin-top: 8px;">
+                <a href="https://www.stackfield.com/developer-api#AnchorAPI2" target="_blank">https://www.stackfield.com/developer-api#AnchorAPI2</a>
+            </i18n-t>
+        </div>
+    </div>
+</template>
--- a/src/components/notifications/Telegram.vue
+++ b/src/components/notifications/Telegram.vue
@ -25,13 +25,7 @@
            </p>

            <p style="margin-top: 8px;">
-                <template v-if="$parent.notification.telegramBotToken">
-                    <a :href="telegramGetUpdatesURL" target="_blank" style="word-break: break-word;">{{ telegramGetUpdatesURL }}</a>
-                </template>
-
-                <template v-else>
-                    {{ telegramGetUpdatesURL }}
-                </template>
+                <a :href="telegramGetUpdatesURL('withToken')" target="_blank" style="word-break: break-word;">{{ telegramGetUpdatesURL("masked") }}</a>
            </p>
        </div>
    </div>
@ -40,49 +34,51 @@
 <script>
 import HiddenInput from "../HiddenInput.vue";
 import axios from "axios";
-import { useToast } from "vue-toastification"
+import { useToast } from "vue-toastification";
 const toast = useToast();

 export default {
    components: {
        HiddenInput,
    },
-    computed: {
-        telegramGetUpdatesURL() {
-            let token = `<${this.$t("YOUR BOT TOKEN HERE")}>`
+    methods: {
+        telegramGetUpdatesURL(mode = "masked") {
+            let token = `<${this.$t("YOUR BOT TOKEN HERE")}>`;

            if (this.$parent.notification.telegramBotToken) {
-                token = this.$parent.notification.telegramBotToken;
+                if (mode === "withToken") {
+                    token = this.$parent.notification.telegramBotToken;
+                } else if (mode === "masked") {
+                    token = "*".repeat(this.$parent.notification.telegramBotToken.length);
+                }
            }

            return `https://api.telegram.org/bot${token}/getUpdates`;
        },
-    },
-    methods: {
        async autoGetTelegramChatID() {
            try {
-                let res = await axios.get(this.telegramGetUpdatesURL)
+                let res = await axios.get(this.telegramGetUpdatesURL("withToken"));

                if (res.data.result.length >= 1) {
-                    let update = res.data.result[res.data.result.length - 1]
+                    let update = res.data.result[res.data.result.length - 1];

                    if (update.channel_post) {
                        this.notification.telegramChatID = update.channel_post.chat.id;
                    } else if (update.message) {
                        this.notification.telegramChatID = update.message.chat.id;
                    } else {
-                        throw new Error(this.$t("chatIDNotFound"))
+                        throw new Error(this.$t("chatIDNotFound"));
                    }

                } else {
-                    throw new Error(this.$t("chatIDNotFound"))
+                    throw new Error(this.$t("chatIDNotFound"));
                }

            } catch (error) {
-                toast.error(error.message)
+                toast.error(error.message);
            }

        },
    }
-}
+};
 </script>
--- a/src/components/notifications/index.js
+++ b/src/components/notifications/index.js
@ -23,6 +23,7 @@ import AliyunSMS from "./AliyunSms.vue";
 import DingDing from "./DingDing.vue";
 import Bark from "./Bark.vue";
 import SerwerSMS from "./SerwerSMS.vue";
+import Stackfield from './Stackfield.vue';

 /**
 * Manage all notification form.
@ -55,6 +56,7 @@ const NotificationFormList = {
    "DingDing": DingDing,
    "Bark": Bark,
    "serwersms": SerwerSMS,
+    "stackfield": Stackfield,
 }

 export default NotificationFormList
--- a/src/languages/en.js
+++ b/src/languages/en.js
@ -351,4 +351,5 @@ export default {
    serwersmsAPIPassword: "API Password",
    serwersmsPhoneNumber: "Phone number",
    serwersmsSenderName: "SMS Sender Name (registered via customer portal)",
+    "stackfield": "Stackfield",
 };
--- a/src/languages/hu.js
+++ b/src/languages/hu.js
@ -54,19 +54,19 @@ export default {
    Delete: "Törlés",
    Current: "Aktuális",
    Uptime: "Uptime",
-    "Cert Exp.": "Tanúsítvány lejár",
-    days: "napok",
+    "Cert Exp.": "SSL lejárat",
+    days: "nap",
    day: "nap",
-    "-day": "-nap",
+    "-day": " nap",
    hour: "óra",
-    "-hour": "-óra",
+    "-hour": " óra",
    Response: "Válasz",
    Ping: "Ping",
    "Monitor Type": "Figyelő típusa",
    Keyword: "Kulcsszó",
    "Friendly Name": "Rövid név",
    URL: "URL",
-    Hostname: "Hostnév",
+    Hostname: "Hosztnév",
    Port: "Port",
    "Heartbeat Interval": "Életjel időköz",
    Retries: "Újrapróbálkozás",
@ -131,9 +131,9 @@ export default {
    Events: "Események",
    Heartbeats: "Életjelek",
    "Auto Get": "Auto lekérd.",
-    backupDescription: "Ki tudja menteni az összes figyelőt és értesítést egy JSON fájlba.",
-    backupDescription2: "Ui.: Történeti és esemény adatokat nem tartalmaz.",
-    backupDescription3: "Érzékeny adatok, pl. szolgáltatás kulcsok is vannak az export fájlban. Figyelmesen őrizze!",
+    backupDescription: "Mentheti az összes figyelőt és értesítést egy JSON fájlba.",
+    backupDescription2: "Megj: Történeti és esemény adatokat nem tartalmaz.",
+    backupDescription3: "Érzékeny adatok, pl. szolgáltatás kulcsok is vannak az export fájlban. Figyeljen erre!",
    alertNoFile: "Válaszzon ki egy fájlt az importáláshoz.",
    alertWrongFileType: "Válasszon egy JSON fájlt.",
    "Clear all statistics": "Összes statisztika törlése",
@ -204,7 +204,7 @@ export default {
    defaultNotificationName: "{notification} értesítésem ({number})",
    here: "itt",
    Required: "Kötelező",
-    "Bot Token": "Hibás token",
+    "Bot Token": "BOT token",
    wayToGetTelegramToken: "Innen kaphat token-t: {0}.",
    "Chat ID": "Csevegés ID",
    supportTelegramChatID: "Támogatja a közvetlen csevegést, csoportnak küldést és csatona ID-t is",
--- a/src/languages/it-IT.js
+++ b/src/languages/it-IT.js
@ -134,7 +134,7 @@ export default {
    "Clear Data": "Cancella dati",
    Events: "Eventi",
    Heartbeats: "Controlli",
-    "Auto Get": "Auto Get",
+    "Auto Get": "Rileva",
    backupDescription: "È possibile fare il backup di tutti i monitoraggi e di tutte le notifiche in un file JSON.",
    backupDescription2: "P.S.: lo storico e i dati relativi agli eventi non saranno inclusi",
    backupDescription3: "Dati sensibili come i token di autenticazione saranno inclusi nel backup, tenere quindi in un luogo sicuro.",
@ -156,11 +156,11 @@ export default {
    Token: "Token",
    "Show URI": "Mostra URI",
    Tags: "Etichette",
-    "Add New below or Select...": "Aggiungine una oppure scegli...",
+    "Add New below or Select...": "Aggiungi oppure scegli...",
    "Tag with this name already exist.": "Un'etichetta con questo nome già esiste.",
    "Tag with this value already exist.": "Un'etichetta con questo valore già esiste.",
-    color: "colori",
-    "value (optional)": "valore (opzionale)",
+    color: "colore",
+    "value (optional)": "descrizione (opzionale)",
    Gray: "Grigio",
    Red: "Rosso",
    Orange: "Arancione",
@ -170,8 +170,8 @@ export default {
    Purple: "Viola",
    Pink: "Rosa",
    "Search...": "Cerca...",
-    "Avg. Ping": "Tempo di risposta al ping medio",
-    "Avg. Response": "Tempo di risposta medio",
+    "Avg. Ping": "Tempo medio di risposta al ping",
+    "Avg. Response": "Tempo medio di risposta",
    "Entry Page": "Pagina Principale",
    statusPageNothing: "Non c'è nulla qui, aggiungere un gruppo oppure un monitoraggio.",
    "No Services": "Nessun Servizio",
@ -351,4 +351,5 @@ export default {
    serwersmsAPIPassword: "Password API",
    serwersmsPhoneNumber: "Numero di Telefono",
    serwersmsSenderName: "Nome del mittente SMS (registrato via portale cliente)",
+    "stackfield": "Stackfield",
 };