From c4a2ce4e78cf90fc371a62c394f9523b5d62c102 Mon Sep 17 00:00:00 2001
From: Rolf Bachmann <1196109+rolfbachmann@users.noreply.github.com>
Date: Tue, 19 Jul 2022 10:57:52 +0200
Subject: [PATCH 01/48] Add authentication support for ntfy

---
 server/notification-providers/ntfy.js | 11 +++++++++--
 src/components/notifications/Ntfy.vue | 18 +++++++++++++++++-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/server/notification-providers/ntfy.js b/server/notification-providers/ntfy.js
index 21f358f6..17d6d812 100644
--- a/server/notification-providers/ntfy.js
+++ b/server/notification-providers/ntfy.js
@@ -8,12 +8,19 @@ class Ntfy extends NotificationProvider {
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         let okMsg = "Sent Successfully.";
         try {
-            await axios.post(`${notification.ntfyserverurl}`, {
+            let headers = {};
+            if (notification.ntfyusername.length > 0) {
+                headers = {
+                    "Authorization": "Basic " + Buffer.from(notification.ntfyusername + ":" + notification.ntfypassword).toString("base64"),
+                };
+            }
+            let data = {
                 "topic": notification.ntfytopic,
                 "message": msg,
                 "priority": notification.ntfyPriority || 4,
                 "title": "Uptime-Kuma",
-            });
+            };
+            await axios.post(`${notification.ntfyserverurl}`, data, { headers: headers });
 
             return okMsg;
 
diff --git a/src/components/notifications/Ntfy.vue b/src/components/notifications/Ntfy.vue
index d9a83b49..a42dca30 100644
--- a/src/components/notifications/Ntfy.vue
+++ b/src/components/notifications/Ntfy.vue
@@ -11,7 +11,18 @@
             <input id="ntfy-server-url" v-model="$parent.notification.ntfyserverurl" type="text" class="form-control" required>
         </div>
     </div>
-
+    <div class="mb-3">
+        <label for="ntfy-username" class="form-label">{{ $t("Username") }}</label>
+        <div class="input-group mb-3">
+            <input id="ntfy-username" v-model="$parent.notification.ntfyusername" type="text" class="form-control" required>
+        </div>
+    </div>
+    <div class="mb-3">
+        <label for="ntfy-password" class="form-label">{{ $t("Password") }}</label>
+        <div class="input-group mb-3">
+            <HiddenInput id="ntfy-password" v-model="$parent.notification.ntfypassword"></HiddenInput>
+        </div>
+    </div>
     <div class="mb-3">
         <label for="ntfy-priority" class="form-label">{{ $t("Priority") }}</label>
         <input id="ntfy-priority" v-model="$parent.notification.ntfyPriority" type="number" class="form-control" required min="1" max="5" step="1">
@@ -19,7 +30,12 @@
 </template>
 
 <script>
+import HiddenInput from "../HiddenInput.vue";
+
 export default {
+    components: {
+        HiddenInput,
+    },
     mounted() {
         if (typeof this.$parent.notification.ntfyPriority === "undefined") {
             this.$parent.notification.ntfyserverurl = "https://ntfy.sh";

From 4157c7d5463a7467c849dd71fd2d17b846b81c95 Mon Sep 17 00:00:00 2001
From: Patrick <patrick@hindmar.sh>
Date: Mon, 26 Sep 2022 22:16:34 +1300
Subject: [PATCH 02/48] Add support for Squadcast incoming webhook

---
 server/notification-providers/squadcast.js | 76 ++++++++++++++++++++++
 server/notification.js                     |  2 +
 src/components/notifications/Squadcast.vue |  6 ++
 src/components/notifications/index.js      |  2 +
 src/languages/en.js                        |  1 +
 5 files changed, 87 insertions(+)
 create mode 100644 server/notification-providers/squadcast.js
 create mode 100644 src/components/notifications/Squadcast.vue

diff --git a/server/notification-providers/squadcast.js b/server/notification-providers/squadcast.js
new file mode 100644
index 00000000..0302cb6f
--- /dev/null
+++ b/server/notification-providers/squadcast.js
@@ -0,0 +1,76 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+const { DOWN, UP } = require("../../src/util");
+
+class Squadcast extends NotificationProvider {
+
+    name = "squadcast";
+
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        let okMsg = "Sent Successfully.";
+
+        try {
+
+            let config = {};
+            let data = {
+                message: msg,
+                description: '',
+                tags: {},
+                heartbeat: heartbeatJSON,
+                source: 'uptime-kuma'
+            }
+
+            if (heartbeatJSON !== null) {
+                data.description = heartbeatJSON["msg"];
+                data.event_id = heartbeatJSON["monitorID"];
+
+                if (heartbeatJSON["status"] === DOWN) {
+                    data.message = `${monitorJSON['name']} is DOWN`;
+                    data.status = "trigger";
+                } else {
+                    data.message = `${monitorJSON['name']} is UP`;
+                    data.status = "resolve";
+                }
+
+                let address;
+                switch (monitorJSON["type"]) {
+                    case "ping":
+                        address = monitorJSON["hostname"];
+                        break;
+                    case "port":
+                    case "dns":
+                    case "steam":
+                        address = monitorJSON["hostname"];
+                        if (monitorJSON["port"]) {
+                            address += ":" + monitorJSON["port"];
+                        }
+                        break;
+                    default:
+                        address = monitorJSON["url"];
+                        break;
+                }
+
+                data.tags["AlertAddress"] = address;
+
+                monitorJSON["tags"].forEach(tag => {
+                    data.tags[tag["name"]] = {
+                        value: tag["value"]
+                    };
+                    if (tag["color"] !== null) {
+                        data.tags[tag["name"]]["color"] = tag["color"]
+                    }
+                });
+            }
+
+            await axios.post(notification.squadcastWebhookURL, data, config);
+            return okMsg;
+
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+
+    }
+
+}
+
+module.exports = Squadcast;
\ No newline at end of file
diff --git a/server/notification.js b/server/notification.js
index 3bf51243..7a4b4f29 100644
--- a/server/notification.js
+++ b/server/notification.js
@@ -32,6 +32,7 @@ const SerwerSMS = require("./notification-providers/serwersms");
 const Signal = require("./notification-providers/signal");
 const Slack = require("./notification-providers/slack");
 const SMTP = require("./notification-providers/smtp");
+const Squadcast = require("./notification-providers/squadcast");
 const Stackfield = require("./notification-providers/stackfield");
 const Teams = require("./notification-providers/teams");
 const TechulusPush = require("./notification-providers/techulus-push");
@@ -87,6 +88,7 @@ class Notification {
             new SMSManager(),
             new Slack(),
             new SMTP(),
+            new Squadcast(),
             new Stackfield(),
             new Teams(),
             new TechulusPush(),
diff --git a/src/components/notifications/Squadcast.vue b/src/components/notifications/Squadcast.vue
new file mode 100644
index 00000000..6650c44d
--- /dev/null
+++ b/src/components/notifications/Squadcast.vue
@@ -0,0 +1,6 @@
+<template>
+    <div class="mb-3">
+        <label for="webhook-url" class="form-label">{{ $t("Post URL") }}</label>
+        <input id="webhook-url" v-model="$parent.notification.squadcastWebhookURL" type="url" pattern="https?://.+" class="form-control" required>
+    </div>
+</template>
diff --git a/src/components/notifications/index.js b/src/components/notifications/index.js
index 6add06ea..319a7922 100644
--- a/src/components/notifications/index.js
+++ b/src/components/notifications/index.js
@@ -31,6 +31,7 @@ import SerwerSMS from "./SerwerSMS.vue";
 import Signal from "./Signal.vue";
 import SMSManager from "./SMSManager.vue";
 import Slack from "./Slack.vue";
+import Squadcast from "./Squadcast.vue";
 import Stackfield from "./Stackfield.vue";
 import STMP from "./SMTP.vue";
 import Teams from "./Teams.vue";
@@ -79,6 +80,7 @@ const NotificationFormList = {
     "signal": Signal,
     "SMSManager": SMSManager,
     "slack": Slack,
+    "squadcast": Squadcast,
     "smtp": STMP,
     "stackfield": Stackfield,
     "teams": Teams,
diff --git a/src/languages/en.js b/src/languages/en.js
index 7d980f63..1f20c7ea 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -582,4 +582,5 @@ export default {
     goAlert: "GoAlert",
     backupOutdatedWarning: "Deprecated: Since a lot of features added and this backup feature is a bit unmaintained, it cannot generate or restore a complete backup.",
     backupRecommend: "Please backup the volume or the data folder (./data/) directly instead.",
+    squadcast: "Squadcast",
 };

From bef9cb6a5fb06dbd2fb76c6ce6214b3c3b54b45f Mon Sep 17 00:00:00 2001
From: Patrick <patrick@hindmar.sh>
Date: Mon, 26 Sep 2022 22:30:43 +1300
Subject: [PATCH 03/48] Linting fixes

---
 server/notification-providers/squadcast.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/server/notification-providers/squadcast.js b/server/notification-providers/squadcast.js
index 0302cb6f..15553ff7 100644
--- a/server/notification-providers/squadcast.js
+++ b/server/notification-providers/squadcast.js
@@ -1,6 +1,6 @@
 const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
-const { DOWN, UP } = require("../../src/util");
+const { DOWN } = require("../../src/util");
 
 class Squadcast extends NotificationProvider {
 
@@ -14,21 +14,21 @@ class Squadcast extends NotificationProvider {
             let config = {};
             let data = {
                 message: msg,
-                description: '',
+                description: "",
                 tags: {},
                 heartbeat: heartbeatJSON,
-                source: 'uptime-kuma'
-            }
+                source: "uptime-kuma"
+            };
 
             if (heartbeatJSON !== null) {
                 data.description = heartbeatJSON["msg"];
                 data.event_id = heartbeatJSON["monitorID"];
 
                 if (heartbeatJSON["status"] === DOWN) {
-                    data.message = `${monitorJSON['name']} is DOWN`;
+                    data.message = `${monitorJSON["name"]} is DOWN`;
                     data.status = "trigger";
                 } else {
-                    data.message = `${monitorJSON['name']} is UP`;
+                    data.message = `${monitorJSON["name"]} is UP`;
                     data.status = "resolve";
                 }
 
@@ -57,7 +57,7 @@ class Squadcast extends NotificationProvider {
                         value: tag["value"]
                     };
                     if (tag["color"] !== null) {
-                        data.tags[tag["name"]]["color"] = tag["color"]
+                        data.tags[tag["name"]]["color"] = tag["color"];
                     }
                 });
             }
@@ -73,4 +73,4 @@ class Squadcast extends NotificationProvider {
 
 }
 
-module.exports = Squadcast;
\ No newline at end of file
+module.exports = Squadcast;

From 2e54dee817f02953393be0167ce71128dbfe8fac Mon Sep 17 00:00:00 2001
From: Matthew Nickson <mnickson@sidingsmedia.com>
Date: Sat, 1 Oct 2022 15:03:28 +0100
Subject: [PATCH 04/48] Fixed Octopush Notifier not working #2144

The version number was passed as a string from the frontend but was
checked against a number in the backend provider. This caused the if else
if to fall through into an error. The literal it is now being compared
has been changed to a string and the unknown version error is no longer
encountered.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
---
 server/notification-providers/octopush.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/notification-providers/octopush.js b/server/notification-providers/octopush.js
index 0eda940b..524a4a88 100644
--- a/server/notification-providers/octopush.js
+++ b/server/notification-providers/octopush.js
@@ -10,7 +10,7 @@ class Octopush extends NotificationProvider {
 
         try {
         // Default - V2
-            if (notification.octopushVersion === 2 || !notification.octopushVersion) {
+            if (notification.octopushVersion === "2" || !notification.octopushVersion) {
                 let config = {
                     headers: {
                         "api-key": notification.octopushAPIKey,
@@ -31,7 +31,7 @@ class Octopush extends NotificationProvider {
                     "sender": notification.octopushSenderName
                 };
                 await axios.post("https://api.octopush.com/v1/public/sms-campaign/send", data, config);
-            } else if (notification.octopushVersion === 1) {
+            } else if (notification.octopushVersion === "1") {
                 let data = {
                     "user_login": notification.octopushDMLogin,
                     "api_key": notification.octopushDMAPIKey,

From 63e408f4f2c3886874fb8a6cbd9e10a5ee6bd33a Mon Sep 17 00:00:00 2001
From: Matthew Nickson <mnickson@sidingsmedia.com>
Date: Sat, 1 Oct 2022 15:42:34 +0100
Subject: [PATCH 05/48] Fixed octopush legacy doesn't return error code

The octopush legacy API does not return a HTTP error code and instead
always returns a HTTP 200. This means that no error it thrown even if
something like the parameters are incorrect.
Instead the error code is given in the json response data.
Therefore we must look at the response data and check for the presence
of the "error_code" key in the response data.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
---
 server/notification-providers/octopush.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/server/notification-providers/octopush.js b/server/notification-providers/octopush.js
index 524a4a88..35d88f5f 100644
--- a/server/notification-providers/octopush.js
+++ b/server/notification-providers/octopush.js
@@ -49,7 +49,13 @@ class Octopush extends NotificationProvider {
                     },
                     params: data
                 };
-                await axios.post("https://www.octopush-dm.com/api/sms/json", {}, config);
+
+                // V1 API returns 200 even on error so we must check
+                // response data
+                let response = await axios.post("https://www.octopush-dm.com/api/sms/json", {}, config);
+                if ("error_code" in response.data) {
+                    this.throwGeneralAxiosError(`Octopush error ${JSON.stringify(response.data)}`);
+                }
             } else {
                 throw new Error("Unknown Octopush version!");
             }

From 97de3959cd3c71d17bcfa32a2a3ec131c3255e9b Mon Sep 17 00:00:00 2001
From: Matthew Nickson <mnickson@sidingsmedia.com>
Date: Sat, 1 Oct 2022 19:48:00 +0100
Subject: [PATCH 06/48] Updated octopush error handling to accept 000

The legacy octopush API includes an error code with all responses. A
code other than 000 is an error.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
---
 server/notification-providers/octopush.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/notification-providers/octopush.js b/server/notification-providers/octopush.js
index 35d88f5f..d5c475d3 100644
--- a/server/notification-providers/octopush.js
+++ b/server/notification-providers/octopush.js
@@ -54,7 +54,9 @@ class Octopush extends NotificationProvider {
                 // response data
                 let response = await axios.post("https://www.octopush-dm.com/api/sms/json", {}, config);
                 if ("error_code" in response.data) {
-                    this.throwGeneralAxiosError(`Octopush error ${JSON.stringify(response.data)}`);
+                    if (response.data.error_code !== "000") {
+                        this.throwGeneralAxiosError(`Octopush error ${JSON.stringify(response.data)}`);
+                    }
                 }
             } else {
                 throw new Error("Unknown Octopush version!");

From 6a3eccf6a6631e249658c749f6a1bd3466347f92 Mon Sep 17 00:00:00 2001
From: Matthew Nickson <mnickson@sidingsmedia.com>
Date: Sun, 2 Oct 2022 02:26:38 +0100
Subject: [PATCH 07/48] Fixed alert features unnecessary URL field #2009

The filling of the URL field was incorrect previously. It has been
updated to handle new monitor types.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
---
 server/notification-providers/teams.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/server/notification-providers/teams.js b/server/notification-providers/teams.js
index c398e03c..bcfc82c2 100644
--- a/server/notification-providers/teams.js
+++ b/server/notification-providers/teams.js
@@ -63,7 +63,7 @@ class Teams extends NotificationProvider {
             });
         }
 
-        if (monitorUrl) {
+        if (monitorUrl && monitorUrl !== "https://") {
             facts.push({
                 name: "URL",
                 value: monitorUrl,
@@ -127,13 +127,17 @@ class Teams extends NotificationProvider {
 
             let url;
 
-            if (monitorJSON["type"] === "port") {
-                url = monitorJSON["hostname"];
-                if (monitorJSON["port"]) {
-                    url += ":" + monitorJSON["port"];
-                }
-            } else {
-                url = monitorJSON["url"];
+            switch (monitorJSON["type"]) {
+                case "http":
+                case "keywork":
+                    url = monitorJSON["url"];
+                    break;
+                case "docker":
+                    url = monitorJSON["docker_host"];
+                    break;
+                default:
+                    url = monitorJSON["hostname"];
+                    break;
             }
 
             const payload = this._notificationPayloadFactory({

From ed7bc0e6d194f603eb6ca658b47560c10eeb1c2a Mon Sep 17 00:00:00 2001
From: MrEddX <66828538+MrEddX@users.noreply.github.com>
Date: Sun, 2 Oct 2022 09:55:58 +0300
Subject: [PATCH 08/48] Update bg-BG.js

Added New Fields
---
 src/languages/bg-BG.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/languages/bg-BG.js b/src/languages/bg-BG.js
index a234e56f..2002bc46 100644
--- a/src/languages/bg-BG.js
+++ b/src/languages/bg-BG.js
@@ -562,4 +562,24 @@ export default {
     "Docker Host": "Docker хост",
     "Docker Hosts": "Docker хостове",
     trustProxyDescription: "Trust 'X-Forwarded-*' headers.  Ако искате да получавате правилния IP адрес на клиента, а Uptime Kuma е зад системи като Nginx или Apache, трябва да разрешите тази опция.",
+    Examples: "Примери",
+    "Home Assistant URL": "Home Assistant URL адрес",
+    "Long-Lived Access Token": "Long-Lived Access Token",
+    "Long-Lived Access Token can be created by clicking on your profile name (bottom left) and scrolling to the bottom then click Create Token. ": "Long-Lived Access Token можете да създадете, като кликнете върху името на профила си (долу ляво) и превъртите до най-долу, след това кликнете върху Създаване на токен. ",
+    "Notification Service": "Услуга за известяване",
+    "default: notify all devices": "по подразбиране: извести всички устройства",
+    "A list of Notification Services can be found in Home Assistant under \"Developer Tools > Services\" search for \"notification\" to find your device/phone name.": "Списък с услугите за известяване може да бъде намерен в Home Assistant под \"Developer Tools > Services\", там потърсете \"notification\", за да намерите името на вашето устройство/телефон.",
+    "Automations can optionally be triggered in Home Assistant:": "Автоматизациите могат да се задействат при нужда в Home Assistant:",
+    "Trigger type:": "Задействане тип:",
+    "Event type:": "Събитие тип:",
+    "Event data:": "Събитие данни:",
+    "Then choose an action, for example switch the scene to where an RGB light is red.": "След което изберете действие, например да превключите сцената, където RGB светлината е червена.",
+    "Frontend Version": "Фронтенд версия",
+    "Frontend Version do not match backend version!": "Фронтенд версията не съвпада с Бекенд версията!",
+    "Base URL": "Базов  URL адрес",
+    goAlertInfo: "GoAlert е приложение с отворен код за планиране на повиквания, автоматизирани ескалации и известия (като SMS или гласови повиквания). Автоматично ангажирайте точния човек, по точния начин и в точното време! {0}",
+    goAlertIntegrationKeyInfo: "Вземете общ API интеграционен ключ за услугата във формат \"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\" обикновено стойността на параметъра token на копирания URL адрес.",
+    goAlert: "GoAlert",
+    backupOutdatedWarning: "Отпаднало: Тъй като са добавени много функции, тази опция за архивиране не е достатъчно поддържана и не може да генерира или възстанови пълен архив.",
+    backupRecommend: "Моля, архивирайте дяла или папката (./data/) директно вместо това.",
 };

From da34685019b6902b3464423a72f3b867a614a1d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?An=20=7C=20Anton=20R=C3=B6hm?=
 <18481195+AnTheMaker@users.noreply.github.com>
Date: Sun, 2 Oct 2022 13:38:33 +0200
Subject: [PATCH 09/48] fix typos

---
 CONTRIBUTING.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e9829c96..12fd6ed4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,7 +27,7 @@ The frontend code build into "dist" directory. The server (express.js) exposes t
 
 ## Can I create a pull request for Uptime Kuma?
 
-Yes or no, it depends on what you will try to do. Since I don't want to waste your time, be sure to **create empty draft pull request or open an issue, so we can discuss first**. Especially for a large pull request or you don't know it will be merged or not.
+Yes or no, it depends on what you will try to do. Since I don't want to waste your time, be sure to **create an empty draft pull request or open an issue, so we can discuss first**. Especially for a large pull request or you don't know it will be merged or not.
 
 Here are some references:
 
@@ -48,7 +48,7 @@ Here are some references:
 - UI/UX is not close to Uptime Kuma 
 - Existing logic is completely modified or deleted for no reason
 - A function that is completely out of scope
-- Unnesscary large code changes (Hard to review, casuse code conflicts to other pull requests)
+- Unnecessary large code changes (Hard to review, causes code conflicts to other pull requests)
 
 I will mark your pull request in the [milestones](https://github.com/louislam/uptime-kuma/milestones), if I am plan to review and merge it.
 
@@ -183,7 +183,7 @@ By default, the Chromium window will be shown up during the test. Specifying `HE
 
 ## Dependencies
 
-Both frontend and backend share the same package.json. However, the frontend dependencies are eventually not be used in production environment, because it is usually also baked into dist files. So:
+Both frontend and backend share the same package.json. However, the frontend dependencies are eventually not used in the production environment, because it is usually also baked into dist files. So:
 
 - Frontend dependencies = "devDependencies"
   - Examples: vue, chart.js

From 8595824b5dd7ce4eb94d9e554be77e5f9fc982ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?An=20=7C=20Anton=20R=C3=B6hm?=
 <18481195+AnTheMaker@users.noreply.github.com>
Date: Sun, 2 Oct 2022 13:49:40 +0200
Subject: [PATCH 10/48] Improve German translation

---
 src/languages/de-DE.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/languages/de-DE.js b/src/languages/de-DE.js
index bd5bf87d..a6ae4077 100644
--- a/src/languages/de-DE.js
+++ b/src/languages/de-DE.js
@@ -68,7 +68,7 @@ export default {
     Timezone: "Zeitzone",
     "Search Engine Visibility": "Sichtbarkeit für Suchmaschinen",
     "Allow indexing": "Indizierung zulassen",
-    "Discourage search engines from indexing site": "Halte Suchmaschinen von der Indexierung der Seite ab",
+    "Discourage search engines from indexing site": "Suchmaschinen darum bitten, die Seite nicht zu indizieren",
     "Change Password": "Passwort ändern",
     "Current Password": "Aktuelles Passwort",
     "New Password": "Neues Passwort",
@@ -78,7 +78,7 @@ export default {
     "Disable Auth": "Authentifizierung deaktivieren",
     "Enable Auth": "Authentifizierung aktivieren",
     "disableauth.message1": "Bist du sicher das du die <strong>Authentifizierung deaktivieren</strong> möchtest?",
-    "disableauth.message2": "Es ist für <strong>jemanden der eine externe Authentifizierung</strong> vor Uptime Kuma geschaltet hat, wie z.B. Cloudflare Access.",
+    "disableauth.message2": "Dies ist für Szenarien gedacht, <strong>in denen man eine externe Authentifizierung</strong> vor Uptime Kuma geschaltet hat, wie z.B. Cloudflare Access, Authelia oder andere Authentifizierungsmechanismen.",
     "Please use this option carefully!": "Bitte mit Vorsicht nutzen.",
     Logout: "Ausloggen",
     notificationDescription: "Benachrichtigungen müssen einem Monitor zugewiesen werden, damit diese funktionieren.",
@@ -559,7 +559,7 @@ export default {
     "ntfy Topic": "ntfy Thema",
     Domain: "Domain",
     Workstation: "Workstation",
-    disableCloudflaredNoAuthMsg: "Du bist im nicht-authentifizieren modus, ein Passwort wird nicht benötigt.",
+    disableCloudflaredNoAuthMsg: "Du bist im nicht-authentifizieren Modus, ein Passwort wird nicht benötigt.",
     trustProxyDescription: "Vertraue 'X-Forwarded-*' headern. Wenn man die richtige client IP haben möchte und Uptime Kuma hinter einem Proxy wie Nginx or Apache läuft, wollte dies aktiviert werden.",
     wayToGetLineNotifyToken: "Du kannst hier ein Token erhalten: {0}",
     Examples: "Beispiele",

From f6ac09b7513afccfed2c1e8a01921e3562351869 Mon Sep 17 00:00:00 2001
From: SametKUM <kumsamet@gmail.com>
Date: Sun, 2 Oct 2022 21:14:00 +0300
Subject: [PATCH 11/48] fix some translations

---
 src/languages/tr-TR.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/languages/tr-TR.js b/src/languages/tr-TR.js
index 75bc103c..1bf94993 100644
--- a/src/languages/tr-TR.js
+++ b/src/languages/tr-TR.js
@@ -224,7 +224,7 @@ export default {
     teams: "Microsoft Teams",
     "Webhook URL": "Webhook URL",
     wayToGetTeamsURL: "Bir webhook URL'sinin nasıl oluşturulacağını öğrenebilirsiniz {0}.",
-    signal: "Signal",
+    signal: "Sinyal",
     Number: "Numara",
     Recipients: "Alıcılar",
     needSignalAPI: "REST API ile bir signal istemciniz olması gerekiyor.",
@@ -552,14 +552,14 @@ export default {
     deleteDockerHostMsg: "Bu docker ana bilgisayarını tüm monitörler için silmek istediğinizden emin misiniz?",
     socket: "Soket",
     tcp: "TCP / HTTP",
-    "Docker Container": "Docker Konteyneri",
+    "Docker Container": "Docker Konteyner",
     "Container Name / ID": "Konteyner Adı / Kimliği",
     "Docker Host": "Docker Ana Bilgisayarı",
     "Docker Hosts": "Docker Ana Bilgisayarları",
     "ntfy Topic": "ntfy Konu",
     Domain: "Domain",
     Workstation: "İş İstasyonu",
-    disableCloudflaredNoAuthMsg: "Yetki Yok modundasınız, şifre gerekli değil.",
+    disableCloudflaredNoAuthMsg: "Yetki yok modundasınız, şifre gerekli değil.",
     trustProxyDescription: "'X-Forwarded-*' başlıklarına güvenin. Doğru istemci IP'sini almak istiyorsanız ve Uptime Kuma'nız Nginx veya Apache'nin arkasındaysa, bunu etkinleştirmelisiniz.",
     wayToGetLineNotifyToken: "{0} adresinden bir erişim jetonu alabilirsiniz.",
     Examples: "Örnekler",

From d39a4770e05edf42c545af412bf23cde9c6f8d1a Mon Sep 17 00:00:00 2001
From: 5idereal <nelson22768384@gmail.com>
Date: Mon, 3 Oct 2022 13:11:39 +0800
Subject: [PATCH 12/48] sync

---
 src/languages/zh-TW.js | 56 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 50 insertions(+), 6 deletions(-)

diff --git a/src/languages/zh-TW.js b/src/languages/zh-TW.js
index 3405c02a..afb1fabc 100644
--- a/src/languages/zh-TW.js
+++ b/src/languages/zh-TW.js
@@ -2,6 +2,8 @@ export default {
     languageName: "繁體中文 (台灣)",
     checkEverySecond: "每 {0} 秒檢查一次",
     retryCheckEverySecond: "每 {0} 秒重試一次",
+    resendEveryXTimes: "Resend every {0} times",
+    resendDisabled: "Resend disabled",
     retriesDescription: "在服務被標記為離線並傳送通知前的最大重試次數",
     ignoreTLSError: "忽略 HTTPS 網站的 TLS/SSL 錯誤",
     upsideDownModeDescription: "反轉顯示狀態。若服務可以連線，將顯示離線。",
@@ -72,6 +74,7 @@ export default {
     "Heartbeat Interval": "心跳間隔",
     Retries: "重試次數",
     "Heartbeat Retry Interval": "心跳重試間隔",
+    "Resend Notification if Down X times consequently": "若 X 次心跳皆離線，重新傳送通知",
     Advanced: "進階",
     "Upside Down Mode": "顛倒模式",
     "Max. Redirects": "最大重新導向次數",
@@ -455,6 +458,8 @@ export default {
     "Message:": "訊息：",
     "Don't know how to get the token? Please read the guide:": "不知道如何取得權杖嗎？請閱讀指南：",
     "The current connection may be lost if you are currently connecting via Cloudflare Tunnel. Are you sure want to stop it? Type your current password to confirm it.": "如果您目前正透過 Cloudflare Tunnel 連線，可能會導致連線中斷。您確定要停止嗎？請輸入密碼以確認。",
+    "HTTP Headers": "HTTP 標頭",
+    "Trust Proxy": "信任的 Proxy",
     "Other Software": "其他軟體",
     "For example: nginx, Apache and Traefik.": "例如 nginx、Apache 和 Traefik。",
     "Please read": "請閱覽",
@@ -467,6 +472,7 @@ export default {
     "Domain Name Expiry Notification": "網域名稱到期通知",
     Proxy: "Proxy",
     "Date Created": "建立日期",
+    HomeAssistant: "Home Assistant",
     onebotHttpAddress: "OneBot HTTP 位址",
     onebotMessageType: "OneBot 訊息類型",
     onebotGroupMessage: "群組",
@@ -479,6 +485,12 @@ export default {
     "Domain Names": "網域名稱",
     signedInDisp: "以 {0} 身分登入",
     signedInDispDisabled: "驗證已停用。",
+    RadiusSecret: "Radius Secret",
+    RadiusSecretDescription: "Shared Secret between client and server",
+    RadiusCalledStationId: "Called Station Id",
+    RadiusCalledStationIdDescription: "Identifier of the called device",
+    RadiusCallingStationId: "Calling Station Id",
+    RadiusCallingStationIdDescription: "Identifier of the calling device",
     "Certificate Expiry Notification": "憑證到期通知",
     "API Username": "API 使用者名稱",
     "API Key": "API 金鑰",
@@ -504,9 +516,9 @@ export default {
     "pushoversounds intermission": "中場休息",
     "pushoversounds magic": "魔法",
     "pushoversounds mechanical": "機械",
-    "pushoversounds pianobar": "Piano Bar",
-    "pushoversounds siren": "Siren",
-    "pushoversounds spacealarm": "Space Alarm",
+    "pushoversounds pianobar": "鋼琴酒吧",
+    "pushoversounds siren": "警鈴",
+    "pushoversounds spacealarm": "太空鬧鐘",
     "pushoversounds tugboat": "汽笛",
     "pushoversounds alien": "外星鬧鐘 (長)",
     "pushoversounds climb": "爬升 (長)",
@@ -531,11 +543,43 @@ export default {
     "Coming Soon": "即將推出",
     wayToGetClickSendSMSToken: "您可以從 {0} 取得 API 使用者名稱和金鑰。",
     "Connection String": "連線字串",
-    "Query": "查詢",
+    Query: "查詢",
     settingsCertificateExpiry: "TLS 憑證到期",
     certificationExpiryDescription: "TLS 將於 X 天後到期時觸發 HTTPS 監測器通知：",
+    "Setup Docker Host": "設定 Docker 主機",
+    "Connection Type": "連線類型",
+    "Docker Daemon": "Docker 精靈",
+    deleteDockerHostMsg: "您確定要為所有監測器刪除此 Docker 主機嗎？",
+    socket: "通訊端",
+    tcp: "TCP / HTTP",
+    "Docker Container": "Docker 容器",
+    "Container Name / ID": "容器名稱 / ID",
+    "Docker Host": "Docker 主機",
+    "Docker Hosts": "Docker 主機",
     "ntfy Topic": "ntfy 主題",
-    "Domain": "網域",
-    "Workstation": "工作站",
+    Domain: "網域",
+    Workstation: "工作站",
     disableCloudflaredNoAuthMsg: "您處於無驗證模式。無須輸入密碼。",
+    trustProxyDescription: "Trust 'X-Forwarded-*' headers. If you want to get the correct client IP and your Uptime Kuma is behind such as Nginx or Apache, you should enable this. 如果您的 Uptime Kuma 架設於 Nginx 或 Apache ",
+    wayToGetLineNotifyToken: "您可以從 {0} 取得存取權杖",
+    Examples: "範例",
+    "Home Assistant URL": "Home Assistant 網址",
+    "Long-Lived Access Token": "長期有效存取權杖",
+    "Long-Lived Access Token can be created by clicking on your profile name (bottom left) and scrolling to the bottom then click Create Token. ": "若要建立長期有效存取權杖，請點擊您的個人檔案名稱 (左下角)，捲動至最下方，然後點擊建立權杖。",
+    "Notification Service": "通知服務",
+    "default: notify all devices": "預設：通知所有服務",
+    "A list of Notification Services can be found in Home Assistant under \"Developer Tools > Services\" search for \"notification\" to find your device/phone name.": "A list of Notification Services can be found in Home Assistant under \"Developer Tools > Services\" search for \"notification\" to find your device/phone name.",
+    "Automations can optionally be triggered in Home Assistant:": " 	自動化程序可以 can optionally be triggered in Home Assistant:",
+    "Trigger type:": "觸發器類型：",
+    "Event type:": "事件類型：",
+    "Event data:": "事件資料：",
+    "Then choose an action, for example switch the scene to where an RGB light is red.": "Then choose an action, for example switch the scene to where an RGB light is red.",
+    "Frontend Version": "前端版本",
+    "Frontend Version do not match backend version!": "前端版本與後端版本不符！",
+    "Base URL": "Base URL",
+    goAlertInfo: "GoAlert 是用於待命排程、升級自動化，以及通知 (如簡訊或語音通話) 的開源應用程式。自動在正確的時間、用洽當的方法、聯絡合適的人！ {0}",
+    goAlertIntegrationKeyInfo: "Get generic API integration key for the service in this format \"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\" usually the value of token parameter of copied URL.",
+    goAlert: "GoAlert",
+    backupOutdatedWarning: "Deprecated: Since a lot of features added and this backup feature is a bit unmaintained, it cannot generate or restore a complete backup. 由於新功能的增加，且此備份功能，故",
+    backupRecommend: "Please backup the volume or the data folder (./data/) directly instead. 請直接備份或 ./data/ 資料夾",
 };

From 7672057319c28ec2957622abbcb2559e3cf5abc6 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Mon, 3 Oct 2022 15:51:29 +0800
Subject: [PATCH 13/48] [ntfy] Do not autofill

---
 src/components/notifications/Ntfy.vue | 14 +++++++-------
 src/languages/en.js                   |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/notifications/Ntfy.vue b/src/components/notifications/Ntfy.vue
index a42dca30..ddcc3917 100644
--- a/src/components/notifications/Ntfy.vue
+++ b/src/components/notifications/Ntfy.vue
@@ -12,21 +12,21 @@
         </div>
     </div>
     <div class="mb-3">
-        <label for="ntfy-username" class="form-label">{{ $t("Username") }}</label>
+        <label for="ntfy-priority" class="form-label">{{ $t("Priority") }}</label>
+        <input id="ntfy-priority" v-model="$parent.notification.ntfyPriority" type="number" class="form-control" required min="1" max="5" step="1">
+    </div>
+    <div class="mb-3">
+        <label for="ntfy-username" class="form-label">{{ $t("Username") }} ({{ $t("Optional") }})</label>
         <div class="input-group mb-3">
             <input id="ntfy-username" v-model="$parent.notification.ntfyusername" type="text" class="form-control" required>
         </div>
     </div>
     <div class="mb-3">
-        <label for="ntfy-password" class="form-label">{{ $t("Password") }}</label>
+        <label for="ntfy-password" class="form-label">{{ $t("Password") }} ({{ $t("Optional") }})</label>
         <div class="input-group mb-3">
-            <HiddenInput id="ntfy-password" v-model="$parent.notification.ntfypassword"></HiddenInput>
+            <HiddenInput id="ntfy-password" v-model="$parent.notification.ntfypassword" autocomplete="new-password"></HiddenInput>
         </div>
     </div>
-    <div class="mb-3">
-        <label for="ntfy-priority" class="form-label">{{ $t("Priority") }}</label>
-        <input id="ntfy-priority" v-model="$parent.notification.ntfyPriority" type="number" class="form-control" required min="1" max="5" step="1">
-    </div>
 </template>
 
 <script>
diff --git a/src/languages/en.js b/src/languages/en.js
index 7d980f63..00e9551f 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -582,4 +582,5 @@ export default {
     goAlert: "GoAlert",
     backupOutdatedWarning: "Deprecated: Since a lot of features added and this backup feature is a bit unmaintained, it cannot generate or restore a complete backup.",
     backupRecommend: "Please backup the volume or the data folder (./data/) directly instead.",
+    "Optional": "Optional",
 };

From c2c3f981bcd1e6c487d2260b51542a816b36e763 Mon Sep 17 00:00:00 2001
From: 5idereal <nelson22768384@gmail.com>
Date: Mon, 3 Oct 2022 18:03:15 +0800
Subject: [PATCH 14/48] update zh-tw translation

---
 src/languages/zh-TW.js | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/languages/zh-TW.js b/src/languages/zh-TW.js
index afb1fabc..e677d27e 100644
--- a/src/languages/zh-TW.js
+++ b/src/languages/zh-TW.js
@@ -2,8 +2,8 @@ export default {
     languageName: "繁體中文 (台灣)",
     checkEverySecond: "每 {0} 秒檢查一次",
     retryCheckEverySecond: "每 {0} 秒重試一次",
-    resendEveryXTimes: "Resend every {0} times",
-    resendDisabled: "Resend disabled",
+    resendEveryXTimes: "每 {0} 次便重新傳送",
+    resendDisabled: "重新傳送已停用",
     retriesDescription: "在服務被標記為離線並傳送通知前的最大重試次數",
     ignoreTLSError: "忽略 HTTPS 網站的 TLS/SSL 錯誤",
     upsideDownModeDescription: "反轉顯示狀態。若服務可以連線，將顯示離線。",
@@ -486,11 +486,11 @@ export default {
     signedInDisp: "以 {0} 身分登入",
     signedInDispDisabled: "驗證已停用。",
     RadiusSecret: "Radius Secret",
-    RadiusSecretDescription: "Shared Secret between client and server",
-    RadiusCalledStationId: "Called Station Id",
-    RadiusCalledStationIdDescription: "Identifier of the called device",
-    RadiusCallingStationId: "Calling Station Id",
-    RadiusCallingStationIdDescription: "Identifier of the calling device",
+    RadiusSecretDescription: "客戶端與伺服器端的共享機密",
+    RadiusCalledStationId: "被叫站 Id",
+    RadiusCalledStationIdDescription: "被呼叫裝置的識別碼",
+    RadiusCallingStationId: "呼叫站 Id",
+    RadiusCallingStationIdDescription: "呼叫裝置的識別碼",
     "Certificate Expiry Notification": "憑證到期通知",
     "API Username": "API 使用者名稱",
     "API Key": "API 金鑰",
@@ -500,8 +500,8 @@ export default {
     "Octopush API Version": "Octopush API 版本",
     "Legacy Octopush-DM": "舊版 Octopush-DM",
     "endpoint": "端",
-    octopushAPIKey: "\"API key\" from HTTP API credentials in control panel",
-    octopushLogin: "\"Login\" from HTTP API credentials in control panel",
+    octopushAPIKey: "在控制台的 HTTP API 憑證取得的 \"API 金鑰\"",
+    octopushLogin: "在控制台的 HTTP API 憑證取得的 \"Login\"",
     promosmsLogin: "API 登入名稱",
     promosmsPassword: "API 密碼",
     "pushoversounds pushover": "Pushover (預設)",
@@ -560,7 +560,7 @@ export default {
     Domain: "網域",
     Workstation: "工作站",
     disableCloudflaredNoAuthMsg: "您處於無驗證模式。無須輸入密碼。",
-    trustProxyDescription: "Trust 'X-Forwarded-*' headers. If you want to get the correct client IP and your Uptime Kuma is behind such as Nginx or Apache, you should enable this. 如果您的 Uptime Kuma 架設於 Nginx 或 Apache ",
+    trustProxyDescription: "信任 'X-Forwarded-*' 標頭。如果您想要取得正確的客戶端 IP，且您的 Uptime Kuma 架設於 Nginx 或 Apache 後方，您應啟用此選項。",
     wayToGetLineNotifyToken: "您可以從 {0} 取得存取權杖",
     Examples: "範例",
     "Home Assistant URL": "Home Assistant 網址",
@@ -568,18 +568,18 @@ export default {
     "Long-Lived Access Token can be created by clicking on your profile name (bottom left) and scrolling to the bottom then click Create Token. ": "若要建立長期有效存取權杖，請點擊您的個人檔案名稱 (左下角)，捲動至最下方，然後點擊建立權杖。",
     "Notification Service": "通知服務",
     "default: notify all devices": "預設：通知所有服務",
-    "A list of Notification Services can be found in Home Assistant under \"Developer Tools > Services\" search for \"notification\" to find your device/phone name.": "A list of Notification Services can be found in Home Assistant under \"Developer Tools > Services\" search for \"notification\" to find your device/phone name.",
-    "Automations can optionally be triggered in Home Assistant:": " 	自動化程序可以 can optionally be triggered in Home Assistant:",
+    "A list of Notification Services can be found in Home Assistant under \"Developer Tools > Services\" search for \"notification\" to find your device/phone name.": "您可以在 Home Assistant 中查看通知服務的列表，在\"開發者工具 > 服務\"下搜尋\"通知\"來找到您的裝置/手機的名稱。",
+    "Automations can optionally be triggered in Home Assistant:": "可以選擇在 Home Assistant 中觸發自動化程序：",
     "Trigger type:": "觸發器類型：",
     "Event type:": "事件類型：",
     "Event data:": "事件資料：",
-    "Then choose an action, for example switch the scene to where an RGB light is red.": "Then choose an action, for example switch the scene to where an RGB light is red.",
+    "Then choose an action, for example switch the scene to where an RGB light is red.": "然後選擇動作，例如切換至 RGB 燈為紅色的場景。",
     "Frontend Version": "前端版本",
     "Frontend Version do not match backend version!": "前端版本與後端版本不符！",
-    "Base URL": "Base URL",
+    "Base URL": "基底網址",
     goAlertInfo: "GoAlert 是用於待命排程、升級自動化，以及通知 (如簡訊或語音通話) 的開源應用程式。自動在正確的時間、用洽當的方法、聯絡合適的人！ {0}",
-    goAlertIntegrationKeyInfo: "Get generic API integration key for the service in this format \"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\" usually the value of token parameter of copied URL.",
+    goAlertIntegrationKeyInfo: "取得服務的通用 API 整合金鑰，格式為 \"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\"。通常是已複製的網址的權杖參數值。",
     goAlert: "GoAlert",
-    backupOutdatedWarning: "Deprecated: Since a lot of features added and this backup feature is a bit unmaintained, it cannot generate or restore a complete backup. 由於新功能的增加，且此備份功能，故",
-    backupRecommend: "Please backup the volume or the data folder (./data/) directly instead. 請直接備份或 ./data/ 資料夾",
+    backupOutdatedWarning: "過時：由於新功能的增加，且未妥善維護，故此備份功能無法產生或復原完整備份。",
+    backupRecommend: "請直接備份磁碟區或 ./data/ 資料夾。",
 };

From b0d6b5b13d59de628eeb8820cfb3023d8501566a Mon Sep 17 00:00:00 2001
From: George Tsomlektsis <ultrawelfaredev@gmail.com>
Date: Mon, 3 Oct 2022 17:48:34 +0300
Subject: [PATCH 15/48] Fixed entry route not redirecting correctly when the
 status entry page changes slug.

---
 server/server.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/server/server.js b/server/server.js
index 0c9a45e6..0f215245 100644
--- a/server/server.js
+++ b/server/server.js
@@ -155,7 +155,9 @@ let needSetup = false;
     Database.init(args);
     await initDatabase(testMode);
 
-    exports.entryPage = await setting("entryPage");
+    const entryPage = (await getSettings("general"))["entryPage"];
+    exports.entryPage = entryPage;
+    UptimeKumaServer.getInstance().entryPage = entryPage;
     await StatusPage.loadDomainMappingList();
 
     log.info("server", "Adding route");
@@ -176,14 +178,15 @@ let needSetup = false;
 
         log.debug("entry", `Request Domain: ${hostname}`);
 
+        const uptimeKumaEntryPage=UptimeKumaServer.getInstance().entryPage;
         if (hostname in StatusPage.domainMappingList) {
             log.debug("entry", "This is a status page domain");
 
             let slug = StatusPage.domainMappingList[hostname];
             await StatusPage.handleStatusPageResponse(response, server.indexHTML, slug);
 
-        } else if (exports.entryPage && exports.entryPage.startsWith("statusPage-")) {
-            response.redirect("/status/" + exports.entryPage.replace("statusPage-", ""));
+        } else if (uptimeKumaEntryPage && uptimeKumaEntryPage.startsWith('statusPage-')) {
+            response.redirect("/status/" + uptimeKumaEntryPage.replace("statusPage-", ""));
 
         } else {
             response.redirect("/dashboard");
@@ -200,7 +203,7 @@ let needSetup = false;
     // Robots.txt
     app.get("/robots.txt", async (_request, response) => {
         let txt = "User-agent: *\nDisallow:";
-        if (! await setting("searchEngineIndex")) {
+        if (!await setting("searchEngineIndex")) {
             txt += " /";
         }
         response.setHeader("Content-Type", "text/plain");
@@ -1085,6 +1088,7 @@ let needSetup = false;
 
                 await setSettings("general", data);
                 exports.entryPage = data.entryPage;
+                UptimeKumaServer.getInstance().entryPage = data.entryPage;
 
                 callback({
                     ok: true,

From 3e699f8ac3c544cd0dd7d9459ef9b8da3c7efd65 Mon Sep 17 00:00:00 2001
From: George Tsomlektsis <ultrawelfaredev@gmail.com>
Date: Mon, 3 Oct 2022 18:01:52 +0300
Subject: [PATCH 16/48] Fix linting errors.

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

diff --git a/server/server.js b/server/server.js
index 0f215245..620e5bb4 100644
--- a/server/server.js
+++ b/server/server.js
@@ -178,14 +178,14 @@ let needSetup = false;
 
         log.debug("entry", `Request Domain: ${hostname}`);
 
-        const uptimeKumaEntryPage=UptimeKumaServer.getInstance().entryPage;
+        const uptimeKumaEntryPage = UptimeKumaServer.getInstance().entryPage;
         if (hostname in StatusPage.domainMappingList) {
             log.debug("entry", "This is a status page domain");
 
             let slug = StatusPage.domainMappingList[hostname];
             await StatusPage.handleStatusPageResponse(response, server.indexHTML, slug);
 
-        } else if (uptimeKumaEntryPage && uptimeKumaEntryPage.startsWith('statusPage-')) {
+        } else if (uptimeKumaEntryPage && uptimeKumaEntryPage.startsWith("statusPage-")) {
             response.redirect("/status/" + uptimeKumaEntryPage.replace("statusPage-", ""));
 
         } else {

From 068675716086fe8cd24922dddc6c7d2db5c07a95 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Tue, 4 Oct 2022 16:19:56 +0800
Subject: [PATCH 17/48] [Docker Monitor] Change `tcp://` to `http://`

---
 server/docker.js                                | 14 +++++++++++++-
 server/model/monitor.js                         |  3 ++-
 server/socket-handlers/docker-socket-handler.js |  2 +-
 src/components/DockerHostDialog.vue             |  3 ++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/server/docker.js b/server/docker.js
index 177fa6cb..ff231502 100644
--- a/server/docker.js
+++ b/server/docker.js
@@ -75,7 +75,7 @@ class DockerHost {
         if (dockerHost.dockerType === "socket") {
             options.socketPath = dockerHost.dockerDaemon;
         } else if (dockerHost.dockerType === "tcp") {
-            options.baseURL = dockerHost.dockerDaemon;
+            options.baseURL = DockerHost.patchDockerURL(dockerHost.dockerDaemon);
         }
 
         let res = await axios.request(options);
@@ -99,6 +99,18 @@ class DockerHost {
         }
 
     }
+
+    /**
+     * Since axios 0.27.X, it does not accept `tcp://` protocol.
+     * Change it to `http://` on the fly in order to fix it. (https://github.com/louislam/uptime-kuma/issues/2165)
+     */
+    static patchDockerURL(url) {
+        if (typeof url === "string") {
+            // Replace the first occurrence only with g
+            return url.replace(/tcp:\/\//g, "http://");
+        }
+        return url;
+    }
 }
 
 module.exports = {
diff --git a/server/model/monitor.js b/server/model/monitor.js
index f96b4df0..ac892560 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -17,6 +17,7 @@ const version = require("../../package.json").version;
 const apicache = require("../modules/apicache");
 const { UptimeKumaServer } = require("../uptime-kuma-server");
 const { CacheableDnsHttpAgent } = require("../cacheable-dns-http-agent");
+const { DockerHost } = require("../docker");
 
 /**
  * status:
@@ -498,7 +499,7 @@ class Monitor extends BeanModel {
                     if (dockerHost._dockerType === "socket") {
                         options.socketPath = dockerHost._dockerDaemon;
                     } else if (dockerHost._dockerType === "tcp") {
-                        options.baseURL = dockerHost._dockerDaemon;
+                        options.baseURL = DockerHost.patchDockerURL(dockerHost._dockerDaemon);
                     }
 
                     log.debug(`[${this.name}] Axios Request`);
diff --git a/server/socket-handlers/docker-socket-handler.js b/server/socket-handlers/docker-socket-handler.js
index 5a53494d..542f18ce 100644
--- a/server/socket-handlers/docker-socket-handler.js
+++ b/server/socket-handlers/docker-socket-handler.js
@@ -56,7 +56,7 @@ module.exports.dockerSocketHandler = (socket) => {
             let amount = await DockerHost.testDockerHost(dockerHost);
             let msg;
 
-            if (amount > 1) {
+            if (amount >= 1) {
                 msg = "Connected Successfully. Amount of containers: " + amount;
             } else {
                 msg = "Connected Successfully, but there are no containers?";
diff --git a/src/components/DockerHostDialog.vue b/src/components/DockerHostDialog.vue
index 92a8ce45..50ffa49c 100644
--- a/src/components/DockerHostDialog.vue
+++ b/src/components/DockerHostDialog.vue
@@ -30,7 +30,8 @@
                                 {{ $t("Examples") }}:
                                 <ul>
                                     <li>/var/run/docker.sock</li>
-                                    <li>tcp://localhost:2375</li>
+                                    <li>http://localhost:2375</li>
+                                    <li>https://localhost:2376 (TLS)</li>
                                 </ul>
                             </div>
                         </div>

From 16b2cf0e89ea421aa2640e3c1fa330e6d2f837e4 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Tue, 4 Oct 2022 17:50:11 +0800
Subject: [PATCH 18/48] Update to 1.18.2

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 219042aa..2357bfe4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "uptime-kuma",
-    "version": "1.18.0",
+    "version": "1.18.2",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -40,7 +40,7 @@
         "build-docker-nightly-amd64": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain",
         "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test --target pr-test . --push",
         "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain",
-        "setup": "git checkout 1.18.0 && npm ci --production && npm run download-dist",
+        "setup": "git checkout 1.18.2 && npm ci --production && npm run download-dist",
         "download-dist": "node extra/download-dist.js",
         "mark-as-nightly": "node extra/mark-as-nightly.js",
         "reset-password": "node extra/reset-password.js",

From afbc283423c633240c9628308508c9c32ec69d8b Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Tue, 4 Oct 2022 22:23:57 +0800
Subject: [PATCH 19/48] Move Cypress directory and convert it to JavaScript
 (#2170)

---
 config/cypress.config.js                      | 26 +++++++++++++++++++
 cypress.config.ts                             | 15 -----------
 cypress/e2e/setup.cy.ts                       | 24 -----------------
 cypress/support/actors/actor.ts               |  8 ------
 cypress/support/e2e.ts                        |  1 -
 cypress/support/tasks/setup-task.ts           | 15 -----------
 package.json                                  |  3 ++-
 src/util.js                                   |  6 ++---
 test/cypress/e2e/setup.cy.js                  | 18 +++++++++++++
 {cypress => test/cypress}/plugins/index.js    |  0
 test/cypress/support/actors/actor.js          |  8 ++++++
 .../cypress/support/commands.js               |  0
 .../cypress/support/const/user-data.js        |  2 +-
 test/cypress/support/e2e.js                   |  1 +
 .../cypress/support/pages/dashboard-page.js   |  2 +-
 .../cypress/support/pages/setup-page.js       |  2 +-
 test/cypress/support/tasks/setup-task.js      | 11 ++++++++
 tsconfig.json                                 |  8 +++---
 18 files changed, 75 insertions(+), 75 deletions(-)
 create mode 100644 config/cypress.config.js
 delete mode 100644 cypress.config.ts
 delete mode 100644 cypress/e2e/setup.cy.ts
 delete mode 100644 cypress/support/actors/actor.ts
 delete mode 100644 cypress/support/e2e.ts
 delete mode 100644 cypress/support/tasks/setup-task.ts
 create mode 100644 test/cypress/e2e/setup.cy.js
 rename {cypress => test/cypress}/plugins/index.js (100%)
 create mode 100644 test/cypress/support/actors/actor.js
 rename cypress/support/commands.ts => test/cypress/support/commands.js (100%)
 rename cypress/support/const/user-data.ts => test/cypress/support/const/user-data.js (62%)
 create mode 100644 test/cypress/support/e2e.js
 rename cypress/support/pages/dasboard-page.ts => test/cypress/support/pages/dashboard-page.js (62%)
 rename cypress/support/pages/setup-page.ts => test/cypress/support/pages/setup-page.js (90%)
 create mode 100644 test/cypress/support/tasks/setup-task.js

diff --git a/config/cypress.config.js b/config/cypress.config.js
new file mode 100644
index 00000000..4eeb6845
--- /dev/null
+++ b/config/cypress.config.js
@@ -0,0 +1,26 @@
+const { defineConfig } = require("cypress");
+
+module.exports = defineConfig({
+    e2e: {
+        setupNodeEvents(on, config) {
+
+        },
+        fixturesFolder: "test/cypress/fixtures",
+        screenshotsFolder: "test/cypress/screenshots",
+        videosFolder: "test/cypress/videos",
+        downloadsFolder: "test/cypress/downloads",
+        supportFile: "test/cypress/support/e2e.js",
+        baseUrl: "http://localhost:3002",
+        defaultCommandTimeout: 10000,
+        pageLoadTimeout: 60000,
+        viewportWidth: 1920,
+        viewportHeight: 1080,
+        specPattern: [
+            "test/cypress/e2e/setup.cy.js",
+            "test/cypress/e2e/**/*.js"
+        ],
+    },
+    env: {
+        baseUrl: "http://localhost:3002",
+    },
+});
diff --git a/cypress.config.ts b/cypress.config.ts
deleted file mode 100644
index d97e0875..00000000
--- a/cypress.config.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { defineConfig } from "cypress";
-
-export default defineConfig({
-    e2e: {
-        baseUrl: "http://localhost:3002",
-        defaultCommandTimeout: 10000,
-        pageLoadTimeout: 60000,
-        viewportWidth: 1920,
-        viewportHeight: 1080,
-        specPattern: ["cypress/e2e/setup.cy.ts", "cypress/e2e/**/*.ts"],
-    },
-    env: {
-        baseUrl: "http://localhost:3002",
-    },
-});
diff --git a/cypress/e2e/setup.cy.ts b/cypress/e2e/setup.cy.ts
deleted file mode 100644
index 94e18ede..00000000
--- a/cypress/e2e/setup.cy.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { actor } from "../support/actors/actor";
-import { DEFAULT_USER_DATA } from "../support/const/user-data";
-import { DashboardPage } from "../support/pages/dasboard-page";
-import { SetupPage } from "../support/pages/setup-page";
-
-describe("user can create a new account on setup page", () => {
-    before(() => {
-        cy.visit("/setup");
-    });
-
-    it("user can create new account", () => {
-        cy.url().should("be.equal", SetupPage.url);
-        actor.setupTask.fillAndSubmitSetupForm(
-            DEFAULT_USER_DATA.username,
-            DEFAULT_USER_DATA.password,
-            DEFAULT_USER_DATA.password
-        );
-
-        cy.url().should("be.equal", DashboardPage.url);
-        cy.get('[role="alert"]')
-            .should("be.visible")
-            .and("contain.text", "Added Successfully.");
-    });
-});
diff --git a/cypress/support/actors/actor.ts b/cypress/support/actors/actor.ts
deleted file mode 100644
index 680c26ce..00000000
--- a/cypress/support/actors/actor.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { SetupTask } from "../tasks/setup-task";
-
-class Actor {
-    setupTask: SetupTask = new SetupTask();
-}
-
-const actor = new Actor();
-export { actor };
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
deleted file mode 100644
index f887c29a..00000000
--- a/cypress/support/e2e.ts
+++ /dev/null
@@ -1 +0,0 @@
-import "./commands";
diff --git a/cypress/support/tasks/setup-task.ts b/cypress/support/tasks/setup-task.ts
deleted file mode 100644
index 866e3ca5..00000000
--- a/cypress/support/tasks/setup-task.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { SetupPage } from "../pages/setup-page";
-
-export class SetupTask {
-    fillAndSubmitSetupForm(
-        username: string,
-        password: string,
-        passwordRepeat: string
-    ) {
-        cy.get(SetupPage.usernameInput).type(username);
-        cy.get(SetupPage.passWordInput).type(password);
-        cy.get(SetupPage.passwordRepeatInput).type(passwordRepeat);
-
-        cy.get(SetupPage.submitSetupForm).click();
-    }
-}
diff --git a/package.json b/package.json
index 2357bfe4..479876a6 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,8 @@
         "build-dist-and-restart": "npm run build && npm run start-server-dev",
         "start-pr-test": "node extra/checkout-pr.js && npm install && npm run dev",
         "cy:test": "node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/ --e2e",
-        "cy:run": "npx cypress run --browser chrome --headless"
+        "cy:run": "npx cypress run --browser chrome --headless --config-file ./config/cypress.config.js",
+        "cypress-open": "concurrently -k -r \"node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/\" \"cypress open --config-file ./config/cypress.config.js\""
     },
     "dependencies": {
         "@louislam/sqlite3": "~15.0.6",
diff --git a/src/util.js b/src/util.js
index d5e3617f..d766feb7 100644
--- a/src/util.js
+++ b/src/util.js
@@ -280,9 +280,9 @@ function getCryptoRandomInt(min, max) {
 }
 exports.getCryptoRandomInt = getCryptoRandomInt;
 /**
- * Generate a secret
- * @param length Lenght of secret to generate
- * @returns
+ * Generate a random alphanumeric string of fixed length
+ * @param length Length of string to generate
+ * @returns string
  */
 function genSecret(length = 64) {
     let secret = "";
diff --git a/test/cypress/e2e/setup.cy.js b/test/cypress/e2e/setup.cy.js
new file mode 100644
index 00000000..57960403
--- /dev/null
+++ b/test/cypress/e2e/setup.cy.js
@@ -0,0 +1,18 @@
+const actor = require("../support/actors/actor");
+const userData = require("../support/const/user-data");
+const dashboardPage = require("../support/pages/dashboard-page");
+const setupPage = require("../support/pages/setup-page");
+
+describe("user can create a new account on setup page", () => {
+    before(() => {
+        cy.visit("/setup");
+    });
+    it("user can create new account", () => {
+        cy.url().should("be.equal", setupPage.SetupPage.url);
+        actor.actor.setupTask.fillAndSubmitSetupForm(userData.DEFAULT_USER_DATA.username, userData.DEFAULT_USER_DATA.password, userData.DEFAULT_USER_DATA.password);
+        cy.url().should("be.equal", dashboardPage.DashboardPage.url);
+        cy.get('[role="alert"]')
+            .should("be.visible")
+            .and("contain.text", "Added Successfully.");
+    });
+});
diff --git a/cypress/plugins/index.js b/test/cypress/plugins/index.js
similarity index 100%
rename from cypress/plugins/index.js
rename to test/cypress/plugins/index.js
diff --git a/test/cypress/support/actors/actor.js b/test/cypress/support/actors/actor.js
new file mode 100644
index 00000000..9775880b
--- /dev/null
+++ b/test/cypress/support/actors/actor.js
@@ -0,0 +1,8 @@
+const setupTask = require("../tasks/setup-task");
+class Actor {
+    constructor() {
+        this.setupTask = new setupTask.SetupTask();
+    }
+}
+const actor = new Actor();
+exports.actor = actor;
diff --git a/cypress/support/commands.ts b/test/cypress/support/commands.js
similarity index 100%
rename from cypress/support/commands.ts
rename to test/cypress/support/commands.js
diff --git a/cypress/support/const/user-data.ts b/test/cypress/support/const/user-data.js
similarity index 62%
rename from cypress/support/const/user-data.ts
rename to test/cypress/support/const/user-data.js
index ee2264dd..983597bd 100644
--- a/cypress/support/const/user-data.ts
+++ b/test/cypress/support/const/user-data.js
@@ -1,4 +1,4 @@
-export const DEFAULT_USER_DATA = {
+exports.DEFAULT_USER_DATA = {
     username: "testuser",
     password: "testuser123",
 };
diff --git a/test/cypress/support/e2e.js b/test/cypress/support/e2e.js
new file mode 100644
index 00000000..449ab857
--- /dev/null
+++ b/test/cypress/support/e2e.js
@@ -0,0 +1 @@
+require("./commands");
diff --git a/cypress/support/pages/dasboard-page.ts b/test/cypress/support/pages/dashboard-page.js
similarity index 62%
rename from cypress/support/pages/dasboard-page.ts
rename to test/cypress/support/pages/dashboard-page.js
index 48660dc1..fc2d67e1 100644
--- a/cypress/support/pages/dasboard-page.ts
+++ b/test/cypress/support/pages/dashboard-page.js
@@ -1,3 +1,3 @@
-export const DashboardPage = {
+exports.DashboardPage = {
     url: Cypress.env("baseUrl") + "/dashboard",
 };
diff --git a/cypress/support/pages/setup-page.ts b/test/cypress/support/pages/setup-page.js
similarity index 90%
rename from cypress/support/pages/setup-page.ts
rename to test/cypress/support/pages/setup-page.js
index 8c1b9cfa..44a525a8 100644
--- a/cypress/support/pages/setup-page.ts
+++ b/test/cypress/support/pages/setup-page.js
@@ -1,4 +1,4 @@
-export const SetupPage = {
+exports.SetupPage = {
     url: Cypress.env("baseUrl") + "/setup",
     usernameInput: '[data-cy="username-input"]',
     passWordInput: '[data-cy="password-input"]',
diff --git a/test/cypress/support/tasks/setup-task.js b/test/cypress/support/tasks/setup-task.js
new file mode 100644
index 00000000..205f78c2
--- /dev/null
+++ b/test/cypress/support/tasks/setup-task.js
@@ -0,0 +1,11 @@
+const setupPage = require("../pages/setup-page");
+
+class SetupTask {
+    fillAndSubmitSetupForm(username, password, passwordRepeat) {
+        cy.get(setupPage.SetupPage.usernameInput).type(username);
+        cy.get(setupPage.SetupPage.passWordInput).type(password);
+        cy.get(setupPage.SetupPage.passwordRepeatInput).type(passwordRepeat);
+        cy.get(setupPage.SetupPage.submitSetupForm).click();
+    }
+}
+exports.SetupTask = SetupTask;
diff --git a/tsconfig.json b/tsconfig.json
index cd5f7c5d..c5454642 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -11,11 +11,9 @@
         "removeComments": false,
         "preserveConstEnums": true,
         "sourceMap": false,
-        "strict": true,
-        "types": ["cypress"]
+        "strict": true
     },
     "files": [
-        "./src/util.ts",
-    ],
-    "include": ["cypress/**/*.ts"]
+        "./src/util.ts"
+    ]
 }

From f1a9046193f014148d6fcdaf53ee53c6a2f4608e Mon Sep 17 00:00:00 2001
From: Sympatron GmbH <35803463+Sympatron@users.noreply.github.com>
Date: Tue, 4 Oct 2022 15:30:19 +0000
Subject: [PATCH 20/48] Prevent terminal window from showing when using ping on
 Windows (#2152)

---
 server/ping-lite.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/ping-lite.js b/server/ping-lite.js
index b7d003b8..05dff31d 100644
--- a/server/ping-lite.js
+++ b/server/ping-lite.js
@@ -105,7 +105,7 @@ Ping.prototype.send = function (callback) {
     let _exited;
     let _errored;
 
-    this._ping = spawn(this._bin, this._args); // spawn the binary
+    this._ping = spawn(this._bin, this._args, { windowsHide: true }); // spawn the binary
 
     this._ping.on("error", function (err) { // handle binary errors
         _errored = true;

From d565320f7422fe4493fc2f22962219780848476e Mon Sep 17 00:00:00 2001
From: Muhammed Hussein karimi <info@karimi.dev>
Date: Wed, 5 Oct 2022 08:23:58 +0330
Subject: [PATCH 21/48] New Demo Server (#2172)

Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index b81c0be2..2ebf31a0 100644
--- a/README.md
+++ b/README.md
@@ -15,11 +15,12 @@ It is a self-hosted monitoring tool like "Uptime Robot".
 
 Try it!
 
-https://demo.uptime.kuma.pet
+https://demo.uptime.kuma.pet (Tokyo Server)
+https://demo.uptime-kuma.karimi.dev:27000 (Europe server)
 
-It is a temporary live demo, all data will be deleted after 10 minutes. The server is located in Tokyo, so if you live far from there, it may affect your experience. I suggest that you should install and try it out for the best demo experience.
+It is a temporary live demo, all data will be deleted after 10 minutes. Use the one that is closer to you, but I suggest that you should install and try it out for the best demo experience.
 
-VPS is sponsored by Uptime Kuma sponsors on [Open Collective](https://opencollective.com/uptime-kuma)! Thank you so much!
+Tokyo VPS is sponsored by Uptime Kuma sponsors on [Open Collective](https://opencollective.com/uptime-kuma)! Thank you so much!
 
 ## ⭐ Features
 

From 12696dd53ea1eb5407c46cda05d38ac30603121f Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Wed, 5 Oct 2022 12:54:25 +0800
Subject: [PATCH 22/48] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2ebf31a0..cb81f4db 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,8 @@ It is a self-hosted monitoring tool like "Uptime Robot".
 
 Try it!
 
-https://demo.uptime.kuma.pet (Tokyo Server)
-https://demo.uptime-kuma.karimi.dev:27000 (Europe server)
+- https://demo.uptime.kuma.pet (Tokyo Server)
+- https://demo.uptime-kuma.karimi.dev:27000 (Europe server)
 
 It is a temporary live demo, all data will be deleted after 10 minutes. Use the one that is closer to you, but I suggest that you should install and try it out for the best demo experience.
 

From e5145a209ac642a36da539dc414f26da75486c52 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Wed, 5 Oct 2022 13:28:13 +0800
Subject: [PATCH 23/48] Update cypress config

---
 config/cypress.config.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/cypress.config.js b/config/cypress.config.js
index 4eeb6845..26784e88 100644
--- a/config/cypress.config.js
+++ b/config/cypress.config.js
@@ -1,7 +1,9 @@
 const { defineConfig } = require("cypress");
 
 module.exports = defineConfig({
+    projectId: "vyjuem",
     e2e: {
+        experimentalStudio: true,
         setupNodeEvents(on, config) {
 
         },

From 64ba2dce2483eb413ac2c4c1ca6d3e513d8fcafe Mon Sep 17 00:00:00 2001
From: Cyril59310 <70776486+cyril59310@users.noreply.github.com>
Date: Wed, 5 Oct 2022 07:57:38 +0200
Subject: [PATCH 24/48] Update FR language (#2173)

---
 src/languages/fr-FR.js | 120 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 110 insertions(+), 10 deletions(-)

diff --git a/src/languages/fr-FR.js b/src/languages/fr-FR.js
index 10b8c1ba..22df2728 100644
--- a/src/languages/fr-FR.js
+++ b/src/languages/fr-FR.js
@@ -200,7 +200,7 @@ export default {
     chatIDNotFound: "ID du salon introuvable, envoyez un message via le bot avant",
     webhook: "Webhook",
     "Post URL": "Post URL",
-    "Content Type": "Content Type",
+    "Content Type": "Type de contenu",
     webhookJsonDesc: "{0} est bien/bon pour tous les serveurs HTTP modernes comme express.js",
     webhookFormDataDesc: "{multipart} est bien/bon pour du PHP, vous avez juste besoin de mettre le json via/depuis {decodeFunction}",
     smtp: "Email (SMTP)",
@@ -227,8 +227,8 @@ export default {
     wayToCheckSignalURL: "Vous pouvez regarder l'URL sur comment le mettre en place :",
     signalImportant: "IMPORTANT : Vous ne pouvez pas mixer les groupes et les numéros en destinataires !",
     gotify: "Gotify",
-    "Application Token": "Application Token",
-    "Server URL": "Server URL",
+    "Application Token": "Jeton d'application",
+    "Server URL": "URL du serveur",
     Priority: "Priorité",
     slack: "Slack",
     "Icon Emoji": "Icon Emoji",
@@ -287,7 +287,7 @@ export default {
     promosmsTypeSpeed: "SMS SPEED - La plus haute des priorités dans le système. Très rapide et fiable mais cher (environ le double du prix d'un SMS FULL).",
     promosmsPhoneNumber: "Numéro de téléphone (Poiur les déstinataires Polonais, vous pouvez enlever les codes interna.)",
     promosmsSMSSender: "SMS Expéditeur : Nom pré-enregistré ou l'un de base : InfoSMS, SMS Info, MaxSMS, INFO, SMS",
-    "Primary Base URL": "Primary Base URL",
+    "Primary Base URL": "URL principale",
     emailCustomSubject: "Sujet personalisé",
     clicksendsms: "ClickSend SMS",
     checkPrice: "Vérification {0} tarifs :",
@@ -342,13 +342,13 @@ export default {
     Title: "Titre",
     Content: "Contenu",
     Style: "Style",
-    info: "info",
+    info: "Info",
     warning: "Attention",
-    danger: "danger",
+    danger: "Danger",
     error: "Erreur",
-    critical: "critique",
-    primary: "primaire",
-    light: "blanc",
+    critical: "Critique",
+    primary: "Primaire",
+    light: "Blanc",
     dark: "Noir",
     Post: "Post",
     "Please input title and content": "Veuillez entrer le titre et le contenu",
@@ -390,7 +390,7 @@ export default {
     Installed: "Installé",
     "Not installed": "Pas installé",
     "Remove Token": "Supprimer le jeton",
-    Slug: "chemin",
+    Slug: "Chemin",
     "The slug is already taken. Please choose another slug.": "Le chemin est déjà pris. Veuillez choisir un autre chemin.",
     Authentication: "Authentication",
     "Page Not Found": "Page non trouvée",
@@ -431,4 +431,104 @@ export default {
     "Trigger type:": "Type de déclencheur:",
     "Event type:": "Type d'événement:",
     "Event data:": "Données d'événement:",
+    topic: "Topic",
+    topicExplanation: "MQTT sujet à surveiller",
+    successMessage: "Message de réussite",
+    successMessageExplanation: "MQTT message qui sera considéré comme un succès",
+    "Powered by": "Propulsé par",
+    serwersms: "SerwerSMS.pl",
+    stackfield: "Stackfield",
+    smtpDkimSettings: "Paramètres DKIM",
+    smtpDkimDesc: "Veuillez vous référer au Nodemailer DKIM {0} pour l'utilisation.",
+    documentation: "Documentation",
+    smtpDkimDomain: "Nom de domaine",
+    smtpDkimKeySelector: "Sélecteur de clé",
+    smtpDkimPrivateKey: "Clé privée",
+    smtpDkimHashAlgo: "Algorithme de hachage (facultatif)",
+    smtpDkimheaderFieldNames: "Clés d'en-tête à signer (facultatif)",
+    smtpDkimskipFields: "Clés d'en-tête à ne pas signer (facultatif)",
+    wayToGetPagerDutyKey: "Vous pouvez l'obtenir en allant dans Service -> Annuaire des services -> (Sélectionner un service) -> Intégrations -> Ajouter une intégration. Ici, vous pouvez rechercher \"Events API V2\". Plus d'infos {0}",
+    "Integration Key": "Clé d'intégration",
+    "Integration URL": "URL d'intégration",
+    "Auto resolve or acknowledged": "Résolution automatique ou accusé de réception",
+    "do nothing": "ne fais rien",
+    "auto acknowledged": "accusé de réception automatique",
+    "auto resolve": "résolution automatique",
+    AccessKeyId: "ID de clé d'accès",
+    SecretAccessKey: "Clé secrète d'accès",
+    PhoneNumbers: "Les numéros de téléphone",
+    SignName: "Signature",
+    "Sms template must contain parameters: ": "Le modèle de SMS doit contenir des paramètres : ",
+    SecretKey: "Clé secrète",
+    "For safety, must use secret key": "Pour la sécurité, doit utiliser la clé secrète",
+    "Device Token": "Jeton d'appareil",
+    Platform: "Plateforme",
+    Retry: "Recommencez",
+    Topic: "Topic",
+    "Proxy server has authentication": "Le serveur proxy a une authentification",
+    Running: "Fonctionne",
+    "Not running": "Ne fonctionne pas",
+    Start: "Start",
+    Stop: "Stop",
+    "Uptime Kuma": "Uptime Kuma",
+    "No Proxy": "Pas de Proxy",
+    "HTTP Basic Auth": "Authentification de base HTTP",
+    "Reverse Proxy": "Proxy inverse",
+    wayToGetCloudflaredURL: "(Télécharger cloudflared depuis {0})",
+    cloudflareWebsite: "le site Cloudflare ",
+    "Message:": "Message:",
+    "Don't know how to get the token? Please read the guide:": "Vous ne savez pas comment obtenir le jeton ? Veuillez lire le guide:",
+    "The current connection may be lost if you are currently connecting via Cloudflare Tunnel. Are you sure want to stop it? Type your current password to confirm it.": "La connexion actuelle peut être perdue si vous vous connectez actuellement via Cloudflare Tunnel. Êtes-vous sûr de vouloir l'arrêter ? Tapez votre mot de passe actuel pour le confirmer.",
+    "HTTP Headers": "En-têtes HTTP",
+    "Trust Proxy": "Proxy de confiance",
+    "Other Software": "Autres logiciels",
+    "For example: nginx, Apache and Traefik.": "Par exemple : nginx, Apache et Traefik.",
+    "Please read": "S'il vous plaît Lisez",
+    "Valid To:": "Valable pour:",
+    "Days Remaining:": "Jours restant:",
+    "Domain Name Expiry Notification": "Notification d'expiration de nom de domaine",
+    "Date Created": "Date de création",
+    HomeAssistant: "Home Assistant",
+    onebotHttpAddress: "Adresse HTTP OneBot",
+    onebotMessageType: "Type de message OneBot",
+    onebotGroupMessage: "Groupe",
+    onebotUserOrGroupId: "ID de groupe/utilisateur",
+    onebotSafetyTips: "Pour des raisons de sécurité, vous devez définir un jeton d'accès",
+    "PushDeer Key": "Clé PushDeer",
+    "Show Powered By": "Afficher \"Propulsé par\"",
+    RadiusSecretDescription: "Secret partagé entre le client et le serveur",
+    RadiusCalledStationId: "Identifiant de la station appelée",
+    RadiusCalledStationIdDescription: "Identifiant de l'appareil appelé",
+    RadiusCallingStationId: "Identifiant de la station appelante",
+    RadiusCallingStationIdDescription: "Identifiant de l'appareil appelant",
+    "Certificate Expiry Notification": "Notification d'expiration du certificat",
+    "API Username": "Nom d'utilisateur de l'API",
+    "API Key": "clé API",
+    "Recipient Number": "Numéro du destinataire",
+    "From Name/Number": "De Nom/Numéro",
+    "Leave blank to use a shared sender number.": "Laisser vide pour utiliser un numéro d'expéditeur partagé.",
+    "Octopush API Version": "Version de l'API Octopush",
+    octopushAPIKey: "\"Clé API\" à partir des informations d'identification de l'API HTTP dans le panneau de configuration",
+    octopushLogin: "\"Connexion\" à partir des informations d'identification de l'API HTTP dans le panneau de configuration",
+    "Using a Reverse Proxy?": "Utiliser un proxy inverse ?",
+    "Check how to config it for WebSocket": "Vérifiez comment le configurer pour WebSocket",
+    wayToGetClickSendSMSToken: "Vous pouvez obtenir le nom d'utilisateur API et la clé API à partir de {0} .",
+    "Connection String": "Chaîne de connexion",
+    Query: "Requête",
+    tcp: "TCP / HTTP",
+    "Docker Container": "Conteneur Docker",
+    Workstation: "Poste de travail",
+    disableCloudflaredNoAuthMsg: "Vous êtes en mode No Auth, un mot de passe n'est pas nécessaire.",
+    "Long-Lived Access Token": "Jeton d'accès de longue durée",
+    "Then choose an action, for example switch the scene to where an RGB light is red.": "Ensuite, choisissez une action, par exemple basculer la scène là où une lumière RVB est rouge.",
+    "Frontend Version": "Frontend Version",
+    "Frontend Version do not match backend version!": "La version frontale ne correspond pas à la version principale !",
+    "Base URL": "URL de base",
+    goAlertInfo: "GoAlert est une application open source pour la planification des appels, les escalades automatisées et les notifications (comme les SMS ou les appels vocaux). Engagez automatiquement la bonne personne, de la bonne manière et au bon moment ! {0}",
+    goAlertIntegrationKeyInfo: "Obtenez la clé d'intégration d'API générique pour le service dans ce format \"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\" généralement la valeur du paramètre de jeton de l'URL copiée.",
+    goAlert: "GoAlert",
+    backupOutdatedWarning: "Obsolète : étant donné que de nombreuses fonctionnalités ont été ajoutées et que cette fonctionnalité de sauvegarde est un peu non maintenue, elle ne peut pas générer ou restaurer une sauvegarde complète.",
+    backupRecommend: "Veuillez sauvegarder le volume ou le dossier de données (./data/) directement à la place.",
+    Optional: "Optionnel",
+    squadcast: "Squadcast",
 };

From a5c102e750f49b510fbf229bb97ce338fadad1f3 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Wed, 5 Oct 2022 14:19:50 +0800
Subject: [PATCH 25/48] Update README.md

---
 README.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index cb81f4db..55a6ec50 100644
--- a/README.md
+++ b/README.md
@@ -15,13 +15,11 @@ It is a self-hosted monitoring tool like "Uptime Robot".
 
 Try it!
 
-- https://demo.uptime.kuma.pet (Tokyo Server)
-- https://demo.uptime-kuma.karimi.dev:27000 (Europe server)
+- Tokyo Demo Server: https://demo.uptime.kuma.pet (Sponsored by [Uptime Kuma Sponsors](https://github.com/louislam/uptime-kuma#%EF%B8%8F-sponsors))
+- Europe Demo Server: https://demo.uptime-kuma.karimi.dev:27000 (Provided by [@mhkarimi1383](https://github.com/mhkarimi1383))
 
 It is a temporary live demo, all data will be deleted after 10 minutes. Use the one that is closer to you, but I suggest that you should install and try it out for the best demo experience.
 
-Tokyo VPS is sponsored by Uptime Kuma sponsors on [Open Collective](https://opencollective.com/uptime-kuma)! Thank you so much!
-
 ## ⭐ Features
 
 * Monitoring uptime for HTTP(s) / TCP / HTTP(s) Keyword / Ping / DNS Record / Push / Steam Game Server / Docker Containers.

From b993859926566efc31ed962029d857e04a58d493 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Wed, 5 Oct 2022 14:26:30 +0800
Subject: [PATCH 26/48] Drop Jest e2e testing (#2174)

---
 config/jest-debug-env.js        |   33 -
 config/jest-frontend.config.js  |    5 -
 config/jest-puppeteer.config.js |   20 -
 config/jest.config.js           |   12 -
 package-lock.json               | 1447 +------------------------------
 package.json                    |    4 -
 server/util-server.js           |    2 +-
 test/e2e.spec.js                |  329 -------
 test/frontend.spec.js           |   42 -
 test/prepare-jest.js            |   10 -
 10 files changed, 43 insertions(+), 1861 deletions(-)
 delete mode 100644 config/jest-debug-env.js
 delete mode 100644 config/jest-frontend.config.js
 delete mode 100644 config/jest-puppeteer.config.js
 delete mode 100644 config/jest.config.js
 delete mode 100644 test/e2e.spec.js
 delete mode 100644 test/frontend.spec.js
 delete mode 100644 test/prepare-jest.js

diff --git a/config/jest-debug-env.js b/config/jest-debug-env.js
deleted file mode 100644
index 74f6d783..00000000
--- a/config/jest-debug-env.js
+++ /dev/null
@@ -1,33 +0,0 @@
-const PuppeteerEnvironment = require("jest-environment-puppeteer");
-const util = require("util");
-
-class DebugEnv extends PuppeteerEnvironment {
-    async handleTestEvent(event, state) {
-        const ignoredEvents = [
-            "setup",
-            "add_hook",
-            "start_describe_definition",
-            "add_test",
-            "finish_describe_definition",
-            "run_start",
-            "run_describe_start",
-            "test_start",
-            "hook_start",
-            "hook_success",
-            "test_fn_start",
-            "test_fn_success",
-            "test_done",
-            "run_describe_finish",
-            "run_finish",
-            "teardown",
-            "test_fn_failure",
-        ];
-        if (!ignoredEvents.includes(event.name)) {
-            console.log(
-                new Date().toString() + ` Unhandled event [${event.name}] ` + util.inspect(event)
-            );
-        }
-    }
-}
-
-module.exports = DebugEnv;
diff --git a/config/jest-frontend.config.js b/config/jest-frontend.config.js
deleted file mode 100644
index ab6af7f1..00000000
--- a/config/jest-frontend.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
-    "rootDir": "..",
-    "testRegex": "./test/frontend.spec.js",
-};
-
diff --git a/config/jest-puppeteer.config.js b/config/jest-puppeteer.config.js
deleted file mode 100644
index dc4f7b34..00000000
--- a/config/jest-puppeteer.config.js
+++ /dev/null
@@ -1,20 +0,0 @@
-module.exports = {
-    "launch": {
-        "dumpio": true,
-        "slowMo": 500,
-        "headless": process.env.HEADLESS_TEST || false,
-        "userDataDir": "./data/test-chrome-profile",
-        args: [
-            "--disable-setuid-sandbox",
-            "--disable-gpu",
-            "--disable-dev-shm-usage",
-            "--no-default-browser-check",
-            "--no-experiments",
-            "--no-first-run",
-            "--no-pings",
-            "--no-sandbox",
-            "--no-zygote",
-            "--single-process",
-        ],
-    }
-};
diff --git a/config/jest.config.js b/config/jest.config.js
deleted file mode 100644
index 2d3f585e..00000000
--- a/config/jest.config.js
+++ /dev/null
@@ -1,12 +0,0 @@
-module.exports = {
-    "verbose": true,
-    "preset": "jest-puppeteer",
-    "globals": {
-        "__DEV__": true
-    },
-    "testRegex": "./test/e2e.spec.js",
-    "testEnvironment": "./config/jest-debug-env.js",
-    "rootDir": "..",
-    "testTimeout": 30000,
-};
-
diff --git a/package-lock.json b/package-lock.json
index 65e380d1..71827042 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "uptime-kuma",
-    "version": "1.18.0",
+    "version": "1.18.2",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "uptime-kuma",
-            "version": "1.18.0",
+            "version": "1.18.2",
             "license": "MIT",
             "dependencies": {
                 "@louislam/sqlite3": "~15.0.6",
@@ -83,12 +83,10 @@
                 "eslint-plugin-vue": "~8.7.1",
                 "favico.js": "^0.3.10",
                 "jest": "~27.2.5",
-                "jest-puppeteer": "~6.0.3",
                 "postcss-html": "~1.5.0",
                 "postcss-rtlcss": "~3.7.2",
                 "postcss-scss": "~4.0.4",
                 "prismjs": "^1.27.0",
-                "puppeteer": "~13.1.3",
                 "qrcode": "~1.5.0",
                 "rollup-plugin-visualizer": "^5.6.0",
                 "sass": "~1.42.1",
@@ -4231,15 +4229,6 @@
             "resolved": "https://registry.npmjs.org/args-parser/-/args-parser-1.3.0.tgz",
             "integrity": "sha512-If3Zi4BSjlQIJ9fgAhSiKi0oJtgMzSqh0H4wvl7XSeO16FKx7QqaHld8lZeEajPX7y1C5qKKeNgyrfyvmjmjUQ=="
         },
-        "node_modules/arr-union": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-            "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/array-flatten": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
@@ -5317,34 +5306,6 @@
                 "wrap-ansi": "^7.0.0"
             }
         },
-        "node_modules/clone-deep": {
-            "version": "0.2.4",
-            "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz",
-            "integrity": "sha512-we+NuQo2DHhSl+DP6jlUiAhyAjBQrYnpOk15rN6c6JSPScjiCLh8IbSU+VTcph6YS3o7mASE8a0+gbZ7ChLpgg==",
-            "dev": true,
-            "dependencies": {
-                "for-own": "^0.1.3",
-                "is-plain-object": "^2.0.1",
-                "kind-of": "^3.0.2",
-                "lazy-cache": "^1.0.3",
-                "shallow-clone": "^0.1.2"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/clone-deep/node_modules/is-plain-object": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-            "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-            "dev": true,
-            "dependencies": {
-                "isobject": "^3.0.1"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/clone-regexp": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
@@ -5935,19 +5896,6 @@
             "resolved": "https://registry.npmjs.org/custom-error-instance/-/custom-error-instance-2.1.1.tgz",
             "integrity": "sha512-p6JFxJc3M4OTD2li2qaHkDCw9SfMw82Ldr6OC9Je1aXiGfhx2W8p3GaoeaGrPJTUN9NirTM/KTxHWMUdR1rsUg=="
         },
-        "node_modules/cwd": {
-            "version": "0.10.0",
-            "resolved": "https://registry.npmjs.org/cwd/-/cwd-0.10.0.tgz",
-            "integrity": "sha512-YGZxdTTL9lmLkCUTpg4j0zQ7IhRB5ZmqNBbGCl3Tg6MP/d5/6sY7L5mmTjzbc6JKgVZYiqTQTNhPFsbXNGlRaA==",
-            "dev": true,
-            "dependencies": {
-                "find-pkg": "^0.1.2",
-                "fs-exists-sync": "^0.1.0"
-            },
-            "engines": {
-                "node": ">=0.8"
-            }
-        },
         "node_modules/cypress": {
             "version": "10.7.0",
             "resolved": "https://registry.npmjs.org/cypress/-/cypress-10.7.0.tgz",
@@ -6400,12 +6348,6 @@
             "resolved": "https://registry.npmjs.org/dev-null/-/dev-null-0.1.1.tgz",
             "integrity": "sha512-nMNZG0zfMgmdv8S5O0TM5cpwNbGKRGPCxVsr0SmA3NZZy9CYBbuNLL0PD3Acx9e5LIUgwONXtM9kM6RlawPxEQ=="
         },
-        "node_modules/devtools-protocol": {
-            "version": "0.0.948846",
-            "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.948846.tgz",
-            "integrity": "sha512-5fGyt9xmMqUl2VI7+rnUkKCiAQIpLns8sfQtTENy5L70ktbNw0Z3TFJ1JoFNYdx/jffz4YXU45VF75wKZD7sZQ==",
-            "dev": true
-        },
         "node_modules/diff-sequences": {
             "version": "27.5.1",
             "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
@@ -7717,18 +7659,6 @@
                 "node": ">= 0.8.0"
             }
         },
-        "node_modules/expand-tilde": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz",
-            "integrity": "sha512-rtmc+cjLZqnu9dSYosX9EWmSJhTwpACgJQTfj4hgg2JjOD/6SIQalZrt4a3aQeh++oNxkazcaxrhPUj6+g5G/Q==",
-            "dev": true,
-            "dependencies": {
-                "os-homedir": "^1.0.1"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/expect": {
             "version": "27.5.1",
             "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
@@ -7744,12 +7674,6 @@
                 "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
             }
         },
-        "node_modules/expect-puppeteer": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/expect-puppeteer/-/expect-puppeteer-6.1.1.tgz",
-            "integrity": "sha512-cnQF96qdoEcOD63j5NQMc0RtW9WRMW/WHKXEKsuDQ2tszhVH3qC7zkXXS4D0LTt9qCB3DEExioqylsQXvqPrUw==",
-            "dev": true
-        },
         "node_modules/express": {
             "version": "4.17.3",
             "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz",
@@ -8073,115 +7997,6 @@
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
             "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         },
-        "node_modules/find-file-up": {
-            "version": "0.1.3",
-            "resolved": "https://registry.npmjs.org/find-file-up/-/find-file-up-0.1.3.tgz",
-            "integrity": "sha512-mBxmNbVyjg1LQIIpgO8hN+ybWBgDQK8qjht+EbrTCGmmPV/sc7RF1i9stPTD6bpvXZywBdrwRYxhSdJv867L6A==",
-            "dev": true,
-            "dependencies": {
-                "fs-exists-sync": "^0.1.0",
-                "resolve-dir": "^0.1.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/find-pkg": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/find-pkg/-/find-pkg-0.1.2.tgz",
-            "integrity": "sha512-0rnQWcFwZr7eO0513HahrWafsc3CTFioEB7DRiEYCUM/70QXSY8f3mCST17HXLcPvEhzH/Ty/Bxd72ZZsr/yvw==",
-            "dev": true,
-            "dependencies": {
-                "find-file-up": "^0.1.2"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/find-process": {
-            "version": "1.4.7",
-            "resolved": "https://registry.npmjs.org/find-process/-/find-process-1.4.7.tgz",
-            "integrity": "sha512-/U4CYp1214Xrp3u3Fqr9yNynUrr5Le4y0SsJh2lMDDSbpwYSz3M2SMWQC+wqcx79cN8PQtHQIL8KnuY9M66fdg==",
-            "dev": true,
-            "dependencies": {
-                "chalk": "^4.0.0",
-                "commander": "^5.1.0",
-                "debug": "^4.1.1"
-            },
-            "bin": {
-                "find-process": "bin/find-process.js"
-            }
-        },
-        "node_modules/find-process/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==",
-            "dev": true,
-            "dependencies": {
-                "color-convert": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
-        "node_modules/find-process/node_modules/chalk": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/chalk?sponsor=1"
-            }
-        },
-        "node_modules/find-process/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==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/find-process/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==",
-            "dev": true
-        },
-        "node_modules/find-process/node_modules/has-flag": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/find-process/node_modules/supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-            "dev": true,
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/find-up": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -8233,27 +8048,6 @@
                 }
             }
         },
-        "node_modules/for-in": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-            "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/for-own": {
-            "version": "0.1.5",
-            "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-            "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==",
-            "dev": true,
-            "dependencies": {
-                "for-in": "^1.0.1"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/forever-agent": {
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -8326,21 +8120,6 @@
                 "safe-buffer": "~5.1.0"
             }
         },
-        "node_modules/fs-constants": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-            "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-            "dev": true
-        },
-        "node_modules/fs-exists-sync": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz",
-            "integrity": "sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/fs-extra": {
             "version": "10.1.0",
             "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
@@ -8606,46 +8385,6 @@
                 "node": ">=10"
             }
         },
-        "node_modules/global-modules": {
-            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz",
-            "integrity": "sha512-JeXuCbvYzYXcwE6acL9V2bAOeSIGl4dD+iwLY9iUx2VBJJ80R18HCn+JCwHM9Oegdfya3lEkGCdaRkSyc10hDA==",
-            "dev": true,
-            "dependencies": {
-                "global-prefix": "^0.1.4",
-                "is-windows": "^0.2.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/global-prefix": {
-            "version": "0.1.5",
-            "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz",
-            "integrity": "sha512-gOPiyxcD9dJGCEArAhF4Hd0BAqvAe/JzERP7tYumE4yIkmIedPUVXcJFWbV3/p/ovIIvKjkrTk+f1UVkq7vvbw==",
-            "dev": true,
-            "dependencies": {
-                "homedir-polyfill": "^1.0.0",
-                "ini": "^1.3.4",
-                "is-windows": "^0.2.0",
-                "which": "^1.2.12"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/global-prefix/node_modules/which": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-            "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-            "dev": true,
-            "dependencies": {
-                "isexe": "^2.0.0"
-            },
-            "bin": {
-                "which": "bin/which"
-            }
-        },
         "node_modules/globals": {
             "version": "11.12.0",
             "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -8822,18 +8561,6 @@
             "integrity": "sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ==",
             "deprecated": "This module has moved and is now available at @hapi/hoek. Please update your dependencies as this version is no longer maintained an may contain bugs and security issues."
         },
-        "node_modules/homedir-polyfill": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-            "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-            "dev": true,
-            "dependencies": {
-                "parse-passwd": "^1.0.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/hosted-git-info": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
@@ -9186,12 +8913,6 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/is-buffer": {
-            "version": "1.1.6",
-            "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-            "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-            "dev": true
-        },
         "node_modules/is-callable": {
             "version": "1.2.4",
             "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
@@ -9254,15 +8975,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/is-extendable": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-            "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/is-extglob": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -9545,15 +9257,6 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/is-windows": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
-            "integrity": "sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/is-wsl": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
@@ -9588,15 +9291,6 @@
             "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
             "devOptional": true
         },
-        "node_modules/isobject": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-            "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/isstream": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
@@ -10064,22 +9758,22 @@
                 "node": ">=8"
             }
         },
-        "node_modules/jest-dev-server": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/jest-dev-server/-/jest-dev-server-6.1.1.tgz",
-            "integrity": "sha512-z5LnaGDvlIkdMv/rppSO4+rq+GyQKf1xI9oiBxf9/2EBeN2hxRaWiMvaLNDnHPZj2PAhBXsycrKslDDoZO2Xtw==",
+        "node_modules/jest-diff": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
+            "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
             "dev": true,
             "dependencies": {
-                "chalk": "^4.1.2",
-                "cwd": "^0.10.0",
-                "find-process": "^1.4.7",
-                "prompts": "^2.4.2",
-                "spawnd": "^6.0.2",
-                "tree-kill": "^1.2.2",
-                "wait-on": "^6.0.1"
+                "chalk": "^4.0.0",
+                "diff-sequences": "^27.5.1",
+                "jest-get-type": "^27.5.1",
+                "pretty-format": "^27.5.1"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
             }
         },
-        "node_modules/jest-dev-server/node_modules/ansi-styles": {
+        "node_modules/jest-diff/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==",
@@ -10094,7 +9788,7 @@
                 "url": "https://github.com/chalk/ansi-styles?sponsor=1"
             }
         },
-        "node_modules/jest-dev-server/node_modules/chalk": {
+        "node_modules/jest-diff/node_modules/chalk": {
             "version": "4.1.2",
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
@@ -10110,7 +9804,7 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/jest-dev-server/node_modules/color-convert": {
+        "node_modules/jest-diff/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==",
@@ -10122,13 +9816,13 @@
                 "node": ">=7.0.0"
             }
         },
-        "node_modules/jest-dev-server/node_modules/color-name": {
+        "node_modules/jest-diff/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==",
             "dev": true
         },
-        "node_modules/jest-dev-server/node_modules/has-flag": {
+        "node_modules/jest-diff/node_modules/has-flag": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
             "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
@@ -10137,7 +9831,7 @@
                 "node": ">=8"
             }
         },
-        "node_modules/jest-dev-server/node_modules/supports-color": {
+        "node_modules/jest-diff/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
@@ -10149,22 +9843,35 @@
                 "node": ">=8"
             }
         },
-        "node_modules/jest-diff": {
+        "node_modules/jest-docblock": {
             "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
-            "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+            "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz",
+            "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
+            "dev": true,
+            "dependencies": {
+                "detect-newline": "^3.0.0"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-each": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
+            "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
             "dev": true,
             "dependencies": {
+                "@jest/types": "^27.5.1",
                 "chalk": "^4.0.0",
-                "diff-sequences": "^27.5.1",
                 "jest-get-type": "^27.5.1",
+                "jest-util": "^27.5.1",
                 "pretty-format": "^27.5.1"
             },
             "engines": {
                 "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
             }
         },
-        "node_modules/jest-diff/node_modules/ansi-styles": {
+        "node_modules/jest-each/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==",
@@ -10179,7 +9886,7 @@
                 "url": "https://github.com/chalk/ansi-styles?sponsor=1"
             }
         },
-        "node_modules/jest-diff/node_modules/chalk": {
+        "node_modules/jest-each/node_modules/chalk": {
             "version": "4.1.2",
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
@@ -10195,105 +9902,7 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/jest-diff/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==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/jest-diff/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==",
-            "dev": true
-        },
-        "node_modules/jest-diff/node_modules/has-flag": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/jest-diff/node_modules/supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-            "dev": true,
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/jest-docblock": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz",
-            "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
-            "dev": true,
-            "dependencies": {
-                "detect-newline": "^3.0.0"
-            },
-            "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-            }
-        },
-        "node_modules/jest-each": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
-            "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
-            "dev": true,
-            "dependencies": {
-                "@jest/types": "^27.5.1",
-                "chalk": "^4.0.0",
-                "jest-get-type": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "pretty-format": "^27.5.1"
-            },
-            "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-            }
-        },
-        "node_modules/jest-each/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==",
-            "dev": true,
-            "dependencies": {
-                "color-convert": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
-        "node_modules/jest-each/node_modules/chalk": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/chalk?sponsor=1"
-            }
-        },
-        "node_modules/jest-each/node_modules/color-convert": {
+        "node_modules/jest-each/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==",
@@ -10367,89 +9976,6 @@
                 "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
             }
         },
-        "node_modules/jest-environment-puppeteer": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/jest-environment-puppeteer/-/jest-environment-puppeteer-6.1.1.tgz",
-            "integrity": "sha512-Ces37g8Gdj7QaVxszeoXlvmsZxcEJN9EPUdJt8fGMLA+6ARVFKyVmFgP9xVeGyjTvzsXdtIiJdeOKMLMeD8r2A==",
-            "dev": true,
-            "dependencies": {
-                "chalk": "^4.1.2",
-                "cwd": "^0.10.0",
-                "jest-dev-server": "^6.1.1",
-                "jest-environment-node": "^27.4.4",
-                "merge-deep": "^3.0.3"
-            }
-        },
-        "node_modules/jest-environment-puppeteer/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==",
-            "dev": true,
-            "dependencies": {
-                "color-convert": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
-        "node_modules/jest-environment-puppeteer/node_modules/chalk": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/chalk?sponsor=1"
-            }
-        },
-        "node_modules/jest-environment-puppeteer/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==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/jest-environment-puppeteer/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==",
-            "dev": true
-        },
-        "node_modules/jest-environment-puppeteer/node_modules/has-flag": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/jest-environment-puppeteer/node_modules/supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-            "dev": true,
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/jest-get-type": {
             "version": "27.5.1",
             "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
@@ -10801,19 +10327,6 @@
                 }
             }
         },
-        "node_modules/jest-puppeteer": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/jest-puppeteer/-/jest-puppeteer-6.0.3.tgz",
-            "integrity": "sha512-6GRdbkWwNu8dfzo4icpwc50+K5ECYpWyD9sxpRa03PA8Hi3byl0dcAx+NjCivSezWjAl2Iwwhujqb+bczei0Bg==",
-            "dev": true,
-            "dependencies": {
-                "expect-puppeteer": "^6.0.2",
-                "jest-environment-puppeteer": "^6.0.3"
-            },
-            "peerDependencies": {
-                "puppeteer": ">= 1.5.0"
-            }
-        },
         "node_modules/jest-regex-util": {
             "version": "27.5.1",
             "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
@@ -11863,18 +11376,6 @@
             "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz",
             "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="
         },
-        "node_modules/kind-of": {
-            "version": "3.2.2",
-            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-            "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-            "dev": true,
-            "dependencies": {
-                "is-buffer": "^1.1.5"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/kleur": {
             "version": "3.0.3",
             "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
@@ -11982,15 +11483,6 @@
                 "node": "> 0.8"
             }
         },
-        "node_modules/lazy-cache": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-            "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/leven": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -12454,20 +11946,6 @@
             "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==",
             "dev": true
         },
-        "node_modules/merge-deep": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.3.tgz",
-            "integrity": "sha512-qtmzAS6t6grwEkNrunqTBdn0qKwFgNWvlxUbAV8es9M7Ot1EbyApytCnvE0jALPa46ZpKDUo527kKiaWplmlFA==",
-            "dev": true,
-            "dependencies": {
-                "arr-union": "^3.1.0",
-                "clone-deep": "^0.2.4",
-                "kind-of": "^3.0.2"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/merge-descriptors": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -12619,28 +12097,6 @@
                 "node": ">= 8"
             }
         },
-        "node_modules/mixin-object": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
-            "integrity": "sha512-ALGF1Jt9ouehcaXaHhn6t1yGWRqGaHkPFndtFVHfZXOvkIZ/yoGaSi0AHVTafb3ZBGg4dr/bDwnaEKqCXzchMA==",
-            "dev": true,
-            "dependencies": {
-                "for-in": "^0.1.3",
-                "is-extendable": "^0.1.1"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/mixin-object/node_modules/for-in": {
-            "version": "0.1.8",
-            "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
-            "integrity": "sha512-F0to7vbBSHP8E3l6dCjxNOLuSFAACIxFy3UehTUlG7svlXi37HHsDkyVcHo0Pq8QwrE+pXvWSVX3ZT1T9wAZ9g==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/mkdirp": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -12652,12 +12108,6 @@
                 "node": ">=10"
             }
         },
-        "node_modules/mkdirp-classic": {
-            "version": "0.5.3",
-            "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-            "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-            "dev": true
-        },
         "node_modules/mqemitter": {
             "version": "4.5.0",
             "resolved": "https://registry.npmjs.org/mqemitter/-/mqemitter-4.5.0.tgz",
@@ -13292,15 +12742,6 @@
                 "node": ">= 0.8.0"
             }
         },
-        "node_modules/os-homedir": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-            "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/ospath": {
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz",
@@ -13426,15 +12867,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/parse-passwd": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-            "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/parse5": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.0.0.tgz",
@@ -13910,15 +13342,6 @@
             "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
             "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
         },
-        "node_modules/progress": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-            "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.4.0"
-            }
-        },
         "node_modules/prom-client": {
             "version": "13.2.0",
             "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-13.2.0.tgz",
@@ -13984,12 +13407,6 @@
                 "node": ">= 0.10"
             }
         },
-        "node_modules/proxy-from-env": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-            "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-            "dev": true
-        },
         "node_modules/psl": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
@@ -14013,87 +13430,6 @@
                 "node": ">=6"
             }
         },
-        "node_modules/puppeteer": {
-            "version": "13.1.3",
-            "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-13.1.3.tgz",
-            "integrity": "sha512-nqcJNThLUG0Dgo++2mMtGR2FCyg7olJJhj/rm0A65muyN3nrH6lGvnNRzEaNmSnHWvjaDIG9ox5kxQB+nXTg5A==",
-            "dev": true,
-            "hasInstallScript": true,
-            "dependencies": {
-                "debug": "4.3.2",
-                "devtools-protocol": "0.0.948846",
-                "extract-zip": "2.0.1",
-                "https-proxy-agent": "5.0.0",
-                "node-fetch": "2.6.7",
-                "pkg-dir": "4.2.0",
-                "progress": "2.0.3",
-                "proxy-from-env": "1.1.0",
-                "rimraf": "3.0.2",
-                "tar-fs": "2.1.1",
-                "unbzip2-stream": "1.4.3",
-                "ws": "8.2.3"
-            },
-            "engines": {
-                "node": ">=10.18.1"
-            }
-        },
-        "node_modules/puppeteer/node_modules/debug": {
-            "version": "4.3.2",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-            "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-            "dev": true,
-            "dependencies": {
-                "ms": "2.1.2"
-            },
-            "engines": {
-                "node": ">=6.0"
-            },
-            "peerDependenciesMeta": {
-                "supports-color": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/puppeteer/node_modules/https-proxy-agent": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-            "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-            "dev": true,
-            "dependencies": {
-                "agent-base": "6",
-                "debug": "4"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/puppeteer/node_modules/ms": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-            "dev": true
-        },
-        "node_modules/puppeteer/node_modules/ws": {
-            "version": "8.2.3",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
-            "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
-            "dev": true,
-            "engines": {
-                "node": ">=10.0.0"
-            },
-            "peerDependencies": {
-                "bufferutil": "^4.0.1",
-                "utf-8-validate": "^5.0.2"
-            },
-            "peerDependenciesMeta": {
-                "bufferutil": {
-                    "optional": true
-                },
-                "utf-8-validate": {
-                    "optional": true
-                }
-            }
-        },
         "node_modules/qlobber": {
             "version": "5.0.3",
             "resolved": "https://registry.npmjs.org/qlobber/-/qlobber-5.0.3.tgz",
@@ -14728,19 +14064,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/resolve-dir": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz",
-            "integrity": "sha512-QxMPqI6le2u0dCLyiGzgy92kjkkL6zO0XyvHzjdTNH3zM6e5Hz3BwG6+aEyNgiQ5Xz6PwTwgQEj3U50dByPKIA==",
-            "dev": true,
-            "dependencies": {
-                "expand-tilde": "^1.2.2",
-                "global-modules": "^0.2.3"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/resolve-from": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -15070,42 +14393,6 @@
             "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
             "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
         },
-        "node_modules/shallow-clone": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
-            "integrity": "sha512-J1zdXCky5GmNnuauESROVu31MQSnLoYvlyEn6j2Ztk6Q5EHFIhxkMhYcv6vuDzl2XEzoRr856QwzMgWM/TmZgw==",
-            "dev": true,
-            "dependencies": {
-                "is-extendable": "^0.1.1",
-                "kind-of": "^2.0.1",
-                "lazy-cache": "^0.2.3",
-                "mixin-object": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/shallow-clone/node_modules/kind-of": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-            "integrity": "sha512-0u8i1NZ/mg0b+W3MGGw5I7+6Eib2nx72S/QvXa0hYjEkjTknYmEYQJwGu3mLC0BrhtJjtQafTkyRUQ75Kx0LVg==",
-            "dev": true,
-            "dependencies": {
-                "is-buffer": "^1.0.2"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/shallow-clone/node_modules/lazy-cache": {
-            "version": "0.2.7",
-            "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
-            "integrity": "sha512-gkX52wvU/R8DVMMt78ATVPFMJqfW8FPz1GZ1sVHBVQHmu/WvhIWE4cE1GBzhJNFicDeYhnwp6Rl35BcAIM3YOQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/shebang-command": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -15359,17 +14646,6 @@
             "integrity": "sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg==",
             "dev": true
         },
-        "node_modules/spawnd": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/spawnd/-/spawnd-6.0.2.tgz",
-            "integrity": "sha512-+YJtx0dvy2wt304MrHD//tASc84zinBUYU1jacPBzrjhZUd7RsDo25krxr4HUHAQzEQFuMAs4/p+yLYU5ciZ1w==",
-            "dev": true,
-            "dependencies": {
-                "exit": "^0.1.2",
-                "signal-exit": "^3.0.6",
-                "tree-kill": "^1.2.2"
-            }
-        },
         "node_modules/spdx-correct": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
@@ -15914,40 +15190,6 @@
                 "node": ">= 10"
             }
         },
-        "node_modules/tar-fs": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-            "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
-            "dev": true,
-            "dependencies": {
-                "chownr": "^1.1.1",
-                "mkdirp-classic": "^0.5.2",
-                "pump": "^3.0.0",
-                "tar-stream": "^2.1.4"
-            }
-        },
-        "node_modules/tar-fs/node_modules/chownr": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-            "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-            "dev": true
-        },
-        "node_modules/tar-stream": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-            "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-            "dev": true,
-            "dependencies": {
-                "bl": "^4.0.3",
-                "end-of-stream": "^1.4.1",
-                "fs-constants": "^1.0.0",
-                "inherits": "^2.0.3",
-                "readable-stream": "^3.1.1"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
         "node_modules/tarn": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/tarn/-/tarn-3.0.2.tgz",
@@ -16349,16 +15591,6 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/unbzip2-stream": {
-            "version": "1.4.3",
-            "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
-            "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
-            "dev": true,
-            "dependencies": {
-                "buffer": "^5.2.1",
-                "through": "^2.3.8"
-            }
-        },
         "node_modules/unicode-canonical-property-names-ecmascript": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
@@ -20628,12 +19860,6 @@
             "resolved": "https://registry.npmjs.org/args-parser/-/args-parser-1.3.0.tgz",
             "integrity": "sha512-If3Zi4BSjlQIJ9fgAhSiKi0oJtgMzSqh0H4wvl7XSeO16FKx7QqaHld8lZeEajPX7y1C5qKKeNgyrfyvmjmjUQ=="
         },
-        "arr-union": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-            "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
-            "dev": true
-        },
         "array-flatten": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
@@ -21462,30 +20688,6 @@
                 "wrap-ansi": "^7.0.0"
             }
         },
-        "clone-deep": {
-            "version": "0.2.4",
-            "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz",
-            "integrity": "sha512-we+NuQo2DHhSl+DP6jlUiAhyAjBQrYnpOk15rN6c6JSPScjiCLh8IbSU+VTcph6YS3o7mASE8a0+gbZ7ChLpgg==",
-            "dev": true,
-            "requires": {
-                "for-own": "^0.1.3",
-                "is-plain-object": "^2.0.1",
-                "kind-of": "^3.0.2",
-                "lazy-cache": "^1.0.3",
-                "shallow-clone": "^0.1.2"
-            },
-            "dependencies": {
-                "is-plain-object": {
-                    "version": "2.0.4",
-                    "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-                    "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-                    "dev": true,
-                    "requires": {
-                        "isobject": "^3.0.1"
-                    }
-                }
-            }
-        },
         "clone-regexp": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
@@ -21950,16 +21152,6 @@
             "resolved": "https://registry.npmjs.org/custom-error-instance/-/custom-error-instance-2.1.1.tgz",
             "integrity": "sha512-p6JFxJc3M4OTD2li2qaHkDCw9SfMw82Ldr6OC9Je1aXiGfhx2W8p3GaoeaGrPJTUN9NirTM/KTxHWMUdR1rsUg=="
         },
-        "cwd": {
-            "version": "0.10.0",
-            "resolved": "https://registry.npmjs.org/cwd/-/cwd-0.10.0.tgz",
-            "integrity": "sha512-YGZxdTTL9lmLkCUTpg4j0zQ7IhRB5ZmqNBbGCl3Tg6MP/d5/6sY7L5mmTjzbc6JKgVZYiqTQTNhPFsbXNGlRaA==",
-            "dev": true,
-            "requires": {
-                "find-pkg": "^0.1.2",
-                "fs-exists-sync": "^0.1.0"
-            }
-        },
         "cypress": {
             "version": "10.7.0",
             "resolved": "https://registry.npmjs.org/cypress/-/cypress-10.7.0.tgz",
@@ -22299,12 +21491,6 @@
             "resolved": "https://registry.npmjs.org/dev-null/-/dev-null-0.1.1.tgz",
             "integrity": "sha512-nMNZG0zfMgmdv8S5O0TM5cpwNbGKRGPCxVsr0SmA3NZZy9CYBbuNLL0PD3Acx9e5LIUgwONXtM9kM6RlawPxEQ=="
         },
-        "devtools-protocol": {
-            "version": "0.0.948846",
-            "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.948846.tgz",
-            "integrity": "sha512-5fGyt9xmMqUl2VI7+rnUkKCiAQIpLns8sfQtTENy5L70ktbNw0Z3TFJ1JoFNYdx/jffz4YXU45VF75wKZD7sZQ==",
-            "dev": true
-        },
         "diff-sequences": {
             "version": "27.5.1",
             "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
@@ -23167,15 +22353,6 @@
             "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
             "dev": true
         },
-        "expand-tilde": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz",
-            "integrity": "sha512-rtmc+cjLZqnu9dSYosX9EWmSJhTwpACgJQTfj4hgg2JjOD/6SIQalZrt4a3aQeh++oNxkazcaxrhPUj6+g5G/Q==",
-            "dev": true,
-            "requires": {
-                "os-homedir": "^1.0.1"
-            }
-        },
         "expect": {
             "version": "27.5.1",
             "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
@@ -23188,12 +22365,6 @@
                 "jest-message-util": "^27.5.1"
             }
         },
-        "expect-puppeteer": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/expect-puppeteer/-/expect-puppeteer-6.1.1.tgz",
-            "integrity": "sha512-cnQF96qdoEcOD63j5NQMc0RtW9WRMW/WHKXEKsuDQ2tszhVH3qC7zkXXS4D0LTt9qCB3DEExioqylsQXvqPrUw==",
-            "dev": true
-        },
         "express": {
             "version": "4.17.3",
             "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz",
@@ -23464,87 +22635,6 @@
                 }
             }
         },
-        "find-file-up": {
-            "version": "0.1.3",
-            "resolved": "https://registry.npmjs.org/find-file-up/-/find-file-up-0.1.3.tgz",
-            "integrity": "sha512-mBxmNbVyjg1LQIIpgO8hN+ybWBgDQK8qjht+EbrTCGmmPV/sc7RF1i9stPTD6bpvXZywBdrwRYxhSdJv867L6A==",
-            "dev": true,
-            "requires": {
-                "fs-exists-sync": "^0.1.0",
-                "resolve-dir": "^0.1.0"
-            }
-        },
-        "find-pkg": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/find-pkg/-/find-pkg-0.1.2.tgz",
-            "integrity": "sha512-0rnQWcFwZr7eO0513HahrWafsc3CTFioEB7DRiEYCUM/70QXSY8f3mCST17HXLcPvEhzH/Ty/Bxd72ZZsr/yvw==",
-            "dev": true,
-            "requires": {
-                "find-file-up": "^0.1.2"
-            }
-        },
-        "find-process": {
-            "version": "1.4.7",
-            "resolved": "https://registry.npmjs.org/find-process/-/find-process-1.4.7.tgz",
-            "integrity": "sha512-/U4CYp1214Xrp3u3Fqr9yNynUrr5Le4y0SsJh2lMDDSbpwYSz3M2SMWQC+wqcx79cN8PQtHQIL8KnuY9M66fdg==",
-            "dev": true,
-            "requires": {
-                "chalk": "^4.0.0",
-                "commander": "^5.1.0",
-                "debug": "^4.1.1"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "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==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "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==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
         "find-up": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -23576,21 +22666,6 @@
             "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
             "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="
         },
-        "for-in": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-            "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
-            "dev": true
-        },
-        "for-own": {
-            "version": "0.1.5",
-            "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-            "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==",
-            "dev": true,
-            "requires": {
-                "for-in": "^1.0.1"
-            }
-        },
         "forever-agent": {
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -23653,18 +22728,6 @@
                 }
             }
         },
-        "fs-constants": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-            "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-            "dev": true
-        },
-        "fs-exists-sync": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz",
-            "integrity": "sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg==",
-            "dev": true
-        },
         "fs-extra": {
             "version": "10.1.0",
             "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
@@ -23858,39 +22921,6 @@
                 }
             }
         },
-        "global-modules": {
-            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz",
-            "integrity": "sha512-JeXuCbvYzYXcwE6acL9V2bAOeSIGl4dD+iwLY9iUx2VBJJ80R18HCn+JCwHM9Oegdfya3lEkGCdaRkSyc10hDA==",
-            "dev": true,
-            "requires": {
-                "global-prefix": "^0.1.4",
-                "is-windows": "^0.2.0"
-            }
-        },
-        "global-prefix": {
-            "version": "0.1.5",
-            "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz",
-            "integrity": "sha512-gOPiyxcD9dJGCEArAhF4Hd0BAqvAe/JzERP7tYumE4yIkmIedPUVXcJFWbV3/p/ovIIvKjkrTk+f1UVkq7vvbw==",
-            "dev": true,
-            "requires": {
-                "homedir-polyfill": "^1.0.0",
-                "ini": "^1.3.4",
-                "is-windows": "^0.2.0",
-                "which": "^1.2.12"
-            },
-            "dependencies": {
-                "which": {
-                    "version": "1.3.1",
-                    "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-                    "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-                    "dev": true,
-                    "requires": {
-                        "isexe": "^2.0.0"
-                    }
-                }
-            }
-        },
         "globals": {
             "version": "11.12.0",
             "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -24013,18 +23043,9 @@
             }
         },
         "hoek": {
-            "version": "6.1.3",
-            "resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.3.tgz",
-            "integrity": "sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ=="
-        },
-        "homedir-polyfill": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-            "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-            "dev": true,
-            "requires": {
-                "parse-passwd": "^1.0.0"
-            }
+            "version": "6.1.3",
+            "resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.3.tgz",
+            "integrity": "sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ=="
         },
         "hosted-git-info": {
             "version": "4.1.0",
@@ -24275,12 +23296,6 @@
                 "has-tostringtag": "^1.0.0"
             }
         },
-        "is-buffer": {
-            "version": "1.1.6",
-            "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-            "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-            "dev": true
-        },
         "is-callable": {
             "version": "1.2.4",
             "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
@@ -24316,12 +23331,6 @@
             "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
             "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="
         },
-        "is-extendable": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-            "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-            "dev": true
-        },
         "is-extglob": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -24510,12 +23519,6 @@
                 "call-bind": "^1.0.2"
             }
         },
-        "is-windows": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
-            "integrity": "sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==",
-            "dev": true
-        },
         "is-wsl": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
@@ -24544,12 +23547,6 @@
             "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
             "devOptional": true
         },
-        "isobject": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-            "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-            "dev": true
-        },
         "isstream": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
@@ -24893,72 +23890,6 @@
                 }
             }
         },
-        "jest-dev-server": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/jest-dev-server/-/jest-dev-server-6.1.1.tgz",
-            "integrity": "sha512-z5LnaGDvlIkdMv/rppSO4+rq+GyQKf1xI9oiBxf9/2EBeN2hxRaWiMvaLNDnHPZj2PAhBXsycrKslDDoZO2Xtw==",
-            "dev": true,
-            "requires": {
-                "chalk": "^4.1.2",
-                "cwd": "^0.10.0",
-                "find-process": "^1.4.7",
-                "prompts": "^2.4.2",
-                "spawnd": "^6.0.2",
-                "tree-kill": "^1.2.2",
-                "wait-on": "^6.0.1"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "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==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "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==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
         "jest-diff": {
             "version": "27.5.1",
             "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
@@ -25124,70 +24055,6 @@
                 "jest-util": "^27.5.1"
             }
         },
-        "jest-environment-puppeteer": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/jest-environment-puppeteer/-/jest-environment-puppeteer-6.1.1.tgz",
-            "integrity": "sha512-Ces37g8Gdj7QaVxszeoXlvmsZxcEJN9EPUdJt8fGMLA+6ARVFKyVmFgP9xVeGyjTvzsXdtIiJdeOKMLMeD8r2A==",
-            "dev": true,
-            "requires": {
-                "chalk": "^4.1.2",
-                "cwd": "^0.10.0",
-                "jest-dev-server": "^6.1.1",
-                "jest-environment-node": "^27.4.4",
-                "merge-deep": "^3.0.3"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "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==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "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==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
         "jest-get-type": {
             "version": "27.5.1",
             "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
@@ -25448,16 +24315,6 @@
             "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
             "dev": true
         },
-        "jest-puppeteer": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/jest-puppeteer/-/jest-puppeteer-6.0.3.tgz",
-            "integrity": "sha512-6GRdbkWwNu8dfzo4icpwc50+K5ECYpWyD9sxpRa03PA8Hi3byl0dcAx+NjCivSezWjAl2Iwwhujqb+bczei0Bg==",
-            "dev": true,
-            "requires": {
-                "expect-puppeteer": "^6.0.2",
-                "jest-environment-puppeteer": "^6.0.3"
-            }
-        },
         "jest-regex-util": {
             "version": "27.5.1",
             "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
@@ -26277,15 +25134,6 @@
             "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz",
             "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="
         },
-        "kind-of": {
-            "version": "3.2.2",
-            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-            "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-            "dev": true,
-            "requires": {
-                "is-buffer": "^1.1.5"
-            }
-        },
         "kleur": {
             "version": "3.0.3",
             "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
@@ -26349,12 +25197,6 @@
             "integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==",
             "dev": true
         },
-        "lazy-cache": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-            "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==",
-            "dev": true
-        },
         "leven": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -26722,17 +25564,6 @@
             "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==",
             "dev": true
         },
-        "merge-deep": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.3.tgz",
-            "integrity": "sha512-qtmzAS6t6grwEkNrunqTBdn0qKwFgNWvlxUbAV8es9M7Ot1EbyApytCnvE0jALPa46ZpKDUo527kKiaWplmlFA==",
-            "dev": true,
-            "requires": {
-                "arr-union": "^3.1.0",
-                "clone-deep": "^0.2.4",
-                "kind-of": "^3.0.2"
-            }
-        },
         "merge-descriptors": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -26844,35 +25675,11 @@
                 "yallist": "^4.0.0"
             }
         },
-        "mixin-object": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
-            "integrity": "sha512-ALGF1Jt9ouehcaXaHhn6t1yGWRqGaHkPFndtFVHfZXOvkIZ/yoGaSi0AHVTafb3ZBGg4dr/bDwnaEKqCXzchMA==",
-            "dev": true,
-            "requires": {
-                "for-in": "^0.1.3",
-                "is-extendable": "^0.1.1"
-            },
-            "dependencies": {
-                "for-in": {
-                    "version": "0.1.8",
-                    "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
-                    "integrity": "sha512-F0to7vbBSHP8E3l6dCjxNOLuSFAACIxFy3UehTUlG7svlXi37HHsDkyVcHo0Pq8QwrE+pXvWSVX3ZT1T9wAZ9g==",
-                    "dev": true
-                }
-            }
-        },
         "mkdirp": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
             "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
         },
-        "mkdirp-classic": {
-            "version": "0.5.3",
-            "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-            "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-            "dev": true
-        },
         "mqemitter": {
             "version": "4.5.0",
             "resolved": "https://registry.npmjs.org/mqemitter/-/mqemitter-4.5.0.tgz",
@@ -27381,12 +26188,6 @@
                 "word-wrap": "^1.2.3"
             }
         },
-        "os-homedir": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-            "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
-            "dev": true
-        },
         "ospath": {
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz",
@@ -27473,12 +26274,6 @@
                 "lines-and-columns": "^1.1.6"
             }
         },
-        "parse-passwd": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-            "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
-            "dev": true
-        },
         "parse5": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.0.0.tgz",
@@ -27811,12 +26606,6 @@
             "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
             "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
         },
-        "progress": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-            "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-            "dev": true
-        },
         "prom-client": {
             "version": "13.2.0",
             "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-13.2.0.tgz",
@@ -27872,12 +26661,6 @@
                 "ipaddr.js": "1.9.1"
             }
         },
-        "proxy-from-env": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-            "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-            "dev": true
-        },
         "psl": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
@@ -27898,59 +26681,6 @@
             "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
             "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
         },
-        "puppeteer": {
-            "version": "13.1.3",
-            "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-13.1.3.tgz",
-            "integrity": "sha512-nqcJNThLUG0Dgo++2mMtGR2FCyg7olJJhj/rm0A65muyN3nrH6lGvnNRzEaNmSnHWvjaDIG9ox5kxQB+nXTg5A==",
-            "dev": true,
-            "requires": {
-                "debug": "4.3.2",
-                "devtools-protocol": "0.0.948846",
-                "extract-zip": "2.0.1",
-                "https-proxy-agent": "5.0.0",
-                "node-fetch": "2.6.7",
-                "pkg-dir": "4.2.0",
-                "progress": "2.0.3",
-                "proxy-from-env": "1.1.0",
-                "rimraf": "3.0.2",
-                "tar-fs": "2.1.1",
-                "unbzip2-stream": "1.4.3",
-                "ws": "8.2.3"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "4.3.2",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-                    "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "2.1.2"
-                    }
-                },
-                "https-proxy-agent": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-                    "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-                    "dev": true,
-                    "requires": {
-                        "agent-base": "6",
-                        "debug": "4"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-                    "dev": true
-                },
-                "ws": {
-                    "version": "8.2.3",
-                    "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
-                    "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
-                    "dev": true
-                }
-            }
-        },
         "qlobber": {
             "version": "5.0.3",
             "resolved": "https://registry.npmjs.org/qlobber/-/qlobber-5.0.3.tgz",
@@ -28447,16 +27177,6 @@
                 }
             }
         },
-        "resolve-dir": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz",
-            "integrity": "sha512-QxMPqI6le2u0dCLyiGzgy92kjkkL6zO0XyvHzjdTNH3zM6e5Hz3BwG6+aEyNgiQ5Xz6PwTwgQEj3U50dByPKIA==",
-            "dev": true,
-            "requires": {
-                "expand-tilde": "^1.2.2",
-                "global-modules": "^0.2.3"
-            }
-        },
         "resolve-from": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -28698,35 +27418,6 @@
             "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
             "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
         },
-        "shallow-clone": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
-            "integrity": "sha512-J1zdXCky5GmNnuauESROVu31MQSnLoYvlyEn6j2Ztk6Q5EHFIhxkMhYcv6vuDzl2XEzoRr856QwzMgWM/TmZgw==",
-            "dev": true,
-            "requires": {
-                "is-extendable": "^0.1.1",
-                "kind-of": "^2.0.1",
-                "lazy-cache": "^0.2.3",
-                "mixin-object": "^2.0.1"
-            },
-            "dependencies": {
-                "kind-of": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-                    "integrity": "sha512-0u8i1NZ/mg0b+W3MGGw5I7+6Eib2nx72S/QvXa0hYjEkjTknYmEYQJwGu3mLC0BrhtJjtQafTkyRUQ75Kx0LVg==",
-                    "dev": true,
-                    "requires": {
-                        "is-buffer": "^1.0.2"
-                    }
-                },
-                "lazy-cache": {
-                    "version": "0.2.7",
-                    "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
-                    "integrity": "sha512-gkX52wvU/R8DVMMt78ATVPFMJqfW8FPz1GZ1sVHBVQHmu/WvhIWE4cE1GBzhJNFicDeYhnwp6Rl35BcAIM3YOQ==",
-                    "dev": true
-                }
-            }
-        },
         "shebang-command": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -28928,17 +27619,6 @@
             "integrity": "sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg==",
             "dev": true
         },
-        "spawnd": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/spawnd/-/spawnd-6.0.2.tgz",
-            "integrity": "sha512-+YJtx0dvy2wt304MrHD//tASc84zinBUYU1jacPBzrjhZUd7RsDo25krxr4HUHAQzEQFuMAs4/p+yLYU5ciZ1w==",
-            "dev": true,
-            "requires": {
-                "exit": "^0.1.2",
-                "signal-exit": "^3.0.6",
-                "tree-kill": "^1.2.2"
-            }
-        },
         "spdx-correct": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
@@ -29363,39 +28043,6 @@
                 "yallist": "^4.0.0"
             }
         },
-        "tar-fs": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-            "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
-            "dev": true,
-            "requires": {
-                "chownr": "^1.1.1",
-                "mkdirp-classic": "^0.5.2",
-                "pump": "^3.0.0",
-                "tar-stream": "^2.1.4"
-            },
-            "dependencies": {
-                "chownr": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-                    "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-                    "dev": true
-                }
-            }
-        },
-        "tar-stream": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-            "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-            "dev": true,
-            "requires": {
-                "bl": "^4.0.3",
-                "end-of-stream": "^1.4.1",
-                "fs-constants": "^1.0.0",
-                "inherits": "^2.0.3",
-                "readable-stream": "^3.1.1"
-            }
-        },
         "tarn": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/tarn/-/tarn-3.0.2.tgz",
@@ -29704,16 +28351,6 @@
                 "which-boxed-primitive": "^1.0.2"
             }
         },
-        "unbzip2-stream": {
-            "version": "1.4.3",
-            "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
-            "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
-            "dev": true,
-            "requires": {
-                "buffer": "^5.2.1",
-                "through": "^2.3.8"
-            }
-        },
         "unicode-canonical-property-names-ecmascript": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
diff --git a/package.json b/package.json
index 479876a6..4f7da681 100644
--- a/package.json
+++ b/package.json
@@ -25,8 +25,6 @@
         "build": "vite build --config ./config/vite.config.js",
         "test": "node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/ --test",
         "test-with-build": "npm run build && npm test",
-        "jest": "node test/prepare-jest.js && npm run jest-frontend && npm run jest-backend",
-        "jest-frontend": "cross-env TEST_FRONTEND=1 jest --config=./config/jest-frontend.config.js",
         "jest-backend": "cross-env TEST_BACKEND=1 jest --config=./config/jest-backend.config.js",
         "tsc": "tsc",
         "vite-preview-dist": "vite preview --host --config ./config/vite.config.js",
@@ -140,12 +138,10 @@
         "eslint-plugin-vue": "~8.7.1",
         "favico.js": "^0.3.10",
         "jest": "~27.2.5",
-        "jest-puppeteer": "~6.0.3",
         "postcss-html": "~1.5.0",
         "postcss-rtlcss": "~3.7.2",
         "postcss-scss": "~4.0.4",
         "prismjs": "^1.27.0",
-        "puppeteer": "~13.1.3",
         "qrcode": "~1.5.0",
         "rollup-plugin-visualizer": "^5.6.0",
         "sass": "~1.42.1",
diff --git a/server/util-server.js b/server/util-server.js
index 1517bcfe..cf303ba8 100644
--- a/server/util-server.js
+++ b/server/util-server.js
@@ -557,7 +557,7 @@ exports.doubleCheckPassword = async (socket, currentPassword) => {
 exports.startUnitTest = async () => {
     console.log("Starting unit test...");
     const npm = /^win/.test(process.platform) ? "npm.cmd" : "npm";
-    const child = childProcess.spawn(npm, [ "run", "jest" ]);
+    const child = childProcess.spawn(npm, [ "run", "jest-backend" ]);
 
     child.stdout.on("data", (data) => {
         console.log(data.toString());
diff --git a/test/e2e.spec.js b/test/e2e.spec.js
deleted file mode 100644
index 8de8ceb1..00000000
--- a/test/e2e.spec.js
+++ /dev/null
@@ -1,329 +0,0 @@
-// eslint-disable-next-line no-unused-vars
-const { Page, Browser } = require("puppeteer");
-const { sleep } = require("../src/util");
-
-/**
- * Set back the correct data type for page object
- * @type {Page}
- */
-page;
-
-/**
- * @type {Browser}
- */
-browser;
-
-beforeAll(async () => {
-    await page.setViewport({
-        width: 1280,
-        height: 720,
-        deviceScaleFactor: 1,
-    });
-});
-
-afterAll(() => {
-
-});
-
-const baseURL = "http://127.0.0.1:3002";
-
-describe("Init", () => {
-    const title = "Uptime Kuma";
-
-    beforeAll(async () => {
-        await page.goto(baseURL);
-    });
-
-    it(`should be titled "${title}"`, async () => {
-        await expect(page.title()).resolves.toEqual(title);
-    });
-
-    // Setup Page
-    it("Setup", async () => {
-        // Create an Admin
-        await page.waitForSelector("#floatingInput");
-        await page.waitForSelector("#repeat");
-        await page.click("#floatingInput");
-        await page.type("#floatingInput", "admin");
-        await page.type("#floatingPassword", "admin123");
-        await page.type("#repeat", "admin123");
-        await page.click(".btn-primary[type=submit]");
-        await sleep(3000);
-
-        // Go to /setup again
-        await page.goto(baseURL + "/setup");
-        await sleep(3000);
-        let pathname = await page.evaluate(() => location.pathname);
-        expect(pathname).toEqual("/dashboard");
-
-        // Go to /
-        await page.goto(baseURL);
-        await page.waitForSelector("h1.mb-3");
-        pathname = await page.evaluate(() => location.pathname);
-        expect(pathname).toEqual("/dashboard");
-    });
-
-    it("should create monitor", async () => {
-        // Create monitor
-        await page.goto(baseURL + "/add");
-        await page.waitForSelector("#name");
-
-        await page.type("#name", "Myself");
-        await page.waitForSelector("#url");
-        await page.click("#url", { clickCount: 3 });
-        await page.keyboard.type(baseURL);
-        await page.keyboard.press("Enter");
-
-        await page.waitForFunction(() => {
-            const badge = document.querySelector("span.badge");
-            return badge && badge.innerText == "100%";
-        }, { timeout: 5000 });
-
-    });
-
-    // Settings Page
-    /*
-    describe("Settings", () => {
-        beforeEach(async () => {
-            await page.goto(baseURL + "/settings");
-        });
-
-        it("Change Language", async () => {
-            await page.goto(baseURL + "/settings/appearance");
-            await page.waitForSelector("#language");
-
-            await page.select("#language", "zh-HK");
-            let languageTitle = await page.evaluate(() => document.querySelector("[for=language]").innerText);
-            expect(languageTitle).toEqual("語言");
-
-            await page.select("#language", "en");
-            languageTitle = await page.evaluate(() => document.querySelector("[for=language]").innerText);
-            expect(languageTitle).toEqual("Language");
-        });
-
-        it("Change Theme", async () => {
-            await page.goto(baseURL + "/settings/appearance");
-
-            // Dark
-            await click(page, ".btn[for=btncheck2]");
-            await page.waitForSelector("div.dark");
-
-            await page.waitForSelector(".btn[for=btncheck1]");
-
-            // Light
-            await click(page, ".btn[for=btncheck1]");
-            await page.waitForSelector("div.light");
-        });
-
-        it("Change Heartbeat Bar Style", async () => {
-            await page.goto(baseURL + "/settings/appearance");
-
-            // Bottom
-            await click(page, ".btn[for=btncheck5]");
-            await page.waitForSelector("div.hp-bar-big");
-
-            // None
-            await click(page, ".btn[for=btncheck6]");
-            await page.waitForSelector("div.hp-bar-big", {
-                hidden: true,
-                timeout: 1000
-            });
-        });
-
-        // TODO: Timezone
-
-        it("Search Engine Visibility", async () => {
-            // Default
-            let res = await axios.get(baseURL + "/robots.txt");
-            expect(res.data).toContain("Disallow: /");
-
-            // Yes
-            await click(page, "#searchEngineIndexYes");
-            await click(page, "form > div > .btn[type=submit]");
-            await sleep(1000);
-            res = await axios.get(baseURL + "/robots.txt");
-            expect(res.data).not.toContain("Disallow: /");
-
-            // No
-            await click(page, "#searchEngineIndexNo");
-            await click(page, "form > div > .btn[type=submit]");
-            await sleep(1000);
-            res = await axios.get(baseURL + "/robots.txt");
-            expect(res.data).toContain("Disallow: /");
-        });
-
-        it("Entry Page", async () => {
-            const newPage = await browser.newPage();
-
-            // Default
-            await newPage.goto(baseURL);
-            await newPage.waitForSelector("h1.mb-3", { timeout: 3000 });
-            let pathname = await newPage.evaluate(() => location.pathname);
-            expect(pathname).toEqual("/dashboard");
-
-            // Status Page
-            await click(page, "#entryPageNo");
-            await click(page, "form > div > .btn[type=submit]");
-            await sleep(1000);
-            await newPage.goto(baseURL);
-            await newPage.waitForSelector("img.logo", { timeout: 3000 });
-            pathname = await newPage.evaluate(() => location.pathname);
-            expect(pathname).toEqual("/status");
-
-            // Back to Dashboard
-            await click(page, "#entryPageYes");
-            await click(page, "form > div > .btn[type=submit]");
-            await sleep(1000);
-            await newPage.goto(baseURL);
-            await newPage.waitForSelector("h1.mb-3", { timeout: 3000 });
-            pathname = await newPage.evaluate(() => location.pathname);
-            expect(pathname).toEqual("/dashboard");
-
-            await newPage.close();
-        });
-
-        it("Change Password (wrong current password)", async () => {
-            await page.goto(baseURL + "/settings/security");
-            await page.waitForSelector("#current-password");
-
-            await page.type("#current-password", "wrong_passw$$d");
-            await page.type("#new-password", "new_password123");
-            await page.type("#repeat-new-password", "new_password123");
-
-            // Save
-            await click(page, "form > div > .btn[type=submit]", 0);
-            await sleep(1000);
-
-            await click(page, "#logout-btn");
-            await login("admin", "new_password123");
-            let elementCount = await page.evaluate(() => document.querySelectorAll("#floatingPassword").length);
-            expect(elementCount).toEqual(1);
-
-            await login("admin", "admin123");
-        });
-
-        it("Change Password (wrong repeat)", async () => {
-            await page.goto(baseURL + "/settings/security");
-            await page.waitForSelector("#current-password");
-
-            await page.type("#current-password", "admin123");
-            await page.type("#new-password", "new_password123");
-            await page.type("#repeat-new-password", "new_password1234567898797898");
-
-            await click(page, "form > div > .btn[type=submit]", 0);
-            await sleep(1000);
-
-            await click(page, "#logout-btn");
-            await login("admin", "new_password123");
-
-            let elementCount = await page.evaluate(() => document.querySelectorAll("#floatingPassword").length);
-            expect(elementCount).toEqual(1);
-
-            await login("admin", "admin123");
-            await page.waitForSelector("#current-password");
-            let pathname = await page.evaluate(() => location.pathname);
-            expect(pathname).toEqual("/settings/security");
-        });
-
-        // TODO: 2FA
-
-        // TODO: Export Backup
-
-        // TODO: Import Backup
-
-        it("Should disable & enable auth", async () => {
-            await page.goto(baseURL + "/settings/security");
-            await click(page, "#disableAuth-btn");
-            await click(page, ".btn.btn-danger[data-bs-dismiss='modal']", 2); // Not a good way to do it
-            await page.waitForSelector("#enableAuth-btn", { timeout: 3000 });
-            await page.waitForSelector("#logout-btn", {
-                hidden: true,
-                timeout: 3000
-            });
-
-            const newPage = await browser.newPage();
-            await newPage.goto(baseURL);
-            await newPage.waitForSelector("span.badge", { timeout: 3000 });
-            newPage.close();
-
-            await click(page, "#enableAuth-btn");
-            await login("admin", "admin123");
-            await page.waitForSelector("#disableAuth-btn", { timeout: 3000 });
-        });
-
-        // it("Should clear all statistics", async () => {
-        //     await page.goto(baseURL + "/settings/monitor-history");
-        //     await click(page, "#clearAllStats-btn");
-        //     await click(page, ".btn.btn-danger");
-        //     await page.waitForFunction(() => {
-        //         const badge = document.querySelector("span.badge");
-        //         return badge && badge.innerText == "0%";
-        //     }, { timeout: 3000 });
-        // });
-    });
-     */
-
-    /*
-     * TODO
-     * Create Monitor - All type
-     * Edit Monitor
-     * Delete Monitor
-     *
-     * Create Notification (token problem, maybe hard to test)
-     *
-     */
-
-    describe("Status Page", () => {
-        const title = "Uptime Kuma";
-        beforeAll(async () => {
-            await page.goto(baseURL + "/status");
-        });
-        it(`should be titled "${title}"`, async () => {
-            await expect(page.title()).resolves.toEqual(title);
-        });
-    });
-});
-
-/**
- * Test login
- * @param {string} username
- * @param {string} password
- */
-async function login(username, password) {
-    await input(page, "#floatingInput", username);
-    await input(page, "#floatingPassword", password);
-    await page.click(".btn-primary[type=submit]");
-    await sleep(5000);
-}
-
-/**
- * Click on an element on the page
- * @param {Page} page Puppeteer page instance
- * @param {string} selector
- * @param {number} elementIndex
- * @returns {Promise<any>}
- */
-async function click(page, selector, elementIndex = 0) {
-    await page.waitForSelector(selector, {
-        timeout: 5000,
-    });
-    return await page.evaluate((s, i) => {
-        return document.querySelectorAll(s)[i].click();
-    }, selector, elementIndex);
-}
-
-/**
- * Input text into selected field
- * @param {Page} page Puppeteer page instance
- * @param {string} selector
- * @param {string} text Text to input
- */
-async function input(page, selector, text) {
-    await page.waitForSelector(selector, {
-        timeout: 5000,
-    });
-    const element = await page.$(selector);
-    await element.click({ clickCount: 3 });
-    await page.keyboard.press("Backspace");
-    await page.type(selector, text);
-}
diff --git a/test/frontend.spec.js b/test/frontend.spec.js
deleted file mode 100644
index 63121a6b..00000000
--- a/test/frontend.spec.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// eslint-disable-next-line no-global-assign
-global.localStorage = {};
-global.navigator = {
-    language: "en"
-};
-
-const { currentLocale } = require("../src/i18n");
-
-describe("Test i18n.js", () => {
-
-    it("currentLocale()", () => {
-        expect(currentLocale()).toEqual("en");
-
-        navigator.language = "zh-HK";
-        expect(currentLocale()).toEqual("zh-HK");
-
-        // Note that in Safari on iOS prior to 10.2, the country code returned is lowercase: "en-us", "fr-fr" etc.
-        // https://developer.mozilla.org/en-US/docs/Web/API/Navigator/language
-        navigator.language = "zh-hk";
-        expect(currentLocale()).toEqual("en");
-
-        navigator.language = "en-US";
-        expect(currentLocale()).toEqual("en");
-
-        navigator.language = "ja-ZZ";
-        expect(currentLocale()).toEqual("ja");
-
-        navigator.language = "zz";
-        expect(currentLocale()).toEqual("en");
-
-        navigator.language = "zz-ZZ";
-        expect(currentLocale()).toEqual("en");
-
-        localStorage.locale = "en";
-        expect(currentLocale()).toEqual("en");
-
-        localStorage.locale = "zh-HK";
-        expect(currentLocale()).toEqual("zh-HK");
-    });
-
-});
-
diff --git a/test/prepare-jest.js b/test/prepare-jest.js
deleted file mode 100644
index 3fd89d10..00000000
--- a/test/prepare-jest.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const fs = require("fs");
-const rmSync = require("../extra/fs-rmSync.js");
-
-const path = "./data/test-chrome-profile";
-
-if (fs.existsSync(path)) {
-    rmSync(path, {
-        recursive: true,
-    });
-}

From 528a615fb2b330c05efc86a41cea678bc5b1dff3 Mon Sep 17 00:00:00 2001
From: CL0Pinette <51855790+CL0Pinette@users.noreply.github.com>
Date: Wed, 5 Oct 2022 11:30:49 +0200
Subject: [PATCH 27/48] Add free.fr SMS notification provider (#2159)

---
 server/notification-providers/freemobile.js | 24 +++++++++++++++++++++
 server/notification.js                      |  2 ++
 src/components/notifications/FreeMobile.vue | 12 +++++++++++
 src/components/notifications/index.js       |  2 ++
 4 files changed, 40 insertions(+)
 create mode 100644 server/notification-providers/freemobile.js
 create mode 100644 src/components/notifications/FreeMobile.vue

diff --git a/server/notification-providers/freemobile.js b/server/notification-providers/freemobile.js
new file mode 100644
index 00000000..919150fa
--- /dev/null
+++ b/server/notification-providers/freemobile.js
@@ -0,0 +1,24 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+
+class FreeMobile extends NotificationProvider {
+
+    name = "FreeMobile";
+
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        let okMsg = "Sent Successfully.";
+        try {
+            await axios.post(`https://smsapi.free-mobile.fr/sendmsg?msg=${encodeURIComponent(msg.replace("🔴", "⛔️"))}`, {
+                "user": notification.freemobileUser,
+                "pass": notification.freemobilePass,
+            });
+
+            return okMsg;
+
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+    }
+}
+
+module.exports = FreeMobile;
diff --git a/server/notification.js b/server/notification.js
index 7a4b4f29..aed92e5d 100644
--- a/server/notification.js
+++ b/server/notification.js
@@ -9,6 +9,7 @@ const ClickSendSMS = require("./notification-providers/clicksendsms");
 const DingDing = require("./notification-providers/dingding");
 const Discord = require("./notification-providers/discord");
 const Feishu = require("./notification-providers/feishu");
+const FreeMobile = require("./notification-providers/freemobile");
 const GoogleChat = require("./notification-providers/google-chat");
 const Gorush = require("./notification-providers/gorush");
 const Gotify = require("./notification-providers/gotify");
@@ -63,6 +64,7 @@ class Notification {
             new DingDing(),
             new Discord(),
             new Feishu(),
+            new FreeMobile(),
             new GoogleChat(),
             new Gorush(),
             new Gotify(),
diff --git a/src/components/notifications/FreeMobile.vue b/src/components/notifications/FreeMobile.vue
new file mode 100644
index 00000000..852d9ae2
--- /dev/null
+++ b/src/components/notifications/FreeMobile.vue
@@ -0,0 +1,12 @@
+<template>
+    <div class="mb-3">
+        <label for="freemobileUser" class="form-label">{{ $t("Free Mobile User Identifier") }}<span style="color: red;"><sup>*</sup></span></label>
+        <input id="freemobileUser" v-model="$parent.notification.freemobileUser" type="text" class="form-control" required>
+    </div>
+
+    <div class="mb-3">
+        <label for="freemobilePass" class="form-label">{{ $t("Free Mobile API Key") }}<span style="color: red;"><sup>*</sup></span></label>
+        <input id="freemobilePass" v-model="$parent.notification.freemobilePass" type="text" class="form-control" required>
+    </div>
+</template>
+
diff --git a/src/components/notifications/index.js b/src/components/notifications/index.js
index 319a7922..bca4a510 100644
--- a/src/components/notifications/index.js
+++ b/src/components/notifications/index.js
@@ -7,6 +7,7 @@ import ClickSendSMS from "./ClickSendSMS.vue";
 import DingDing from "./DingDing.vue";
 import Discord from "./Discord.vue";
 import Feishu from "./Feishu.vue";
+import FreeMobile from "./FreeMobile.vue";
 import GoogleChat from "./GoogleChat.vue";
 import Gorush from "./Gorush.vue";
 import Gotify from "./Gotify.vue";
@@ -56,6 +57,7 @@ const NotificationFormList = {
     "DingDing": DingDing,
     "discord": Discord,
     "Feishu": Feishu,
+    "FreeMobile": FreeMobile,
     "GoogleChat": GoogleChat,
     "gorush": Gorush,
     "gotify": Gotify,

From c28d8ddff9342da501e60df23cbb79e3259a4306 Mon Sep 17 00:00:00 2001
From: Ben Scobie <benscobie@users.noreply.github.com>
Date: Wed, 5 Oct 2022 16:45:21 +0100
Subject: [PATCH 28/48] Correctly handle multiple IPs in X-Forwarded-For
 (#2177)

Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
---
 package.json                 |  4 +-
 server/uptime-kuma-server.js |  4 +-
 test/backend.spec.js         | 83 +++++++++++++++++++++++++++++++++++-
 3 files changed, 87 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 4f7da681..1411168d 100644
--- a/package.json
+++ b/package.json
@@ -23,9 +23,9 @@
         "start-server": "node server/server.js",
         "start-server-dev": "cross-env NODE_ENV=development node server/server.js",
         "build": "vite build --config ./config/vite.config.js",
-        "test": "node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/ --test",
+        "test": "node test/prepare-test-server.js && npm run jest-backend",
         "test-with-build": "npm run build && npm test",
-        "jest-backend": "cross-env TEST_BACKEND=1 jest --config=./config/jest-backend.config.js",
+        "jest-backend": "cross-env TEST_BACKEND=1 jest --runInBand --detectOpenHandles --forceExit --config=./config/jest-backend.config.js",
         "tsc": "tsc",
         "vite-preview-dist": "vite preview --host --config ./config/vite.config.js",
         "build-docker": "npm run build && npm run build-docker-debian && npm run build-docker-alpine",
diff --git a/server/uptime-kuma-server.js b/server/uptime-kuma-server.js
index 98de65a4..6e77e1fd 100644
--- a/server/uptime-kuma-server.js
+++ b/server/uptime-kuma-server.js
@@ -138,7 +138,9 @@ class UptimeKumaServer {
         }
 
         if (await Settings.get("trustProxy")) {
-            return socket.client.conn.request.headers["x-forwarded-for"]
+            const forwardedFor = socket.client.conn.request.headers["x-forwarded-for"];
+
+            return (typeof forwardedFor === "string" ? forwardedFor.split(",")[0].trim() : null)
                 || socket.client.conn.request.headers["x-real-ip"]
                 || clientIP.replace(/^.*:/, "");
         } else {
diff --git a/test/backend.spec.js b/test/backend.spec.js
index 6deb2853..5b9fa92c 100644
--- a/test/backend.spec.js
+++ b/test/backend.spec.js
@@ -1,7 +1,11 @@
-const { genSecret, DOWN } = require("../src/util");
+const { genSecret, DOWN, log} = require("../src/util");
 const utilServerRewire = require("../server/util-server");
 const Discord = require("../server/notification-providers/discord");
 const axios = require("axios");
+const { UptimeKumaServer } = require("../server/uptime-kuma-server");
+const Database = require("../server/database");
+const {Settings} = require("../server/settings");
+const fs = require("fs");
 
 jest.mock("axios");
 
@@ -225,3 +229,80 @@ describe("The function filterAndJoin", () => {
         expect(result).toBe("");
     });
 });
+
+describe("Test uptimeKumaServer.getClientIP()", () => {
+    it("should able to get a correct client IP", async () => {
+        Database.init({
+            "data-dir": "./data/test"
+        });
+
+        if (! fs.existsSync(Database.path)) {
+            log.info("server", "Copying Database");
+            fs.copyFileSync(Database.templatePath, Database.path);
+        }
+
+        await Database.connect(true);
+        await Database.patch();
+
+        const fakeSocket = {
+            client: {
+                conn: {
+                    remoteAddress: "192.168.10.10",
+                    request: {
+                        headers: {
+                        }
+                    }
+                }
+            }
+        }
+        const server = Object.create(UptimeKumaServer.prototype);
+        let ip = await server.getClientIP(fakeSocket);
+
+        await Settings.set("trustProxy", false);
+        expect(await Settings.get("trustProxy")).toBe(false);
+        expect(ip).toBe("192.168.10.10");
+
+        fakeSocket.client.conn.request.headers["x-forwarded-for"] = "10.10.10.10";
+        ip = await server.getClientIP(fakeSocket);
+        expect(ip).toBe("192.168.10.10");
+
+        fakeSocket.client.conn.request.headers["x-real-ip"] = "20.20.20.20";
+        ip = await server.getClientIP(fakeSocket);
+        expect(ip).toBe("192.168.10.10");
+
+        await Settings.set("trustProxy", true);
+        expect(await Settings.get("trustProxy")).toBe(true);
+
+        fakeSocket.client.conn.request.headers["x-forwarded-for"] = "10.10.10.10";
+        ip = await server.getClientIP(fakeSocket);
+        expect(ip).toBe("10.10.10.10");
+
+        // x-real-ip
+        delete fakeSocket.client.conn.request.headers["x-forwarded-for"];
+        ip = await server.getClientIP(fakeSocket);
+        expect(ip).toBe("20.20.20.20");
+
+        fakeSocket.client.conn.request.headers["x-forwarded-for"] = "2001:db8:85a3:8d3:1319:8a2e:370:7348";
+        ip = await server.getClientIP(fakeSocket);
+        expect(ip).toBe("2001:db8:85a3:8d3:1319:8a2e:370:7348");
+
+        fakeSocket.client.conn.request.headers["x-forwarded-for"] = "203.0.113.195";
+        ip = await server.getClientIP(fakeSocket);
+        expect(ip).toBe("203.0.113.195");
+
+        fakeSocket.client.conn.request.headers["x-forwarded-for"] = "203.0.113.195, 2001:db8:85a3:8d3:1319:8a2e:370:7348";
+        ip = await server.getClientIP(fakeSocket);
+        expect(ip).toBe("203.0.113.195");
+
+        fakeSocket.client.conn.request.headers["x-forwarded-for"] = "203.0.113.195,2001:db8:85a3:8d3:1319:8a2e:370:7348,150.172.238.178";
+        ip = await server.getClientIP(fakeSocket);
+        expect(ip).toBe("203.0.113.195");
+
+        // Elements are comma-separated, with optional whitespace surrounding the commas.
+        fakeSocket.client.conn.request.headers["x-forwarded-for"] = "203.0.113.195 , 2001:db8:85a3:8d3:1319:8a2e:370:7348,150.172.238.178";
+        ip = await server.getClientIP(fakeSocket);
+        expect(ip).toBe("203.0.113.195");
+
+        await Database.close();
+    }, 120000);
+});

From c24b64921d08b6d5c0cfc060fe35e43ecdbce20b Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Thu, 6 Oct 2022 23:28:06 +0800
Subject: [PATCH 29/48] Fix #2183 ntfy issue

---
 server/notification-providers/ntfy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/notification-providers/ntfy.js b/server/notification-providers/ntfy.js
index 17d6d812..5381da46 100644
--- a/server/notification-providers/ntfy.js
+++ b/server/notification-providers/ntfy.js
@@ -9,7 +9,7 @@ class Ntfy extends NotificationProvider {
         let okMsg = "Sent Successfully.";
         try {
             let headers = {};
-            if (notification.ntfyusername.length > 0) {
+            if (notification.ntfyusername) {
                 headers = {
                     "Authorization": "Basic " + Buffer.from(notification.ntfyusername + ":" + notification.ntfypassword).toString("base64"),
                 };

From 60460442f869f2cc581690bd7c8930b3eb7777b8 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Fri, 7 Oct 2022 00:25:34 +0800
Subject: [PATCH 30/48] Update to 1.18.3

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 1411168d..df0bdbfb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "uptime-kuma",
-    "version": "1.18.2",
+    "version": "1.18.3",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -38,7 +38,7 @@
         "build-docker-nightly-amd64": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain",
         "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test --target pr-test . --push",
         "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain",
-        "setup": "git checkout 1.18.2 && npm ci --production && npm run download-dist",
+        "setup": "git checkout 1.18.3 && npm ci --production && npm run download-dist",
         "download-dist": "node extra/download-dist.js",
         "mark-as-nightly": "node extra/mark-as-nightly.js",
         "reset-password": "node extra/reset-password.js",

From 6e07ed20816969bfd1c6c06eb518171938312782 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Fri, 7 Oct 2022 15:02:19 +0800
Subject: [PATCH 31/48] Fix #2186

---
 package-lock.json           | 41 +++++++++++++++++++++++++++----------
 package.json                |  1 +
 server/model/status_page.js | 15 ++++++++++----
 3 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 71827042..4f222171 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "uptime-kuma",
-    "version": "1.18.2",
+    "version": "1.18.3",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "uptime-kuma",
-            "version": "1.18.2",
+            "version": "1.18.3",
             "license": "MIT",
             "dependencies": {
                 "@louislam/sqlite3": "~15.0.6",
@@ -33,6 +33,7 @@
                 "http-proxy-agent": "^5.0.0",
                 "https-proxy-agent": "^5.0.0",
                 "iconv-lite": "^0.6.3",
+                "jsesc": "^3.0.2",
                 "jsonwebtoken": "~8.5.1",
                 "jwt-decode": "^3.1.2",
                 "limiter": "^2.1.0",
@@ -474,6 +475,18 @@
                 "node": ">=6.9.0"
             }
         },
+        "node_modules/@babel/generator/node_modules/jsesc": {
+            "version": "2.5.2",
+            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+            "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+            "dev": true,
+            "bin": {
+                "jsesc": "bin/jsesc"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
         "node_modules/@babel/helper-annotate-as-pure": {
             "version": "7.18.6",
             "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
@@ -11229,15 +11242,14 @@
             "dev": true
         },
         "node_modules/jsesc": {
-            "version": "2.5.2",
-            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-            "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-            "dev": true,
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+            "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
             "bin": {
                 "jsesc": "bin/jsesc"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=6"
             }
         },
         "node_modules/json-parse-even-better-errors": {
@@ -16957,6 +16969,14 @@
                 "@babel/types": "^7.18.13",
                 "@jridgewell/gen-mapping": "^0.3.2",
                 "jsesc": "^2.5.1"
+            },
+            "dependencies": {
+                "jsesc": {
+                    "version": "2.5.2",
+                    "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+                    "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+                    "dev": true
+                }
             }
         },
         "@babel/helper-annotate-as-pure": {
@@ -25010,10 +25030,9 @@
             }
         },
         "jsesc": {
-            "version": "2.5.2",
-            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-            "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-            "dev": true
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+            "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="
         },
         "json-parse-even-better-errors": {
             "version": "2.3.1",
diff --git a/package.json b/package.json
index df0bdbfb..d478a1d2 100644
--- a/package.json
+++ b/package.json
@@ -88,6 +88,7 @@
         "http-proxy-agent": "^5.0.0",
         "https-proxy-agent": "^5.0.0",
         "iconv-lite": "^0.6.3",
+        "jsesc": "^3.0.2",
         "jsonwebtoken": "~8.5.1",
         "jwt-decode": "^3.1.2",
         "limiter": "^2.1.0",
diff --git a/server/model/status_page.js b/server/model/status_page.js
index 82d184bf..7682272c 100644
--- a/server/model/status_page.js
+++ b/server/model/status_page.js
@@ -2,6 +2,7 @@ const { BeanModel } = require("redbean-node/dist/bean-model");
 const { R } = require("redbean-node");
 const cheerio = require("cheerio");
 const { UptimeKumaServer } = require("../uptime-kuma-server");
+const jsesc = require("jsesc");
 
 class StatusPage extends BeanModel {
 
@@ -56,13 +57,19 @@ class StatusPage extends BeanModel {
         head.append(`<meta property="og:description" content="${description155}" />`);
 
         // Preload data
-        const json = JSON.stringify(await StatusPage.getStatusPageData(statusPage));
-        head.append(`
-            <script>
-                window.preloadData = ${json}
+        // Add jsesc, fix https://github.com/louislam/uptime-kuma/issues/2186
+        const escapedJSONObject = jsesc(JSON.stringify(await StatusPage.getStatusPageData(statusPage)), {
+            "isScriptContext": true
+        });
+
+        const script = $(`
+            <script id="preload-data" data-json="{}">
+                window.preloadData = ${escapedJSONObject};
             </script>
         `);
 
+        head.append(script);
+
         // manifest.json
         $("link[rel=manifest]").attr("href", `/api/status-page/${statusPage.slug}/manifest.json`);
 

From 7d3cc002ea8fe95c7ca23885052280110e7f5217 Mon Sep 17 00:00:00 2001
From: Vasilis The Pikachu <vascreeper@yahoo.com>
Date: Fri, 7 Oct 2022 08:55:12 +0000
Subject: [PATCH 32/48] Added greek language

---
 src/i18n.js            |   1 +
 src/languages/el-GR.js | 585 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 586 insertions(+)
 create mode 100644 src/languages/el-GR.js

diff --git a/src/i18n.js b/src/i18n.js
index 8495cd99..4c19eb00 100644
--- a/src/i18n.js
+++ b/src/i18n.js
@@ -34,6 +34,7 @@ const languageList = {
     "zh-TW": "繁體中文 (台灣)",
     "uk-UA": "Український",
     "th-TH": "ไทย",
+    "el-GR": "Ελληνικά",
 };
 
 let messages = {
diff --git a/src/languages/el-GR.js b/src/languages/el-GR.js
new file mode 100644
index 00000000..29af0417
--- /dev/null
+++ b/src/languages/el-GR.js
@@ -0,0 +1,585 @@
+export default {
+    languageName: "Ελληνικά",
+    checkEverySecond: "Έλεγχος κάθε {0} δευτερόλεπτα",
+    retryCheckEverySecond: "Επανάληψη κάθε {0} δευτερόλεπτα",
+    resendEveryXTimes: "Επανάληψη αποστολής ειδοποίησης κάθε {0} φορές",
+    resendDisabled: "Η επανάληψη αποστολής ειδοποίησης είναι απενεργοποιημένη",
+    retriesDescription: "Μέγιστες επαναλήψεις προτού η υπηρεσία επισημανθεί ως κατω και σταλεί μια ειδοποίηση",
+    ignoreTLSError: "Παράβλεψη σφάλματος TLS/SSL για ιστότοπους HTTPS",
+    upsideDownModeDescription: "Αναποδογυρίστε την κατάσταση. Εάν η υπηρεσία είναι προσβάσιμη, είναι ΚΑΤΩ.",
+    maxRedirectDescription: "Μέγιστος αριθμός redirect που θα ακολουθήσουν. Ρυθμίστε το 0 για να απενεργοποιήσετε τα redirect.",
+    acceptedStatusCodesDescription: "Επιλέξτε κωδικούς κατάστασης που θεωρούνται επιτυχή.",
+    passwordNotMatchMsg: "Ο κωδικός δεν ταιριάζει.",
+    notificationDescription: "Οι ειδοποιήσεις πρέπει να εκχωρηθούν σε μια παρακολούθηση για να λειτουργήσουν.",
+    keywordDescription: "Αναζήτηση λέξης-κλειδιού σε απλή απόκριση HTML ή JSON. Η αναζήτηση είναι διάκριση πεζών-κεφαλαίων.",
+    pauseDashboardHome: "Παύση",
+    deleteMonitorMsg: "Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την παρακολούθηση;",
+    deleteNotificationMsg: "Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την ειδοποίηση για όλες τις παρακολούθησης?",
+    dnsPortDescription: "Θύρα διακομιστή DNS. Προεπιλογή σε 53. Μπορείτε να αλλάξετε τη θύρα ανά πάσα στιγμή.",
+    resolverserverDescription: "Το Cloudflare είναι ο προεπιλεγμένος διακομιστής. Μπορείτε να αλλάξετε τον διακομιστή επίλυσης ανά πάσα στιγμήhe default server. You can change the resolver server anytime.",
+    rrtypeDescription: "Επιλέξτε τον τύπο RR που θέλετε να παρακολουθήσετε",
+    pauseMonitorMsg: "Είστε βέβαιοι ότι θέλετε να κάνετε παύση;",
+    enableDefaultNotificationDescription: "Αυτή η ειδοποίηση θα είναι ενεργοποιημένη από προεπιλογή για νέες παρακολούθησης. Μπορείτε ακόμα να απενεργοποιήσετε την ειδοποίηση ξεχωριστά για κάθε παρακολούθηση.",
+    clearEventsMsg: "Είστε βέβαιοι ότι θέλετε να διαγράψετε όλα τα συμβάντα για αυτήν την παρακολούθηση;",
+    clearHeartbeatsMsg: "Είστε βέβαιοι ότι θέλετε να διαγράψετε όλους τους καρδιακούς παλμούς για αυτήν την παρακολούθηση;",
+    confirmClearStatisticsMsg: "Είστε βέβαιοι ότι θέλετε να διαγράψετε ΟΛΑ τα στατιστικά στοιχεία;?",
+    importHandleDescription: "Επιλέξτε «Παράλειψη υπάρχοντος» εάν θέλετε να παραλείψετε κάθε παρακολούθηση ή ειδοποίηση με το ίδιο όνομα. Το 'Overwrite' θα διαγράψει κάθε υπάρχουσα παρακολούθηση και ειδοποίηση.",
+    confirmImportMsg: "Είστε βέβαιοι ότι θέλετε να εισαγάγετε το αντίγραφο ασφαλείας; Επαληθεύστε ότι έχετε επιλέξει τη σωστή επιλογή.",
+    twoFAVerifyLabel: "Εισαγάγετε το 2FA κωδικό για να επαληθεύσετε: ",
+    tokenValidSettingsMsg: "Ο κωδικός 2FA είναι έγκυρο! Τώρα μπορείτε να αποθηκεύσετε τις ρυθμίσεις 2FA",
+    confirmEnableTwoFAMsg: "Είστε βέβαιοι ότι θέλετε να ενεργοποιήσετε το 2FA;",
+    confirmDisableTwoFAMsg: "Είστε βέβαιοι ότι θέλετε να απενεργοποιήσετε το 2FA;",
+    Settings: "Ρυθμίσεις",
+    Dashboard: "Πίνακας",
+    "New Update": "Νέα αναβάθμιση",
+    Language: "Γλώσσα",
+    Appearance: "Εμφάνιση",
+    Theme: "Θέμα",
+    General: "Γενικά",
+    "Primary Base URL": "Κύρια βασική διεύθυνση URL",
+    Version: "Εκδοχή",
+    "Check Update On GitHub": "Ελέγξτε για Ενημέρωση στο GitHub",
+    List: "Λίστα",
+    Add: "Προσθήκη",
+    "Add New Monitor": "Προσθήκη νέας παρακολούθησης",
+    "Quick Stats": "Γρήγορα στατιστικά",
+    Up: "Πάνω",
+    Down: "Κάτω",
+    Pending: "Εκκρεμεί",
+    Unknown: "Άγνωστο",
+    Pause: "Παύση",
+    Name: "Ονομα",
+    Status: "Κατάσταση",
+    DateTime: "ΗμερομηνίαΏρα",
+    Message: "Μήνυμα",
+    "No important events": "Δεν υπάρχουν σημαντικά γεγονότα",
+    Resume: "Συνέχιση",
+    Edit: "Επεξεργασία",
+    Delete: "Διαγράφω",
+    Current: "Current",
+    Uptime: "Χρόνος λειτουργίας",
+    "Cert Exp.": "Cert Exp.",
+    day: "ημέρα | ημέρες",
+    "-day": "-ημέρα",
+    hour: "ώρα",
+    "-hour": "-ώρα",
+    Response: "Απάντηση",
+    Ping: "Ping",
+    "Monitor Type": "Τύπος παρακολούθησης",
+    Keyword: "Λέξη-κλειδί",
+    "Friendly Name": "Φιλικό όνομα",
+    URL: "URL",
+    Hostname: "Hostname",
+    Port: "Port",
+    "Heartbeat Interval": "Διάστημα καρδιακών παλμών",
+    Retries: "Επαναλήψεις",
+    "Heartbeat Retry Interval": "Διάστημα επανάληψης παλμών καρδιάς",
+    "Resend Notification if Down X times consequently": "Αποστολή νέας ειδοποίησης εάν κατω X φορές κατά συνέχεια",
+    Advanced: "Προχωρημένα",
+    "Upside Down Mode": "Ανάποδη λειτουργία",
+    "Max. Redirects": "Μέγιστη. Ανακατευθύνσεις",
+    "Accepted Status Codes": "Αποδεκτοί Κωδικοί Κατάστασης",
+    "Push URL": "Push URL",
+    needPushEvery: "Θα πρέπει να καλείτε αυτήν τη διεύθυνση URL κάθε {0} δευτερόλεπτα.",
+    pushOptionalParams: "Προαιρετικές παράμετροι: {0}",
+    Save: "Αποθηκεύση",
+    Notifications: "Ειδοποιήσεις",
+    "Not available, please setup.": "Μη διαθέσιμο, παρακαλώ ρυθμίστε.",
+    "Setup Notification": "Δημιουργία ειδοποίησης",
+    Light: "Φωτεινό",
+    Dark: "Σκοτεινό",
+    Auto: "Αυτόματο",
+    "Theme - Heartbeat Bar": "Θέμα - Μπάρα καρδιακών παλμών",
+    Normal: "Κανονικό",
+    Bottom: "Κάτω μέρος",
+    None: "Τίποτα",
+    Timezone: "Ζώνη ώρας",
+    "Search Engine Visibility": "Ορατότητα μηχανών αναζήτησης",
+    "Allow indexing": "Να επιτρέπεται η ευρετηρίαση",
+    "Discourage search engines from indexing site": "Αποθαρρύνετε τις μηχανές αναζήτησης από την ευρετηρίαση ιστότοπου",
+    "Change Password": "Αλλαγή κωδικού πρόσβασης",
+    "Current Password": "Τρέχων κωδικός πρόσβασης",
+    "New Password": "Νέος κωδικός πρόσβασης",
+    "Repeat New Password": "Επαναλάβετε τον νέο κωδικό πρόσβασης",
+    "Update Password": "Ενημέρωση κωδικού πρόσβασης",
+    "Disable Auth": "Απενεργοποίηση ελέγχου ταυτότητας",
+    "Enable Auth": "Ενεργοποίηση ελέγχου ταυτότητας",
+    "disableauth.message1": "Είστε βέβαιοι ότι θέλετε να <strong>απενεργοποιήσετε τον έλεγχο ταυτότητας</strong>;",
+    "disableauth.message2": "Έχει σχεδιαστεί για σενάρια <strong>όπου σκοπεύετε να εφαρμόσετε έλεγχο ταυτότητας τρίτου μέρους</strong> μπροστά από το Uptime Kuma, όπως το Cloudflare Access, Authelia ή άλλους μηχανισμούς ελέγχου ταυτότητας.",
+    "Please use this option carefully!": "Χρησιμοποιήστε αυτή την επιλογή προσεκτικά!",
+    Logout: "Αποσύνδεση",
+    Leave: "Φύγετε",
+    "I understand, please disable": "Καταλαβαίνω, απενεργοποιήστε",
+    Confirm: "Επιβεβαίωση",
+    Yes: "Ναί",
+    No: "Οχι",
+    Username: "Όνομα χρήστη",
+    Password: "Κωδικός πρόσβασης",
+    "Remember me": "Θυμήσου με",
+    Login: "Σύνδεση",
+    "No Monitors, please": "Δεν υπάρχουν παρακολούθησης παρακαλώ",
+    "add one": "προσθέστε ένα",
+    "Notification Type": "Είδος ειδοποίησης",
+    Email: "Email",
+    Test: "Δοκιμή",
+    "Certificate Info": "Πληροφορίες πιστοποιητικού",
+    "Resolver Server": "Διακομιστής επίλυσης",
+    "Resource Record Type": "Τύπος εγγραφής πόρων",
+    "Last Result": "Τελευταίο Αποτέλεσμα",
+    "Create your admin account": "Δημιουργήστε τον λογαριασμό διαχειριστή σας",
+    "Repeat Password": "Επαναλάβετε τον κωδικό πρόσβασης",
+    "Import Backup": "Εισαγωγή αντιγράφων ασφαλείας",
+    "Export Backup": "Εξαγωγή αντιγράφων ασφαλείας",
+    Export: "Εξαγωγή",
+    Import: "Εισαγωγή",
+    respTime: "Χρόν. Aπό (ms)",
+    notAvailableShort: "N/A",
+    "Default enabled": "Προεπιλογή ενεργοποιημένη",
+    "Apply on all existing monitors": "Εφαρμόστε σε όλες τις υπάρχουσες παρακολούθησης",
+    Create: "Δημιουργία",
+    "Clear Data": "Καθαρισμός δεδομένων",
+    Events: "Γεγονότα",
+    Heartbeats: "Παλμοι καρδιας",
+    "Auto Get": "Αυτόματη λήψη",
+    backupDescription: "Μπορείτε να δημιουργήσετε αντίγραφα ασφαλείας γία ολλες της παρακολούθησης και ειδοποιήσης σε ένα αρχείο JSON..",
+    backupDescription2: "Σημείωση: δεν περιλαμβάνονται δεδομένα ιστορικού και συμβάντων.",
+    backupDescription3: "Στο αρχείο εξαγωγής περιλαμβάνονται ευαίσθητα δεδομένα, όπως token ειδοποιήσεων. Aποθηκεύστε την εξαγωγή με ασφάλεια..",
+    alertNoFile: "Επιλέξτε ένα αρχείο για εισαγωγή.",
+    alertWrongFileType: "Επιλέξτε ένα αρχείο JSON.",
+    "Clear all statistics": "Εκκαθάριση όλων των στατιστικών",
+    "Skip existing": "Παράβλεψη υπάρχοντος",
+    Overwrite: "Αντικατάσταση",
+    Options: "Επιλογές",
+    "Keep both": "Κράτα και τα δύο",
+    "Verify Token": "Επαλήθευση Token",
+    "Setup 2FA": "Ρύθμιση 2FA",
+    "Enable 2FA": "Ενεργοποίηση 2FA",
+    "Disable 2FA": "Απενεργοποίηση 2FA",
+    "2FA Settings": "Ρυθμίσεις 2FA",
+    "Two Factor Authentication": "Έλεγχος ταυτότητας δύο παραγόντων",
+    Active: "Ενεργός",
+    Inactive: "Ανενεργό",
+    Token: "Token",
+    "Show URI": "Εμφάνιση URI",
+    Tags: "Ετικέτες",
+    "Add New below or Select...": "Προσθήκη νέου παρακάτω ή Επιλέξτε...",
+    "Tag with this name already exist.": "Υπάρχει ήδη η ετικέτα με αυτό το όνομα.",
+    "Tag with this value already exist.": "Υπάρχει ήδη ετικέτα με αυτό το value.",
+    color: "χρώμα",
+    "value (optional)": "value (optional)",
+    Gray: "Γκρί",
+    Red: "Κόκκινο",
+    Orange: "Πορτοκάλι",
+    Green: "Πράσινο",
+    Blue: "Μπλε",
+    Indigo: "Indigo",
+    Purple: "Μωβ",
+    Pink: "Ροζ",
+    "Search...": "Αναζήτηση...",
+    "Avg. Ping": "Μέσo.Ping",
+    "Avg. Response": "Μέσo. Aπάντηση",
+    "Entry Page": "Σελίδα εισαγωγής",
+    statusPageNothing: "Δεν υπάρχει τίποτα εδώ, προσθέστε μια ομάδα ή μια παρακολούθηση.",
+    "No Services": "Δεν υπάρχουν υπηρεσίες",
+    "All Systems Operational": "Όλα τα συστήματα λειτουργούν",
+    "Partially Degraded Service": "Μερικώς υποβαθμισμένη υπηρεσία",
+    "Degraded Service": "Υποβαθμισμένη υπηρεσία",
+    "Add Group": "Προσθήκη γρουπ",
+    "Add a monitor": "Προσθήκη παρακολούθησης",
+    "Edit Status Page": "Επεξεργασία σελίδας κατάστασης",
+    "Go to Dashboard": "Μεταβείτε στον Πίνακα ελέγχου",
+    "Status Page": "Σελίδα κατάστασης",
+    "Status Pages": "Σελίδες κατάστασης",
+    defaultNotificationName: "Η ειδοποίηση μου {notification} ({number})",
+    here: "εδώ",
+    Required: "Απαιτείται",
+    telegram: "Telegram",
+    "Bot Token": "Διακριτικό Bot",
+    wayToGetTelegramToken: "Μπορείτε να πάρετε ένα διακριτικό από {0}.",
+    "Chat ID": "Chat ID",
+    supportTelegramChatID: "Support Direct Chat / Group / Channel's Chat ID",
+    wayToGetTelegramChatID: "Μπορείτε να λάβετε το αναγνωριστικό συνομιλίας σας στέλνοντας ένα μήνυμα στο bot και μεταβαίνοντας σε αυτήν τη διεύθυνση URL για να προβάλετε το chat_id:",
+    "YOUR BOT TOKEN HERE": "ΤΟ BOT ΣΑΣ ΔΙΑΚΡΙΤΙΚΌ ΕΔΩ",
+    chatIDNotFound: "Το Chat ID δεν βρέθηκε. Στείλτε πρώτα ένα μήνυμα σε αυτό το bot",
+    webhook: "Webhook",
+    "Post URL": "Post URL",
+    "Content Type": "Τύπος περιεχομένου",
+    webhookJsonDesc: "{0} είναι καλό για οποιονδήποτε σύγχρονο διακομιστή HTTP όπως το Express.js",
+    webhookFormDataDesc: "{multipart} είναι καλό για την PHP. Το JSON θα πρέπει να αναλυθεί με {decodeFunction}",
+    smtp: "Email (SMTP)",
+    secureOptionNone: "None / STARTTLS (25, 587)",
+    secureOptionTLS: "TLS (465)",
+    "Ignore TLS Error": "Παράβλεψη σφάλματος TLS",
+    "From Email": "Από Email",
+    emailCustomSubject: "Προσαρμοσμένο θέμα",
+    "To Email": "Προς Email",
+    smtpCC: "CC",
+    smtpBCC: "BCC",
+    discord: "Discord",
+    "Discord Webhook URL": "Discord Webhook URL",
+    wayToGetDiscordURL: "Μπορείτε να το αποκτήσετε μεταβαίνοντας στις Ρυθμίσεις διακομιστή -> Ενσωματώσεις -> Δημιουργία Webhook",
+    "Bot Display Name": "Εμφανιζόμενο όνομα bot",
+    "Prefix Custom Message": "Προσαρμοσμένο μήνυμα",
+    "Hello @everyone is...": "Γεια {'@'}everyone ειναι...",
+    teams: "Microsoft Teams",
+    "Webhook URL": "Webhook URL",
+    wayToGetTeamsURL: "Μπορείτε να μάθετε πώς να δημιουργείτε μια διεύθυνση URL webhook {0}.",
+    signal: "Signal",
+    Number: "Αριθμός",
+    Recipients: "Αποδέκτες",
+    needSignalAPI: "Πρέπει να έχετε ένα signal client με REST API..",
+    wayToCheckSignalURL: "Μπορείτε να ελέγξετε αυτό το URL για να δείτε πώς να ρυθμίσετε ένα:",
+    signalImportant: "ΣΗΜΑΝΤΙΚΟ: Δεν μπορείτε να συνδυάσετε ομάδες και αριθμούς στους παραλήπτες!",
+    gotify: "Gotify",
+    "Application Token": "Token εφαρμογής",
+    "Server URL": "URL διακομιστή",
+    Priority: "Προτεραιότητα",
+    slack: "Slack",
+    "Icon Emoji": "Εικονίδιο Emoji",
+    "Channel Name": "Όνομα καναλιού",
+    "Uptime Kuma URL": "Uptime Kuma URL",
+    aboutWebhooks: "Περισσότερες πληροφορίες σχετικά με τα Webhooks στο: {0}",
+    aboutChannelName: "Εισαγάγετε το όνομα του καναλιού στο {0} Όνομα καναλιού εάν θέλετε να παρακάμψετε το κανάλι Webhook. Π.χ.: #other-channel",
+    aboutKumaURL: "Εάν αφήσετε κενό το πεδίο URL Uptime Kuma, θα είναι προεπιλεγμένο στη σελίδα Project GitHub..",
+    emojiCheatSheet: "Φύλλο εξαπάτησης emoji: {0}",
+    "rocket.chat": "Rocket.Chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    PushByTechulus: "Push by Techulus",
+    octopush: "Octopush",
+    promosms: "PromoSMS",
+    clicksendsms: "ClickSend SMS",
+    lunasea: "LunaSea",
+    apprise: "Apprise (Support 50+ Notification services)",
+    GoogleChat: "Google Chat (Google Workspace only)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
+    "User Key": "Κλειδί χρήστη",
+    Device: "Συσκευή",
+    "Message Title": "Τίτλος μηνύματος",
+    "Notification Sound": "Ήχος ειδοποίησης",
+    "More info on:": "Περισσότερες πληροφορίες στο: {0}",
+    pushoverDesc1: "Η προτεραιότητα έκτακτης ανάγκης (2) έχει προεπιλεγμένο χρονικό όριο 30 δευτερολέπτων μεταξύ των επαναλήψεων και θα λήξει μετά από 1 ώρα.",
+    pushoverDesc2: "Εάν θέλετε να στέλνετε ειδοποιήσεις σε διαφορετικές συσκευές, συμπληρώστε το πεδίο Συσκευή.",
+    "SMS Type": "Τύπος SMS",
+    octopushTypePremium: "Premium (Γρήγορη - συνιστάται για ειδοποίηση)",
+    octopushTypeLowCost: "Χαμηλό κόστος (Αργό - μερικές φορές μπλοκάρεται από τον χειριστή)",
+    checkPrice: "Ελέγξτε τις τιμές {0}:",
+    apiCredentials: "API credentials",
+    octopushLegacyHint: "Χρησιμοποιείτε την παλαιού τύπου έκδοση του Octopush (2011-2020) ή τη νέα έκδοση;",
+    "Check octopush prices": "Ελέγξτε τις τιμές OctoPush {0}.",
+    octopushPhoneNumber: "Αριθμός τηλεφώνου (διεθνής μορφή, π.χ.: +30694345678)",
+    octopushSMSSender: "Όνομα αποστολέα SMS: 3-11 αλφαριθμητικοί χαρακτήρες και διάστημα (a-zA-Z0-9)",
+    "LunaSea Device ID": "LunaSea Device ID",
+    "Apprise URL": "Apprise URL",
+    "Example:": "Παράδειγμα: {0}",
+    "Read more:": "Διαβάστε περισσότερα: {0}",
+    "Status:": "Κατάσταση: {0}",
+    "Read more": "Διαβάστε περισσότερα",
+    appriseInstalled: "Το Apprise έχει εγκατασταθεί.",
+    appriseNotInstalled: "Το Apprise δεν έχει εγκατασταθεί. {0}",
+    "Access Token": "Access Token",
+    "Channel access token": "Channel Access Token",
+    "Line Developers Console": "Line Developers Console",
+    lineDevConsoleTo: "Line Developers Console - {0}",
+    "Basic Settings": "Βασικές ρυθμίσεις",
+    "User ID": "User ID",
+    "Messaging API": "Messaging API",
+    wayToGetLineChannelToken: "Πρώτα αποκτήστε πρόσβαση στο {0}, δημιουργήστε έναν πάροχο και ένα κανάλι (Messanging API) και, στη συνέχεια, μπορείτε να λάβετε το channel access token και το user ID από τα παραπάνω στοιχεία μενού.",
+    "Icon URL": "Διεύθυνση URL εικονιδίου",
+    aboutIconURL: "Μπορείτε να παρέχετε έναν σύνδεσμο προς μια εικόνα στο \"Icon URL\" για να παρακάμψετε την προεπιλεγμένη εικόνα προφίλ. Δεν θα χρησιμοποιηθεί εάν έχει οριστεί το εικονίδιο Emoji.",
+    aboutMattermostChannelName: "Μπορείτε να παρακάμψετε το προεπιλεγμένο κανάλι στο οποίο δημοσιεύει το Webhook εισάγοντας το όνομα του καναλιού στο πεδίο \"Όνομα καναλιού\". Αυτό πρέπει να ενεργοποιηθεί στις ρυθμίσεις του Mattermost Webhook. Π.χ.: #other-channel",
+    matrix: "Matrix",
+    promosmsTypeEco: "SMS ECO - φθηνό αλλά αργό και συχνά υπερφορτωμένο. Περιορίζεται μόνο σε Πολωνούς παραλήπτες.",
+    promosmsTypeFlash: "SMS FLASH - Το μήνυμα θα εμφανίζεται αυτόματα στη συσκευή του παραλήπτη. Περιορίζεται μόνο σε Πολωνούς παραλήπτες.",
+    promosmsTypeFull: "SMS FULL - Premium επίπεδο SMS, Μπορείτε να χρησιμοποιήσετε το Όνομα Αποστολέα σας (Πρέπει πρώτα να καταχωρήσετε το όνομα). Αξιόπιστο για ειδοποιήσεις.",
+    promosmsTypeSpeed: "SMS SPEED - Υψηλότερη προτεραιότητα στο σύστημα. Πολύ γρήγορο και αξιόπιστο αλλά ακριβό (περίπου διπλάσια τιμή SMS FULL).",
+    promosmsPhoneNumber: "Αριθμός τηλεφώνου (για πολωνούς παραλήπτες Μπορείτε να παραλείψετε τους κωδικούς περιοχής)",
+    promosmsSMSSender: "Όνομα αποστολέα SMS: Προεγγεγραμμένο όνομα ή ένα από τα προεπιλεγμένα: InfoSMS, SMS Info, MaxSMS, INFO, SMS",
+    "Feishu WebHookUrl": "Feishu WebHookURL",
+    matrixHomeserverURL: "Homeserver URL (με http(s):// και προαιρετικά θύρα)",
+    "Internal Room Id": "Internal Room ID",
+    matrixDesc1: "Μπορείτε να βρείτε το internal room ID ανατρέχοντας στην ενότητα για προχωρημένους των ρυθμίσεων δωματίου στο πρόγραμμα-πελάτη Matrix. Θα πρέπει να μοιάζει με !QMdRCpUIfLwsfjxye6:home.server.",
+    matrixDesc2: "Συνιστάται ανεπιφύλακτα να δημιουργήσετε έναν νέο χρήστη και να μην χρησιμοποιήσετε το διακριτικό πρόσβασης του χρήστη Matrix, καθώς θα επιτρέψει την πλήρη πρόσβαση στον λογαριασμό σας και σε όλα τα δωμάτια στα οποία συμμετέχετε. Αντίθετα, δημιουργήστε έναν νέο χρήστη και προσκαλέστε τον μόνο στο δωμάτιο στο οποίο θέλετε να λαμβάνετε την ειδοποίηση. Μπορείτε να λάβετε το access token εκτελώντας {0}",
+    Method: "Μέθοδος",
+    Body: "Σώμα",
+    Headers: "Headers",
+    PushUrl: "Push URL",
+    HeadersInvalidFormat: "The request headers are not valid JSON: ",
+    BodyInvalidFormat: "The request body is not valid JSON: ",
+    "Monitor History": "Ιστορικο Παρακολούθησης",
+    clearDataOlderThan: "Διατηρήστε τα δεδομένα ιστορικού παρακολούθησης για {0} ημέρες.",
+    PasswordsDoNotMatch: "Οι κωδικοί πρόσβασης δεν ταιριάζουν.",
+    records: "εγγραφές",
+    "One record": "Μία εγγραφή",
+    steamApiKeyDescription: "Για την παρακολούθηση ενός διακομιστή παιχνιδιών Steam χρειάζεστε ένα κλειδί Steam Web-API. Μπορείτε να καταχωρήσετε το κλειδί API σας εδώ: ",
+    "Current User": "Τρέχων χρήστης",
+    topic: "Θέμα",
+    topicExplanation: "Θέμα MQTT προς παρακολούθηση",
+    successMessage: "Μήνυμα επιτυχίας",
+    successMessageExplanation: "Μήνυμα MQTT που θα θεωρηθεί επιτυχές",
+    recent: "Πρόσφατος",
+    Done: "Ολοκληρώθηκε",
+    Info: "Πληροφορίες",
+    Security: "Ασφάλεια",
+    "Steam API Key": "Steam API Key",
+    "Shrink Database": "Συρρίκνωση βάσης δεδομένων",
+    "Pick a RR-Type...": "Επιλέξτε έναν τύπο RR...",
+    "Pick Accepted Status Codes...": "Επιλέξτε Αποδεκτούς κωδικούς κατάστασης...",
+    Default: "Προκαθορισμένο",
+    "HTTP Options": "Επιλογές HTTP",
+    "Create Incident": "Δημιουργία περιστατικού",
+    Title: "Τίτλος",
+    Content: "Περιεχόμενο",
+    Style: "Στυλ",
+    info: "πληροφορίες",
+    warning: "προειδοποίηση",
+    danger: "κίνδυνος",
+    error: "σφάλμα",
+    critical: "κριτικό",
+    primary: "primary",
+    light: "light",
+    dark: "dark",
+    Post: "Δημοσίευση",
+    "Please input title and content": "Παρακαλούμε εισαγάγετε τίτλο και περιεχόμενο",
+    Created: "Δημιουργήθηκε",
+    "Last Updated": "Τελευταία ενημέρωση",
+    Unpin: "Ξεκαρφιτσώστε",
+    "Switch to Light Theme": "Μετάβαση σε Ανιχτό θέμα",
+    "Switch to Dark Theme": "Μετάβαση σε Σκούρο θέμα",
+    "Show Tags": "Εμφάνιση ετικετών",
+    "Hide Tags": "Απόκρυψη ετικετών",
+    Description: "Περιγραφή",
+    "No monitors available.": "Δεν υπάρχουν διαθέσιμες παρακολουθήσεις.",
+    "Add one": "Προσθέστε ένα",
+    "No Monitors": "Χωρίς παρακολουθήσεις",
+    "Untitled Group": "Ομάδα χωρίς τίτλο",
+    Services: "Υπηρεσίες",
+    Discard: "Απορρίψει",
+    Cancel: "Ακυρο",
+    "Powered by": "Με την υποστήριξη του",
+    shrinkDatabaseDescription: "Ενεργοποίηση βάσης δεδομένων VACUUM για SQLite. Εάν η βάση δεδομένων σας έχει δημιουργηθεί μετά την έκδοση 1.10.0, το AUTO_VACUUM είναι ήδη ενεργοποιημένο και αυτή η ενέργεια δεν χρειάζεται.",
+    serwersms: "SerwerSMS.pl",
+    serwersmsAPIUser: "API Username (incl. webapi_ prefix)",
+    serwersmsAPIPassword: "API κωδικός πρόσβασης",
+    serwersmsPhoneNumber: "Αριθμός τηλεφώνου",
+    serwersmsSenderName: "Όνομα αποστολέα SMS (καταχωρήθηκε μέσω της πύλης πελατών)",
+    stackfield: "Stackfield",
+    Customize: "Προσαρμογή",
+    "Custom Footer": "Προσαρμογή Footer",
+    "Custom CSS": "Προσαρμογή CSS",
+    smtpDkimSettings: "Ρυθμίσεις DKIM",
+    smtpDkimDesc: "Ανατρέξτε στο Nodemailer DKIM {0} για χρήση.",
+    documentation: "documentation",
+    smtpDkimDomain: "Domain Name",
+    smtpDkimKeySelector: "Key Selector",
+    smtpDkimPrivateKey: "Private Key",
+    smtpDkimHashAlgo: "Hash Algorithm (Optional)",
+    smtpDkimheaderFieldNames: "Header Keys to sign (Optional)",
+    smtpDkimskipFields: "Header Keys not to sign (Optional)",
+    wayToGetPagerDutyKey: "Μπορείτε να το λάβετε μεταβαίνοντας στο Service -> Service Directory -> (Επιλέξτε μια υπηρεσία) -> Integrations -> Add integration. Εδώ μπορείτε να κάνετε αναζήτηση για \"Events API V2\". Περισσότερες πληροφορίες {0}",
+    "Integration Key": "Integration Key",
+    "Integration URL": "Integration URL",
+    "Auto resolve or acknowledged": "Αυτόματη επίλυση ή αναγνώριση",
+    "do nothing": "μην κάνεις τίποτα",
+    "auto acknowledged": "αυτόματη αναγνώριση",
+    "auto resolve": "αυτόματη επίλυση",
+    gorush: "Gorush",
+    alerta: "Alerta",
+    alertaApiEndpoint: "API Endpoint",
+    alertaEnvironment: "Environment",
+    alertaApiKey: "API Key",
+    alertaAlertState: "Alert State",
+    alertaRecoverState: "Recover State",
+    deleteStatusPageMsg: "Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν τη σελίδα κατάστασης?",
+    Proxies: "Proxies",
+    default: "Προκαθορισμένο",
+    enabled: "Ενεργοποιημένο",
+    setAsDefault: "Ορίσετε ως προεπιλογή",
+    deleteProxyMsg: "Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το proxy για όλες τις παρακολουθήσεις;",
+    proxyDescription: "Πρέπει να εκχωρηθούν proxies σε μια οθπαρακολουθή για να λειτουργήσουν..",
+    enableProxyDescription: "Το proxy δεν θα επηρεάσει τα αιτήματα της παρακολουθήσεις μέχρι να ενεργοποιηθεί. Μπορείτε να ελέγξετε την προσωρινή απενεργοποίηση του proxy από όλες τις παρακολουθήσεις βάσει κατάστασης ενεργοποίησης.",
+    setAsDefaultProxyDescription: "Αυτός το proxy θα είναι ενεργοποιημένο από προεπιλογή για νέες παρακολουθήσεις. Μπορείτε ακόμα να απενεργοποιήσετε το proxy ξεχωριστά για κάθε οθόνη.",
+    "Certificate Chain": "Certificate Chain",
+    Valid: "Εγκυρο",
+    Invalid: "Μη έγκυρο",
+    AccessKeyId: "AccessKey ID",
+    SecretAccessKey: "AccessKey Secret",
+    PhoneNumbers: "PhoneNumbers",
+    TemplateCode: "TemplateCode",
+    SignName: "SignName",
+    "Sms template must contain parameters: ": "Το πρότυπο SMS πρέπει να περιέχει παραμέτρους: ",
+    "Bark Endpoint": "Bark Endpoint",
+    "Bark Group": "Bark Ομάδα",
+    "Bark Sound": "Bark Ήχος",
+    WebHookUrl: "WebHookUrl",
+    SecretKey: "SecretKey",
+    "For safety, must use secret key": "Για ασφάλεια, πρέπει να χρησιμοποιήσετε secret key",
+    "Device Token": "Device Token",
+    Platform: "Platform",
+    iOS: "iOS",
+    Android: "Android",
+    Huawei: "Huawei",
+    High: "High",
+    Retry: "Ξαναδοκιμάσετε",
+    Topic: "Θέμα",
+    "WeCom Bot Key": "WeCom Bot Key",
+    "Setup Proxy": "Ρύθμιση Proxy",
+    "Proxy Protocol": "Πρωτόκολλο Proxy",
+    "Proxy Server": "Proxy Server",
+    "Proxy server has authentication": "Το Proxy διαθέτει έλεγχο ταυτότητας",
+    User: "Χρήστης",
+    Installed: "Εγκατεστημένο",
+    "Not installed": "Μη εγκατεστημενο",
+    Running: "Τρέχη",
+    "Not running": "Δεν τρεχη",
+    "Remove Token": "Κατάργηση Token",
+    Start: "Αρχή",
+    Stop: "Στάση",
+    "Uptime Kuma": "Uptime Kuma",
+    "Add New Status Page": "Προσθήκη νέας σελίδας κατάστασης",
+    Slug: "Slug",
+    "Accept characters:": "Αποδοχή χαρακτήρων:",
+    startOrEndWithOnly: "Ξεκινήστε ή τελειώστε μόνο με {0}",
+    "No consecutive dashes": "Χωρίς διαδοχικές παύλες",
+    Next: "Επόμενο",
+    "The slug is already taken. Please choose another slug.": "Ο slug έχει ήδη πιαστεί. Επιλέξτε άλλο slug.",
+    "No Proxy": "Οχι Proxy",
+    Authentication: "Authentication",
+    "HTTP Basic Auth": "HTTP Basic Auth",
+    "New Status Page": "Σελίδα νέας κατάστασης",
+    "Page Not Found": "Η σελίδα δεν βρέθηκε",
+    "Reverse Proxy": "Αντίστροφο Proxy",
+    Backup: "Αντιγράφων ασφαλείας",
+    About: "Σχετικά με",
+    wayToGetCloudflaredURL: "(Λήψη cloudflared από {0})",
+    cloudflareWebsite: "Ιστοσελίδα Cloudflare",
+    "Message:": "Μήνυμα:",
+    "Don't know how to get the token? Please read the guide:": "Δεν ξέρετε πώς να αποκτήσετε το token; Διαβάστε τον οδηγό:",
+    "The current connection may be lost if you are currently connecting via Cloudflare Tunnel. Are you sure want to stop it? Type your current password to confirm it.": "Η τρέχουσα σύνδεση μπορεί να χαθεί εάν αυτή τη στιγμή συνδέεστε μέσω του Cloudflare Tunnel. Θέλετε σίγουρα να το σταματήσετε; Πληκτρολογήστε τον τρέχοντα κωδικό πρόσβασής σας για να τον επιβεβαιώσετε.",
+    "HTTP Headers": "HTTP Headers",
+    "Trust Proxy": "Εμπιστοσύνη του Proxy",
+    "Other Software": "Other Software",
+    "For example: nginx, Apache and Traefik.": "Για παράδειγμα: nginx, Apache και Traefik.",
+    "Please read": "Παρακαλώ διαβάστε",
+    "Subject:": "Θέμα:",
+    "Valid To:": "Εγκυρο για:",
+    "Days Remaining:": "Ημέρες που απομένουν:",
+    "Issuer:": "Εκδότης:",
+    "Fingerprint:": "Δακτυλικό αποτύπωμα:",
+    "No status pages": "Δεν υπάρχουν σελίδες κατάστασης",
+    "Domain Name Expiry Notification": "Ειδοποίηση λήξης ονόματος τομέα",
+    Proxy: "Proxy",
+    "Date Created": "Ημερομηνία Δημιουργίας",
+    HomeAssistant: "Home Assistant",
+    onebotHttpAddress: "OneBot HTTP Address",
+    onebotMessageType: "OneBot Message Type",
+    onebotGroupMessage: "Group",
+    onebotPrivateMessage: "Private",
+    onebotUserOrGroupId: "Group/User ID",
+    onebotSafetyTips: "Για ασφάλεια, πρέπει να ορίσετε το acess token",
+    "PushDeer Key": "PushDeer Key",
+    "Footer Text": "Κείμενο υποσέλιδου",
+    "Show Powered By": "Εμφάνιση Powered By",
+    "Domain Names": "Ονόματα Τομέα",
+    signedInDisp: "Συνδεθήκατε ως {0}",
+    signedInDispDisabled: "Εξουσιοδότηση είναι απενεργοποιημένη.",
+    RadiusSecret: "Radius Secret",
+    RadiusSecretDescription: "Shared Secret μεταξύ client και το server",
+    RadiusCalledStationId: "Called Station Id",
+    RadiusCalledStationIdDescription: "Identifier της καλούμενης συσκευής",
+    RadiusCallingStationId: "Calling Station Id",
+    RadiusCallingStationIdDescription: "Identifier oτης συσκευής κλήσης",
+    "Certificate Expiry Notification": "Ειδοποίηση Λήξης Πιστοποιητικού",
+    "API Username": "API Username",
+    "API Key": "API Key",
+    "Recipient Number": "Αριθμός Παραλήπτη",
+    "From Name/Number": "Από Όνομα/Αριθμός",
+    "Leave blank to use a shared sender number.": "Αφήστε το κενό για να χρησιμοποιήσετε έναν κοινόχρηστο αριθμό αποστολέα.",
+    "Octopush API Version": "Octopush API Version",
+    "Legacy Octopush-DM": "Legacy Octopush-DM",
+    endpoint: "endpoint",
+    octopushAPIKey: "\"API key\" από το HTTP API credentials στον πίνακα ελέγχου",
+    octopushLogin: "\"Login\" από το HTTP API credentials στον πίνακα ελέγχου",
+    promosmsLogin: "API Login Name",
+    promosmsPassword: "API Password",
+    "pushoversounds pushover": "Pushover (default)",
+    "pushoversounds bike": "Bike",
+    "pushoversounds bugle": "Bugle",
+    "pushoversounds cashregister": "Cash Register",
+    "pushoversounds classical": "Classical",
+    "pushoversounds cosmic": "Cosmic",
+    "pushoversounds falling": "Falling",
+    "pushoversounds gamelan": "Gamelan",
+    "pushoversounds incoming": "Incoming",
+    "pushoversounds intermission": "Intermission",
+    "pushoversounds magic": "Magic",
+    "pushoversounds mechanical": "Mechanical",
+    "pushoversounds pianobar": "Piano Bar",
+    "pushoversounds siren": "Siren",
+    "pushoversounds spacealarm": "Space Alarm",
+    "pushoversounds tugboat": "Tug Boat",
+    "pushoversounds alien": "Alien Alarm (long)",
+    "pushoversounds climb": "Climb (long)",
+    "pushoversounds persistent": "Persistent (long)",
+    "pushoversounds echo": "Pushover Echo (long)",
+    "pushoversounds updown": "Up Down (long)",
+    "pushoversounds vibrate": "Vibrate Only",
+    "pushoversounds none": "None (silent)",
+    pushyAPIKey: "Μυστικό API Key",
+    pushyToken: "Τoken Συσκευής",
+    "Show update if available": "Εμφάνιση ενημέρωσης εάν είναι διαθέσιμη",
+    "Also check beta release": "Ελέγξτε επίσης την έκδοση beta",
+    "Using a Reverse Proxy?": "Χρησιμοποιείτε reverse proxy;",
+    "Check how to config it for WebSocket": "Ελέγξτε πώς να το ρυθμίσετε για το WebSocket",
+    "Steam Game Server": "Διακομιστής παιχνιδιών Steam",
+    "Most likely causes:": "Πιο πιθανές αιτίες:",
+    "The resource is no longer available.": "Ο πόρος δεν είναι πλέον διαθέσιμος.",
+    "There might be a typing error in the address.": "Μπορεί να υπάρχει σφάλμα πληκτρολόγησης στη διεύθυνση.",
+    "What you can try:": "Τι μπορείτε να δοκιμάσετε:",
+    "Retype the address.": "Πληκτρολογήστε ξανά τη διεύθυνση.",
+    "Go back to the previous page.": "Επιστρέψτε στην προηγούμενη σελίδα.",
+    "Coming Soon": "Ερχεται σύντομα",
+    wayToGetClickSendSMSToken: "Μπορείτε να πάρετε το API Username και API Key απο {0} .",
+    "Connection String": "Connection String",
+    Query: "Query",
+    settingsCertificateExpiry: "Λήξη πιστοποιητικού TLS",
+    certificationExpiryDescription: "Οι παρακολουθήσεις HTTPS ενεργοποιούν ειδοποίηση όταν λήξει το πιστοποιητικό TLS σε:",
+    "Setup Docker Host": "Ρύθμιση Docker Host",
+    "Connection Type": "Τύπος σύνδεσης",
+    "Docker Daemon": "Docker Daemon",
+    deleteDockerHostMsg: "Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτόν τον κεντρικό υπολογιστή βάσης για όλες τις παρακολουθήσεις;",
+    socket: "Socket",
+    tcp: "TCP / HTTP",
+    "Docker Container": "Docker Container",
+    "Container Name / ID": "Container Name / ID",
+    "Docker Host": "Docker Host",
+    "Docker Hosts": "Docker Hosts",
+    "ntfy Topic": "ntfy Topic",
+    Domain: "Domain",
+    Workstation: "Workstation",
+    disableCloudflaredNoAuthMsg: "Βρίσκεστε σε λειτουργία No Auth, δεν απαιτείται κωδικός πρόσβασης.",
+    trustProxyDescription: "Εμπιστευτείτε τις κεφαλίδες 'X-Forwarded-*'. Εάν θέλετε να λάβετε τη σωστή IP πελάτη και το Uptime Kuma σας βρίσκεται πίσω το Nginx ή το Apache, θα πρέπει να το ενεργοποιήσετε.",
+    wayToGetLineNotifyToken: "Μπορείτε να λάβετε ένα access token από το {0}",
+    Examples: "Παραδείγματα",
+    "Home Assistant URL": "Home Assistant URL",
+    "Long-Lived Access Token": "Long-Lived Access Token",
+    "Long-Lived Access Token can be created by clicking on your profile name (bottom left) and scrolling to the bottom then click Create Token. ": "Long-Lived Access Token μπορεί να δημιουργηθεί κάνοντας κλικ στο όνομα του προφίλ σας (κάτω αριστερά) και κάνοντας κύλιση προς τα κάτω και, στη συνέχεια, κάντε κλικ στο Create Token. ",
+    "Notification Service": "Υπηρεσία ειδοποιήσεων",
+    "default: notify all devices": "προεπιλογή: ειδοποίηση όλων των συσκευών",
+    "A list of Notification Services can be found in Home Assistant under \"Developer Tools > Services\" search for \"notification\" to find your device/phone name.": "Μπορείτε να βρείτε μια λίστα με τις Υπηρεσίες ειδοποιήσεων στον Home assistant στην περιοχή \"Developer Tools > Services\" αναζήτηση για \"notification\" για να βρείτε το όνομα της συσκευής/τηλεφώνου σας.",
+    "Automations can optionally be triggered in Home Assistant:": "Οι αυτοματισμοί μπορούν προαιρετικά να ενεργοποιηθούν στο Home Assistant:",
+    "Trigger type:": "Τύπος ενεργοποίησης:",
+    "Event type:": "Τύπος συμβάντος:",
+    "Event data:": "Δεδομένα συμβάντος:",
+    "Then choose an action, for example switch the scene to where an RGB light is red.": "Στη συνέχεια, επιλέξτε μια ενέργεια, για παράδειγμα αλλάξτε τη σκηνή στο σημείο όπου ένα φως RGB είναι κόκκινο.",
+    "Frontend Version": "Έκδοση Frontend",
+    "Frontend Version do not match backend version!": "Η Frontend έκδοση δεν ταιριάζει με την έκδοση backend!",
+    "Base URL": "Βασική διεύθυνση URL",
+    goAlertInfo: "Το GoAlert είναι μια εφαρμογή ανοιχτού κώδικα για προγραμματισμό κλήσεων, αυτοματοποιημένες κλιμακώσεις και ειδοποιήσεις (όπως SMS ή φωνητικές κλήσεις). Αλληλεπιδράστε αυτόματα με το σωστό άτομο, με τον σωστό τρόπο και τη σωστή στιγμή! {0}",
+    goAlertIntegrationKeyInfo: "Λάβετε το generic API integration key για την υπηρεσία σε αυτήν τη μορφή \"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\" συνήθως την τιμή της παραμέτρου διακριτικού της αντιγραμμένης διεύθυνσης URL.",
+    goAlert: "GoAlert",
+    backupOutdatedWarning: "Καταργήθηκε: Επειδή προστέθηκαν πολλές δυνατότητες και αυτή η δυνατότητα δημιουργίας αντιγράφων ασφαλείας δεν διατηρείται πολη, δεν μπορεί να δημιουργήσει ή να επαναφέρει ένα πλήρες αντίγραφο ασφαλείας.",
+    backupRecommend: "Παρακαλούμε δημιουργήστε αντίγραφα ασφαλείας του τόμου ή του φακέλου δεδομένων (./data/) απευθείας.",
+};

From e29527e22fad7f9691b3fed4b29466f9bd1ced9c Mon Sep 17 00:00:00 2001
From: Vasilis The Pikachu <vasilis@pikachu.systems>
Date: Fri, 7 Oct 2022 11:33:29 +0200
Subject: [PATCH 33/48] Update Greek

---
 src/languages/el-GR.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/languages/el-GR.js b/src/languages/el-GR.js
index 29af0417..92a2d775 100644
--- a/src/languages/el-GR.js
+++ b/src/languages/el-GR.js
@@ -55,7 +55,7 @@ export default {
     "No important events": "Δεν υπάρχουν σημαντικά γεγονότα",
     Resume: "Συνέχιση",
     Edit: "Επεξεργασία",
-    Delete: "Διαγράφω",
+    Delete: "Διαγράφη",
     Current: "Current",
     Uptime: "Χρόνος λειτουργίας",
     "Cert Exp.": "Cert Exp.",
@@ -448,11 +448,11 @@ export default {
     "No Proxy": "Οχι Proxy",
     Authentication: "Authentication",
     "HTTP Basic Auth": "HTTP Basic Auth",
-    "New Status Page": "Σελίδα νέας κατάστασης",
+    "New Status Page": "Νέας Σελίδα κατάστασης",
     "Page Not Found": "Η σελίδα δεν βρέθηκε",
     "Reverse Proxy": "Αντίστροφο Proxy",
     Backup: "Αντιγράφων ασφαλείας",
-    About: "Σχετικά με",
+    About: "Σχετικά με το Uptime Kuma",
     wayToGetCloudflaredURL: "(Λήψη cloudflared από {0})",
     cloudflareWebsite: "Ιστοσελίδα Cloudflare",
     "Message:": "Μήνυμα:",

From 4f6dec41c617267860ec9c686477e03c633e7c4b Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Fri, 7 Oct 2022 20:46:43 +0800
Subject: [PATCH 34/48] Fix ntfy username should not be required

---
 src/components/notifications/Ntfy.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/notifications/Ntfy.vue b/src/components/notifications/Ntfy.vue
index ddcc3917..b0f7888a 100644
--- a/src/components/notifications/Ntfy.vue
+++ b/src/components/notifications/Ntfy.vue
@@ -18,7 +18,7 @@
     <div class="mb-3">
         <label for="ntfy-username" class="form-label">{{ $t("Username") }} ({{ $t("Optional") }})</label>
         <div class="input-group mb-3">
-            <input id="ntfy-username" v-model="$parent.notification.ntfyusername" type="text" class="form-control" required>
+            <input id="ntfy-username" v-model="$parent.notification.ntfyusername" type="text" class="form-control">
         </div>
     </div>
     <div class="mb-3">

From 43c1ec640c41e83b0cb7783b1760f7781fab8f4a Mon Sep 17 00:00:00 2001
From: AnnAngela <naganjue@vip.qq.com>
Date: Sat, 8 Oct 2022 01:45:00 +0800
Subject: [PATCH 35/48] feat: :globe_with_meridians: Update zh-cn and en
 translation (#2167)

Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
---
 src/components/notifications/HomeAssistant.vue |  2 +-
 src/components/notifications/SMSManager.vue    |  2 +-
 src/languages/en.js                            |  6 ++++++
 src/languages/zh-CN.js                         | 14 ++++++++++++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/components/notifications/HomeAssistant.vue b/src/components/notifications/HomeAssistant.vue
index 67e370a1..de368095 100644
--- a/src/components/notifications/HomeAssistant.vue
+++ b/src/components/notifications/HomeAssistant.vue
@@ -18,7 +18,7 @@
         <input id="notificationService" v-model="$parent.notification.notificationService" type="text" :placeholder="$t('default: notify all devices')" class="form-control">
 
         <div class="form-text">
-            <p>{{ $t("A list of Notification Services can be found in Home Assistant under \"Developer Tools > Services\" search for \"notification\" to find your device/phone name.") }}</p>
+            <p>{{ $t('A list of Notification Services can be found in Home Assistant under "Developer Tools > Services" search for "notification" to find your device/phone name.') }}</p>
             <p>{{ $t("Automations can optionally be triggered in Home Assistant:") }}</p>
             <p>
                 {{ $t("Trigger type:") }} <code>Event</code><br />
diff --git a/src/components/notifications/SMSManager.vue b/src/components/notifications/SMSManager.vue
index 25db624f..1be952ae 100644
--- a/src/components/notifications/SMSManager.vue
+++ b/src/components/notifications/SMSManager.vue
@@ -2,7 +2,7 @@
     <div class="mb-3">
         <label for="smsmanager-key" class="form-label">API Key</label>
         <div class="form-text">
-            {{ $t("SMSManager API Docs ") }}
+            {{ $t("SMSManager API Docs") }}
             <a href="https://smsmanager.cz/api/http#send" target="_blank">{{ $t("here") }}</a>
         </div>
         <input id="smsmanager-key" v-model="$parent.notification.smsmanagerApiKey" type="text" class="form-control">
diff --git a/src/languages/en.js b/src/languages/en.js
index 4bf92e92..e277958b 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -584,4 +584,10 @@ export default {
     backupRecommend: "Please backup the volume or the data folder (./data/) directly instead.",
     "Optional": "Optional",
     squadcast: "Squadcast",
+    SendKey: "SendKey",
+    "SMSManager API Docs": "SMSManager API Docs ",
+    "Gateway Type": "Gateway Type",
+    SMSManager: "SMSManager",
+    "You can divide numbers with": "You can divide numbers with",
+    "or": "or",
 };
diff --git a/src/languages/zh-CN.js b/src/languages/zh-CN.js
index a37d4ae4..0d21efda 100644
--- a/src/languages/zh-CN.js
+++ b/src/languages/zh-CN.js
@@ -581,4 +581,18 @@ export default {
     "Then choose an action, for example switch the scene to where an RGB light is red.": "然后您可以选择关联操作，例如切换到 RGB 灯发出红光的场景",
     "Frontend Version": "前端版本",
     "Frontend Version do not match backend version!": "前端版本与后端版本不符！",
+    "Base URL": "API 基础地址",
+    goAlertInfo: "GoAlert 是一个用于呼叫调度、自动汇报和通知（如 SMS 或语音呼叫）的开源应用程序。在正确的时间以正确的方式自动让正确的人参与！{0}",
+    goAlertIntegrationKeyInfo: "使用形如 aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee 的通用 API 集成密钥，通常是复制来的链接中的 token 参数值。",
+    goAlert: "GoAlert",
+    backupOutdatedWarning: "已弃用：由于大量新功能的加入，以及备份功能没有时时维护，现在备份功能已经无法生成完整的备份和恢复完整的设置。",
+    backupRecommend: "请改为直接备份 docker 卷或者数据文件夹（./data/）。",
+    Optional: "可选的",
+    squadcast: "Squadcast",
+    SendKey: "SendKey",
+    "SMSManager API Docs": "SMSManager API 文档在",
+    "Gateway Type": "网关类型",
+    SMSManager: "SMSManager",
+    "You can divide numbers with": "可用的分隔符：",
+    "or": "或",
 };

From 59e7aa74a3a7c542b06d05b963216c4246a65b06 Mon Sep 17 00:00:00 2001
From: Vasilis The Pikachu <vascreeper@yahoo.com>
Date: Fri, 7 Oct 2022 17:51:45 +0000
Subject: [PATCH 36/48] Remove some double dots & fix backuprecommended

---
 src/languages/el-GR.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/languages/el-GR.js b/src/languages/el-GR.js
index 92a2d775..c520a607 100644
--- a/src/languages/el-GR.js
+++ b/src/languages/el-GR.js
@@ -141,9 +141,9 @@ export default {
     Events: "Γεγονότα",
     Heartbeats: "Παλμοι καρδιας",
     "Auto Get": "Αυτόματη λήψη",
-    backupDescription: "Μπορείτε να δημιουργήσετε αντίγραφα ασφαλείας γία ολλες της παρακολούθησης και ειδοποιήσης σε ένα αρχείο JSON..",
+    backupDescription: "Μπορείτε να δημιουργήσετε αντίγραφα ασφαλείας γία ολλες της παρακολούθησης και ειδοποιήσης σε ένα αρχείο JSON.",
     backupDescription2: "Σημείωση: δεν περιλαμβάνονται δεδομένα ιστορικού και συμβάντων.",
-    backupDescription3: "Στο αρχείο εξαγωγής περιλαμβάνονται ευαίσθητα δεδομένα, όπως token ειδοποιήσεων. Aποθηκεύστε την εξαγωγή με ασφάλεια..",
+    backupDescription3: "Στο αρχείο εξαγωγής περιλαμβάνονται ευαίσθητα δεδομένα, όπως token ειδοποιήσεων. Aποθηκεύστε την εξαγωγή με ασφάλεια.",
     alertNoFile: "Επιλέξτε ένα αρχείο για εισαγωγή.",
     alertWrongFileType: "Επιλέξτε ένα αρχείο JSON.",
     "Clear all statistics": "Εκκαθάριση όλων των στατιστικών",
@@ -581,5 +581,5 @@ export default {
     goAlertIntegrationKeyInfo: "Λάβετε το generic API integration key για την υπηρεσία σε αυτήν τη μορφή \"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\" συνήθως την τιμή της παραμέτρου διακριτικού της αντιγραμμένης διεύθυνσης URL.",
     goAlert: "GoAlert",
     backupOutdatedWarning: "Καταργήθηκε: Επειδή προστέθηκαν πολλές δυνατότητες και αυτή η δυνατότητα δημιουργίας αντιγράφων ασφαλείας δεν διατηρείται πολη, δεν μπορεί να δημιουργήσει ή να επαναφέρει ένα πλήρες αντίγραφο ασφαλείας.",
-    backupRecommend: "Παρακαλούμε δημιουργήστε αντίγραφα ασφαλείας του τόμου ή του φακέλου δεδομένων (./data/) απευθείας.",
+    backupRecommend: "Παρακαλούμε δημιουργήστε αντίγραφα ασφαλείας του volume ή του φακέλου δεδομένων (./data/) απευθείας.",
 };

From df2f5368459cccab1a4713c11aaf3f51273dfc4c Mon Sep 17 00:00:00 2001
From: wellart <wella.design@gmail.com>
Date: Sat, 8 Oct 2022 01:15:03 +0700
Subject: [PATCH 37/48] [id-ID.js] Fix some type and word (#2149)

Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
---
 src/languages/id-ID.js | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/languages/id-ID.js b/src/languages/id-ID.js
index 3d3c3389..f8ee3ab7 100644
--- a/src/languages/id-ID.js
+++ b/src/languages/id-ID.js
@@ -126,10 +126,10 @@ export default {
     "Resolver Server": "Resolver Server",
     "Resource Record Type": "Resource Record Type",
     "Last Result": "Hasil Terakhir",
-    "Create your admin account": "Buat admin akun Anda",
+    "Create your admin account": "Buat akun admin anda",
     "Repeat Password": "Ulangi Sandi",
     "Import Backup": "Impor Cadangan",
-    "Export Backup": "Expor Cadangan",
+    "Export Backup": "Ekspor Cadangan",
     Export: "Ekspor",
     Import: "Impor",
     respTime: "Tanggapan. Waktu (milidetik)",
@@ -217,7 +217,7 @@ export default {
     smtpBCC: "BCC",
     discord: "Discord",
     "Discord Webhook URL": "Discord Webhook URL",
-    wayToGetDiscordURL: "Anda bisa mendapatkan ini dengan pergi ke Server Settings -> Integrations -> Create Webhook",
+    wayToGetDiscordURL: "Anda bisa mendapatkan ini dengan pergi ke Server Pengaturan -> Integrasi -> Buat Webhook",
     "Bot Display Name": "Nama Bot",
     "Prefix Custom Message": "Awalan Pesan",
     "Hello @everyone is...": "Halo {'@'}everyone is...",
@@ -328,7 +328,7 @@ export default {
     "Pick a RR-Type...": "Pilih RR-Type...",
     "Pick Accepted Status Codes...": "Pilih Kode Status yang Diterima...",
     Default: "Default",
-    "HTTP Options": "HTTP Options",
+    "HTTP Options": "Opsi HTTP",
     "Create Incident": "Buat Incident",
     Title: "Judul",
     Content: "Konten",
@@ -379,8 +379,8 @@ export default {
     smtpDkimheaderFieldNames: "Header Keys untuk ditambahkan (Optional)",
     smtpDkimskipFields: "Header Keys not untuk ditambahkan (Optional)",
     wayToGetPagerDutyKey: "Anda dapat menambahkan melalui Service -> Service Directory -> (Select a service) -> Integrations -> Add integration. Lalu Anda dapat menjadi dengan kata kunci \"Events API V2\". Informasi tambahan {0}",
-    "Integration Key": "Integration Key",
-    "Integration URL": "Integration URL",
+    "Integration Key": "Kunci Integrasi",
+    "Integration URL": "URL Integrasi",
     "Auto resolve or acknowledged": "Penyelesaian otomatis atau diakui",
     "do nothing": "tidak melakukan apapun",
     "auto acknowledged": "otomatis diakui",
@@ -402,14 +402,14 @@ export default {
     enableProxyDescription: "Proxy berikut tidak akan berdampak ke monitor hingga diaktifkan. Anda dapat mengontrol menonaktifkan sementara proxy dari semua monitor dengan status aktivasi.",
     setAsDefaultProxyDescription: "Proxy berikut akan diaktifkan sebagai bawaan untuk monitor baru. Anda masih dapat menonaktifkan proxy secara terpisah untuk setiap monitor.",
     "Certificate Chain": "Certificate Chain",
-    Valid: "Sahih",
+    Valid: "Valid",
     Invalid: "Tidak Valid",
     AccessKeyId: "AccessKey ID",
     SecretAccessKey: "AccessKey Secret",
     PhoneNumbers: "Nomor Telepon",
     TemplateCode: "Kode Template",
     SignName: "Nama Tanda",
-    "Sms template must contain parameters: ": "Template SMS harus memuat parameter: ",
+    "Sms template must contain parameters: ": "Template SMS harus berisi parameter: ",
     "Bark Endpoint": "Bark Endpoint",
     "Bark Group": "Bark Group",
     "Bark Sound": "Bark Sound",
@@ -432,7 +432,7 @@ export default {
     User: "Pengguna",
     Installed: "Terpasang",
     "Not installed": "Tidak terpasang",
-    Running: "Berlari",
+    Running: "Berjalan",
     "Not running": "Tidak berjalan",
     "Remove Token": "Hapus Token",
     Start: "Mulai",
@@ -445,7 +445,7 @@ export default {
     "No consecutive dashes": "Tanda hubung tidak berurutan",
     Next: "Selanjutnya",
     "The slug is already taken. Please choose another slug.": "Slug telah digunakan. Silakan pilih slug lain.",
-    "No Proxy": "TIdak ada Proxy",
+    "No Proxy": "Tidak ada Proxy",
     Authentication: "Autentikasi",
     "HTTP Basic Auth": "HTTP Basic Auth",
     "New Status Page": "Halaman Status Baru",
@@ -457,7 +457,7 @@ export default {
     cloudflareWebsite: "Situs Cloudflare",
     "Message:": "Pesan:",
     "Don't know how to get the token? Please read the guide:": "Tidak tahu cara mendapatkan token? Silakan baca panduannya:",
-    "The current connection may be lost if you are currently connecting via Cloudflare Tunnel. Are you sure want to stop it? Type your current password to confirm it.": "Koneksi saat ini mungkin hilang jika Anda saat ini terhubung melalui CloudflareTunnel. Apakah Anda yakin ingin menghentikannya? Ketik kata sandi Anda saat ini untuk mengonfirmasinya.",
+    "The current connection may be lost if you are currently connecting via Cloudflare Tunnel. Are you sure want to stop it? Type your current password to confirm it.": "Koneksi saat ini mungkin hilang jika Anda saat ini terhubung melalui Cloudflare Tunel. Apakah Anda yakin ingin menghentikannya? Ketik kata sandi Anda saat ini untuk mengonfirmasinya.",
     "HTTP Headers": "HTTP Headers",
     "Trust Proxy": "Proxy Terpercaya",
     "Other Software": "Perangkat Lunak lainnya",
@@ -494,7 +494,7 @@ export default {
     "Certificate Expiry Notification": "Pemberitahuan Kedaluwarsa Sertifikat",
     "API Username": "Nama Pengguna API",
     "API Key": "Kunci API",
-    "Recipient Number": "Nomor Penerima Recipient Number",
+    "Recipient Number": "Nomor Penerima",
     "From Name/Number": "Dari Nama/Nomor",
     "Leave blank to use a shared sender number.": "Biarkan kosong untuk menggunakan nomor pengirim bersama.",
     "Octopush API Version": "Versi API Octopush",
@@ -542,9 +542,9 @@ export default {
     "Go back to the previous page.": "Kembali ke halaman sebelumnya.",
     "Coming Soon": "Segera",
     wayToGetClickSendSMSToken: "Anda bisa mendapatkan Nama Pengguna API dan Kunci API dari {0} .",
-    "Connection String": "Connection String",
+    "Connection String": "String Koneksi",
     Query: "Query",
-    settingsCertificateExpiry: "Kedaluwarsa Sertifikat TLS",
+    settingsCertificateExpiry: "Sertifikat TLS Kadaluarsa",
     certificationExpiryDescription: "Monitor HTTPS memicu pemberitahuan saat sertifikat TLS kedaluwarsa dalam:",
     "Setup Docker Host": "Siapkan Host Docker",
     "Connection Type": "Jenis Koneksi",
@@ -570,9 +570,9 @@ export default {
     "default: notify all devices": "bawaan: notifikasi seluruh perangkat",
     "A listof Notification Services can be found in Home Assistant under \"Developer Tools > Services\" search for \"notification\" to find your device/phone name.": "Daftar Layanan Pemberitahuan dapat ditemukan di Home Assistant pada \"Developer Tools > Services\" cari \"notification\" lalu cari nama perangkat Anda.",
     "Automations can optionally be triggered in Home Assistant:": "Otomatisasi dapat dipicu secara opsional di Home Assistant:",
-    "Trigger type:": "Trigger type:",
-    "Event type:": "Event type:",
-    "Event data:": "Event data:",
+    "Trigger type:": "Tipe Trigger/Pemicu:",
+    "Event type:": "Tipe event:",
+    "Event data:": "Data event:",
     "Then choose an action, for example switch the scene to where an RGB light is red.": "Kemudian pilih tindakan, misalnya alihkan ke tempat dimana lampu RGB berwarna merah.",
     "Frontend Version": "Versi Frontend",
     "Frontend Version do not match backend version!": "Versi Frontend tidak sama dengan versi backend!",
@@ -580,6 +580,6 @@ export default {
     goAlertInfo: "GoAlert adalah aplikasi open source untuk penjadwalan panggilan, eskalasi otomatis dan pemberitahuan (seperti SMS atau panggilan suara). Secara otomatis melibatkan orang yang tepat, dengan cara yang benar, dan pada waktu yang tepat! {0}",
     goAlertIntegrationKeyInfo: "Dapatkan kunci integrasi API generik untuk layanan dalam format ini \"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\" biasanya nilai parameter token dari URL yang disalin.",
     goAlert: "GoAlert",
-    backupOutdatedWarning: "Usang: Karena banyak fitur ditambahkan dan fitur cadangan ini agak tidak terawat, itu tidak dapat menghasilkan atau memulihkan cadangan lengkap.",
+    backupOutdatedWarning: "Tidak digunakan lagi: Karena banyak fitur ditambahkan dan fitur cadangan ini agak tidak terawat, itu tidak dapat menghasilkan atau memulihkan cadangan lengkap.",
     backupRecommend: "Harap cadangkan volume atau folder data (./data/) secara langsung.",
 };

From f67d7cdf3f3edf66415747bde53c944a600df57d Mon Sep 17 00:00:00 2001
From: Matthew Nickson <mnickson@sidingsmedia.com>
Date: Sat, 8 Oct 2022 08:01:47 +0100
Subject: [PATCH 38/48] Make update-language-files command more useful (#2198)

* [empty commit] pull request for Fix language update script

* Avoid mass changes with update-language-files

This commit updates the update-language-files script to prevent mass
changes as seen on a number of recent PRs where the contributer has
ran the script and comitted the results.
The script has been updated to now require the --language argument to
specify which language file to update. This ensures that only that file
is updated instead of all files. If the provided language code does not
already exist, a new file with that code is created. This should make
it easier to add new languages as you only need to pass the language
code to the script.
The base lang code is now also passed as an optional argument to negate
the need for a seperate script entry in package.json.
The script has been restructures into a couple of functions to make it
easier to understand.
ESlint now only checks the changed file instead of
them all in order to improve performance.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>

* Updated translation docs for new command

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>

* [update-language-files] Add cross-env-shell

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
---
 extra/update-language-files/index.js | 79 ++++++++++++++++------------
 package.json                         |  3 +-
 src/languages/README.md              | 13 +++--
 3 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/extra/update-language-files/index.js b/extra/update-language-files/index.js
index e449fe34..078c4e6f 100644
--- a/extra/update-language-files/index.js
+++ b/extra/update-language-files/index.js
@@ -1,51 +1,45 @@
 // Need to use ES6 to read language files
 
 import fs from "fs";
-import path from "path";
 import util from "util";
 import rmSync from "../fs-rmSync.js";
 
-// https://stackoverflow.com/questions/13786160/copy-folder-recursively-in-node-js
 /**
- * Look ma, it's cp -R.
- * @param {string} src  The path to the thing to copy.
- * @param {string} dest The path to the new copy.
+ * Copy across the required language files
+ * Creates a local directory (./languages) and copies the required files
+ * into it.
+ * @param {string} langCode Code of language to update. A file will be
+ * created with this code if one does not already exist
+ * @param {string} baseLang The second base language file to copy. This
+ * will be ignored if set to "en" as en.js is copied by default
  */
-const copyRecursiveSync = function (src, dest) {
-    let exists = fs.existsSync(src);
-    let stats = exists && fs.statSync(src);
-    let isDirectory = exists && stats.isDirectory();
-
-    if (isDirectory) {
-        fs.mkdirSync(dest);
-        fs.readdirSync(src).forEach(function (childItemName) {
-            copyRecursiveSync(path.join(src, childItemName),
-                path.join(dest, childItemName));
-        });
-    } else {
-        fs.copyFileSync(src, dest);
+function copyFiles(langCode, baseLang) {
+    if (fs.existsSync("./languages")) {
+        rmSync("./languages", { recursive: true });
     }
-};
+    fs.mkdirSync("./languages");
 
-console.log("Arguments:", process.argv);
-const baseLangCode = process.argv[2] || "en";
-console.log("Base Lang: " + baseLangCode);
-if (fs.existsSync("./languages")) {
-    rmSync("./languages", { recursive: true });
+    if (!fs.existsSync(`../../src/languages/${langCode}.js`)) {
+        fs.closeSync(fs.openSync(`./languages/${langCode}.js`, "a"));
+    } else {
+        fs.copyFileSync(`../../src/languages/${langCode}.js`, `./languages/${langCode}.js`);
+    }
+    fs.copyFileSync("../../src/languages/en.js", "./languages/en.js");
+    if (baseLang !== "en") {
+        fs.copyFileSync(`../../src/languages/${baseLang}.js`, `./languages/${baseLang}.js`);
+    }
 }
-copyRecursiveSync("../../src/languages", "./languages");
-
-const en = (await import("./languages/en.js")).default;
-const baseLang = (await import(`./languages/${baseLangCode}.js`)).default;
-const files = fs.readdirSync("./languages");
-console.log("Files:", files);
 
-for (const file of files) {
-    if (! file.endsWith(".js")) {
-        console.log("Skipping " + file);
-        continue;
-    }
+/**
+ * Update the specified language file
+ * @param {string} langCode Language code to update
+ * @param {string} baseLang Second language to copy keys from
+ */
+async function updateLanguage(langCode, baseLangCode) {
+    const en = (await import("./languages/en.js")).default;
+    const baseLang = (await import(`./languages/${baseLangCode}.js`)).default;
 
+    let file = langCode + ".js";
     console.log("Processing " + file);
     const lang = await import("./languages/" + file);
 
@@ -83,5 +77,20 @@ for (const file of files) {
     fs.writeFileSync(`../../src/languages/${file}`, code);
 }
 
+// Get command line arguments
+const baseLangCode = process.env.npm_config_baselang || "en";
+const langCode = process.env.npm_config_language;
+
+// We need the file to edit
+if (langCode == null) {
+    throw new Error("Argument --language=<code> must be provided");
+}
+
+console.log("Base Lang: " + baseLangCode);
+console.log("Updating: " + langCode);
+
+copyFiles(langCode, baseLangCode);
+await updateLanguage(langCode, baseLangCode);
 rmSync("./languages", { recursive: true });
+
 console.log("Done. Fixing formatting by ESLint...");
diff --git a/package.json b/package.json
index d478a1d2..f5f78f3a 100644
--- a/package.json
+++ b/package.json
@@ -51,8 +51,7 @@
         "test-nodejs16": "docker build --progress plain -f test/ubuntu-nodejs16.dockerfile .",
         "simple-dns-server": "node extra/simple-dns-server.js",
         "simple-mqtt-server": "node extra/simple-mqtt-server.js",
-        "update-language-files-with-base-lang": "cd extra/update-language-files && node index.js %npm_config_base_lang% && eslint ../../src/languages/**.js --fix",
-        "update-language-files": "cd extra/update-language-files && node index.js && eslint ../../src/languages/**.js --fix",
+        "update-language-files": "cd extra/update-language-files && node index.js && cross-env-shell eslint ../../src/languages/$npm_config_language.js --fix",
         "ncu-patch": "npm-check-updates -u -t patch",
         "release-final": "node extra/update-version.js && npm run build-docker && node ./extra/press-any-key.js && npm run upload-artifacts && node ./extra/update-wiki-version.js",
         "release-beta": "node extra/beta/update-version.js && npm run build && node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:$VERSION -t louislam/uptime-kuma:beta .  --target release --push && node ./extra/press-any-key.js && npm run upload-artifacts",
diff --git a/src/languages/README.md b/src/languages/README.md
index d505476a..eddd6102 100644
--- a/src/languages/README.md
+++ b/src/languages/README.md
@@ -1,10 +1,13 @@
 # How to translate
 
 1. Fork this repo.
-2. Create a language file (e.g. `zh-TW.js`). The filename must be ISO language code: http://www.lingoes.net/en/translator/langcode.htm
-3. Run `npm run update-language-files`. You can also use this command to check if there are new strings to translate for your language.
-4. Your language file should be filled in. You can translate now.
-5. Add it into `languageList` constant.
-6. Make a [pull request](https://github.com/louislam/uptime-kuma/pulls) when you have done.
+2. Run `npm run update-language-files --language=<code>` where `<code>`
+   is a valid ISO language code:
+   http://www.lingoes.net/en/translator/langcode.htm. You can also use
+   this command to check if there are new strings to
+   translate for your language.
+3. Your language file should be filled in. You can translate now.
+4. Add it into `languageList` constant.
+5. Make a [pull request](https://github.com/louislam/uptime-kuma/pulls) when you have done.
 
 If you do not have programming skills, let me know in [the issues section](https://github.com/louislam/uptime-kuma/issues). I will assist you. 😏

From 230e5110b1db0527c763daa680fa556a06d3bd9b Mon Sep 17 00:00:00 2001
From: Kevin Falentio <f@lentio.my.id>
Date: Sat, 8 Oct 2022 19:59:22 +0700
Subject: [PATCH 39/48] Fix typo in id-ID language file (#2202)

---
 src/languages/id-ID.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/id-ID.js b/src/languages/id-ID.js
index f8ee3ab7..fe5d3594 100644
--- a/src/languages/id-ID.js
+++ b/src/languages/id-ID.js
@@ -565,7 +565,7 @@ export default {
     Examples: "Contoh",
     "Home Assistant URL": "Home Assistant URL",
     "Long-Lived Access Token": "Token Akses Berumur Panjang",
-    "Long-Lived Access Token canbe created by clicking on your profile name (bottom left) and scrolling to the bottom then click Create Token. ": "Token Akses Berumur Panjang dapat dibuat dengan mengklik nama profil Anda (kiri bawah) dan menggulir ke bawah lalu klik Buat Token. ",
+    "Long-Lived Access Token can be created by clicking on your profile name (bottom left) and scrolling to the bottom then click Create Token. ": "Token Akses Berumur Panjang dapat dibuat dengan mengklik nama profil Anda (kiri bawah) dan menggulir ke bawah lalu klik Buat Token. ",
     "Notification Service": "Layanan Pemberitahuan",
     "default: notify all devices": "bawaan: notifikasi seluruh perangkat",
     "A listof Notification Services can be found in Home Assistant under \"Developer Tools > Services\" search for \"notification\" to find your device/phone name.": "Daftar Layanan Pemberitahuan dapat ditemukan di Home Assistant pada \"Developer Tools > Services\" cari \"notification\" lalu cari nama perangkat Anda.",

From ad1a7c255f214d2ce0be9d71d0d232d246fb64f9 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Sat, 8 Oct 2022 23:56:58 +0800
Subject: [PATCH 40/48] Drop exports.entryPage fully

---
 server/server.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/server/server.js b/server/server.js
index 620e5bb4..2efad753 100644
--- a/server/server.js
+++ b/server/server.js
@@ -127,6 +127,7 @@ const StatusPage = require("./model/status_page");
 const { cloudflaredSocketHandler, autoStart: cloudflaredAutoStart, stop: cloudflaredStop } = require("./socket-handlers/cloudflared-socket-handler");
 const { proxySocketHandler } = require("./socket-handlers/proxy-socket-handler");
 const { dockerSocketHandler } = require("./socket-handlers/docker-socket-handler");
+const { Settings } = require("./settings");
 
 app.use(express.json());
 
@@ -155,9 +156,7 @@ let needSetup = false;
     Database.init(args);
     await initDatabase(testMode);
 
-    const entryPage = (await getSettings("general"))["entryPage"];
-    exports.entryPage = entryPage;
-    UptimeKumaServer.getInstance().entryPage = entryPage;
+    server.entryPage = await Settings.get("entryPage");
     await StatusPage.loadDomainMappingList();
 
     log.info("server", "Adding route");
@@ -178,7 +177,7 @@ let needSetup = false;
 
         log.debug("entry", `Request Domain: ${hostname}`);
 
-        const uptimeKumaEntryPage = UptimeKumaServer.getInstance().entryPage;
+        const uptimeKumaEntryPage = server.entryPage;
         if (hostname in StatusPage.domainMappingList) {
             log.debug("entry", "This is a status page domain");
 
@@ -1087,8 +1086,7 @@ let needSetup = false;
                 }
 
                 await setSettings("general", data);
-                exports.entryPage = data.entryPage;
-                UptimeKumaServer.getInstance().entryPage = data.entryPage;
+                server.entryPage = data.entryPage;
 
                 callback({
                     ok: true,

From 1c8631af8d5b3547f1fff5bea1ee3da75b7ee45f Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Sun, 9 Oct 2022 16:02:47 +0800
Subject: [PATCH 41/48] Pin dependencies (#2205)

---
 package-lock.json | 48 +++++++++++++++++++++++------------------------
 package.json      | 48 +++++++++++++++++++++++------------------------
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4f222171..6053fa5f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,47 +12,47 @@
                 "@louislam/sqlite3": "~15.0.6",
                 "args-parser": "~1.3.0",
                 "axios": "~0.27.0",
-                "axios-ntlm": "^1.3.0",
-                "badge-maker": "^3.3.1",
+                "axios-ntlm": "~1.3.0",
+                "badge-maker": "~3.3.1",
                 "bcryptjs": "~2.4.3",
                 "bree": "~7.1.5",
                 "cacheable-lookup": "~6.0.4",
-                "chardet": "^1.3.0",
+                "chardet": "~1.4.0",
                 "check-password-strength": "^2.0.5",
-                "cheerio": "^1.0.0-rc.10",
-                "chroma-js": "^2.1.2",
+                "cheerio": "~1.0.0-rc.12",
+                "chroma-js": "~2.4.2",
                 "command-exists": "~1.2.9",
                 "compare-versions": "~3.6.0",
-                "compression": "^1.7.4",
-                "dayjs": "^1.11.0",
+                "compression": "~1.7.4",
+                "dayjs": "~1.11.5",
                 "express": "~4.17.3",
                 "express-basic-auth": "~1.2.1",
-                "express-static-gzip": "^2.1.7",
+                "express-static-gzip": "~2.1.7",
                 "form-data": "~4.0.0",
                 "http-graceful-shutdown": "~3.1.7",
-                "http-proxy-agent": "^5.0.0",
-                "https-proxy-agent": "^5.0.0",
-                "iconv-lite": "^0.6.3",
-                "jsesc": "^3.0.2",
+                "http-proxy-agent": "~5.0.0",
+                "https-proxy-agent": "~5.0.1",
+                "iconv-lite": "~0.6.3",
+                "jsesc": "~3.0.2",
                 "jsonwebtoken": "~8.5.1",
-                "jwt-decode": "^3.1.2",
-                "limiter": "^2.1.0",
-                "mqtt": "^4.2.8",
-                "mssql": "^8.1.0",
+                "jwt-decode": "~3.1.2",
+                "limiter": "~2.1.0",
+                "mqtt": "~4.3.7",
+                "mssql": "~8.1.4",
                 "node-cloudflared-tunnel": "~1.0.9",
-                "node-radius-client": "^1.0.0",
+                "node-radius-client": "~1.0.0",
                 "nodemailer": "~6.6.5",
                 "notp": "~2.0.3",
                 "password-hash": "~1.2.2",
-                "pg": "^8.7.3",
-                "pg-connection-string": "^2.5.0",
+                "pg": "~8.8.0",
+                "pg-connection-string": "~2.5.0",
                 "prom-client": "~13.2.0",
                 "prometheus-api-metrics": "~3.2.1",
                 "redbean-node": "0.1.4",
                 "socket.io": "~4.4.1",
                 "socket.io-client": "~4.4.1",
                 "socks-proxy-agent": "6.1.1",
-                "tar": "^6.1.11",
+                "tar": "~6.1.11",
                 "tcp-ping": "~0.1.1",
                 "thirty-two": "~1.0.2"
             },
@@ -82,18 +82,18 @@
                 "dns2": "~2.0.1",
                 "eslint": "~8.14.0",
                 "eslint-plugin-vue": "~8.7.1",
-                "favico.js": "^0.3.10",
+                "favico.js": "~0.3.10",
                 "jest": "~27.2.5",
                 "postcss-html": "~1.5.0",
                 "postcss-rtlcss": "~3.7.2",
                 "postcss-scss": "~4.0.4",
-                "prismjs": "^1.27.0",
+                "prismjs": "~1.29.0",
                 "qrcode": "~1.5.0",
                 "rollup-plugin-visualizer": "^5.6.0",
                 "sass": "~1.42.1",
                 "stylelint": "~14.7.1",
                 "stylelint-config-standard": "~25.0.0",
-                "terser": "^5.15.0",
+                "terser": "~5.15.0",
                 "timezones-list": "~3.0.1",
                 "typescript": "~4.4.4",
                 "v-pagination-3": "~0.1.7",
@@ -106,7 +106,7 @@
                 "vue-i18n": "~9.1.9",
                 "vue-image-crop-upload": "~3.0.3",
                 "vue-multiselect": "~3.0.0-alpha.2",
-                "vue-prism-editor": "^2.0.0-alpha.2",
+                "vue-prism-editor": "~2.0.0-alpha.2",
                 "vue-qrcode": "~1.0.0",
                 "vue-router": "~4.0.14",
                 "vue-toastification": "~2.0.0-rc.5",
diff --git a/package.json b/package.json
index f5f78f3a..0c72722d 100644
--- a/package.json
+++ b/package.json
@@ -66,47 +66,47 @@
         "@louislam/sqlite3": "~15.0.6",
         "args-parser": "~1.3.0",
         "axios": "~0.27.0",
-        "axios-ntlm": "^1.3.0",
-        "badge-maker": "^3.3.1",
+        "axios-ntlm": "~1.3.0",
+        "badge-maker": "~3.3.1",
         "bcryptjs": "~2.4.3",
         "bree": "~7.1.5",
         "cacheable-lookup": "~6.0.4",
-        "chardet": "^1.3.0",
+        "chardet": "~1.4.0",
         "check-password-strength": "^2.0.5",
-        "cheerio": "^1.0.0-rc.10",
-        "chroma-js": "^2.1.2",
+        "cheerio": "~1.0.0-rc.12",
+        "chroma-js": "~2.4.2",
         "command-exists": "~1.2.9",
         "compare-versions": "~3.6.0",
-        "compression": "^1.7.4",
-        "dayjs": "^1.11.0",
+        "compression": "~1.7.4",
+        "dayjs": "~1.11.5",
         "express": "~4.17.3",
         "express-basic-auth": "~1.2.1",
-        "express-static-gzip": "^2.1.7",
+        "express-static-gzip": "~2.1.7",
         "form-data": "~4.0.0",
         "http-graceful-shutdown": "~3.1.7",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "iconv-lite": "^0.6.3",
-        "jsesc": "^3.0.2",
+        "http-proxy-agent": "~5.0.0",
+        "https-proxy-agent": "~5.0.1",
+        "iconv-lite": "~0.6.3",
+        "jsesc": "~3.0.2",
         "jsonwebtoken": "~8.5.1",
-        "jwt-decode": "^3.1.2",
-        "limiter": "^2.1.0",
-        "mqtt": "^4.2.8",
-        "mssql": "^8.1.0",
+        "jwt-decode": "~3.1.2",
+        "limiter": "~2.1.0",
+        "mqtt": "~4.3.7",
+        "mssql": "~8.1.4",
         "node-cloudflared-tunnel": "~1.0.9",
-        "node-radius-client": "^1.0.0",
+        "node-radius-client": "~1.0.0",
         "nodemailer": "~6.6.5",
         "notp": "~2.0.3",
         "password-hash": "~1.2.2",
-        "pg": "^8.7.3",
-        "pg-connection-string": "^2.5.0",
+        "pg": "~8.8.0",
+        "pg-connection-string": "~2.5.0",
         "prom-client": "~13.2.0",
         "prometheus-api-metrics": "~3.2.1",
         "redbean-node": "0.1.4",
         "socket.io": "~4.4.1",
         "socket.io-client": "~4.4.1",
         "socks-proxy-agent": "6.1.1",
-        "tar": "^6.1.11",
+        "tar": "~6.1.11",
         "tcp-ping": "~0.1.1",
         "thirty-two": "~1.0.2"
     },
@@ -136,18 +136,18 @@
         "dns2": "~2.0.1",
         "eslint": "~8.14.0",
         "eslint-plugin-vue": "~8.7.1",
-        "favico.js": "^0.3.10",
+        "favico.js": "~0.3.10",
         "jest": "~27.2.5",
         "postcss-html": "~1.5.0",
         "postcss-rtlcss": "~3.7.2",
         "postcss-scss": "~4.0.4",
-        "prismjs": "^1.27.0",
+        "prismjs": "~1.29.0",
         "qrcode": "~1.5.0",
         "rollup-plugin-visualizer": "^5.6.0",
         "sass": "~1.42.1",
         "stylelint": "~14.7.1",
         "stylelint-config-standard": "~25.0.0",
-        "terser": "^5.15.0",
+        "terser": "~5.15.0",
         "timezones-list": "~3.0.1",
         "typescript": "~4.4.4",
         "v-pagination-3": "~0.1.7",
@@ -160,7 +160,7 @@
         "vue-i18n": "~9.1.9",
         "vue-image-crop-upload": "~3.0.3",
         "vue-multiselect": "~3.0.0-alpha.2",
-        "vue-prism-editor": "^2.0.0-alpha.2",
+        "vue-prism-editor": "~2.0.0-alpha.2",
         "vue-qrcode": "~1.0.0",
         "vue-router": "~4.0.14",
         "vue-toastification": "~2.0.0-rc.5",

From 07f9aafd7bce1b6d5226744654070a2fc7d54745 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Sun, 9 Oct 2022 16:50:47 +0800
Subject: [PATCH 42/48] Update to 1.18.4

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 0c72722d..180bea28 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "uptime-kuma",
-    "version": "1.18.3",
+    "version": "1.18.4",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -38,7 +38,7 @@
         "build-docker-nightly-amd64": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain",
         "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test --target pr-test . --push",
         "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain",
-        "setup": "git checkout 1.18.3 && npm ci --production && npm run download-dist",
+        "setup": "git checkout 1.18.4 && npm ci --production && npm run download-dist",
         "download-dist": "node extra/download-dist.js",
         "mark-as-nightly": "node extra/mark-as-nightly.js",
         "reset-password": "node extra/reset-password.js",

From 71af23cf0003c4a5086a9eb44abeabd1ccb8bdce Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Mon, 10 Oct 2022 02:47:24 +0800
Subject: [PATCH 43/48] Fix #2207

---
 server/model/status_page.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/model/status_page.js b/server/model/status_page.js
index 7682272c..68c7f8b0 100644
--- a/server/model/status_page.js
+++ b/server/model/status_page.js
@@ -58,7 +58,7 @@ class StatusPage extends BeanModel {
 
         // Preload data
         // Add jsesc, fix https://github.com/louislam/uptime-kuma/issues/2186
-        const escapedJSONObject = jsesc(JSON.stringify(await StatusPage.getStatusPageData(statusPage)), {
+        const escapedJSONObject = jsesc(await StatusPage.getStatusPageData(statusPage), {
             "isScriptContext": true
         });
 

From bd42450e55dc29bdd1daddb1080aaa6d81b32912 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Mon, 10 Oct 2022 16:23:32 +0800
Subject: [PATCH 44/48] Update vue-i18n from 9.1.9 to 9.2.2, force to use
 production version of vue-i18n in order to improve the performance

---
 package-lock.json | 186 +++++++++++++++++-----------------------------
 package.json      |   2 +-
 src/i18n.js       |   2 +-
 3 files changed, 71 insertions(+), 119 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6053fa5f..44af1469 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "uptime-kuma",
-    "version": "1.18.3",
+    "version": "1.18.4",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "uptime-kuma",
-            "version": "1.18.3",
+            "version": "1.18.4",
             "license": "MIT",
             "dependencies": {
                 "@louislam/sqlite3": "~15.0.6",
@@ -103,7 +103,7 @@
                 "vue-chart-3": "3.0.9",
                 "vue-confirm-dialog": "~1.0.2",
                 "vue-contenteditable": "~3.0.4",
-                "vue-i18n": "~9.1.9",
+                "vue-i18n": "~9.2.2",
                 "vue-image-crop-upload": "~3.0.3",
                 "vue-multiselect": "~3.0.0-alpha.2",
                 "vue-prism-editor": "~2.0.0-alpha.2",
@@ -2338,92 +2338,65 @@
             "dev": true
         },
         "node_modules/@intlify/core-base": {
-            "version": "9.1.10",
-            "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.1.10.tgz",
-            "integrity": "sha512-So9CNUavB/IsZ+zBmk2Cv6McQp6vc2wbGi1S0XQmJ8Vz+UFcNn9MFXAe9gY67PreIHrbLsLxDD0cwo1qsxM1Nw==",
+            "version": "9.2.2",
+            "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.2.2.tgz",
+            "integrity": "sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==",
             "dev": true,
             "dependencies": {
-                "@intlify/devtools-if": "9.1.10",
-                "@intlify/message-compiler": "9.1.10",
-                "@intlify/message-resolver": "9.1.10",
-                "@intlify/runtime": "9.1.10",
-                "@intlify/shared": "9.1.10",
-                "@intlify/vue-devtools": "9.1.10"
+                "@intlify/devtools-if": "9.2.2",
+                "@intlify/message-compiler": "9.2.2",
+                "@intlify/shared": "9.2.2",
+                "@intlify/vue-devtools": "9.2.2"
             },
             "engines": {
-                "node": ">= 10"
+                "node": ">= 14"
             }
         },
         "node_modules/@intlify/devtools-if": {
-            "version": "9.1.10",
-            "resolved": "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.1.10.tgz",
-            "integrity": "sha512-SHaKoYu6sog3+Q8js1y3oXLywuogbH1sKuc7NSYkN3GElvXSBaMoCzW+we0ZSFqj/6c7vTNLg9nQ6rxhKqYwnQ==",
+            "version": "9.2.2",
+            "resolved": "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.2.2.tgz",
+            "integrity": "sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==",
             "dev": true,
             "dependencies": {
-                "@intlify/shared": "9.1.10"
+                "@intlify/shared": "9.2.2"
             },
             "engines": {
-                "node": ">= 10"
+                "node": ">= 14"
             }
         },
         "node_modules/@intlify/message-compiler": {
-            "version": "9.1.10",
-            "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.1.10.tgz",
-            "integrity": "sha512-+JiJpXff/XTb0EadYwdxOyRTB0hXNd4n1HaJ/a4yuV960uRmPXaklJsedW0LNdcptd/hYUZtCkI7Lc9J5C1gxg==",
+            "version": "9.2.2",
+            "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.2.2.tgz",
+            "integrity": "sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==",
             "dev": true,
             "dependencies": {
-                "@intlify/message-resolver": "9.1.10",
-                "@intlify/shared": "9.1.10",
+                "@intlify/shared": "9.2.2",
                 "source-map": "0.6.1"
             },
             "engines": {
-                "node": ">= 10"
-            }
-        },
-        "node_modules/@intlify/message-resolver": {
-            "version": "9.1.10",
-            "resolved": "https://registry.npmjs.org/@intlify/message-resolver/-/message-resolver-9.1.10.tgz",
-            "integrity": "sha512-5YixMG/M05m0cn9+gOzd4EZQTFRUu8RGhzxJbR1DWN21x/Z3bJ8QpDYj6hC4FwBj5uKsRfKpJQ3Xqg98KWoA+w==",
-            "dev": true,
-            "engines": {
-                "node": ">= 10"
-            }
-        },
-        "node_modules/@intlify/runtime": {
-            "version": "9.1.10",
-            "resolved": "https://registry.npmjs.org/@intlify/runtime/-/runtime-9.1.10.tgz",
-            "integrity": "sha512-7QsuByNzpe3Gfmhwq6hzgXcMPpxz8Zxb/XFI6s9lQdPLPe5Lgw4U1ovRPZTOs6Y2hwitR3j/HD8BJNGWpJnOFA==",
-            "dev": true,
-            "dependencies": {
-                "@intlify/message-compiler": "9.1.10",
-                "@intlify/message-resolver": "9.1.10",
-                "@intlify/shared": "9.1.10"
-            },
-            "engines": {
-                "node": ">= 10"
+                "node": ">= 14"
             }
         },
         "node_modules/@intlify/shared": {
-            "version": "9.1.10",
-            "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.1.10.tgz",
-            "integrity": "sha512-Om54xJeo1Vw+K1+wHYyXngE8cAbrxZHpWjYzMR9wCkqbhGtRV5VLhVc214Ze2YatPrWlS2WSMOWXR8JktX/IgA==",
+            "version": "9.2.2",
+            "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.2.2.tgz",
+            "integrity": "sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==",
             "dev": true,
             "engines": {
-                "node": ">= 10"
+                "node": ">= 14"
             }
         },
         "node_modules/@intlify/vue-devtools": {
-            "version": "9.1.10",
-            "resolved": "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.1.10.tgz",
-            "integrity": "sha512-5l3qYARVbkWAkagLu1XbDUWRJSL8br1Dj60wgMaKB0+HswVsrR6LloYZTg7ozyvM621V6+zsmwzbQxbVQyrytQ==",
+            "version": "9.2.2",
+            "resolved": "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.2.2.tgz",
+            "integrity": "sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==",
             "dev": true,
             "dependencies": {
-                "@intlify/message-resolver": "9.1.10",
-                "@intlify/runtime": "9.1.10",
-                "@intlify/shared": "9.1.10"
+                "@intlify/core-base": "9.2.2",
+                "@intlify/shared": "9.2.2"
             },
             "engines": {
-                "node": ">= 10"
+                "node": ">= 14"
             }
         },
         "node_modules/@istanbuljs/load-nyc-config": {
@@ -16107,18 +16080,18 @@
             }
         },
         "node_modules/vue-i18n": {
-            "version": "9.1.10",
-            "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.1.10.tgz",
-            "integrity": "sha512-jpr7gV5KPk4n+sSPdpZT8Qx3XzTcNDWffRlHV/cT2NUyEf+sEgTTmLvnBAibjOFJ0zsUyZlVTAWH5DDnYep+1g==",
+            "version": "9.2.2",
+            "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.2.2.tgz",
+            "integrity": "sha512-yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ==",
             "dev": true,
             "dependencies": {
-                "@intlify/core-base": "9.1.10",
-                "@intlify/shared": "9.1.10",
-                "@intlify/vue-devtools": "9.1.10",
-                "@vue/devtools-api": "^6.0.0-beta.7"
+                "@intlify/core-base": "9.2.2",
+                "@intlify/shared": "9.2.2",
+                "@intlify/vue-devtools": "9.2.2",
+                "@vue/devtools-api": "^6.2.1"
             },
             "engines": {
-                "node": ">= 10"
+                "node": ">= 14"
             },
             "peerDependencies": {
                 "vue": "^3.0.0"
@@ -18279,71 +18252,50 @@
             "dev": true
         },
         "@intlify/core-base": {
-            "version": "9.1.10",
-            "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.1.10.tgz",
-            "integrity": "sha512-So9CNUavB/IsZ+zBmk2Cv6McQp6vc2wbGi1S0XQmJ8Vz+UFcNn9MFXAe9gY67PreIHrbLsLxDD0cwo1qsxM1Nw==",
+            "version": "9.2.2",
+            "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.2.2.tgz",
+            "integrity": "sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==",
             "dev": true,
             "requires": {
-                "@intlify/devtools-if": "9.1.10",
-                "@intlify/message-compiler": "9.1.10",
-                "@intlify/message-resolver": "9.1.10",
-                "@intlify/runtime": "9.1.10",
-                "@intlify/shared": "9.1.10",
-                "@intlify/vue-devtools": "9.1.10"
+                "@intlify/devtools-if": "9.2.2",
+                "@intlify/message-compiler": "9.2.2",
+                "@intlify/shared": "9.2.2",
+                "@intlify/vue-devtools": "9.2.2"
             }
         },
         "@intlify/devtools-if": {
-            "version": "9.1.10",
-            "resolved": "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.1.10.tgz",
-            "integrity": "sha512-SHaKoYu6sog3+Q8js1y3oXLywuogbH1sKuc7NSYkN3GElvXSBaMoCzW+we0ZSFqj/6c7vTNLg9nQ6rxhKqYwnQ==",
+            "version": "9.2.2",
+            "resolved": "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.2.2.tgz",
+            "integrity": "sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==",
             "dev": true,
             "requires": {
-                "@intlify/shared": "9.1.10"
+                "@intlify/shared": "9.2.2"
             }
         },
         "@intlify/message-compiler": {
-            "version": "9.1.10",
-            "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.1.10.tgz",
-            "integrity": "sha512-+JiJpXff/XTb0EadYwdxOyRTB0hXNd4n1HaJ/a4yuV960uRmPXaklJsedW0LNdcptd/hYUZtCkI7Lc9J5C1gxg==",
+            "version": "9.2.2",
+            "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.2.2.tgz",
+            "integrity": "sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==",
             "dev": true,
             "requires": {
-                "@intlify/message-resolver": "9.1.10",
-                "@intlify/shared": "9.1.10",
+                "@intlify/shared": "9.2.2",
                 "source-map": "0.6.1"
             }
         },
-        "@intlify/message-resolver": {
-            "version": "9.1.10",
-            "resolved": "https://registry.npmjs.org/@intlify/message-resolver/-/message-resolver-9.1.10.tgz",
-            "integrity": "sha512-5YixMG/M05m0cn9+gOzd4EZQTFRUu8RGhzxJbR1DWN21x/Z3bJ8QpDYj6hC4FwBj5uKsRfKpJQ3Xqg98KWoA+w==",
-            "dev": true
-        },
-        "@intlify/runtime": {
-            "version": "9.1.10",
-            "resolved": "https://registry.npmjs.org/@intlify/runtime/-/runtime-9.1.10.tgz",
-            "integrity": "sha512-7QsuByNzpe3Gfmhwq6hzgXcMPpxz8Zxb/XFI6s9lQdPLPe5Lgw4U1ovRPZTOs6Y2hwitR3j/HD8BJNGWpJnOFA==",
-            "dev": true,
-            "requires": {
-                "@intlify/message-compiler": "9.1.10",
-                "@intlify/message-resolver": "9.1.10",
-                "@intlify/shared": "9.1.10"
-            }
-        },
         "@intlify/shared": {
-            "version": "9.1.10",
-            "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.1.10.tgz",
-            "integrity": "sha512-Om54xJeo1Vw+K1+wHYyXngE8cAbrxZHpWjYzMR9wCkqbhGtRV5VLhVc214Ze2YatPrWlS2WSMOWXR8JktX/IgA==",
+            "version": "9.2.2",
+            "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.2.2.tgz",
+            "integrity": "sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==",
             "dev": true
         },
         "@intlify/vue-devtools": {
-            "version": "9.1.10",
-            "resolved": "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.1.10.tgz",
-            "integrity": "sha512-5l3qYARVbkWAkagLu1XbDUWRJSL8br1Dj60wgMaKB0+HswVsrR6LloYZTg7ozyvM621V6+zsmwzbQxbVQyrytQ==",
+            "version": "9.2.2",
+            "resolved": "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.2.2.tgz",
+            "integrity": "sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==",
             "dev": true,
             "requires": {
-                "@intlify/message-resolver": "9.1.10",
-                "@intlify/runtime": "9.1.10",
-                "@intlify/shared": "9.1.10"
+                "@intlify/core-base": "9.2.2",
+                "@intlify/shared": "9.2.2"
             }
         },
         "@istanbuljs/load-nyc-config": {
@@ -28795,15 +28747,15 @@
             }
         },
         "vue-i18n": {
-            "version": "9.1.10",
-            "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.1.10.tgz",
-            "integrity": "sha512-jpr7gV5KPk4n+sSPdpZT8Qx3XzTcNDWffRlHV/cT2NUyEf+sEgTTmLvnBAibjOFJ0zsUyZlVTAWH5DDnYep+1g==",
+            "version": "9.2.2",
+            "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.2.2.tgz",
+            "integrity": "sha512-yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ==",
             "dev": true,
             "requires": {
-                "@intlify/core-base": "9.1.10",
-                "@intlify/shared": "9.1.10",
-                "@intlify/vue-devtools": "9.1.10",
-                "@vue/devtools-api": "^6.0.0-beta.7"
+                "@intlify/core-base": "9.2.2",
+                "@intlify/shared": "9.2.2",
+                "@intlify/vue-devtools": "9.2.2",
+                "@vue/devtools-api": "^6.2.1"
             }
         },
         "vue-image-crop-upload": {
diff --git a/package.json b/package.json
index 180bea28..6f48fedd 100644
--- a/package.json
+++ b/package.json
@@ -157,7 +157,7 @@
         "vue-chart-3": "3.0.9",
         "vue-confirm-dialog": "~1.0.2",
         "vue-contenteditable": "~3.0.4",
-        "vue-i18n": "~9.1.9",
+        "vue-i18n": "~9.2.2",
         "vue-image-crop-upload": "~3.0.3",
         "vue-multiselect": "~3.0.0-alpha.2",
         "vue-prism-editor": "~2.0.0-alpha.2",
diff --git a/src/i18n.js b/src/i18n.js
index 4c19eb00..902177cf 100644
--- a/src/i18n.js
+++ b/src/i18n.js
@@ -1,4 +1,4 @@
-import { createI18n } from "vue-i18n/index";
+import { createI18n } from "vue-i18n/dist/vue-i18n.esm-browser.prod.js";
 import en from "./languages/en";
 
 const languageList = {

From 2ee8378814d5cf92dceabcf2d9e4e79505001f16 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Tue, 11 Oct 2022 02:32:57 +0800
Subject: [PATCH 45/48] Update to 1.18.5

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 6f48fedd..b1a76d36 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "uptime-kuma",
-    "version": "1.18.4",
+    "version": "1.18.5",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -38,7 +38,7 @@
         "build-docker-nightly-amd64": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain",
         "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test --target pr-test . --push",
         "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain",
-        "setup": "git checkout 1.18.4 && npm ci --production && npm run download-dist",
+        "setup": "git checkout 1.18.5 && npm ci --production && npm run download-dist",
         "download-dist": "node extra/download-dist.js",
         "mark-as-nightly": "node extra/mark-as-nightly.js",
         "reset-password": "node extra/reset-password.js",

From 180d881ac122fb8f85805153f2342725a4843851 Mon Sep 17 00:00:00 2001
From: Alexander Borzov <59200516+Borzoff@users.noreply.github.com>
Date: Tue, 11 Oct 2022 10:35:08 +0300
Subject: [PATCH 46/48] Update ru-RU.js (#2217)

---
 src/languages/ru-RU.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/languages/ru-RU.js b/src/languages/ru-RU.js
index 0aaf0968..6922f51b 100644
--- a/src/languages/ru-RU.js
+++ b/src/languages/ru-RU.js
@@ -393,6 +393,12 @@ export default {
     alertaAlertState: "Состояние алерта",
     alertaRecoverState: "Состояние восстановления",
     Proxies: "Прокси",
+    "Setup Proxy": "Настройка Прокси",
+    "Proxy Protocol": "Протокол Прокси",
+    "Proxy Server": "Прокси",
+    "Proxy server has authentication": "Прокси имеет аутентификацию",
+    "Reverse Proxy": "Обратный прокси",
+    "No Proxy": "Без прокси",
     default: "По умолчанию",
     enabled: "Включено",
     setAsDefault: "Установлено по умолчанию",

From cb5f90aa89eae0d84c7eb62c98c956b7055183a3 Mon Sep 17 00:00:00 2001
From: MagicFun1241 <nganzikov@gmail.com>
Date: Wed, 12 Oct 2022 19:27:50 +0300
Subject: [PATCH 47/48] Update Russian locale (#2218)

* Update ru-RU.js

* Remove duplicates

* Remove duplicates x2

* Revert to previous version for one translation

* Removed conflicting lines

* Remove conflicting 'Reverse Proxy' key
---
 src/languages/ru-RU.js | 172 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 172 insertions(+)

diff --git a/src/languages/ru-RU.js b/src/languages/ru-RU.js
index 6922f51b..2e6fdf7b 100644
--- a/src/languages/ru-RU.js
+++ b/src/languages/ru-RU.js
@@ -406,4 +406,176 @@ export default {
     proxyDescription: "Прокси должны быть привязаны к монитору, чтобы работать.",
     enableProxyDescription: "Этот прокси не будет влиять на запросы монитора, пока не будет активирован. Вы можете контролировать временное отключение прокси для всех мониторов через статус активации.",
     setAsDefaultProxyDescription: "Этот прокси будет по умолчанию включен для новых мониторов. Вы всё ещё можете отдельно отключать прокси в каждом мониторе.",
+    Invalid: "Недействительный",
+    AccessKeyId: "AccessKey ID",
+    SecretAccessKey: "AccessKey Secret",
+    PhoneNumbers: "PhoneNumbers",
+    TemplateCode: "TemplateCode",
+    SignName: "SignName",
+    "Sms template must contain parameters: ": "Шаблон СМС должен содержать параметры: ",
+    "Bark Endpoint": "Bark Endpoint",
+    "Bark Group": "Bark Group",
+    "Bark Sound": "Bark Sound",
+    WebHookUrl: "WebHookUrl",
+    SecretKey: "SecretKey",
+    "For safety, must use secret key": "В целях безопасности необходимо использовать секретный ключ",
+    "Device Token": "Токен устройства",
+    Platform: "Платформа",
+    iOS: "iOS",
+    Android: "Android",
+    Huawei: "Huawei",
+    High: "High",
+    Retry: "Повторить",
+    Topic: "Тема",
+    "WeCom Bot Key": "WeCom Bot Key",
+    User: "Пользователь",
+    Installed: "Установлено",
+    "Not installed": "Не установлено",
+    Running: "Запускается",
+    "Not running": "Не запускается",
+    "Remove Token": "Удалить токен",
+    Start: "Запустить",
+    Stop: "Остановить",
+    "Uptime Kuma": "Uptime Kuma",
+    Slug: "Slug",
+    "Accept characters:": "Принимаемые символы:",
+    startOrEndWithOnly: "Начинается или кончается только {0}",
+    "No consecutive dashes": "Без последовательных тире",
+    "The slug is already taken. Please choose another slug.": "The slug is already taken. Please choose another slug.",
+    "Page Not Found": "Страница не найдена",
+    wayToGetCloudflaredURL: "(Скачать cloudflared с {0})",
+    cloudflareWebsite: "Cloudflare Website",
+    "Message:": "Сообщение:",
+    "Don't know how to get the token? Please read the guide:": "Don't know how to get the token? Please read the guide:",
+    "The current connection may be lost if you are currently connecting via Cloudflare Tunnel. Are you sure want to stop it? Type your current password to confirm it.": "The current connection may be lost if you are currently connecting via Cloudflare Tunnel. Are you sure want to stop it? Type your current password to confirm it.",
+    "HTTP Headers": "HTTP заголовки",
+    "Trust Proxy": "Доверять прокси",
+    "Other Software": "Другое программное обеспечение",
+    "For example: nginx, Apache and Traefik.": "К примеру: nginx, Apache и Traefik.",
+    "Please read": "Пожалуйста, прочитайте",
+    "Subject:": "Тема:",
+    "Valid To:": "Действителен до:",
+    "Days Remaining:": "Дней осталось:",
+    "Issuer:": "Издатель:",
+    "Fingerprint:": "Отпечаток:",
+    "No status pages": "Нет статусных страниц",
+    "Domain Name Expiry Notification": "Уведомление об истечении срока действия доменного имени",
+    Proxy: "Прокси",
+    "Date Created": "Дата создания",
+    HomeAssistant: "Home Assistant",
+    onebotHttpAddress: "OneBot HTTP Address",
+    onebotMessageType: "OneBot Message Type",
+    onebotGroupMessage: "Группа",
+    onebotPrivateMessage: "Private",
+    onebotUserOrGroupId: "Группа/ID пользователя",
+    onebotSafetyTips: "В целях безопасности необходимо установить токен доступа",
+    "PushDeer Key": "PushDeer Key",
+    "Footer Text": "Текст нижнего колонтитула",
+    "Show Powered By": "Показывать на чем создано",
+    "Domain Names": "Доменные имена",
+    signedInDisp: "Вы вошли как {0}",
+    signedInDispDisabled: "Аутентификация отключена.",
+    RadiusSecret: "Секрет Radius",
+    RadiusSecretDescription: "Общий секрет между клиентом и сервером",
+    RadiusCalledStationId: "Идентификатор вызываемой станции",
+    RadiusCalledStationIdDescription: "Идентификатор вызываемого устройства",
+    RadiusCallingStationId: "Идентификатор вызывающей станции",
+    RadiusCallingStationIdDescription: "Идентификатор вызывающего устройства",
+    "Certificate Expiry Notification": "Уведомление об истечении срока действия сертификата",
+    "API Username": "Имя пользователя API",
+    "API Key": "API ключ",
+    "Recipient Number": "Номер получателя",
+    "From Name/Number": "Имя/номер отправителя",
+    "Leave blank to use a shared sender number.": "Оставьте пустым, чтобы использовать общий номер отправителя.",
+    "Octopush API Version": "Версия API Octopush",
+    "Legacy Octopush-DM": "Legacy Octopush-DM",
+    endpoint: "endpoint",
+    octopushAPIKey: "\"API key\" из учетных данных HTTP API в панели управления",
+    octopushLogin: "\"Login\" из учетных данных HTTP API в панели управления",
+    promosmsLogin: "Логин API",
+    promosmsPassword: "Пароль API",
+    "pushoversounds pushover": "Pushover (default)",
+    "pushoversounds bike": "Bike",
+    "pushoversounds bugle": "Bugle",
+    "pushoversounds cashregister": "Cash Register",
+    "pushoversounds classical": "Classical",
+    "pushoversounds cosmic": "Cosmic",
+    "pushoversounds falling": "Falling",
+    "pushoversounds gamelan": "Gamelan",
+    "pushoversounds incoming": "Incoming",
+    "pushoversounds intermission": "Intermission",
+    "pushoversounds magic": "Magic",
+    "pushoversounds mechanical": "Mechanical",
+    "pushoversounds pianobar": "Piano Bar",
+    "pushoversounds siren": "Siren",
+    "pushoversounds spacealarm": "Space Alarm",
+    "pushoversounds tugboat": "Tug Boat",
+    "pushoversounds alien": "Alien Alarm (long)",
+    "pushoversounds climb": "Climb (long)",
+    "pushoversounds persistent": "Persistent (long)",
+    "pushoversounds echo": "Pushover Echo (long)",
+    "pushoversounds updown": "Up Down (long)",
+    "pushoversounds vibrate": "Vibrate Only",
+    "pushoversounds none": "None (silent)",
+    pushyAPIKey: "Secret API Key",
+    pushyToken: "Токен устройства",
+    "Using a Reverse Proxy?": "Используете обратный прокси?",
+    "Check how to config it for WebSocket": "Проверьте, как настроить его для WebSocket",
+    "Steam Game Server": "Steam Game Server",
+    "Most likely causes:": "Наиболее вероятные причины:",
+    "The resource is no longer available.": "Ресурс больше не доступен.",
+    "There might be a typing error in the address.": "В адресе может быть опечатка.",
+    "What you can try:": "Что вы можете попробовать:",
+    "Retype the address.": "Повторите адрес.",
+    "Go back to the previous page.": "Вернуться на предыдущую страницу.",
+    "Coming Soon": "Скоро",
+    wayToGetClickSendSMSToken: "Вы можете получить имя пользователя API и ключ API из {0} .",
+    "Connection String": "Строка подключения",
+    Query: "Запрос",
+    settingsCertificateExpiry: "Истекание TLS сертификата",
+    certificationExpiryDescription: "HTTPS Мониторы инициируют уведомление, когда срок действия сертификата TLS истечет:",
+    "Setup Docker Host": "Настроить Docker Host",
+    "Connection Type": "Тип соединения",
+    "Docker Daemon": "Docker Daemon",
+    deleteDockerHostMsg: "Are you sure want to delete this docker host for all monitors?",
+    socket: "Socket",
+    tcp: "TCP / HTTP",
+    "Docker Container": "Docker контейнер",
+    "Container Name / ID": "Название контейнера / ID",
+    "Docker Host": "Docker Host",
+    "Docker Hosts": "Docker Hosts",
+    "ntfy Topic": "ntfy Topic",
+    Domain: "Домен",
+    Workstation: "Workstation",
+    disableCloudflaredNoAuthMsg: "Вы находитесь в режиме без авторизации, пароль не требуется.",
+    trustProxyDescription: "Доверять заголовкам 'X-Forwarded-*'. Если вы хотите получить правильный IP-адрес клиента, а ваш Uptime Kuma находится под Nginx или Apache, вам следует включить этот параметр.",
+    wayToGetLineNotifyToken: "Вы можете получить токен доступа в {0}",
+    Examples: "Примеры",
+    "Home Assistant URL": "Home Assistant URL",
+    "Long-Lived Access Token": "Токен доступа с длительным сроком службы",
+    "Long-Lived Access Token can be created by clicking on your profile name (bottom left) and scrolling to the bottom then click Create Token. ": "Long-Lived Access Token can be created by clicking on your profile name (bottom left) and scrolling to the bottom then click Create Token. ",
+    "Notification Service": "Служба уведомлений",
+    "default: notify all devices": "по стандарту: уведомлять все устройства",
+    "A list of Notification Services can be found in Home Assistant under \"Developer Tools > Services\" search for \"notification\" to find your device/phone name.": "A list of Notification Services can be found in Home Assistant under \"Developer Tools > Services\" search for \"notification\" to find your device/phone name.",
+    "Automations can optionally be triggered in Home Assistant:": "При желании автоматизацию можно активировать в Home Assistant.:",
+    "Trigger type:": "Тип триггера:",
+    "Event type:": "Тип события:",
+    "Event data:": "Данные события:",
+    "Then choose an action, for example switch the scene to where an RGB light is red.": "Затем выберите действие, например, переключите сцену на красный индикатор RGB..",
+    "Frontend Version": "Версия интерфейса",
+    "Frontend Version do not match backend version!": "Версия интерфейса не соответствует версии серверной части!",
+    "Base URL": "Базовый URL",
+    goAlertInfo: "GoAlert is a An open source application for on-call scheduling, automated escalations and notifications (like SMS or voice calls). Automatically engage the right person, the right way, and at the right time! {0}",
+    goAlertIntegrationKeyInfo: "Получить общий ключ интеграции API для сервиса в этом формате \"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\" обычно значение параметра токена скопированного URL.",
+    goAlert: "GoAlert",
+    backupOutdatedWarning: "Устарело: поскольку добавлено множество функций, а эта функция резервного копирования немного не поддерживается, она не может создать или восстановить полную резервную копию.",
+    backupRecommend: "Сделайте резервную копию тома или папки с данными (./data/) напрямую.",
+    "Optional": "Необязательно",
+    squadcast: "Squadcast",
+    SendKey: "SendKey",
+    "SMSManager API Docs": "Документация к API SMSManager ",
+    "Gateway Type": "Тип шлюза",
+    SMSManager: "SMSManager",
+    "You can divide numbers with": "Вы можете делить числа с",
+    "or": "или",
 };

From f459ea845c6a1b192fa35efa44f3116aca921dd1 Mon Sep 17 00:00:00 2001
From: Matthew Nickson <mnickson@sidingsmedia.com>
Date: Wed, 12 Oct 2022 17:32:05 +0100
Subject: [PATCH 48/48] Added #2182 Add support for custom radius ports (#2197)

This commit adds support for the port to be specified when using the
radius monitor type. A check has been implemented to ensure that a null
value is not passed to the radius check function as could occur with
monitors that were created before this change was introduced. The
default port of 1812 is displayed when the user selects the radius
monitor in much the same way as the DNS port is handled. The port was
not included in the hostname in the form hostname:port in order to avoid
issues with IPv6 addresses and monitors that had been created before
this change was implemented.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
---
 server/model/monitor.js   | 14 +++++++++++++-
 server/util-server.js     | 13 +++++++++++++
 src/pages/EditMonitor.vue |  8 +++++---
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/server/model/monitor.js b/server/model/monitor.js
index ac892560..c0a3cce6 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -534,6 +534,17 @@ class Monitor extends BeanModel {
                     bean.ping = dayjs().valueOf() - startTime;
                 } else if (this.type === "radius") {
                     let startTime = dayjs().valueOf();
+
+                    // Handle monitors that were created before the
+                    // update and as such don't have a value for
+                    // this.port.
+                    let port;
+                    if (this.port == null) {
+                        port = 1812;
+                    } else {
+                        port = this.port;
+                    }
+
                     try {
                         const resp = await radius(
                             this.hostname,
@@ -541,7 +552,8 @@ class Monitor extends BeanModel {
                             this.radiusPassword,
                             this.radiusCalledStationId,
                             this.radiusCallingStationId,
-                            this.radiusSecret
+                            this.radiusSecret,
+                            port
                         );
                         if (resp.code) {
                             bean.msg = resp.code;
diff --git a/server/util-server.js b/server/util-server.js
index cf303ba8..b975a43f 100644
--- a/server/util-server.js
+++ b/server/util-server.js
@@ -291,6 +291,17 @@ exports.postgresQuery = function (connectionString, query) {
     });
 };
 
+/**
+ * Query radius server
+ * @param {string} hostname Hostname of radius server
+ * @param {string} username Username to use
+ * @param {string} password Password to use
+ * @param {string} calledStationId ID of called station
+ * @param {string} callingStationId ID of calling station
+ * @param {string} secret Secret to use
+ * @param {number} [port=1812] Port to contact radius server on
+ * @returns {Promise<any>}
+ */
 exports.radius = function (
     hostname,
     username,
@@ -298,9 +309,11 @@ exports.radius = function (
     calledStationId,
     callingStationId,
     secret,
+    port = 1812,
 ) {
     const client = new radiusClient({
         host: hostname,
+        hostPort: port,
         dictionaries: [ file ],
     });
 
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 99cbeb95..6d1a7e51 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -97,8 +97,8 @@
                             </div>
 
                             <!-- Port -->
-                            <!-- For TCP Port / Steam / MQTT Type -->
-                            <div v-if="monitor.type === 'port' || monitor.type === 'steam' || monitor.type === 'mqtt'" class="my-3">
+                            <!-- For TCP Port / Steam / MQTT / Radius Type -->
+                            <div v-if="monitor.type === 'port' || monitor.type === 'steam' || monitor.type === 'mqtt' || monitor.type === 'radius'" class="my-3">
                                 <label for="port" class="form-label">{{ $t("Port") }}</label>
                                 <input id="port" v-model="monitor.port" type="number" class="form-control" required min="0" max="65535" step="1">
                             </div>
@@ -616,9 +616,11 @@ export default {
             }
 
             // Set default port for DNS if not already defined
-            if (! this.monitor.port || this.monitor.port === "53") {
+            if (! this.monitor.port || this.monitor.port === "53" || this.monitor.port === "1812") {
                 if (this.monitor.type === "dns") {
                     this.monitor.port = "53";
+                } else if (this.monitor.type === "radius") {
+                    this.monitor.port = "1812";
                 } else {
                     this.monitor.port = undefined;
                 }