From f6d0f28b3a4611336cfdddbc43b8ed2b61404ae7 Mon Sep 17 00:00:00 2001
From: Sebastian Kaempfe <sebastian.kaempfe@sopra-ft.com>
Date: Thu, 12 Jan 2023 11:34:37 +0100
Subject: [PATCH 01/26] [#2593] during certificate evaluation also set the cert
 type for improved notifications

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

diff --git a/server/util-server.js b/server/util-server.js
index 60d8baac7..d9741a7c6 100644
--- a/server/util-server.js
+++ b/server/util-server.js
@@ -445,12 +445,16 @@ const parseCertificateInfo = function (info) {
 
         // Move up the chain until loop is encountered
         if (link.issuerCertificate == null) {
+            link.certType = (i === 0) ? "self-signed" : "root CA";
             break;
         } else if (link.issuerCertificate.fingerprint in existingList) {
+            // a root CA certificate is typically "signed by itself"  (=> "self signed certificate") and thus the "issuerCertificate" is a reference to itself.
             log.debug("cert", `[Last] ${link.issuerCertificate.fingerprint}`);
+            link.certType = (i === 0) ? "self-signed" : "root CA";
             link.issuerCertificate = null;
             break;
         } else {
+            link.certType = (i === 0) ? "server" : "intermediate CA";
             link = link.issuerCertificate;
         }
 

From a21a47de933222fb6abc1823e48602239a5a502e Mon Sep 17 00:00:00 2001
From: Sebastian Kaempfe <sebastian.kaempfe@sopra-ft.com>
Date: Thu, 12 Jan 2023 11:39:36 +0100
Subject: [PATCH 02/26] [#2593] renamed the method `sendCertNotification` to
 better represent what id does. Evaluate certificate expiry from all certs in
 chain. Send a separate notification for every cert in chain, including cert
 type and CN.

---
 server/model/monitor.js | 95 ++++++++++++++++++++++-------------------
 1 file changed, 51 insertions(+), 44 deletions(-)

diff --git a/server/model/monitor.js b/server/model/monitor.js
index 9f8c8300a..dbb16217c 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -322,8 +322,8 @@ class Monitor extends BeanModel {
                             tlsInfo = await this.updateTlsInfo(tlsInfoObject);
 
                             if (!this.getIgnoreTls() && this.isEnabledExpiryNotification()) {
-                                log.debug("monitor", `[${this.name}] call sendCertNotification`);
-                                await this.sendCertNotification(tlsInfoObject);
+                                log.debug("monitor", `[${this.name}] call checkCertExpiryNotifications`);
+                                await this.checkCertExpiryNotifications(tlsInfoObject);
                             }
 
                         } catch (e) {
@@ -1117,13 +1117,19 @@ class Monitor extends BeanModel {
     }
 
     /**
-     * Send notification about a certificate
+     * checks certificate chain for expiring certificates
      * @param {Object} tlsInfoObject Information about certificate
      */
-    async sendCertNotification(tlsInfoObject) {
+    async checkCertExpiryNotifications(tlsInfoObject) {
         if (tlsInfoObject && tlsInfoObject.certInfo && tlsInfoObject.certInfo.daysRemaining) {
             const notificationList = await Monitor.getNotificationList(this);
 
+            if (! notificationList.length > 0) {
+                // fail fast. If no notification is set, all the following checks can be skipped.
+                log.debug("monitor", "No notification, no need to send cert notification");
+                return;
+            }
+
             let notifyDays = await setting("tlsExpiryNotifyDays");
             if (notifyDays == null || !Array.isArray(notifyDays)) {
                 // Reset Default
@@ -1131,10 +1137,19 @@ class Monitor extends BeanModel {
                 notifyDays = [ 7, 14, 21 ];
             }
 
-            if (notifyDays != null && Array.isArray(notifyDays)) {
-                for (const day of notifyDays) {
-                    log.debug("monitor", "call sendCertNotificationByTargetDays", day);
-                    await this.sendCertNotificationByTargetDays(tlsInfoObject.certInfo.daysRemaining, day, notificationList);
+            if (Array.isArray(notifyDays)) {
+                for (const targetDays of notifyDays) {
+                    let certInfo = tlsInfoObject.certInfo;
+                    while (certInfo) {
+                        let subjectCN = certInfo.subject["CN"];
+                        if (certInfo.daysRemaining > targetDays) {
+                            log.debug("monitor", `No need to send cert notification for ${certInfo.certType} certificate "${subjectCN}" (${certInfo.daysRemaining} days valid) on ${targetDays} deadline.`);
+                        } else {
+                            log.debug("monitor", `call sendCertNotificationByTargetDays for ${targetDays} deadline on certificate ${subjectCN}.`);
+                            await this.sendCertNotificationByTargetDays(subjectCN, certInfo.certType, certInfo.daysRemaining, targetDays, notificationList);
+                        }
+                        certInfo = certInfo.issuerCertificate;
+                    }
                 }
             }
         }
@@ -1143,55 +1158,47 @@ class Monitor extends BeanModel {
     /**
      * Send a certificate notification when certificate expires in less
      * than target days
-     * @param {number} daysRemaining Number of days remaining on certifcate
+     * @param {string} certCN  Common Name attribute from the certificate subject
+     * @param {string} certType  certificate type
+     * @param {number} daysRemaining Number of days remaining on certificate
      * @param {number} targetDays Number of days to alert after
      * @param {LooseObject<any>[]} notificationList List of notification providers
      * @returns {Promise<void>}
      */
-    async sendCertNotificationByTargetDays(daysRemaining, targetDays, notificationList) {
+    async sendCertNotificationByTargetDays(certCN, certType, daysRemaining, targetDays, notificationList) {
 
-        if (daysRemaining > targetDays) {
-            log.debug("monitor", `No need to send cert notification. ${daysRemaining} > ${targetDays}`);
+        let row = await R.getRow("SELECT * FROM notification_sent_history WHERE type = ? AND monitor_id = ? AND days = ?", [
+            "certificate",
+            this.id,
+            targetDays,
+        ]);
+
+        // Sent already, no need to send again
+        if (row) {
+            log.debug("monitor", "Sent already, no need to send again");
             return;
         }
 
-        if (notificationList.length > 0) {
+        let sent = false;
+        log.debug("monitor", "Send certificate notification");
 
-            let row = await R.getRow("SELECT * FROM notification_sent_history WHERE type = ? AND monitor_id = ? AND days = ?", [
+        for (let notification of notificationList) {
+            try {
+                log.debug("monitor", "Sending to " + notification.name);
+                await Notification.send(JSON.parse(notification.config), `[${this.name}][${this.url}] ${certType} certificate ${certCN} will be expired in ${daysRemaining} days`);
+                sent = true;
+            } catch (e) {
+                log.error("monitor", "Cannot send cert notification to " + notification.name);
+                log.error("monitor", e);
+            }
+        }
+
+        if (sent) {
+            await R.exec("INSERT INTO notification_sent_history (type, monitor_id, days) VALUES(?, ?, ?)", [
                 "certificate",
                 this.id,
                 targetDays,
             ]);
-
-            // Sent already, no need to send again
-            if (row) {
-                log.debug("monitor", "Sent already, no need to send again");
-                return;
-            }
-
-            let sent = false;
-            log.debug("monitor", "Send certificate notification");
-
-            for (let notification of notificationList) {
-                try {
-                    log.debug("monitor", "Sending to " + notification.name);
-                    await Notification.send(JSON.parse(notification.config), `[${this.name}][${this.url}] Certificate will be expired in ${daysRemaining} days`);
-                    sent = true;
-                } catch (e) {
-                    log.error("monitor", "Cannot send cert notification to " + notification.name);
-                    log.error("monitor", e);
-                }
-            }
-
-            if (sent) {
-                await R.exec("INSERT INTO notification_sent_history (type, monitor_id, days) VALUES(?, ?, ?)", [
-                    "certificate",
-                    this.id,
-                    targetDays,
-                ]);
-            }
-        } else {
-            log.debug("monitor", "No notification, no need to send cert notification");
         }
     }
 

From a6894d36f2ed64178f872058cb2d652372bcbacd Mon Sep 17 00:00:00 2001
From: Sebastian Kaempfe <sebastian.kaempfe@sopra-ft.com>
Date: Mon, 30 Jan 2023 15:55:12 +0100
Subject: [PATCH 03/26] [#2501] Dashboard: Details Page - enable clickable URL
 on Dashboard Details if monitor is of type `mp-health`

---
 src/pages/Details.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Details.vue b/src/pages/Details.vue
index 8325caa45..bd719ac13 100644
--- a/src/pages/Details.vue
+++ b/src/pages/Details.vue
@@ -6,7 +6,7 @@
                 <Tag v-for="tag in monitor.tags" :key="tag.id" :item="tag" :size="'sm'" />
             </div>
             <p class="url">
-                <a v-if="monitor.type === 'http' || monitor.type === 'keyword' " :href="monitor.url" target="_blank" rel="noopener noreferrer">{{ monitor.url }}</a>
+                <a v-if="monitor.type === 'http' || monitor.type === 'keyword' || monitor.type === 'mp-health' " :href="monitor.url" target="_blank" rel="noopener noreferrer">{{ monitor.url }}</a>
                 <span v-if="monitor.type === 'port'">TCP Ping {{ monitor.hostname }}:{{ monitor.port }}</span>
                 <span v-if="monitor.type === 'ping'">Ping: {{ monitor.hostname }}</span>
                 <span v-if="monitor.type === 'keyword'">

From 56d716cee4690bd82c05c10acb2f329c19c4a23b Mon Sep 17 00:00:00 2001
From: Yoswaris Lawpaiboon <22832362+kiznick@users.noreply.github.com>
Date: Fri, 10 Mar 2023 17:46:45 +0700
Subject: [PATCH 04/26] Create badge-list.md

---
 badge-list.md | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 badge-list.md

diff --git a/badge-list.md b/badge-list.md
new file mode 100644
index 000000000..f5fdf332d
--- /dev/null
+++ b/badge-list.md
@@ -0,0 +1,122 @@
+```
+    label,
+    upLabel = "Up",
+    downLabel = "Down",
+    pendingLabel = "Pending",
+    maintenanceLabel = "Maintenance",
+    upColor = badgeConstants.defaultUpColor,
+    downColor = badgeConstants.defaultDownColor,
+    pendingColor = badgeConstants.defaultPendingColor,
+    maintenanceColor = badgeConstants.defaultMaintenanceColor,
+    style = badgeConstants.defaultStyle,
+    value, // for demo purpose only
+```
+
+```
+/api/badge/:id/uptime/:duration?
+    label,
+    labelPrefix,
+    labelSuffix = badgeConstants.defaultUptimeLabelSuffix,
+    prefix,
+    suffix = badgeConstants.defaultUptimeValueSuffix,
+    color,
+    labelColor,
+    style = badgeConstants.defaultStyle,
+    value, // for demo purpose only
+```
+
+```
+/api/badge/:id/ping/:duration?
+    label,
+    labelPrefix,
+    labelSuffix = badgeConstants.defaultPingLabelSuffix,
+    prefix,
+    suffix = badgeConstants.defaultPingValueSuffix,
+    color = badgeConstants.defaultPingColor,
+    labelColor,
+    style = badgeConstants.defaultStyle,
+    value, // for demo purpose only
+```
+
+```
+/api/badge/:id/avg-response/:duration?
+    label,
+    labelPrefix,
+    labelSuffix,
+    prefix,
+    suffix = badgeConstants.defaultPingValueSuffix,
+    color = badgeConstants.defaultPingColor,
+    labelColor,
+    style = badgeConstants.defaultStyle,
+    value, // for demo purpose only
+```
+
+```
+/api/badge/:id/cert-exp
+    label,
+    labelPrefix,
+    labelSuffix,
+    prefix,
+    suffix = date ? "" : badgeConstants.defaultCertExpValueSuffix,
+    upColor = badgeConstants.defaultUpColor,
+    warnColor = badgeConstants.defaultWarnColor,
+    downColor = badgeConstants.defaultDownColor,
+    warnDays = badgeConstants.defaultCertExpireWarnDays,
+    downDays = badgeConstants.defaultCertExpireDownDays,
+    labelColor,
+    style = badgeConstants.defaultStyle,
+    value, // for demo purpose only
+```
+
+```
+/api/badge/:id/response
+    label,
+    labelPrefix,
+    labelSuffix,
+    prefix,
+    suffix = badgeConstants.defaultPingValueSuffix,
+    color = badgeConstants.defaultPingColor,
+    labelColor,
+    style = badgeConstants.defaultStyle,
+    value, // for demo purpose only
+```
+
+```
+Use in all routes
+    label
+    prefix
+    suffix,
+    labelColor
+    style = badgeConstants.defaultStyle,
+    value // for demo purpose only
+```
+
+```
+Use in all routes except status and cert-exp
+    color
+```
+
+```
+Use in all routes except status
+    labelPrefix
+    labelSuffix
+```
+
+```
+Use in routes status and cert-exp
+    upColor = badgeConstants.defaultUpColor,
+    downColor = badgeConstants.defaultDownColor,
+```
+
+```
+Use in status route only
+    pendingColor = badgeConstants.defaultPendingColor,
+    maintenanceColor = badgeConstants.defaultMaintenanceColor,
+```
+
+```
+Use in cert-exp route only
+    warnColor = badgeConstants.defaultWarnColor,
+    warnDays = badgeConstants.defaultCertExpireWarnDays,
+    downDays = badgeConstants.defaultCertExpireDownDays,
+```
\ No newline at end of file

From 3bbf269da036776b28064c38e397412975cd0231 Mon Sep 17 00:00:00 2001
From: Yoswaris Lawpaiboon <22832362+kiznick@users.noreply.github.com>
Date: Fri, 10 Mar 2023 19:25:04 +0700
Subject: [PATCH 05/26] generator modal

---
 badge-list.md                           |   1 +
 src/components/BadgeGeneratorDialog.vue | 283 ++++++++++++++++++++++++
 src/components/PublicGroupList.vue      |  14 +-
 3 files changed, 297 insertions(+), 1 deletion(-)
 create mode 100644 src/components/BadgeGeneratorDialog.vue

diff --git a/badge-list.md b/badge-list.md
index f5fdf332d..958eb1006 100644
--- a/badge-list.md
+++ b/badge-list.md
@@ -1,3 +1,4 @@
+/api/badge/:id/status
 ```
     label,
     upLabel = "Up",
diff --git a/src/components/BadgeGeneratorDialog.vue b/src/components/BadgeGeneratorDialog.vue
new file mode 100644
index 000000000..1be45100d
--- /dev/null
+++ b/src/components/BadgeGeneratorDialog.vue
@@ -0,0 +1,283 @@
+<template>
+    <form @submit.prevent="submit">
+        <div ref="BadgeGeneratorModal" class="modal fade" tabindex="-1" data-bs-backdrop="static">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 id="exampleModalLabel" class="modal-title">
+                            {{ $t("Badge Generator", [monitor.name]) }}
+                        </h5>
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
+                    </div>
+                    <div class="modal-body">
+                        <div class="mb-3">
+                            <label for="type" class="form-label">{{ $t("Badge Type") }}</label>
+                            <select id="type" v-model="badge.type" class="form-select">
+                                <option value="status">status</option>
+                                <option value="uptime">uptime</option>
+                                <option value="ping">ping</option>
+                                <option value="avg-response">avg-response</option>
+                                <option value="cert-exp">cert-exp</option>
+                                <option value="response">response</option>
+                            </select>
+                        </div>
+
+                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('duration') " class="mb-3">
+                            <label for="duration" class="form-label">{{ $t("Badge Duration") }}</label>
+                            <input id="duration" v-model="badge.duration" type="number" min="0" class="form-control" required>
+                        </div>
+
+                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('label') " class="mb-3">
+                            <label for="label" class="form-label">{{ $t("Badge Label") }}</label>
+                            <input id="label" v-model="badge.label" type="text" class="form-control" required>
+                        </div>
+
+                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('prefix') " class="mb-3">
+                            <label for="prefix" class="form-label">{{ $t("Badge Prefix") }}</label>
+                            <input id="prefix" v-model="badge.label" type="text" class="form-control" required>
+                        </div>
+
+                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('suffix') " class="mb-3">
+                            <label for="suffix" class="form-label">{{ $t("Badge Suffix") }}</label>
+                            <input id="suffix" v-model="badge.label" type="text" class="form-control" required>
+                        </div>
+
+                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('labelColor') " class="mb-3">
+                            <label for="labelColor" class="form-label">{{ $t("Badge Label Color") }}</label>
+                            <input id="labelColor" v-model="badge.labelColor" type="text" class="form-control" required>
+                        </div>
+
+                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('color') " class="mb-3">
+                            <label for="color" class="form-label">{{ $t("Badge Color") }}</label>
+                            <input id="color" v-model="badge.labelColor" type="text" class="form-control" required>
+                        </div>
+
+                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('labelPrefix') " class="mb-3">
+                            <label for="labelPrefix" class="form-label">{{ $t("Badge Label Prefix") }}</label>
+                            <input id="labelPrefix" v-model="badge.labelPrefix" type="text" class="form-control" required>
+                        </div>
+
+                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('labelSuffix') " class="mb-3">
+                            <label for="labelSuffix" class="form-label">{{ $t("Badge Label Suffix") }}</label>
+                            <input id="labelSuffix" v-model="badge.labelSuffix" type="text" class="form-control" required>
+                        </div>
+
+                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('upColor') " class="mb-3">
+                            <label for="upColor" class="form-label">{{ $t("Badge Up Color") }}</label>
+                            <input id="upColor" v-model="badge.upColor" type="text" class="form-control" required>
+                        </div>
+
+                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('downColor') " class="mb-3">
+                            <label for="downColor" class="form-label">{{ $t("Badge Down Color") }}</label>
+                            <input id="downColor" v-model="badge.downColor" type="text" class="form-control" required>
+                        </div>
+
+                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('pendingColor') " class="mb-3">
+                            <label for="pendingColor" class="form-label">{{ $t("Badge Pending Color") }}</label>
+                            <input id="pendingColor" v-model="badge.pendingColor" type="text" class="form-control" required>
+                        </div>
+
+                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('maintenanceColor') " class="mb-3">
+                            <label for="maintenanceColor" class="form-label">{{ $t("Badge Maintenance Color") }}</label>
+                            <input id="maintenanceColor" v-model="badge.maintenanceColor" type="text" class="form-control" required>
+                        </div>
+
+                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('warnColor') " class="mb-3">
+                            <label for="warnColor" class="form-label">{{ $t("Badge Warn Color") }}</label>
+                            <input id="warnColor" v-model="badge.warnColor" type="number" min="0" class="form-control" required>
+                        </div>
+
+                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('warnDays') " class="mb-3">
+                            <label for="warnDays" class="form-label">{{ $t("Badge Warn Days") }}</label>
+                            <input id="warnDays" v-model="badge.warnDays" type="number" min="0" class="form-control" required>
+                        </div>
+
+                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('downDays') " class="mb-3">
+                            <label for="downDays" class="form-label">{{ $t("Badge Down Days") }}</label>
+                            <input id="downDays" v-model="badge.labelColor" type="number" min="0" class="form-control" required>
+                        </div>
+
+                        <div class="mb-3">
+                            <label for="style" class="form-label">{{ $t("Badge Style") }}</label>
+                            <select id="style" v-model="badge.style" class="form-select">
+                                <option value="plastic">plastic</option>
+                                <option value="flat">flat</option>
+                                <option value="flat-square">flat-square</option>
+                                <option value="for-the-badge">for-the-badge</option>
+                                <option value="social">social</option>
+                            </select>
+                        </div>
+
+                        <div class="mb-3">
+                            <label for="value" class="form-label">{{ $t("Badge value (For Testing only.)") }}</label>
+                            <input id="value" v-model="badge.value" type="text" class="form-control" required>
+                        </div>
+
+                        <div class="my-3">
+                            <label for="push-url" class="form-label">{{ $t("Badge URL") }}</label>
+                            <CopyableInput id="push-url" v-model="badgeURL" type="url" disabled="disabled" />
+                        </div>
+                    </div>
+
+                    <div class="modal-footer">
+                        <button type="submit" class="btn btn-danger" data-bs-dismiss="modal">
+                            {{ $t("Close") }}
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+</template>
+
+<script lang="ts">
+import { Modal } from "bootstrap";
+import CopyableInput from "./CopyableInput.vue";
+
+export default {
+    components: {
+        CopyableInput
+    },
+    props: {},
+    emits: [],
+    data() {
+        return {
+            model: null,
+            processing: false,
+            monitor: {
+                id: null,
+                name: null,
+            },
+            badge: {
+                type: "status",
+                duration: null,
+                label: null,
+                prefix: null,
+                suffix: null,
+                labelColor: null,
+
+
+                style: "plastic",
+                value: null,
+            },
+            parameters: {
+                status: [
+                    "upLabel",
+                    "downLabel",
+                    "pendingLabel",
+                    "maintenanceLabel",
+                    "upColor",
+                    "downColor",
+                    "pendingColor",
+                    "maintenanceColor",
+                ],
+                uptime: [
+                    "duration",
+                    "labelPrefix",
+                    "labelSuffix",
+                    "prefix",
+                    "suffix",
+                    "color",
+                    "labelColor",
+                ],
+                ping: [
+                    "duration",
+                    "labelPrefix",
+                    "labelSuffix",
+                    "prefix",
+                    "suffix",
+                    "color",
+                    "labelColor",
+                ],
+                "avg-response": [
+                    "duration",
+                    "labelPrefix",
+                    "labelSuffix",
+                    "prefix",
+                    "suffix",
+                    "color",
+                    "labelColor",
+                ],
+                "cert-exp": [
+                    "labelPrefix",
+                    "labelSuffix",
+                    "prefix",
+                    "suffix",
+                    "upColor",
+                    "warnColor",
+                    "downColor",
+                    "downDays",
+                    "labelColor",
+                ],
+                response: [
+                    "labelPrefix",
+                    "labelSuffix",
+                    "prefix",
+                    "suffix",
+                    "color",
+                    "labelColor",
+                ],
+            }
+        };
+    },
+
+    computed: {
+        badgeURL() {
+            if(!this.monitor.id || !this.badge.type) return null;
+            let badgeURL = this.$root.baseURL + "/api/badge/" + this.monitor.id + "/" + this.badge.type;
+
+            let parameter_list = {};
+            for(let parameter of this.parameters[this.badge.type] || []) {
+                if(parameter == "duration" && this.badge.duration) {
+                    badgeURL += "/" + this.badge.duration;
+                    continue;
+                }
+                
+                if(this.badge[parameter]) {
+                    parameter_list[parameter] = this.badge[parameter]
+                }
+            }
+
+            for(let parameter of ["label", "style", "value"]) {
+                if(this.badge[parameter]) {
+                    parameter_list[parameter] = this.badge[parameter]
+                }
+            }
+
+            if(Object.keys(parameter_list).length > 0) return badgeURL + "?" + new URLSearchParams(parameter_list);
+
+            return badgeURL;
+        },
+    },
+
+    mounted() {
+        this.BadgeGeneratorModal = new Modal(this.$refs.BadgeGeneratorModal);
+    },
+
+    methods: {
+        /**
+         * Setting monitor
+         * @param {number} monitorId    ID of monitor
+         * @param {string} monitorName  Name of monitor
+         */
+        show(monitorId, monitorName) {
+            this.monitor = {
+                id: monitorId,
+                name: monitorName,
+            };
+
+            this.BadgeGeneratorModal.show();
+        },
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../assets/vars.scss";
+
+.dark {
+    .modal-dialog .form-text, .modal-dialog p {
+        color: $dark-font-color;
+    }
+}
+</style>
diff --git a/src/components/PublicGroupList.vue b/src/components/PublicGroupList.vue
index 1b4d004b9..3345a991c 100644
--- a/src/components/PublicGroupList.vue
+++ b/src/components/PublicGroupList.vue
@@ -57,10 +57,19 @@
                                                     v-if="editMode"
                                                     :class="{'link-active': monitor.element.sendUrl, 'btn-link': true}"
                                                     icon="link" class="action me-3"
-
                                                     @click="toggleLink(group.index, monitor.index)"
                                                 />
                                             </span>
+
+                                            <span
+                                                title="Badge Generator"
+                                            >
+                                                <font-awesome-icon
+                                                    :class="{'link-active': true, 'btn-link': true}"
+                                                    icon="eye" class="action me-3"
+                                                    @click="$refs.badgeGeneratorDialog.show(monitor.element.id, monitor.element.name)"
+                                                />
+                                            </span>
                                         </div>
                                         <div v-if="showTags" class="tags">
                                             <Tag v-for="tag in monitor.element.tags" :key="tag" :item="tag" :size="'sm'" />
@@ -70,6 +79,7 @@
                                         <HeartbeatBar size="small" :monitor-id="monitor.element.id" />
                                     </div>
                                 </div>
+                                <BadgeGeneratorDialog ref="badgeGeneratorDialog" />
                             </div>
                         </template>
                     </Draggable>
@@ -80,6 +90,7 @@
 </template>
 
 <script>
+import BadgeGeneratorDialog from "./BadgeGeneratorDialog.vue";
 import Draggable from "vuedraggable";
 import HeartbeatBar from "./HeartbeatBar.vue";
 import Uptime from "./Uptime.vue";
@@ -87,6 +98,7 @@ import Tag from "./Tag.vue";
 
 export default {
     components: {
+        BadgeGeneratorDialog,
         Draggable,
         HeartbeatBar,
         Uptime,

From 16f2701f61f38dfb5c19a4023b2be772c40c1719 Mon Sep 17 00:00:00 2001
From: Yoswaris Lawpaiboon <22832362+kiznick@users.noreply.github.com>
Date: Fri, 10 Mar 2023 20:24:10 +0700
Subject: [PATCH 06/26] idk how to fix camelcase lint :cry:

---
 src/components/BadgeGeneratorDialog.vue | 29 +++++++++++++++----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/components/BadgeGeneratorDialog.vue b/src/components/BadgeGeneratorDialog.vue
index 1be45100d..b8d912fba 100644
--- a/src/components/BadgeGeneratorDialog.vue
+++ b/src/components/BadgeGeneratorDialog.vue
@@ -156,7 +156,6 @@ export default {
                 suffix: null,
                 labelColor: null,
 
-
                 style: "plastic",
                 value: null,
             },
@@ -223,28 +222,36 @@ export default {
 
     computed: {
         badgeURL() {
-            if(!this.monitor.id || !this.badge.type) return null;
+            if (!this.monitor.id || !this.badge.type) {
+                return null;
+            }
             let badgeURL = this.$root.baseURL + "/api/badge/" + this.monitor.id + "/" + this.badge.type;
 
+            // eslint-disable-next-line camelcase
             let parameter_list = {};
-            for(let parameter of this.parameters[this.badge.type] || []) {
-                if(parameter == "duration" && this.badge.duration) {
+
+            for (let parameter of this.parameters[this.badge.type] || []) {
+                if (parameter === "duration" && this.badge.duration) {
                     badgeURL += "/" + this.badge.duration;
                     continue;
                 }
-                
-                if(this.badge[parameter]) {
-                    parameter_list[parameter] = this.badge[parameter]
+
+                if (this.badge[parameter]) {
+                    // eslint-disable-next-line camelcase
+                    parameter_list[parameter] = this.badge[parameter];
                 }
             }
 
-            for(let parameter of ["label", "style", "value"]) {
-                if(this.badge[parameter]) {
-                    parameter_list[parameter] = this.badge[parameter]
+            for (let parameter of [ "label", "style", "value" ]) {
+                if (this.badge[parameter]) {
+                    // eslint-disable-next-line camelcase
+                    parameter_list[parameter] = this.badge[parameter];
                 }
             }
 
-            if(Object.keys(parameter_list).length > 0) return badgeURL + "?" + new URLSearchParams(parameter_list);
+            if (Object.keys(parameter_list).length > 0) {
+                return badgeURL + "?" + new URLSearchParams(parameter_list);
+            }
 
             return badgeURL;
         },

From 29b28092791c6d5fb004da65c43e11e713d69305 Mon Sep 17 00:00:00 2001
From: Yoswaris Lawpaiboon <22832362+kiznick@users.noreply.github.com>
Date: Fri, 10 Mar 2023 22:04:47 +0700
Subject: [PATCH 07/26] Change Icon, Add missing var

---
 badge-list.md                           | 123 -----------
 src/components/BadgeGeneratorDialog.vue | 264 +++++++++++++-----------
 src/components/PublicGroupList.vue      |   3 +-
 src/icon.js                             |   2 +
 4 files changed, 142 insertions(+), 250 deletions(-)
 delete mode 100644 badge-list.md

diff --git a/badge-list.md b/badge-list.md
deleted file mode 100644
index 958eb1006..000000000
--- a/badge-list.md
+++ /dev/null
@@ -1,123 +0,0 @@
-/api/badge/:id/status
-```
-    label,
-    upLabel = "Up",
-    downLabel = "Down",
-    pendingLabel = "Pending",
-    maintenanceLabel = "Maintenance",
-    upColor = badgeConstants.defaultUpColor,
-    downColor = badgeConstants.defaultDownColor,
-    pendingColor = badgeConstants.defaultPendingColor,
-    maintenanceColor = badgeConstants.defaultMaintenanceColor,
-    style = badgeConstants.defaultStyle,
-    value, // for demo purpose only
-```
-
-```
-/api/badge/:id/uptime/:duration?
-    label,
-    labelPrefix,
-    labelSuffix = badgeConstants.defaultUptimeLabelSuffix,
-    prefix,
-    suffix = badgeConstants.defaultUptimeValueSuffix,
-    color,
-    labelColor,
-    style = badgeConstants.defaultStyle,
-    value, // for demo purpose only
-```
-
-```
-/api/badge/:id/ping/:duration?
-    label,
-    labelPrefix,
-    labelSuffix = badgeConstants.defaultPingLabelSuffix,
-    prefix,
-    suffix = badgeConstants.defaultPingValueSuffix,
-    color = badgeConstants.defaultPingColor,
-    labelColor,
-    style = badgeConstants.defaultStyle,
-    value, // for demo purpose only
-```
-
-```
-/api/badge/:id/avg-response/:duration?
-    label,
-    labelPrefix,
-    labelSuffix,
-    prefix,
-    suffix = badgeConstants.defaultPingValueSuffix,
-    color = badgeConstants.defaultPingColor,
-    labelColor,
-    style = badgeConstants.defaultStyle,
-    value, // for demo purpose only
-```
-
-```
-/api/badge/:id/cert-exp
-    label,
-    labelPrefix,
-    labelSuffix,
-    prefix,
-    suffix = date ? "" : badgeConstants.defaultCertExpValueSuffix,
-    upColor = badgeConstants.defaultUpColor,
-    warnColor = badgeConstants.defaultWarnColor,
-    downColor = badgeConstants.defaultDownColor,
-    warnDays = badgeConstants.defaultCertExpireWarnDays,
-    downDays = badgeConstants.defaultCertExpireDownDays,
-    labelColor,
-    style = badgeConstants.defaultStyle,
-    value, // for demo purpose only
-```
-
-```
-/api/badge/:id/response
-    label,
-    labelPrefix,
-    labelSuffix,
-    prefix,
-    suffix = badgeConstants.defaultPingValueSuffix,
-    color = badgeConstants.defaultPingColor,
-    labelColor,
-    style = badgeConstants.defaultStyle,
-    value, // for demo purpose only
-```
-
-```
-Use in all routes
-    label
-    prefix
-    suffix,
-    labelColor
-    style = badgeConstants.defaultStyle,
-    value // for demo purpose only
-```
-
-```
-Use in all routes except status and cert-exp
-    color
-```
-
-```
-Use in all routes except status
-    labelPrefix
-    labelSuffix
-```
-
-```
-Use in routes status and cert-exp
-    upColor = badgeConstants.defaultUpColor,
-    downColor = badgeConstants.defaultDownColor,
-```
-
-```
-Use in status route only
-    pendingColor = badgeConstants.defaultPendingColor,
-    maintenanceColor = badgeConstants.defaultMaintenanceColor,
-```
-
-```
-Use in cert-exp route only
-    warnColor = badgeConstants.defaultWarnColor,
-    warnDays = badgeConstants.defaultCertExpireWarnDays,
-    downDays = badgeConstants.defaultCertExpireDownDays,
-```
\ No newline at end of file
diff --git a/src/components/BadgeGeneratorDialog.vue b/src/components/BadgeGeneratorDialog.vue
index b8d912fba..1ebcd525f 100644
--- a/src/components/BadgeGeneratorDialog.vue
+++ b/src/components/BadgeGeneratorDialog.vue
@@ -1,133 +1,131 @@
 <template>
-    <form @submit.prevent="submit">
-        <div ref="BadgeGeneratorModal" class="modal fade" tabindex="-1" data-bs-backdrop="static">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 id="exampleModalLabel" class="modal-title">
-                            {{ $t("Badge Generator", [monitor.name]) }}
-                        </h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
-                    </div>
-                    <div class="modal-body">
-                        <div class="mb-3">
-                            <label for="type" class="form-label">{{ $t("Badge Type") }}</label>
-                            <select id="type" v-model="badge.type" class="form-select">
-                                <option value="status">status</option>
-                                <option value="uptime">uptime</option>
-                                <option value="ping">ping</option>
-                                <option value="avg-response">avg-response</option>
-                                <option value="cert-exp">cert-exp</option>
-                                <option value="response">response</option>
-                            </select>
-                        </div>
-
-                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('duration') " class="mb-3">
-                            <label for="duration" class="form-label">{{ $t("Badge Duration") }}</label>
-                            <input id="duration" v-model="badge.duration" type="number" min="0" class="form-control" required>
-                        </div>
-
-                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('label') " class="mb-3">
-                            <label for="label" class="form-label">{{ $t("Badge Label") }}</label>
-                            <input id="label" v-model="badge.label" type="text" class="form-control" required>
-                        </div>
-
-                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('prefix') " class="mb-3">
-                            <label for="prefix" class="form-label">{{ $t("Badge Prefix") }}</label>
-                            <input id="prefix" v-model="badge.label" type="text" class="form-control" required>
-                        </div>
-
-                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('suffix') " class="mb-3">
-                            <label for="suffix" class="form-label">{{ $t("Badge Suffix") }}</label>
-                            <input id="suffix" v-model="badge.label" type="text" class="form-control" required>
-                        </div>
-
-                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('labelColor') " class="mb-3">
-                            <label for="labelColor" class="form-label">{{ $t("Badge Label Color") }}</label>
-                            <input id="labelColor" v-model="badge.labelColor" type="text" class="form-control" required>
-                        </div>
-
-                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('color') " class="mb-3">
-                            <label for="color" class="form-label">{{ $t("Badge Color") }}</label>
-                            <input id="color" v-model="badge.labelColor" type="text" class="form-control" required>
-                        </div>
-
-                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('labelPrefix') " class="mb-3">
-                            <label for="labelPrefix" class="form-label">{{ $t("Badge Label Prefix") }}</label>
-                            <input id="labelPrefix" v-model="badge.labelPrefix" type="text" class="form-control" required>
-                        </div>
-
-                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('labelSuffix') " class="mb-3">
-                            <label for="labelSuffix" class="form-label">{{ $t("Badge Label Suffix") }}</label>
-                            <input id="labelSuffix" v-model="badge.labelSuffix" type="text" class="form-control" required>
-                        </div>
-
-                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('upColor') " class="mb-3">
-                            <label for="upColor" class="form-label">{{ $t("Badge Up Color") }}</label>
-                            <input id="upColor" v-model="badge.upColor" type="text" class="form-control" required>
-                        </div>
-
-                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('downColor') " class="mb-3">
-                            <label for="downColor" class="form-label">{{ $t("Badge Down Color") }}</label>
-                            <input id="downColor" v-model="badge.downColor" type="text" class="form-control" required>
-                        </div>
-
-                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('pendingColor') " class="mb-3">
-                            <label for="pendingColor" class="form-label">{{ $t("Badge Pending Color") }}</label>
-                            <input id="pendingColor" v-model="badge.pendingColor" type="text" class="form-control" required>
-                        </div>
-
-                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('maintenanceColor') " class="mb-3">
-                            <label for="maintenanceColor" class="form-label">{{ $t("Badge Maintenance Color") }}</label>
-                            <input id="maintenanceColor" v-model="badge.maintenanceColor" type="text" class="form-control" required>
-                        </div>
-
-                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('warnColor') " class="mb-3">
-                            <label for="warnColor" class="form-label">{{ $t("Badge Warn Color") }}</label>
-                            <input id="warnColor" v-model="badge.warnColor" type="number" min="0" class="form-control" required>
-                        </div>
-
-                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('warnDays') " class="mb-3">
-                            <label for="warnDays" class="form-label">{{ $t("Badge Warn Days") }}</label>
-                            <input id="warnDays" v-model="badge.warnDays" type="number" min="0" class="form-control" required>
-                        </div>
-
-                        <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('downDays') " class="mb-3">
-                            <label for="downDays" class="form-label">{{ $t("Badge Down Days") }}</label>
-                            <input id="downDays" v-model="badge.labelColor" type="number" min="0" class="form-control" required>
-                        </div>
-
-                        <div class="mb-3">
-                            <label for="style" class="form-label">{{ $t("Badge Style") }}</label>
-                            <select id="style" v-model="badge.style" class="form-select">
-                                <option value="plastic">plastic</option>
-                                <option value="flat">flat</option>
-                                <option value="flat-square">flat-square</option>
-                                <option value="for-the-badge">for-the-badge</option>
-                                <option value="social">social</option>
-                            </select>
-                        </div>
-
-                        <div class="mb-3">
-                            <label for="value" class="form-label">{{ $t("Badge value (For Testing only.)") }}</label>
-                            <input id="value" v-model="badge.value" type="text" class="form-control" required>
-                        </div>
-
-                        <div class="my-3">
-                            <label for="push-url" class="form-label">{{ $t("Badge URL") }}</label>
-                            <CopyableInput id="push-url" v-model="badgeURL" type="url" disabled="disabled" />
-                        </div>
+    <div ref="BadgeGeneratorModal" class="modal fade" tabindex="-1" data-bs-backdrop="static">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 id="exampleModalLabel" class="modal-title">
+                        {{ $t("Badge Generator", [monitor.name]) }}
+                    </h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
+                </div>
+                <div class="modal-body">
+                    <div class="mb-3">
+                        <label for="type" class="form-label">{{ $t("Badge Type") }}</label>
+                        <select id="type" v-model="badge.type" class="form-select">
+                            <option value="status">status</option>
+                            <option value="uptime">uptime</option>
+                            <option value="ping">ping</option>
+                            <option value="avg-response">avg-response</option>
+                            <option value="cert-exp">cert-exp</option>
+                            <option value="response">response</option>
+                        </select>
                     </div>
 
-                    <div class="modal-footer">
-                        <button type="submit" class="btn btn-danger" data-bs-dismiss="modal">
-                            {{ $t("Close") }}
-                        </button>
+                    <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('duration') " class="mb-3">
+                        <label for="duration" class="form-label">{{ $t("Badge Duration") }}</label>
+                        <input id="duration" v-model="badge.duration" type="number" min="0" class="form-control" required>
                     </div>
+
+                    <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('label') " class="mb-3">
+                        <label for="label" class="form-label">{{ $t("Badge Label") }}</label>
+                        <input id="label" v-model="badge.label" type="text" class="form-control" required>
+                    </div>
+
+                    <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('prefix') " class="mb-3">
+                        <label for="prefix" class="form-label">{{ $t("Badge Prefix") }}</label>
+                        <input id="prefix" v-model="badge.prefix" type="text" class="form-control" required>
+                    </div>
+
+                    <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('suffix') " class="mb-3">
+                        <label for="suffix" class="form-label">{{ $t("Badge Suffix") }}</label>
+                        <input id="suffix" v-model="badge.suffix" type="text" class="form-control" required>
+                    </div>
+
+                    <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('labelColor') " class="mb-3">
+                        <label for="labelColor" class="form-label">{{ $t("Badge Label Color") }}</label>
+                        <input id="labelColor" v-model="badge.labelColor" type="text" class="form-control" required>
+                    </div>
+
+                    <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('color') " class="mb-3">
+                        <label for="color" class="form-label">{{ $t("Badge Color") }}</label>
+                        <input id="color" v-model="badge.color" type="text" class="form-control" required>
+                    </div>
+
+                    <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('labelPrefix') " class="mb-3">
+                        <label for="labelPrefix" class="form-label">{{ $t("Badge Label Prefix") }}</label>
+                        <input id="labelPrefix" v-model="badge.labelPrefix" type="text" class="form-control" required>
+                    </div>
+
+                    <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('labelSuffix') " class="mb-3">
+                        <label for="labelSuffix" class="form-label">{{ $t("Badge Label Suffix") }}</label>
+                        <input id="labelSuffix" v-model="badge.labelSuffix" type="text" class="form-control" required>
+                    </div>
+
+                    <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('upColor') " class="mb-3">
+                        <label for="upColor" class="form-label">{{ $t("Badge Up Color") }}</label>
+                        <input id="upColor" v-model="badge.upColor" type="text" class="form-control" required>
+                    </div>
+
+                    <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('downColor') " class="mb-3">
+                        <label for="downColor" class="form-label">{{ $t("Badge Down Color") }}</label>
+                        <input id="downColor" v-model="badge.downColor" type="text" class="form-control" required>
+                    </div>
+
+                    <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('pendingColor') " class="mb-3">
+                        <label for="pendingColor" class="form-label">{{ $t("Badge Pending Color") }}</label>
+                        <input id="pendingColor" v-model="badge.pendingColor" type="text" class="form-control" required>
+                    </div>
+
+                    <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('maintenanceColor') " class="mb-3">
+                        <label for="maintenanceColor" class="form-label">{{ $t("Badge Maintenance Color") }}</label>
+                        <input id="maintenanceColor" v-model="badge.maintenanceColor" type="text" class="form-control" required>
+                    </div>
+
+                    <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('warnColor') " class="mb-3">
+                        <label for="warnColor" class="form-label">{{ $t("Badge Warn Color") }}</label>
+                        <input id="warnColor" v-model="badge.warnColor" type="number" min="0" class="form-control" required>
+                    </div>
+
+                    <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('warnDays') " class="mb-3">
+                        <label for="warnDays" class="form-label">{{ $t("Badge Warn Days") }}</label>
+                        <input id="warnDays" v-model="badge.warnDays" type="number" min="0" class="form-control" required>
+                    </div>
+
+                    <div v-if=" (parameters[badge.type || 'null'] || [] ).includes('downDays') " class="mb-3">
+                        <label for="downDays" class="form-label">{{ $t("Badge Down Days") }}</label>
+                        <input id="downDays" v-model="badge.downDays" type="number" min="0" class="form-control" required>
+                    </div>
+
+                    <div class="mb-3">
+                        <label for="style" class="form-label">{{ $t("Badge Style") }}</label>
+                        <select id="style" v-model="badge.style" class="form-select">
+                            <option value="plastic">plastic</option>
+                            <option value="flat">flat</option>
+                            <option value="flat-square">flat-square</option>
+                            <option value="for-the-badge">for-the-badge</option>
+                            <option value="social">social</option>
+                        </select>
+                    </div>
+
+                    <div class="mb-3">
+                        <label for="value" class="form-label">{{ $t("Badge value (For Testing only.)") }}</label>
+                        <input id="value" v-model="badge.value" type="text" class="form-control" required>
+                    </div>
+
+                    <div class="my-3">
+                        <label for="push-url" class="form-label">{{ $t("Badge URL") }}</label>
+                        <CopyableInput id="push-url" v-model="badgeURL" type="url" disabled="disabled" />
+                    </div>
+                </div>
+
+                <div class="modal-footer">
+                    <button type="submit" class="btn btn-danger" data-bs-dismiss="modal">
+                        {{ $t("Close") }}
+                    </button>
                 </div>
             </div>
         </div>
-    </form>
+    </div>
 </template>
 
 <script lang="ts">
@@ -155,8 +153,17 @@ export default {
                 prefix: null,
                 suffix: null,
                 labelColor: null,
-
-                style: "plastic",
+                color: null,
+                labelPrefix: null,
+                labelSuffix: null,
+                upColor: null,
+                downColor: null,
+                pendingColor: null,
+                maintenanceColor: null,
+                warnColor: null,
+                warnDays: null,
+                downDays: null,
+                style: "flat",
                 value: null,
             },
             parameters: {
@@ -205,6 +212,7 @@ export default {
                     "upColor",
                     "warnColor",
                     "downColor",
+                    "warnDays",
                     "downDays",
                     "labelColor",
                 ],
@@ -223,7 +231,7 @@ export default {
     computed: {
         badgeURL() {
             if (!this.monitor.id || !this.badge.type) {
-                return null;
+                return;
             }
             let badgeURL = this.$root.baseURL + "/api/badge/" + this.monitor.id + "/" + this.badge.type;
 
@@ -243,6 +251,10 @@ export default {
             }
 
             for (let parameter of [ "label", "style", "value" ]) {
+                if (parameter === "style" && this.badge.style === "flat") {
+                    continue;
+                }
+
                 if (this.badge[parameter]) {
                     // eslint-disable-next-line camelcase
                     parameter_list[parameter] = this.badge[parameter];
diff --git a/src/components/PublicGroupList.vue b/src/components/PublicGroupList.vue
index 3345a991c..59658d6d8 100644
--- a/src/components/PublicGroupList.vue
+++ b/src/components/PublicGroupList.vue
@@ -65,8 +65,9 @@
                                                 title="Badge Generator"
                                             >
                                                 <font-awesome-icon
+                                                    v-if="editMode"
                                                     :class="{'link-active': true, 'btn-link': true}"
-                                                    icon="eye" class="action me-3"
+                                                    icon="certificate" class="action me-3"
                                                     @click="$refs.badgeGeneratorDialog.show(monitor.element.id, monitor.element.name)"
                                                 />
                                             </span>
diff --git a/src/icon.js b/src/icon.js
index a69b2a88b..7bdfe1ca0 100644
--- a/src/icon.js
+++ b/src/icon.js
@@ -49,6 +49,7 @@ import {
     faFilter,
     faInfoCircle,
     faClone,
+    faCertificate,
 } from "@fortawesome/free-solid-svg-icons";
 
 library.add(
@@ -95,6 +96,7 @@ library.add(
     faFilter,
     faInfoCircle,
     faClone,
+    faCertificate,
 );
 
 export { FontAwesomeIcon };

From 8f259e17562d89c95dc0136e887f2bea79f3b2d7 Mon Sep 17 00:00:00 2001
From: Lukas Bableck <lukas.bableck@bit-host.io>
Date: Fri, 10 Mar 2023 17:42:06 +0100
Subject: [PATCH 08/26] Add padding to bottom-nav

---
 src/layouts/Layout.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/layouts/Layout.vue b/src/layouts/Layout.vue
index 9069aef70..49c3dfe51 100644
--- a/src/layouts/Layout.vue
+++ b/src/layouts/Layout.vue
@@ -95,7 +95,7 @@
         </main>
 
         <!-- Mobile Only -->
-        <div v-if="$root.isMobile" style="width: 100%; height: 60px;" />
+        <div v-if="$root.isMobile" style="width: 100%; height: calc(60px + env(safe-area-inset-bottom));" />
         <nav v-if="$root.isMobile && $root.loggedIn" class="bottom-nav">
             <router-link to="/dashboard" class="nav-link">
                 <div><font-awesome-icon icon="tachometer-alt" /></div>
@@ -182,14 +182,14 @@ export default {
     z-index: 1000;
     position: fixed;
     bottom: 0;
-    height: 60px;
+    height: calc(60px + env(safe-area-inset-bottom));
     width: 100%;
     left: 0;
     background-color: #fff;
     box-shadow: 0 15px 47px 0 rgba(0, 0, 0, 0.05), 0 5px 14px 0 rgba(0, 0, 0, 0.05);
     text-align: center;
     white-space: nowrap;
-    padding: 0 10px;
+    padding: 0 10px env(safe-area-inset-bottom);
 
     a {
         text-align: center;

From cf59832d51efa911df2f7683a0cbad70e0d0d1e4 Mon Sep 17 00:00:00 2001
From: Lukas Bableck <lukas.bableck@bit-host.io>
Date: Fri, 10 Mar 2023 17:42:30 +0100
Subject: [PATCH 09/26] Set viewport-fit=cover in meta viewport tag

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 6a5525fb4..01f68410c 100644
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
     <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
     <link rel="icon" type="image/svg+xml" href="/icon.svg" />
     <link rel="manifest" href="/manifest.json" />

From 3579520575150937d4ff8a9778024b71968f93e0 Mon Sep 17 00:00:00 2001
From: Yoswaris Lawpaiboon <22832362+kiznick@users.noreply.github.com>
Date: Wed, 12 Apr 2023 20:09:04 +0700
Subject: [PATCH 10/26] Fix Eslint

Co-authored-by: Nelson Chan <3271800+chakflying@users.noreply.github.com>
---
 src/components/BadgeGeneratorDialog.vue | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/components/BadgeGeneratorDialog.vue b/src/components/BadgeGeneratorDialog.vue
index 1ebcd525f..58a03e2b2 100644
--- a/src/components/BadgeGeneratorDialog.vue
+++ b/src/components/BadgeGeneratorDialog.vue
@@ -235,8 +235,7 @@ export default {
             }
             let badgeURL = this.$root.baseURL + "/api/badge/" + this.monitor.id + "/" + this.badge.type;
 
-            // eslint-disable-next-line camelcase
-            let parameter_list = {};
+            let parameterList = {};
 
             for (let parameter of this.parameters[this.badge.type] || []) {
                 if (parameter === "duration" && this.badge.duration) {
@@ -245,8 +244,7 @@ export default {
                 }
 
                 if (this.badge[parameter]) {
-                    // eslint-disable-next-line camelcase
-                    parameter_list[parameter] = this.badge[parameter];
+                    parameterList[parameter] = this.badge[parameter];
                 }
             }
 
@@ -256,13 +254,12 @@ export default {
                 }
 
                 if (this.badge[parameter]) {
-                    // eslint-disable-next-line camelcase
-                    parameter_list[parameter] = this.badge[parameter];
+                    parameterList[parameter] = this.badge[parameter];
                 }
             }
 
-            if (Object.keys(parameter_list).length > 0) {
-                return badgeURL + "?" + new URLSearchParams(parameter_list);
+            if (Object.keys(parameterList).length > 0) {
+                return badgeURL + "?" + new URLSearchParams(parameterList);
             }
 
             return badgeURL;

From 4057ca6e724b52ee7f189111d1994671ba8ee70f Mon Sep 17 00:00:00 2001
From: Nelson Chan <chakflying@hotmail.com>
Date: Tue, 11 Apr 2023 21:16:45 +0800
Subject: [PATCH 11/26] UI: Improve monitor page on mobile

---
 src/pages/Details.vue | 62 ++++++++++++++++++++++++++++---------------
 1 file changed, 40 insertions(+), 22 deletions(-)

diff --git a/src/pages/Details.vue b/src/pages/Details.vue
index dd7df977c..9e5628465 100644
--- a/src/pages/Details.vue
+++ b/src/pages/Details.vue
@@ -54,35 +54,41 @@
 
             <div class="shadow-box big-padding text-center stats">
                 <div class="row">
-                    <div class="col">
-                        <h4>{{ pingTitle() }}</h4>
-                        <p>({{ $t("Current") }})</p>
-                        <span class="num">
+                    <div class="col-12 col-sm col row d-flex align-items-center d-sm-block">
+                        <h4 class="col-4 col-sm-12">{{ pingTitle() }}</h4>
+                        <p class="col-4 col-sm-12 mb-0 mb-sm-2">({{ $t("Current") }})</p>
+                        <span class="col-4 col-sm-12 num">
                             <a href="#" @click.prevent="showPingChartBox = !showPingChartBox">
                                 <CountUp :value="ping" />
                             </a>
                         </span>
                     </div>
-                    <div class="col">
-                        <h4>{{ pingTitle(true) }}</h4>
-                        <p>(24{{ $t("-hour") }})</p>
-                        <span class="num"><CountUp :value="avgPing" /></span>
+                    <div class="col-12 col-sm col row d-flex align-items-center d-sm-block">
+                        <h4 class="col-4 col-sm-12">{{ pingTitle(true) }}</h4>
+                        <p class="col-4 col-sm-12 mb-0 mb-sm-2">(24{{ $t("-hour") }})</p>
+                        <span class="col-4 col-sm-12 num">
+                            <CountUp :value="avgPing" />
+                        </span>
                     </div>
-                    <div class="col">
-                        <h4>{{ $t("Uptime") }}</h4>
-                        <p>(24{{ $t("-hour") }})</p>
-                        <span class="num"><Uptime :monitor="monitor" type="24" /></span>
+                    <div class="col-12 col-sm col row d-flex align-items-center d-sm-block">
+                        <h4 class="col-4 col-sm-12">{{ $t("Uptime") }}</h4>
+                        <p class="col-4 col-sm-12 mb-0 mb-sm-2">(24{{ $t("-hour") }})</p>
+                        <span class="col-4 col-sm-12 num">
+                            <Uptime :monitor="monitor" type="24" />
+                        </span>
                     </div>
-                    <div class="col">
-                        <h4>{{ $t("Uptime") }}</h4>
-                        <p>(30{{ $t("-day") }})</p>
-                        <span class="num"><Uptime :monitor="monitor" type="720" /></span>
+                    <div class="col-12 col-sm col row d-flex align-items-center d-sm-block">
+                        <h4 class="col-4 col-sm-12">{{ $t("Uptime") }}</h4>
+                        <p class="col-4 col-sm-12 mb-0 mb-sm-2">(30{{ $t("-day") }})</p>
+                        <span class="col-4 col-sm-12 num">
+                            <Uptime :monitor="monitor" type="720" />
+                        </span>
                     </div>
 
-                    <div v-if="tlsInfo" class="col">
-                        <h4>{{ $t("Cert Exp.") }}</h4>
-                        <p>(<Datetime :value="tlsInfo.certInfo.validTo" date-only />)</p>
-                        <span class="num">
+                    <div v-if="tlsInfo" class="col-12 col-sm col row d-flex align-items-center d-sm-block">
+                        <h4 class="col-4 col-sm-12">{{ $t("Cert Exp.") }}</h4>
+                        <p class="col-4 col-sm-12 mb-0 mb-sm-2">(<Datetime :value="tlsInfo.certInfo.validTo" date-only />)</p>
+                        <span class="col-4 col-sm-12 num">
                             <a href="#" @click.prevent="toggleCertInfoBox = !toggleCertInfoBox">{{ tlsInfo.certInfo.daysRemaining }} {{ $tc("day", tlsInfo.certInfo.daysRemaining) }}</a>
                         </span>
                     </div>
@@ -136,7 +142,7 @@
                         </tr>
                     </thead>
                     <tbody>
-                        <tr v-for="(beat, index) in displayedRecords" :key="index" :class="{ 'shadow-box': $root.windowWidth <= 550}" style="padding: 10px;">
+                        <tr v-for="(beat, index) in displayedRecords" :key="index" style="padding: 10px;">
                             <td><Status :status="beat.status" /></td>
                             <td :class="{ 'border-0':! beat.msg}"><Datetime :value="beat.time" /></td>
                             <td class="border-0">{{ beat.msg }}</td>
@@ -376,7 +382,7 @@ export default {
                 translationPrefix = "Avg. ";
             }
 
-            if (this.monitor.type === "http") {
+            if (this.monitor.type === "http" || this.monitor.type === "keyword") {
                 return this.$t(translationPrefix + "Response");
             }
 
@@ -415,6 +421,7 @@ export default {
         flex-direction: column;
         align-items: center;
         padding-top: 10px;
+        font-size: 0.9em;
     }
 
     a.btn {
@@ -471,6 +478,17 @@ table {
     }
 }
 
+@media (max-width: 550px) {
+    .stats {
+        .col {
+            margin: 10px 0 !important;
+        }
+        h4 {
+            font-size: 1.1rem;
+        }
+    }
+}
+
 .keyword {
     color: black;
 }

From 9f51115a194c08be2a759ad8283efca8e516f5f9 Mon Sep 17 00:00:00 2001
From: Nelson Chan <chakflying@hotmail.com>
Date: Tue, 11 Apr 2023 21:27:03 +0800
Subject: [PATCH 12/26] Chore: Fix lint

---
 src/pages/Details.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Details.vue b/src/pages/Details.vue
index 9e5628465..100f91bfb 100644
--- a/src/pages/Details.vue
+++ b/src/pages/Details.vue
@@ -483,6 +483,7 @@ table {
         .col {
             margin: 10px 0 !important;
         }
+
         h4 {
             font-size: 1.1rem;
         }

From 966066b897235579dfbac2d7ce639ea236aa63cc Mon Sep 17 00:00:00 2001
From: Yoswaris Lawpaiboon <22832362+kiznick@users.noreply.github.com>
Date: Mon, 15 May 2023 13:56:59 +0700
Subject: [PATCH 13/26] Update src/components/BadgeGeneratorDialog.vue

Co-authored-by: Frank Elsinga <frank@elsinga.de>
---
 src/components/BadgeGeneratorDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/BadgeGeneratorDialog.vue b/src/components/BadgeGeneratorDialog.vue
index 58a03e2b2..9e073e39a 100644
--- a/src/components/BadgeGeneratorDialog.vue
+++ b/src/components/BadgeGeneratorDialog.vue
@@ -3,7 +3,7 @@
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 id="exampleModalLabel" class="modal-title">
+                    <h5 class="modal-title">
                         {{ $t("Badge Generator", [monitor.name]) }}
                     </h5>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />

From 446b5fa9e45237924199363059e6ce20792835d5 Mon Sep 17 00:00:00 2001
From: Nelson Chan <chakflying@hotmail.com>
Date: Sat, 1 Apr 2023 23:54:27 +0800
Subject: [PATCH 14/26] UI: Support more monitor types in URL field

---
 src/pages/Details.vue | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/pages/Details.vue b/src/pages/Details.vue
index dd7df977c..cf65ea17f 100644
--- a/src/pages/Details.vue
+++ b/src/pages/Details.vue
@@ -18,6 +18,21 @@
                     <br>
                     <span>{{ $t("Last Result") }}:</span> <span class="keyword">{{ monitor.dns_last_result }}</span>
                 </span>
+                <span v-if="monitor.type === 'docker'">Docker container: {{ monitor.docker_container }}</span>
+                <span v-if="monitor.type === 'gamedig'">Gamedig - {{ monitor.game }}: {{ monitor.hostname }}:{{ monitor.port }}</span>
+                <span v-if="monitor.type === 'grpc-keyword'">gRPC - {{ monitor.grpcUrl }}
+                    <br>
+                    <span>{{ $t("Keyword") }}:</span> <span class="keyword">{{ monitor.keyword }}</span>
+                </span>
+                <span v-if="monitor.type === 'mongodb'">{{ monitor.databaseConnectionString }}</span>
+                <span v-if="monitor.type === 'mqtt'">MQTT: {{ monitor.hostname }}:{{ monitor.port }}/{{ monitor.mqttTopic }}</span>
+                <span v-if="monitor.type === 'mysql'">{{ monitor.databaseConnectionString }}</span>
+                <span v-if="monitor.type === 'postgres'">{{ monitor.databaseConnectionString }}</span>
+                <span v-if="monitor.type === 'push'">Push: <a :href="pushURL" target="_blank" rel="noopener noreferrer">{{ pushURL }}</a></span>
+                <span v-if="monitor.type === 'radius'">Radius: {{ monitor.hostname }}</span>
+                <span v-if="monitor.type === 'redis'">{{ monitor.databaseConnectionString }}</span>
+                <span v-if="monitor.type === 'sqlserver'">SQL Server: {{ monitor.databaseConnectionString }}</span>
+                <span v-if="monitor.type === 'steam'">Steam Game Server: {{ monitor.hostname }}:{{ monitor.port }}</span>
             </p>
 
             <div class="functions">
@@ -290,6 +305,10 @@ export default {
             const endIndex = startIndex + this.perPage;
             return this.heartBeatList.slice(startIndex, endIndex);
         },
+
+        pushURL() {
+            return this.$root.baseURL + "/api/push/" + this.monitor.pushToken + "?status=up&msg=OK&ping=";
+        },
     },
     mounted() {
 

From 83a59bd984d5eabadaa90b884b7b48a0a00a5352 Mon Sep 17 00:00:00 2001
From: Nelson Chan <chakflying@hotmail.com>
Date: Wed, 19 Apr 2023 03:20:35 +0800
Subject: [PATCH 15/26] Fix: Add password filtering

---
 package-lock.json     | 88 +++++++++++++++++++++++++++++++++++--------
 package.json          |  3 +-
 src/pages/Details.vue | 31 +++++++++++----
 3 files changed, 98 insertions(+), 24 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8614de0b5..71f8196fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -64,7 +64,8 @@
                 "socks-proxy-agent": "6.1.1",
                 "tar": "~6.1.11",
                 "tcp-ping": "~0.1.1",
-                "thirty-two": "~1.0.2"
+                "thirty-two": "~1.0.2",
+                "whatwg-url": "^12.0.1"
             },
             "devDependencies": {
                 "@actions/github": "~5.0.1",
@@ -7522,6 +7523,32 @@
                 "node": ">=10"
             }
         },
+        "node_modules/data-urls/node_modules/tr46": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+            "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+            "dev": true,
+            "dependencies": {
+                "punycode": "^2.1.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/data-urls/node_modules/whatwg-url": {
+            "version": "8.7.0",
+            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+            "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+            "dev": true,
+            "dependencies": {
+                "lodash": "^4.7.0",
+                "tr46": "^2.1.0",
+                "webidl-conversions": "^6.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
         "node_modules/date-fns": {
             "version": "2.30.0",
             "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
@@ -13040,6 +13067,18 @@
                 "node": ">=6"
             }
         },
+        "node_modules/jsdom/node_modules/tr46": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+            "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+            "dev": true,
+            "dependencies": {
+                "punycode": "^2.1.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/jsdom/node_modules/universalify": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
@@ -13049,6 +13088,20 @@
                 "node": ">= 4.0.0"
             }
         },
+        "node_modules/jsdom/node_modules/whatwg-url": {
+            "version": "8.7.0",
+            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+            "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+            "dev": true,
+            "dependencies": {
+                "lodash": "^4.7.0",
+                "tr46": "^2.1.0",
+                "webidl-conversions": "^6.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
         "node_modules/jsesc": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
@@ -17681,15 +17734,14 @@
             }
         },
         "node_modules/tr46": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
-            "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
-            "dev": true,
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
+            "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==",
             "dependencies": {
-                "punycode": "^2.1.1"
+                "punycode": "^2.3.0"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=14"
             }
         },
         "node_modules/tree-kill": {
@@ -18598,17 +18650,23 @@
             "dev": true
         },
         "node_modules/whatwg-url": {
-            "version": "8.7.0",
-            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
-            "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
-            "dev": true,
+            "version": "12.0.1",
+            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz",
+            "integrity": "sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==",
             "dependencies": {
-                "lodash": "^4.7.0",
-                "tr46": "^2.1.0",
-                "webidl-conversions": "^6.1.0"
+                "tr46": "^4.1.1",
+                "webidl-conversions": "^7.0.0"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=14"
+            }
+        },
+        "node_modules/whatwg-url/node_modules/webidl-conversions": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+            "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+            "engines": {
+                "node": ">=12"
             }
         },
         "node_modules/which": {
diff --git a/package.json b/package.json
index ed7778680..98bbfb8b9 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,8 @@
         "socks-proxy-agent": "6.1.1",
         "tar": "~6.1.11",
         "tcp-ping": "~0.1.1",
-        "thirty-two": "~1.0.2"
+        "thirty-two": "~1.0.2",
+        "whatwg-url": "^12.0.1"
     },
     "devDependencies": {
         "@actions/github": "~5.0.1",
diff --git a/src/pages/Details.vue b/src/pages/Details.vue
index cf65ea17f..f361e69eb 100644
--- a/src/pages/Details.vue
+++ b/src/pages/Details.vue
@@ -7,7 +7,7 @@
                 <Tag v-for="tag in monitor.tags" :key="tag.id" :item="tag" :size="'sm'" />
             </div>
             <p class="url">
-                <a v-if="monitor.type === 'http' || monitor.type === 'keyword' " :href="monitor.url" target="_blank" rel="noopener noreferrer">{{ monitor.url }}</a>
+                <a v-if="monitor.type === 'http' || monitor.type === 'keyword' " :href="monitor.url" target="_blank" rel="noopener noreferrer">{{ filterPassword(monitor.url) }}</a>
                 <span v-if="monitor.type === 'port'">TCP Port {{ monitor.hostname }}:{{ monitor.port }}</span>
                 <span v-if="monitor.type === 'ping'">Ping: {{ monitor.hostname }}</span>
                 <span v-if="monitor.type === 'keyword'">
@@ -20,18 +20,18 @@
                 </span>
                 <span v-if="monitor.type === 'docker'">Docker container: {{ monitor.docker_container }}</span>
                 <span v-if="monitor.type === 'gamedig'">Gamedig - {{ monitor.game }}: {{ monitor.hostname }}:{{ monitor.port }}</span>
-                <span v-if="monitor.type === 'grpc-keyword'">gRPC - {{ monitor.grpcUrl }}
+                <span v-if="monitor.type === 'grpc-keyword'">gRPC - {{ filterPassword(monitor.grpcUrl) }}
                     <br>
                     <span>{{ $t("Keyword") }}:</span> <span class="keyword">{{ monitor.keyword }}</span>
                 </span>
-                <span v-if="monitor.type === 'mongodb'">{{ monitor.databaseConnectionString }}</span>
+                <span v-if="monitor.type === 'mongodb'">{{ filterPassword(monitor.databaseConnectionString) }}</span>
                 <span v-if="monitor.type === 'mqtt'">MQTT: {{ monitor.hostname }}:{{ monitor.port }}/{{ monitor.mqttTopic }}</span>
-                <span v-if="monitor.type === 'mysql'">{{ monitor.databaseConnectionString }}</span>
-                <span v-if="monitor.type === 'postgres'">{{ monitor.databaseConnectionString }}</span>
+                <span v-if="monitor.type === 'mysql'">{{ filterPassword(monitor.databaseConnectionString) }}</span>
+                <span v-if="monitor.type === 'postgres'">{{ filterPassword(monitor.databaseConnectionString) }}</span>
                 <span v-if="monitor.type === 'push'">Push: <a :href="pushURL" target="_blank" rel="noopener noreferrer">{{ pushURL }}</a></span>
-                <span v-if="monitor.type === 'radius'">Radius: {{ monitor.hostname }}</span>
-                <span v-if="monitor.type === 'redis'">{{ monitor.databaseConnectionString }}</span>
-                <span v-if="monitor.type === 'sqlserver'">SQL Server: {{ monitor.databaseConnectionString }}</span>
+                <span v-if="monitor.type === 'radius'">Radius: {{ filterPassword(monitor.hostname) }}</span>
+                <span v-if="monitor.type === 'redis'">{{ filterPassword(monitor.databaseConnectionString) }}</span>
+                <span v-if="monitor.type === 'sqlserver'">SQL Server: {{ filterPassword(monitor.databaseConnectionString) }}</span>
                 <span v-if="monitor.type === 'steam'">Steam Game Server: {{ monitor.hostname }}:{{ monitor.port }}</span>
             </p>
 
@@ -208,6 +208,7 @@ import Pagination from "v-pagination-3";
 const PingChart = defineAsyncComponent(() => import("../components/PingChart.vue"));
 import Tag from "../components/Tag.vue";
 import CertificateInfo from "../components/CertificateInfo.vue";
+import { URL } from "whatwg-url";
 
 export default {
     components: {
@@ -401,6 +402,20 @@ export default {
 
             return this.$t(translationPrefix + "Ping");
         },
+
+        /** Filter and hide password in URL for display */
+        filterPassword(urlString) {
+            try {
+                let parsedUrl = new URL(urlString);
+                if (parsedUrl.password !== "") {
+                    parsedUrl.password = "******";
+                }
+                return parsedUrl.toString();
+            } catch (e) {
+                // Handle SQL Server
+                return urlString.replaceAll(/Password=(.+);/ig, "Password=******;");
+            }
+        }
     },
 };
 </script>

From 771ca093311da70e807462c8077fca963a14cedc Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Thu, 25 May 2023 13:41:35 +0800
Subject: [PATCH 16/26] npm update (mainly for socket.io)

---
 package-lock.json | 858 ++++++++++++++++++++++++----------------------
 package.json      |   6 +-
 2 files changed, 448 insertions(+), 416 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 71f8196fe..88246a5e0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -64,8 +64,7 @@
                 "socks-proxy-agent": "6.1.1",
                 "tar": "~6.1.11",
                 "tcp-ping": "~0.1.1",
-                "thirty-two": "~1.0.2",
-                "whatwg-url": "^12.0.1"
+                "thirty-two": "~1.0.2"
             },
             "devDependencies": {
                 "@actions/github": "~5.0.1",
@@ -127,7 +126,8 @@
                 "vue-router": "~4.0.14",
                 "vue-toastification": "~2.0.0-rc.5",
                 "vuedraggable": "~4.1.0",
-                "wait-on": "^6.0.1"
+                "wait-on": "^6.0.1",
+                "whatwg-url": "~12.0.1"
             },
             "engines": {
                 "node": "14.* || >=16.*"
@@ -254,12 +254,12 @@
             "optional": true
         },
         "node_modules/@aws-sdk/abort-controller": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.329.0.tgz",
-            "integrity": "sha512-hzrjPNQcJoSPe0oS20V5i98oiEZSM3mKNiR6P3xHTHTPI/F23lyjGZ+/CSkCmJbSWfGZ5sHZZcU6AWuS7xBdTw==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.338.0.tgz",
+            "integrity": "sha512-/yLI32+HwFNBRJ39jMXw+/cn3AnlCuJpQd7Ax4887g32Dgte5eyrfY8sJUOL6902BUmAq4oSRI5QeBXNplO0Xw==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -267,45 +267,46 @@
             }
         },
         "node_modules/@aws-sdk/client-cognito-identity": {
-            "version": "3.332.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.332.0.tgz",
-            "integrity": "sha512-o2G3+w0Qm+jd5fnmG6+FF5KRu90PIv2Kd0mmMJIFmACVd+VtuWqsk85capX21YLcxizKe+okqaaD8/9vV7nvfw==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.338.0.tgz",
+            "integrity": "sha512-1gu9gXJwrxGGGMlBzmM4d8mkNjD1M8tWo+vmT/Aq1EMBxGef3eN0k6SyeIruj2Jns3olC6pjTIU8zb3vVBkh5Q==",
             "optional": true,
             "dependencies": {
                 "@aws-crypto/sha256-browser": "3.0.0",
                 "@aws-crypto/sha256-js": "3.0.0",
-                "@aws-sdk/client-sts": "3.332.0",
-                "@aws-sdk/config-resolver": "3.329.0",
-                "@aws-sdk/credential-provider-node": "3.332.0",
-                "@aws-sdk/fetch-http-handler": "3.329.0",
-                "@aws-sdk/hash-node": "3.329.0",
-                "@aws-sdk/invalid-dependency": "3.329.0",
-                "@aws-sdk/middleware-content-length": "3.329.0",
-                "@aws-sdk/middleware-endpoint": "3.329.0",
-                "@aws-sdk/middleware-host-header": "3.329.0",
-                "@aws-sdk/middleware-logger": "3.329.0",
-                "@aws-sdk/middleware-recursion-detection": "3.329.0",
-                "@aws-sdk/middleware-retry": "3.329.0",
-                "@aws-sdk/middleware-serde": "3.329.0",
-                "@aws-sdk/middleware-signing": "3.329.0",
-                "@aws-sdk/middleware-stack": "3.329.0",
-                "@aws-sdk/middleware-user-agent": "3.332.0",
-                "@aws-sdk/node-config-provider": "3.329.0",
-                "@aws-sdk/node-http-handler": "3.329.0",
-                "@aws-sdk/protocol-http": "3.329.0",
-                "@aws-sdk/smithy-client": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
-                "@aws-sdk/url-parser": "3.329.0",
+                "@aws-sdk/client-sts": "3.338.0",
+                "@aws-sdk/config-resolver": "3.338.0",
+                "@aws-sdk/credential-provider-node": "3.338.0",
+                "@aws-sdk/fetch-http-handler": "3.338.0",
+                "@aws-sdk/hash-node": "3.338.0",
+                "@aws-sdk/invalid-dependency": "3.338.0",
+                "@aws-sdk/middleware-content-length": "3.338.0",
+                "@aws-sdk/middleware-endpoint": "3.338.0",
+                "@aws-sdk/middleware-host-header": "3.338.0",
+                "@aws-sdk/middleware-logger": "3.338.0",
+                "@aws-sdk/middleware-recursion-detection": "3.338.0",
+                "@aws-sdk/middleware-retry": "3.338.0",
+                "@aws-sdk/middleware-serde": "3.338.0",
+                "@aws-sdk/middleware-signing": "3.338.0",
+                "@aws-sdk/middleware-stack": "3.338.0",
+                "@aws-sdk/middleware-user-agent": "3.338.0",
+                "@aws-sdk/node-config-provider": "3.338.0",
+                "@aws-sdk/node-http-handler": "3.338.0",
+                "@aws-sdk/smithy-client": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
+                "@aws-sdk/url-parser": "3.338.0",
                 "@aws-sdk/util-base64": "3.310.0",
                 "@aws-sdk/util-body-length-browser": "3.310.0",
                 "@aws-sdk/util-body-length-node": "3.310.0",
-                "@aws-sdk/util-defaults-mode-browser": "3.329.0",
-                "@aws-sdk/util-defaults-mode-node": "3.329.0",
-                "@aws-sdk/util-endpoints": "3.332.0",
-                "@aws-sdk/util-retry": "3.329.0",
-                "@aws-sdk/util-user-agent-browser": "3.329.0",
-                "@aws-sdk/util-user-agent-node": "3.329.0",
+                "@aws-sdk/util-defaults-mode-browser": "3.338.0",
+                "@aws-sdk/util-defaults-mode-node": "3.338.0",
+                "@aws-sdk/util-endpoints": "3.338.0",
+                "@aws-sdk/util-retry": "3.338.0",
+                "@aws-sdk/util-user-agent-browser": "3.338.0",
+                "@aws-sdk/util-user-agent-node": "3.338.0",
                 "@aws-sdk/util-utf8": "3.310.0",
+                "@smithy/protocol-http": "^1.0.1",
+                "@smithy/types": "^1.0.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -313,42 +314,43 @@
             }
         },
         "node_modules/@aws-sdk/client-sso": {
-            "version": "3.332.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.332.0.tgz",
-            "integrity": "sha512-4q1Nko8M6YVANdEiLYvdv1qb00j4xN4ppE/6d4xpGp7DxHYlm0GA762h0/TR2dun+2I+SMnwj4Fv6BxOmzBaEw==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.338.0.tgz",
+            "integrity": "sha512-EglKsGlVph65PuFPKq1nGlxsY99XM2xHJaB1uX0bQEC94qrmS/M4a5kno5tiUnTWO1K+K4JBQiOxdGJs0GUS+w==",
             "optional": true,
             "dependencies": {
                 "@aws-crypto/sha256-browser": "3.0.0",
                 "@aws-crypto/sha256-js": "3.0.0",
-                "@aws-sdk/config-resolver": "3.329.0",
-                "@aws-sdk/fetch-http-handler": "3.329.0",
-                "@aws-sdk/hash-node": "3.329.0",
-                "@aws-sdk/invalid-dependency": "3.329.0",
-                "@aws-sdk/middleware-content-length": "3.329.0",
-                "@aws-sdk/middleware-endpoint": "3.329.0",
-                "@aws-sdk/middleware-host-header": "3.329.0",
-                "@aws-sdk/middleware-logger": "3.329.0",
-                "@aws-sdk/middleware-recursion-detection": "3.329.0",
-                "@aws-sdk/middleware-retry": "3.329.0",
-                "@aws-sdk/middleware-serde": "3.329.0",
-                "@aws-sdk/middleware-stack": "3.329.0",
-                "@aws-sdk/middleware-user-agent": "3.332.0",
-                "@aws-sdk/node-config-provider": "3.329.0",
-                "@aws-sdk/node-http-handler": "3.329.0",
-                "@aws-sdk/protocol-http": "3.329.0",
-                "@aws-sdk/smithy-client": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
-                "@aws-sdk/url-parser": "3.329.0",
+                "@aws-sdk/config-resolver": "3.338.0",
+                "@aws-sdk/fetch-http-handler": "3.338.0",
+                "@aws-sdk/hash-node": "3.338.0",
+                "@aws-sdk/invalid-dependency": "3.338.0",
+                "@aws-sdk/middleware-content-length": "3.338.0",
+                "@aws-sdk/middleware-endpoint": "3.338.0",
+                "@aws-sdk/middleware-host-header": "3.338.0",
+                "@aws-sdk/middleware-logger": "3.338.0",
+                "@aws-sdk/middleware-recursion-detection": "3.338.0",
+                "@aws-sdk/middleware-retry": "3.338.0",
+                "@aws-sdk/middleware-serde": "3.338.0",
+                "@aws-sdk/middleware-stack": "3.338.0",
+                "@aws-sdk/middleware-user-agent": "3.338.0",
+                "@aws-sdk/node-config-provider": "3.338.0",
+                "@aws-sdk/node-http-handler": "3.338.0",
+                "@aws-sdk/smithy-client": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
+                "@aws-sdk/url-parser": "3.338.0",
                 "@aws-sdk/util-base64": "3.310.0",
                 "@aws-sdk/util-body-length-browser": "3.310.0",
                 "@aws-sdk/util-body-length-node": "3.310.0",
-                "@aws-sdk/util-defaults-mode-browser": "3.329.0",
-                "@aws-sdk/util-defaults-mode-node": "3.329.0",
-                "@aws-sdk/util-endpoints": "3.332.0",
-                "@aws-sdk/util-retry": "3.329.0",
-                "@aws-sdk/util-user-agent-browser": "3.329.0",
-                "@aws-sdk/util-user-agent-node": "3.329.0",
+                "@aws-sdk/util-defaults-mode-browser": "3.338.0",
+                "@aws-sdk/util-defaults-mode-node": "3.338.0",
+                "@aws-sdk/util-endpoints": "3.338.0",
+                "@aws-sdk/util-retry": "3.338.0",
+                "@aws-sdk/util-user-agent-browser": "3.338.0",
+                "@aws-sdk/util-user-agent-node": "3.338.0",
                 "@aws-sdk/util-utf8": "3.310.0",
+                "@smithy/protocol-http": "^1.0.1",
+                "@smithy/types": "^1.0.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -356,42 +358,43 @@
             }
         },
         "node_modules/@aws-sdk/client-sso-oidc": {
-            "version": "3.332.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.332.0.tgz",
-            "integrity": "sha512-tz8k8Yqm4TScIfit0Tum2zWAq1md+gZKr747CSixd4Zwcp7Vwh75cRoL7Rz1ZHSEn1Yo983MWREevVez3SubLw==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.338.0.tgz",
+            "integrity": "sha512-mny5Q3LWKTcMMFS8WxeOCTinl193z7vS3b+eQz09K4jb1Lq04Bpjw25cySgBnhMGZ7QHQiYBscNLyu/TfOKiHA==",
             "optional": true,
             "dependencies": {
                 "@aws-crypto/sha256-browser": "3.0.0",
                 "@aws-crypto/sha256-js": "3.0.0",
-                "@aws-sdk/config-resolver": "3.329.0",
-                "@aws-sdk/fetch-http-handler": "3.329.0",
-                "@aws-sdk/hash-node": "3.329.0",
-                "@aws-sdk/invalid-dependency": "3.329.0",
-                "@aws-sdk/middleware-content-length": "3.329.0",
-                "@aws-sdk/middleware-endpoint": "3.329.0",
-                "@aws-sdk/middleware-host-header": "3.329.0",
-                "@aws-sdk/middleware-logger": "3.329.0",
-                "@aws-sdk/middleware-recursion-detection": "3.329.0",
-                "@aws-sdk/middleware-retry": "3.329.0",
-                "@aws-sdk/middleware-serde": "3.329.0",
-                "@aws-sdk/middleware-stack": "3.329.0",
-                "@aws-sdk/middleware-user-agent": "3.332.0",
-                "@aws-sdk/node-config-provider": "3.329.0",
-                "@aws-sdk/node-http-handler": "3.329.0",
-                "@aws-sdk/protocol-http": "3.329.0",
-                "@aws-sdk/smithy-client": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
-                "@aws-sdk/url-parser": "3.329.0",
+                "@aws-sdk/config-resolver": "3.338.0",
+                "@aws-sdk/fetch-http-handler": "3.338.0",
+                "@aws-sdk/hash-node": "3.338.0",
+                "@aws-sdk/invalid-dependency": "3.338.0",
+                "@aws-sdk/middleware-content-length": "3.338.0",
+                "@aws-sdk/middleware-endpoint": "3.338.0",
+                "@aws-sdk/middleware-host-header": "3.338.0",
+                "@aws-sdk/middleware-logger": "3.338.0",
+                "@aws-sdk/middleware-recursion-detection": "3.338.0",
+                "@aws-sdk/middleware-retry": "3.338.0",
+                "@aws-sdk/middleware-serde": "3.338.0",
+                "@aws-sdk/middleware-stack": "3.338.0",
+                "@aws-sdk/middleware-user-agent": "3.338.0",
+                "@aws-sdk/node-config-provider": "3.338.0",
+                "@aws-sdk/node-http-handler": "3.338.0",
+                "@aws-sdk/smithy-client": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
+                "@aws-sdk/url-parser": "3.338.0",
                 "@aws-sdk/util-base64": "3.310.0",
                 "@aws-sdk/util-body-length-browser": "3.310.0",
                 "@aws-sdk/util-body-length-node": "3.310.0",
-                "@aws-sdk/util-defaults-mode-browser": "3.329.0",
-                "@aws-sdk/util-defaults-mode-node": "3.329.0",
-                "@aws-sdk/util-endpoints": "3.332.0",
-                "@aws-sdk/util-retry": "3.329.0",
-                "@aws-sdk/util-user-agent-browser": "3.329.0",
-                "@aws-sdk/util-user-agent-node": "3.329.0",
+                "@aws-sdk/util-defaults-mode-browser": "3.338.0",
+                "@aws-sdk/util-defaults-mode-node": "3.338.0",
+                "@aws-sdk/util-endpoints": "3.338.0",
+                "@aws-sdk/util-retry": "3.338.0",
+                "@aws-sdk/util-user-agent-browser": "3.338.0",
+                "@aws-sdk/util-user-agent-node": "3.338.0",
                 "@aws-sdk/util-utf8": "3.310.0",
+                "@smithy/protocol-http": "^1.0.1",
+                "@smithy/types": "^1.0.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -399,45 +402,46 @@
             }
         },
         "node_modules/@aws-sdk/client-sts": {
-            "version": "3.332.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.332.0.tgz",
-            "integrity": "sha512-uVobnXIzMcEhwBDyk6iOt36N/TRNI8hwq7MQugjYGj7Inma9g4vnR09hXJ24HxyKCoVUoIgMbEguQ43+/+uvDQ==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.338.0.tgz",
+            "integrity": "sha512-FBHy/G7BAPX0CdEeeGYpoAnKXVCSIIkESLU2wF6x880z+U2IqiL48Fzoa5qoLaLPQaK/30P7ytznkqm4vd1OFw==",
             "optional": true,
             "dependencies": {
                 "@aws-crypto/sha256-browser": "3.0.0",
                 "@aws-crypto/sha256-js": "3.0.0",
-                "@aws-sdk/config-resolver": "3.329.0",
-                "@aws-sdk/credential-provider-node": "3.332.0",
-                "@aws-sdk/fetch-http-handler": "3.329.0",
-                "@aws-sdk/hash-node": "3.329.0",
-                "@aws-sdk/invalid-dependency": "3.329.0",
-                "@aws-sdk/middleware-content-length": "3.329.0",
-                "@aws-sdk/middleware-endpoint": "3.329.0",
-                "@aws-sdk/middleware-host-header": "3.329.0",
-                "@aws-sdk/middleware-logger": "3.329.0",
-                "@aws-sdk/middleware-recursion-detection": "3.329.0",
-                "@aws-sdk/middleware-retry": "3.329.0",
-                "@aws-sdk/middleware-sdk-sts": "3.329.0",
-                "@aws-sdk/middleware-serde": "3.329.0",
-                "@aws-sdk/middleware-signing": "3.329.0",
-                "@aws-sdk/middleware-stack": "3.329.0",
-                "@aws-sdk/middleware-user-agent": "3.332.0",
-                "@aws-sdk/node-config-provider": "3.329.0",
-                "@aws-sdk/node-http-handler": "3.329.0",
-                "@aws-sdk/protocol-http": "3.329.0",
-                "@aws-sdk/smithy-client": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
-                "@aws-sdk/url-parser": "3.329.0",
+                "@aws-sdk/config-resolver": "3.338.0",
+                "@aws-sdk/credential-provider-node": "3.338.0",
+                "@aws-sdk/fetch-http-handler": "3.338.0",
+                "@aws-sdk/hash-node": "3.338.0",
+                "@aws-sdk/invalid-dependency": "3.338.0",
+                "@aws-sdk/middleware-content-length": "3.338.0",
+                "@aws-sdk/middleware-endpoint": "3.338.0",
+                "@aws-sdk/middleware-host-header": "3.338.0",
+                "@aws-sdk/middleware-logger": "3.338.0",
+                "@aws-sdk/middleware-recursion-detection": "3.338.0",
+                "@aws-sdk/middleware-retry": "3.338.0",
+                "@aws-sdk/middleware-sdk-sts": "3.338.0",
+                "@aws-sdk/middleware-serde": "3.338.0",
+                "@aws-sdk/middleware-signing": "3.338.0",
+                "@aws-sdk/middleware-stack": "3.338.0",
+                "@aws-sdk/middleware-user-agent": "3.338.0",
+                "@aws-sdk/node-config-provider": "3.338.0",
+                "@aws-sdk/node-http-handler": "3.338.0",
+                "@aws-sdk/smithy-client": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
+                "@aws-sdk/url-parser": "3.338.0",
                 "@aws-sdk/util-base64": "3.310.0",
                 "@aws-sdk/util-body-length-browser": "3.310.0",
                 "@aws-sdk/util-body-length-node": "3.310.0",
-                "@aws-sdk/util-defaults-mode-browser": "3.329.0",
-                "@aws-sdk/util-defaults-mode-node": "3.329.0",
-                "@aws-sdk/util-endpoints": "3.332.0",
-                "@aws-sdk/util-retry": "3.329.0",
-                "@aws-sdk/util-user-agent-browser": "3.329.0",
-                "@aws-sdk/util-user-agent-node": "3.329.0",
+                "@aws-sdk/util-defaults-mode-browser": "3.338.0",
+                "@aws-sdk/util-defaults-mode-node": "3.338.0",
+                "@aws-sdk/util-endpoints": "3.338.0",
+                "@aws-sdk/util-retry": "3.338.0",
+                "@aws-sdk/util-user-agent-browser": "3.338.0",
+                "@aws-sdk/util-user-agent-node": "3.338.0",
                 "@aws-sdk/util-utf8": "3.310.0",
+                "@smithy/protocol-http": "^1.0.1",
+                "@smithy/types": "^1.0.0",
                 "fast-xml-parser": "4.1.2",
                 "tslib": "^2.5.0"
             },
@@ -446,14 +450,14 @@
             }
         },
         "node_modules/@aws-sdk/config-resolver": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.329.0.tgz",
-            "integrity": "sha512-Oj6eiT3q+Jn685yvUrfRi8PhB3fb81hasJqdrsEivA8IP8qAgnVUTJzXsh8O2UX8UM2MF6A1gTgToSgneJuw2Q==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.338.0.tgz",
+            "integrity": "sha512-rB9WUaMfTB74Hd2mOiyPFR7Q1viT+w6SaDSR9SA1P8EeIg5H13FNdIKb736Z8/6QJhDj7whdyk1CTGV+DmXOOg==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/types": "3.338.0",
                 "@aws-sdk/util-config-provider": "3.310.0",
-                "@aws-sdk/util-middleware": "3.329.0",
+                "@aws-sdk/util-middleware": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -461,14 +465,14 @@
             }
         },
         "node_modules/@aws-sdk/credential-provider-cognito-identity": {
-            "version": "3.332.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.332.0.tgz",
-            "integrity": "sha512-FJI936QVSFd49PWOgTlW7e8rKO/6Y8sMnkvTJ/APQ1K8em+jWkaAMFBl15NrpOo/jlZCzhkkQDatDHAlbSUXGw==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.338.0.tgz",
+            "integrity": "sha512-kKkBt1qCKx+HspbMq7kd5Yz3jWRW5N1Tegs4cGbTFJH9qMJTyQMoS9GNRcFfzgNEA9sfpHxeTnBbwBw6Ca4S9g==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/client-cognito-identity": "3.332.0",
-                "@aws-sdk/property-provider": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/client-cognito-identity": "3.338.0",
+                "@aws-sdk/property-provider": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -476,13 +480,13 @@
             }
         },
         "node_modules/@aws-sdk/credential-provider-env": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.329.0.tgz",
-            "integrity": "sha512-B4orC9hMt9hG82vAR0TAnQqjk6cFDbO2S14RdzUj2n2NPlGWW4Blkv3NTo86K0lq011VRhtqaLcuTwn5EJD5Sg==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.338.0.tgz",
+            "integrity": "sha512-j14vApy80tpk87C3x3uBf1caQsuR8RdQ8iOW830H/AOhsa88XaZIB/NQSX7exaIKZa2RU0Vv2wIlGAA8ko7J6g==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/property-provider": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/property-provider": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -490,15 +494,15 @@
             }
         },
         "node_modules/@aws-sdk/credential-provider-imds": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.329.0.tgz",
-            "integrity": "sha512-ggPlnd7QROPTid0CwT01TYYGvstRRTpzTGsQ/B31wkh30IrRXE81W3S4xrOYuqQD3u0RnflSxnvhs+EayJEYjg==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.338.0.tgz",
+            "integrity": "sha512-qsqeywYfJevg5pgUUUBmm7pK1bckVrl091PZB2IliFdQVnDvI5GFLf4B0oZqjaLAzPG1gVtxRvqIve+tnP/+xA==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/node-config-provider": "3.329.0",
-                "@aws-sdk/property-provider": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
-                "@aws-sdk/url-parser": "3.329.0",
+                "@aws-sdk/node-config-provider": "3.338.0",
+                "@aws-sdk/property-provider": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
+                "@aws-sdk/url-parser": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -506,19 +510,19 @@
             }
         },
         "node_modules/@aws-sdk/credential-provider-ini": {
-            "version": "3.332.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.332.0.tgz",
-            "integrity": "sha512-DTW6d6rcqizPVyvcIrwvxecQ7e5GONtVc5Wyf0RTfqf41sDOVZYmn6G+zEFSpBLW0975uZbJS0lyLWtJe2VujQ==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.338.0.tgz",
+            "integrity": "sha512-UhgYgymT9sJiRm0peqP5EvtR4dXiS2Q2AuFgDUjBvDz8JaZlqafsIS4cfyGwTHV/xY6cdiMu5rCTe8hTyXsukQ==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/credential-provider-env": "3.329.0",
-                "@aws-sdk/credential-provider-imds": "3.329.0",
-                "@aws-sdk/credential-provider-process": "3.329.0",
-                "@aws-sdk/credential-provider-sso": "3.332.0",
-                "@aws-sdk/credential-provider-web-identity": "3.329.0",
-                "@aws-sdk/property-provider": "3.329.0",
-                "@aws-sdk/shared-ini-file-loader": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/credential-provider-env": "3.338.0",
+                "@aws-sdk/credential-provider-imds": "3.338.0",
+                "@aws-sdk/credential-provider-process": "3.338.0",
+                "@aws-sdk/credential-provider-sso": "3.338.0",
+                "@aws-sdk/credential-provider-web-identity": "3.338.0",
+                "@aws-sdk/property-provider": "3.338.0",
+                "@aws-sdk/shared-ini-file-loader": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -526,20 +530,20 @@
             }
         },
         "node_modules/@aws-sdk/credential-provider-node": {
-            "version": "3.332.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.332.0.tgz",
-            "integrity": "sha512-KkBayS9k4WyJTvC86ngeRM+RmWxNCS1BHvudkR6PLXfnsNPDzxySDVY0UgxVhbNYDYsO561fXZt9ccpKyVWjgg==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.338.0.tgz",
+            "integrity": "sha512-nZjaMRxJqX0EXMV9LA5IbRQI1pDGGZiPYX2KDfZ1Y9Gc1Y/vIZhHKOHGb1uKMAonlR076CsXlev4/tjC8SGGuw==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/credential-provider-env": "3.329.0",
-                "@aws-sdk/credential-provider-imds": "3.329.0",
-                "@aws-sdk/credential-provider-ini": "3.332.0",
-                "@aws-sdk/credential-provider-process": "3.329.0",
-                "@aws-sdk/credential-provider-sso": "3.332.0",
-                "@aws-sdk/credential-provider-web-identity": "3.329.0",
-                "@aws-sdk/property-provider": "3.329.0",
-                "@aws-sdk/shared-ini-file-loader": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/credential-provider-env": "3.338.0",
+                "@aws-sdk/credential-provider-imds": "3.338.0",
+                "@aws-sdk/credential-provider-ini": "3.338.0",
+                "@aws-sdk/credential-provider-process": "3.338.0",
+                "@aws-sdk/credential-provider-sso": "3.338.0",
+                "@aws-sdk/credential-provider-web-identity": "3.338.0",
+                "@aws-sdk/property-provider": "3.338.0",
+                "@aws-sdk/shared-ini-file-loader": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -547,14 +551,14 @@
             }
         },
         "node_modules/@aws-sdk/credential-provider-process": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.329.0.tgz",
-            "integrity": "sha512-5oO220qoFc2pMdZDQa6XN/mVhp669I3+LqMbbscGtX/UgLJPSOb7YzPld9Wjv12L5rf+sD3G1PF3LZXO0vKLFA==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.338.0.tgz",
+            "integrity": "sha512-5I1EgJxFFEg8xel2kInMpkdBKajUut0hR2fBajqCmK7Pflu8s0I2NKDots9a3YJagNrFJq38+EzoDcUvRrd2dg==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/property-provider": "3.329.0",
-                "@aws-sdk/shared-ini-file-loader": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/property-provider": "3.338.0",
+                "@aws-sdk/shared-ini-file-loader": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -562,16 +566,16 @@
             }
         },
         "node_modules/@aws-sdk/credential-provider-sso": {
-            "version": "3.332.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.332.0.tgz",
-            "integrity": "sha512-SaKXl48af3n6LRitcaEqbeg1YDXwQ0A5QziC1xQyYPraEIj3IZ/GyTjx04Lo2jxNYHuEOE8u4aTw1+IK1GDKbg==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.338.0.tgz",
+            "integrity": "sha512-fpzYHK17iF/uFkrm4cLg/utDVKSBTWNjAiNlE3GF6CaixBCwc0QBLKHk2nG4d1ZZeMVCbIUMS7eoqfR0LYc/yw==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/client-sso": "3.332.0",
-                "@aws-sdk/property-provider": "3.329.0",
-                "@aws-sdk/shared-ini-file-loader": "3.329.0",
-                "@aws-sdk/token-providers": "3.332.0",
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/client-sso": "3.338.0",
+                "@aws-sdk/property-provider": "3.338.0",
+                "@aws-sdk/shared-ini-file-loader": "3.338.0",
+                "@aws-sdk/token-providers": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -579,13 +583,13 @@
             }
         },
         "node_modules/@aws-sdk/credential-provider-web-identity": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.329.0.tgz",
-            "integrity": "sha512-lcEibZD7AlutCacpQ6DyNUqElZJDq+ylaIo5a8MH9jGh7Pg2WpDg0Sy+B6FbGCkVn4eIjdHxeX54JM245nhESg==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.338.0.tgz",
+            "integrity": "sha512-kjT/P18jM1icwjYwr8wfY//T8lv2s81ms7OC7vgiSqckmQOxpVkdsep9d44ymSUXwopmotFP7M9gGnEHS6HwAA==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/property-provider": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/property-provider": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -593,24 +597,24 @@
             }
         },
         "node_modules/@aws-sdk/credential-providers": {
-            "version": "3.332.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.332.0.tgz",
-            "integrity": "sha512-UZM8hCJqBBI4yEopVnfQ7HgUCuiYuWJziPFovQpbwvZKadibzo332/n6e5IsQbJxPjymqFLgTn3PQds/+1FOlQ==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.338.0.tgz",
+            "integrity": "sha512-QQkWsR3fyq3N5eTvyKLgk1IO45SEM5+zIDqGqchG74AAhAzTHpiVZ3AOBZckaIAXKyHU3Fgy3gt/u+fdXC4xyw==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/client-cognito-identity": "3.332.0",
-                "@aws-sdk/client-sso": "3.332.0",
-                "@aws-sdk/client-sts": "3.332.0",
-                "@aws-sdk/credential-provider-cognito-identity": "3.332.0",
-                "@aws-sdk/credential-provider-env": "3.329.0",
-                "@aws-sdk/credential-provider-imds": "3.329.0",
-                "@aws-sdk/credential-provider-ini": "3.332.0",
-                "@aws-sdk/credential-provider-node": "3.332.0",
-                "@aws-sdk/credential-provider-process": "3.329.0",
-                "@aws-sdk/credential-provider-sso": "3.332.0",
-                "@aws-sdk/credential-provider-web-identity": "3.329.0",
-                "@aws-sdk/property-provider": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/client-cognito-identity": "3.338.0",
+                "@aws-sdk/client-sso": "3.338.0",
+                "@aws-sdk/client-sts": "3.338.0",
+                "@aws-sdk/credential-provider-cognito-identity": "3.338.0",
+                "@aws-sdk/credential-provider-env": "3.338.0",
+                "@aws-sdk/credential-provider-imds": "3.338.0",
+                "@aws-sdk/credential-provider-ini": "3.338.0",
+                "@aws-sdk/credential-provider-node": "3.338.0",
+                "@aws-sdk/credential-provider-process": "3.338.0",
+                "@aws-sdk/credential-provider-sso": "3.338.0",
+                "@aws-sdk/credential-provider-web-identity": "3.338.0",
+                "@aws-sdk/property-provider": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -618,25 +622,25 @@
             }
         },
         "node_modules/@aws-sdk/fetch-http-handler": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.329.0.tgz",
-            "integrity": "sha512-9jfIeJhYCcTX4ScXOueRTB3S/tVce0bRsKxKDP0PnTxnGYOwKXoM9lAPmiYItzYmQ/+QzjTI8xfkA9Usz2SK/Q==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.338.0.tgz",
+            "integrity": "sha512-NOIQmeSa51J2nFAzl99IjxwQkq27cdNJzF59jQWzpUCGbxXfMD4WWy2NHubabSFuJ4FJU2eyoQHUNUFc6/uxXA==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/protocol-http": "3.329.0",
-                "@aws-sdk/querystring-builder": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/protocol-http": "3.338.0",
+                "@aws-sdk/querystring-builder": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
                 "@aws-sdk/util-base64": "3.310.0",
                 "tslib": "^2.5.0"
             }
         },
         "node_modules/@aws-sdk/hash-node": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.329.0.tgz",
-            "integrity": "sha512-6RmnWXNWpi7yAs0oRDQlkMn2wfXOStr/8kTCgiAiqrk1KopGSBkC2veKiKRSfv02FTd1yV/ISqYNIRqW1VLyxg==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.338.0.tgz",
+            "integrity": "sha512-udveX3ZRO1oUbyBTQH0LJ8Ika7uk0pHuXrqapdi66GGRJB50IhmOg372zUEwZjDB7DZYXfGTCuAj2OoEalgpBA==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/types": "3.338.0",
                 "@aws-sdk/util-buffer-from": "3.310.0",
                 "@aws-sdk/util-utf8": "3.310.0",
                 "tslib": "^2.5.0"
@@ -646,12 +650,12 @@
             }
         },
         "node_modules/@aws-sdk/invalid-dependency": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.329.0.tgz",
-            "integrity": "sha512-UXynGusDxN/HxLma5ByJ7u+XnuMd47NbHOjJgYsaAjb1CVZT7hEPXOB+mcZ+Ku7To5SCOKu2QbRn7m4bGespBg==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.338.0.tgz",
+            "integrity": "sha512-m6r1fTTGSl0V6l8Z+Ii4Ei8VFpDmu0AT6A59ZhJaMZgxf925ywuCPydyDW9ZqTLE0e7CgxhEHEsH1+HzpVuHTw==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             }
         },
@@ -668,13 +672,13 @@
             }
         },
         "node_modules/@aws-sdk/middleware-content-length": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.329.0.tgz",
-            "integrity": "sha512-7kCd+CvY/4KbyXB0uyL7jCwPjMi2yERMALFdEH9dsUciwmxIQT6eSc4aF6wImC4UrbafaqmXvvHErABKMVBTKA==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.338.0.tgz",
+            "integrity": "sha512-m2C+yJaNmbA3ocBp/7ImUUuimymV5JsFdV7yAibpbYMX22g3q83nieOF9x0I66J0+h+/bcriz/T1ZJAPANLz/g==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/protocol-http": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/protocol-http": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -682,15 +686,15 @@
             }
         },
         "node_modules/@aws-sdk/middleware-endpoint": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.329.0.tgz",
-            "integrity": "sha512-hdJRoNdCM0BT4W+rrtee+kfFRgGPGXQDgtbIQlf/FuuuYz2sdef7/SYWr0mxuncnVBW5WkYSPP8h6q07whSKbg==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.338.0.tgz",
+            "integrity": "sha512-bzL9Q8lFidg2NTjGVGDKI6yPG/XiPS+VIAMHJeihQmcv1alIy+N3IL4bEN15Fg+cwaGm+P3BevcLIHmcCOVb4w==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/middleware-serde": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
-                "@aws-sdk/url-parser": "3.329.0",
-                "@aws-sdk/util-middleware": "3.329.0",
+                "@aws-sdk/middleware-serde": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
+                "@aws-sdk/url-parser": "3.338.0",
+                "@aws-sdk/util-middleware": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -698,13 +702,13 @@
             }
         },
         "node_modules/@aws-sdk/middleware-host-header": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.329.0.tgz",
-            "integrity": "sha512-JrHeUdTIpTCfXDo9JpbAbZTS1x4mt63CCytJRq0mpWp+FlP9hjckBcNxWdR/wSKEzP9pDRnTri638BOwWH7O8w==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.338.0.tgz",
+            "integrity": "sha512-k3C7oppkrqeKrAJt9XIl45SdELtnph9BF0QypjyRfT5MNEDnMMsQkc6xy3ZMqG5dWQq6B2l8C+JL7pOvkSQP3w==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/protocol-http": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/protocol-http": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -712,12 +716,12 @@
             }
         },
         "node_modules/@aws-sdk/middleware-logger": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.329.0.tgz",
-            "integrity": "sha512-lKeeTXsYC1NiwmxrXsZepcwNXPoQxTNNbeD1qaCELPGK2cJlrGoeAP2YRWzpwO2kNZWrDLaGAPT/EUEhqw+d1w==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.338.0.tgz",
+            "integrity": "sha512-btj9U0Xovq/UAu3Ur4lAfF7Q3DvvwJ/0UUWsI6GgSzzqSOFgKCz7hCP2GZIT8aXEA5hJOpBOEMkNMjWPNa91Hg==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -725,13 +729,13 @@
             }
         },
         "node_modules/@aws-sdk/middleware-recursion-detection": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.329.0.tgz",
-            "integrity": "sha512-0/TYOJwrj1Z8s+Y7thibD23hggBq/K/01NwPk32CwWG/G+1vWozs5DefknEl++w0vuV+39pkY4KHI8m/+wOCpg==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.338.0.tgz",
+            "integrity": "sha512-fu5KwiHHSqC8KTQH6xdJ9+dua4gQcXSFLE5fVsergqd0uVdsmhiI+IDfW6QNwF/lmCqnoKDkpeasuB98eG2tow==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/protocol-http": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/protocol-http": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -739,16 +743,16 @@
             }
         },
         "node_modules/@aws-sdk/middleware-retry": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.329.0.tgz",
-            "integrity": "sha512-cB3D7GlhHUcHGOlygOYxD9cPhwsTYEAMcohK38An8+RHNp6VQEWezzLFCmHVKUSeCQ+wkjZfPA40jOG0rbjSgQ==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.338.0.tgz",
+            "integrity": "sha512-nw1oPFkB7TdDG4Vlz2Td47ft/2Gmx1bA18QfE9K1mMWZ4nnoAL8xnHbowlTfHo62+BbFCAPu53PzDUCncBL0iw==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/protocol-http": "3.329.0",
-                "@aws-sdk/service-error-classification": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
-                "@aws-sdk/util-middleware": "3.329.0",
-                "@aws-sdk/util-retry": "3.329.0",
+                "@aws-sdk/protocol-http": "3.338.0",
+                "@aws-sdk/service-error-classification": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
+                "@aws-sdk/util-middleware": "3.338.0",
+                "@aws-sdk/util-retry": "3.338.0",
                 "tslib": "^2.5.0",
                 "uuid": "^8.3.2"
             },
@@ -757,13 +761,13 @@
             }
         },
         "node_modules/@aws-sdk/middleware-sdk-sts": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.329.0.tgz",
-            "integrity": "sha512-bqtZuhkH8pANb2Gb4FEM1p27o+BoDBmVhEWm8sWH+APsyOor3jc6eUG2GxkfoO6D5tGNIuyCC/GuvW9XDIe4Kg==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.338.0.tgz",
+            "integrity": "sha512-aZ8eFVaot8oYQri1wOesrA3gLizeAHtlA/ELlqxoGDJtO011J4/hTHTn0iJGbktaCvc1L3TF6mgOsgXpudYqMg==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/middleware-signing": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/middleware-signing": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -771,12 +775,12 @@
             }
         },
         "node_modules/@aws-sdk/middleware-serde": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.329.0.tgz",
-            "integrity": "sha512-tvM9NdPuRPCozPjTGNOeYZeLlyx3BcEyajrkRorCRf1YzG/mXdB6I1stote7i4q1doFtYTz0sYL8bqW3LUPn9A==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.338.0.tgz",
+            "integrity": "sha512-AabRLrE6sk9tqQlQ7z3kn4gTHNN7Anjk/AM0ZEu96WcWjedcpgM1vVpKTBE7vjnxcTRNq0CEM3GLtQqaZ7/HjQ==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -784,16 +788,16 @@
             }
         },
         "node_modules/@aws-sdk/middleware-signing": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.329.0.tgz",
-            "integrity": "sha512-bL1nI+EUcF5B1ipwDXxiKL+Uw02Mbt/TNX54PbzunBGZIyO6DZG/H+M3U296bYbvPlwlZhp26O830g6K7VEWsA==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.338.0.tgz",
+            "integrity": "sha512-AprhhShMF75mOx80SABujLwrU/w2uHQIvWd6aF3BsE5JRI3uQZRqspfjFCaK52HNLQPj3sCQUw1GeiZJ8GyWCw==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/property-provider": "3.329.0",
-                "@aws-sdk/protocol-http": "3.329.0",
-                "@aws-sdk/signature-v4": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
-                "@aws-sdk/util-middleware": "3.329.0",
+                "@aws-sdk/property-provider": "3.338.0",
+                "@aws-sdk/protocol-http": "3.338.0",
+                "@aws-sdk/signature-v4": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
+                "@aws-sdk/util-middleware": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -801,9 +805,9 @@
             }
         },
         "node_modules/@aws-sdk/middleware-stack": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.329.0.tgz",
-            "integrity": "sha512-2huFLhJ45td2nuiIOjpc9JKJbFNn5CYmw9U8YDITTcydpteRN62CzCpeqroDvF89VOLWxh0ZFtuLCGUr7liSWQ==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.338.0.tgz",
+            "integrity": "sha512-9zXyiklX9AK9ZIXuIPzWzz2vevBEcnBs9UNIxiHl4NBZ8d8oyTvaES1PtFuwL6f7ANSZ9EGVQ2rdTTnMNxMI1A==",
             "optional": true,
             "dependencies": {
                 "tslib": "^2.5.0"
@@ -813,14 +817,14 @@
             }
         },
         "node_modules/@aws-sdk/middleware-user-agent": {
-            "version": "3.332.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.332.0.tgz",
-            "integrity": "sha512-rSL1xP4QmcMOsunN1p5ZDR9GT3vvoSCnYa4iPvMSjP8Jx7l4ff/aVctwfZkMs/up12+68Jqwj4TvtaCvCFXdUA==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.338.0.tgz",
+            "integrity": "sha512-DMqODOsDMFMPcDw2Ya6a0i34AhaBDRpp3vJ+FK3zPxUIsv6iHA+XqEcXLOxROLLoydoyxus7k2U+EWibLZrFbQ==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/protocol-http": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
-                "@aws-sdk/util-endpoints": "3.332.0",
+                "@aws-sdk/protocol-http": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
+                "@aws-sdk/util-endpoints": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -828,14 +832,14 @@
             }
         },
         "node_modules/@aws-sdk/node-config-provider": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.329.0.tgz",
-            "integrity": "sha512-hg9rGNlkzh8aeR/sQbijrkFx2BIO53j4Z6qDxPNWwSGpl05jri1VHxHx2HZMwgbY6Zy/DSguETN/BL8vdFqyLg==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.338.0.tgz",
+            "integrity": "sha512-YO7yWg3ipnUI5u6D+Zn2NUpjj5krwc8zNWeY79ULVIp9g7faqGX3xMSjeRSrpZ83s5jg1dOm/+bB0gw7mCrRCw==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/property-provider": "3.329.0",
-                "@aws-sdk/shared-ini-file-loader": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/property-provider": "3.338.0",
+                "@aws-sdk/shared-ini-file-loader": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -843,15 +847,15 @@
             }
         },
         "node_modules/@aws-sdk/node-http-handler": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.329.0.tgz",
-            "integrity": "sha512-OrjaHjU2ZTPfoHa5DruRvTIbeHH/cc0wvh4ml+FwDpWaPaBpOhLiluhZ3anqX1l5QjrXNiQnL8FxSM5OV/zVCA==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.338.0.tgz",
+            "integrity": "sha512-V1BLzCruiv45tJ0vXjiamY8LncIsUFsXYJGDupomFYhWRN8L1MUB9f2vdKn5X3wXn/yKrluwTmNaryrIqd9akA==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/abort-controller": "3.329.0",
-                "@aws-sdk/protocol-http": "3.329.0",
-                "@aws-sdk/querystring-builder": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/abort-controller": "3.338.0",
+                "@aws-sdk/protocol-http": "3.338.0",
+                "@aws-sdk/querystring-builder": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -859,12 +863,12 @@
             }
         },
         "node_modules/@aws-sdk/property-provider": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.329.0.tgz",
-            "integrity": "sha512-1cHLTV6yyMGaMSWWDW/p4vTkJ1cc5BOEO+A0eHuAcoSOk+LDe9IKhUG3/ZOvvYKQYcqIj5jjGSni/noXNCl/qw==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.338.0.tgz",
+            "integrity": "sha512-mC+ZJ738ipif6ZkH59gcipozYj1FOfpXr9pGVCA2hJGLDdaBwI2Jfpb2qCqbsTNtoCjBuIy+sQHGmUHyclgYHg==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -872,12 +876,12 @@
             }
         },
         "node_modules/@aws-sdk/protocol-http": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.329.0.tgz",
-            "integrity": "sha512-0rLEHY6QTHTUUcVxzGbPUSmCKlXWplxT/fcYRh0bcc5MBK4naKfcQft1O6Ajp8uqs/9YPZ7XCVCn90pDeJfeaw==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.338.0.tgz",
+            "integrity": "sha512-JX03Q2gshdzOWtA/07kdpk0hqeOrOfwuF8TB97g66VCcIopYQkCeNH1zzkWu+RsGxfSlzQ7up+ZM6sclYXyB1A==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -885,12 +889,12 @@
             }
         },
         "node_modules/@aws-sdk/querystring-builder": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.329.0.tgz",
-            "integrity": "sha512-UWgMKkS5trliaDJG4nPv3onu8Y0aBuwRo7RdIgggguOiU8pU6pq1I113nH2FBNWy+Me1bwf+bcviJh0pCo6bEg==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.338.0.tgz",
+            "integrity": "sha512-IB3YhO93Htwt2SxJx4VWsN57Rt1KEsvZ6PbneO4bcS96E04BlfBujYMZ+QxEM3EJxorhpkwbI2QnI12IjD8FhA==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/types": "3.338.0",
                 "@aws-sdk/util-uri-escape": "3.310.0",
                 "tslib": "^2.5.0"
             },
@@ -899,12 +903,12 @@
             }
         },
         "node_modules/@aws-sdk/querystring-parser": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.329.0.tgz",
-            "integrity": "sha512-9mkK+FB7snJ2G7H3CqtprDwYIRhzm6jEezffCwUWrC+lbqHBbErbhE9IeU/MKxILmf0RbC2riXEY1MHGspjRrQ==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.338.0.tgz",
+            "integrity": "sha512-vtI8Gqx4yj0BZlWonRMgLz68sHt5H48HN+ClnY+fDDB/8KLnCuwZ3TGKmYIbYbshL9wjJz0A9aLzuC6nPQ5JKw==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -912,21 +916,21 @@
             }
         },
         "node_modules/@aws-sdk/service-error-classification": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.329.0.tgz",
-            "integrity": "sha512-TSNr0flOcCLe71aPp7MjblKNGsmxpTU4xR5772MDX9Cz9GUTNZCPFtvrcqd+wzEPP/AC7XwNXe8KjoXooZImUQ==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.338.0.tgz",
+            "integrity": "sha512-BJFr2mx/N3NbycGTlMMGRBc0tGcHXHEbMPy1H2RbejzL23zh27MchaL1WAK9SvwVMKS29hSDbhkuVR2ABRjerA==",
             "optional": true,
             "engines": {
                 "node": ">=14.0.0"
             }
         },
         "node_modules/@aws-sdk/shared-ini-file-loader": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.329.0.tgz",
-            "integrity": "sha512-e0hyd75fbjMd4aCoRwpP2/HR+0oScwogErVArIkq3F42c/hyNCQP3sph4JImuXIjuo6HNnpKpf20CEPPhNna8A==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.338.0.tgz",
+            "integrity": "sha512-MA1Sp97LFlOXcUaXgo47j86IsPRWYq1V/JqR+uu0zofZw4Xlt7Y6F+mmnDHvuuMy6R2ltzjXSwgrrW3k0bxFPA==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -934,15 +938,15 @@
             }
         },
         "node_modules/@aws-sdk/signature-v4": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.329.0.tgz",
-            "integrity": "sha512-9EnLoyOD5nFtCRAp+QRllDgQASCfY7jLHVhwht7jzwE80wE65Z9Ym5Z/mwTd4IyTz/xXfCvcE2VwClsBt0Ybdw==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.338.0.tgz",
+            "integrity": "sha512-EwKTe/8Iwab/v0eo27w7DRYlqp9wEZEhuRfOMwTikUVH6iuTnW6AXjcIUfcRYBRbx2zqnRSiMAZkjN6ZFYm0bQ==",
             "optional": true,
             "dependencies": {
                 "@aws-sdk/is-array-buffer": "3.310.0",
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/types": "3.338.0",
                 "@aws-sdk/util-hex-encoding": "3.310.0",
-                "@aws-sdk/util-middleware": "3.329.0",
+                "@aws-sdk/util-middleware": "3.338.0",
                 "@aws-sdk/util-uri-escape": "3.310.0",
                 "@aws-sdk/util-utf8": "3.310.0",
                 "tslib": "^2.5.0"
@@ -952,13 +956,13 @@
             }
         },
         "node_modules/@aws-sdk/smithy-client": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.329.0.tgz",
-            "integrity": "sha512-7E0fGpBKxwFqHHAOqNbgNsHSEmCZLuvmU9yvG9DXKVzrS4P48O/PfOro123WpcFZs3STyOVgH8wjUPftHAVKmg==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.338.0.tgz",
+            "integrity": "sha512-IpFLdLG8GwaiFdqVXf+WyU47Hfa2BMIupAU6iSkE2ZO0lBdg+efn/BBwis5WbBNTDCaaU0xH9y68SmnqqtD7pA==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/middleware-stack": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/middleware-stack": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -966,15 +970,15 @@
             }
         },
         "node_modules/@aws-sdk/token-providers": {
-            "version": "3.332.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.332.0.tgz",
-            "integrity": "sha512-fccbg6OSl0l658pxl2p1MoU9gEePo5B361+JNaN0zfRMu7c5HBXCpdl4djlFxAHjltrX9f1+BKqfGHYgI3h8SQ==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.338.0.tgz",
+            "integrity": "sha512-wuiEGcWiMeq5N68M489i2iGYcCad9p1btNEOFgus+JO3DRSA6HZXizLI1wqfbUm5Ei8512AvUKB6N8PMzahQsg==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/client-sso-oidc": "3.332.0",
-                "@aws-sdk/property-provider": "3.329.0",
-                "@aws-sdk/shared-ini-file-loader": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/client-sso-oidc": "3.338.0",
+                "@aws-sdk/property-provider": "3.338.0",
+                "@aws-sdk/shared-ini-file-loader": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -982,9 +986,9 @@
             }
         },
         "node_modules/@aws-sdk/types": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.329.0.tgz",
-            "integrity": "sha512-wFBW4yciDfzQBSFmWNaEvHShnSGLMxSu9Lls6EUf6xDMavxSB36bsrVRX6CyAo/W0NeIIyEOW1LclGPgJV1okg==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.338.0.tgz",
+            "integrity": "sha512-hrNK15o+EObLrl9oWOyxJN2dwjgbdBMGolLEVP/wR/+M9ojHgk/x1kMsCVcV82a8Vgdtqx1TyOC3UugUPT0+NA==",
             "optional": true,
             "dependencies": {
                 "tslib": "^2.5.0"
@@ -994,13 +998,13 @@
             }
         },
         "node_modules/@aws-sdk/url-parser": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.329.0.tgz",
-            "integrity": "sha512-/VcfL7vNJKJGSjYYHVQF3bYCDFs4fSzB7j5qeVDwRdWr870gE7O1Dar+sLWBRKFF3AX+4VzplqzUfpu9t44JVA==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.338.0.tgz",
+            "integrity": "sha512-x8a5swfZ6iWJZEA8rm99OKQ1A6xhWPP1taQUzoPavGCzPAOqyc8cd0FcXYMxvtXb3FeBhGaI8tiGKvelJro0+A==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/querystring-parser": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/querystring-parser": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             }
         },
@@ -1064,13 +1068,13 @@
             }
         },
         "node_modules/@aws-sdk/util-defaults-mode-browser": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.329.0.tgz",
-            "integrity": "sha512-2iSiy/pzX3OXMhtSxtAzOiEFr3viQEFnYOTeZuiheuyS+cea2L79F6SlZ1110b/nOIU/UOrxxtz83HVad8YFMQ==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.338.0.tgz",
+            "integrity": "sha512-Zfr5c7JKMJTfb7z+hgd0ioU5iw+wId6Cppc5V1HpZuS2YY4Mn3aJIixzyzhIoCzbmk/yIkf96981epM9eo3/TA==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/property-provider": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/property-provider": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
                 "bowser": "^2.11.0",
                 "tslib": "^2.5.0"
             },
@@ -1079,16 +1083,16 @@
             }
         },
         "node_modules/@aws-sdk/util-defaults-mode-node": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.329.0.tgz",
-            "integrity": "sha512-7A6C7YKjkZtmKtH29isYEtOCbhd7IcXPP8lftN8WAWlLOiZE4gV7PHveagUj7QserJzgRKGwwTQbBj53n18HYg==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.338.0.tgz",
+            "integrity": "sha512-DFM3BSpSetshZTgTjueCkAYZWS0tn5zl7SjkSpFhWQZ8Tt/Df3/DEjcPvxzmC/5vgYSUXNsqcI7lLAJk9aGZAA==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/config-resolver": "3.329.0",
-                "@aws-sdk/credential-provider-imds": "3.329.0",
-                "@aws-sdk/node-config-provider": "3.329.0",
-                "@aws-sdk/property-provider": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/config-resolver": "3.338.0",
+                "@aws-sdk/credential-provider-imds": "3.338.0",
+                "@aws-sdk/node-config-provider": "3.338.0",
+                "@aws-sdk/property-provider": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -1096,12 +1100,12 @@
             }
         },
         "node_modules/@aws-sdk/util-endpoints": {
-            "version": "3.332.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.332.0.tgz",
-            "integrity": "sha512-nQx7AiOroMU2hj6h+umWOSZ+WECwxupaxFUK/PPKGW6NY/VdQE6LluYnXOtF5awlr8w1nPksT0Lq05PZutMDLA==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.338.0.tgz",
+            "integrity": "sha512-0gBQcohbNcBsBR7oyaD0Dg2m6qOmfp0G1iN/NM23gwAr2H3ni8tUXfs1HsZzxikOwUr6dSLASokc30vQXBF44A==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -1133,9 +1137,9 @@
             }
         },
         "node_modules/@aws-sdk/util-middleware": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.329.0.tgz",
-            "integrity": "sha512-RhBOBaxzkTUghi4MSqr8S5qeeBCjgJ0XPJ6jIYkVkj1saCmqkuZCgl3zFaYdyhdxxPV6nflkFer+1HUoqT+Fqw==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.338.0.tgz",
+            "integrity": "sha512-oQuAmhi16HWEqVa+Nq4VD4Ymet9vS+uiW92reaagQrW2QFjAgJW9A6pU0PcIHF9sWY1iDKeNdV5b9odQ45PDJA==",
             "optional": true,
             "dependencies": {
                 "tslib": "^2.5.0"
@@ -1145,12 +1149,12 @@
             }
         },
         "node_modules/@aws-sdk/util-retry": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-retry/-/util-retry-3.329.0.tgz",
-            "integrity": "sha512-+3VQ9HZLinysnmryUs9Xjt1YVh4TYYHLt30ilu4iUnIHFQoamdzIbRCWseSVFPCxGroen9M9qmAleAsytHEKuA==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-retry/-/util-retry-3.338.0.tgz",
+            "integrity": "sha512-diR6M3gJgSgBg/87L2e8iF8urG+LOW9ZGWxhntYpYX4uhiIjwNgUPUa993553C8GIOZDHez5X9ExU4asYGQ71Q==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/service-error-classification": "3.329.0",
+                "@aws-sdk/service-error-classification": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -1170,24 +1174,24 @@
             }
         },
         "node_modules/@aws-sdk/util-user-agent-browser": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.329.0.tgz",
-            "integrity": "sha512-8hLSmMCl8aw2++0Zuba8ELq8FkK6/VNyx470St201IpMn2GMbQMDl/rLolRKiTgji6wc+T3pOTidkJkz8/cIXA==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.338.0.tgz",
+            "integrity": "sha512-3e8D+SOtOQEtRtksOEF7EC26xPkuY6YK6biLgdtvR9JspK96rHk5eX1HEJeBJJqbxhyPaxpIw+OhWhnsrUS3hA==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/types": "3.338.0",
                 "bowser": "^2.11.0",
                 "tslib": "^2.5.0"
             }
         },
         "node_modules/@aws-sdk/util-user-agent-node": {
-            "version": "3.329.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.329.0.tgz",
-            "integrity": "sha512-C50Zaeodc0+psEP+L4WpElrH8epuLWJPVN4hDOTORcM0cSoU2o025Ost9mbcU7UdoHNxF9vitLnzORGN9SHolg==",
+            "version": "3.338.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.338.0.tgz",
+            "integrity": "sha512-rc+bC5KM9h25urRc+MXuViJkJ+qYG2NlCRw6xm2lSIvHFJTUjH1ZMO3mqNDYkGnQRbj0mmrVe+N77TJZGf3Q2Q==",
             "optional": true,
             "dependencies": {
-                "@aws-sdk/node-config-provider": "3.329.0",
-                "@aws-sdk/types": "3.329.0",
+                "@aws-sdk/node-config-provider": "3.338.0",
+                "@aws-sdk/types": "3.338.0",
                 "tslib": "^2.5.0"
             },
             "engines": {
@@ -1482,9 +1486,9 @@
             }
         },
         "node_modules/@babel/compat-data": {
-            "version": "7.21.7",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.7.tgz",
-            "integrity": "sha512-KYMqFYTaenzMK4yUtf4EW9wc4N9ef80FsbMtkwool5zpwl4YrT1SdWYSTRcT94KO4hannogdS+LxY7L+arP3gA==",
+            "version": "7.21.9",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.9.tgz",
+            "integrity": "sha512-FUGed8kfhyWvbYug/Un/VPJD41rDIgoVVcR+FuzhzOYyRz5uED+Gd3SLZml0Uw2l2aHFb7ZgdW5mGA3G2cCCnQ==",
             "dev": true,
             "engines": {
                 "node": ">=6.9.0"
@@ -1539,9 +1543,9 @@
             }
         },
         "node_modules/@babel/generator": {
-            "version": "7.21.5",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.5.tgz",
-            "integrity": "sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w==",
+            "version": "7.21.9",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.9.tgz",
+            "integrity": "sha512-F3fZga2uv09wFdEjEQIJxXALXfz0+JaOb7SabvVMmjHxeVTuGW8wgE8Vp1Hd7O+zMTYtcfEISGRzPkeiaPPsvg==",
             "dev": true,
             "dependencies": {
                 "@babel/types": "^7.21.5",
@@ -1905,9 +1909,9 @@
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.21.8",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz",
-            "integrity": "sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA==",
+            "version": "7.21.9",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.9.tgz",
+            "integrity": "sha512-q5PNg/Bi1OpGgx5jYlvWZwAorZepEudDMCLtj967aeS7WMont7dUZI46M2XwcIQqvUlMxWfdLFu4S/qSxeUu5g==",
             "dev": true,
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -3060,23 +3064,23 @@
             }
         },
         "node_modules/@babel/standalone": {
-            "version": "7.21.8",
-            "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.21.8.tgz",
-            "integrity": "sha512-Od6cBJ8dm9wjAt+3olvO7N3s+8UsCkX3hH41Ew3BlFJw1QQtbctplq3kuwzzfk+YcmXE95k8fJCzbnhf32+BxQ==",
+            "version": "7.21.9",
+            "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.21.9.tgz",
+            "integrity": "sha512-I9UNGZyBQgJOXdzZNeqO5NfTZhZoCCjnkR31GlEH6CDfnIWSC2D3OYSZTSGsQ2JhEwx7tbNR+1HuYHcoZd1IaQ==",
             "dev": true,
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/template": {
-            "version": "7.20.7",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
-            "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
+            "version": "7.21.9",
+            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.21.9.tgz",
+            "integrity": "sha512-MK0X5k8NKOuWRamiEfc3KEJiHMTkGZNUjzMipqCGDDc6ijRl/B7RGSKVGncu4Ro/HdyzzY6cmoXuKI2Gffk7vQ==",
             "dev": true,
             "dependencies": {
-                "@babel/code-frame": "^7.18.6",
-                "@babel/parser": "^7.20.7",
-                "@babel/types": "^7.20.7"
+                "@babel/code-frame": "^7.21.4",
+                "@babel/parser": "^7.21.9",
+                "@babel/types": "^7.21.5"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -4653,6 +4657,31 @@
                 "@sinonjs/commons": "^1.7.0"
             }
         },
+        "node_modules/@smithy/protocol-http": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-1.0.1.tgz",
+            "integrity": "sha512-9OrEn0WfOVtBNYJUjUAn9AOiJ4lzERCJJ/JeZs8E6yajTGxBaFRxUnNBHiNqoDJVg076hY36UmEnPx7xXrvUSg==",
+            "optional": true,
+            "dependencies": {
+                "@smithy/types": "^1.0.0",
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@smithy/types": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/types/-/types-1.0.0.tgz",
+            "integrity": "sha512-kc1m5wPBHQCTixwuaOh9vnak/iJm21DrSf9UK6yDE5S3mQQ4u11pqAUiKWnlrZnYkeLfAI9UEHj9OaMT1v5Umg==",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
         "node_modules/@socket.io/component-emitter": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
@@ -4909,9 +4938,9 @@
             "dev": true
         },
         "node_modules/@types/node": {
-            "version": "20.1.7",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-20.1.7.tgz",
-            "integrity": "sha512-WCuw/o4GSwDGMoonES8rcvwsig77dGCMbZDrZr2x4ZZiNW4P/gcoZXe/0twgtobcTkmg9TuKflxYL/DuwDyJzg=="
+            "version": "20.2.3",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.3.tgz",
+            "integrity": "sha512-pg9d0yC4rVNWQzX8U7xb4olIOFuuVL9za3bzMT2pu2SU0SNEi66i2qrvhE2qt0HvkhuCaWJu7pLNOt/Pj8BIrw=="
         },
         "node_modules/@types/normalize-package-data": {
             "version": "2.4.1",
@@ -6435,9 +6464,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001488",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001488.tgz",
-            "integrity": "sha512-NORIQuuL4xGpIy6iCCQGN4iFjlBXtfKWIenlUuyZJumLRIindLb7wXM+GO8erEhb7vXfcnf4BAg2PrSDN5TNLQ==",
+            "version": "1.0.30001489",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001489.tgz",
+            "integrity": "sha512-x1mgZEXK8jHIfAxm+xgdpHpk50IN3z3q3zP261/WS+uvePxW8izXuCu6AHz0lkuYTlATDehiZ/tNyYBdSQsOUQ==",
             "dev": true,
             "funding": [
                 {
@@ -7943,9 +7972,9 @@
             "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.4.397",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.397.tgz",
-            "integrity": "sha512-jwnPxhh350Q/aMatQia31KAIQdhEsYS0fFZ0BQQlN9tfvOEwShu6ZNwI4kL/xBabjcB/nTy6lSt17kNIluJZ8Q==",
+            "version": "1.4.407",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.407.tgz",
+            "integrity": "sha512-5smEvFSFYMv90tICOzRVP7Opp98DAC4KW7RRipg3BuNpGbbV3N+x24Zh3sbLb1T5haGtOSy/hrBfXsWnIM9aCg==",
             "dev": true
         },
         "node_modules/emittery": {
@@ -8049,9 +8078,9 @@
             }
         },
         "node_modules/engine.io-parser": {
-            "version": "5.0.6",
-            "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.6.tgz",
-            "integrity": "sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==",
+            "version": "5.0.7",
+            "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.7.tgz",
+            "integrity": "sha512-P+jDFbvK6lE3n1OL+q9KuzdOFWkkZ/cMV9gol/SbVfpyqfvrfrFTOFJ6fQm2VC3PZHlU3QPhVwmbsCnauHF2MQ==",
             "engines": {
                 "node": ">=10.0.0"
             }
@@ -14566,9 +14595,9 @@
             "integrity": "sha512-i3Sf6khnenl0aXumo0whAlfPWTaBqHxEnVBBxpu3dZ7q69NkPPv71rvPjlDZ5wkeKCTNNUTECljerS5kcYQxRw=="
         },
         "node_modules/node-releases": {
-            "version": "2.0.10",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz",
-            "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==",
+            "version": "2.0.12",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz",
+            "integrity": "sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==",
             "dev": true
         },
         "node_modules/node-ssh": {
@@ -16738,9 +16767,9 @@
             }
         },
         "node_modules/socket.io-parser": {
-            "version": "4.2.2",
-            "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.2.tgz",
-            "integrity": "sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==",
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.3.tgz",
+            "integrity": "sha512-JMafRntWVO2DCJimKsRTh/wnqVvO4hrfwOqtO7f+uzwsQMuxO6VwImtYxaQ+ieoyshWOTJyV0fA21lccEXRPpQ==",
             "dependencies": {
                 "@socket.io/component-emitter": "~3.1.0",
                 "debug": "~4.3.1"
@@ -17737,6 +17766,7 @@
             "version": "4.1.1",
             "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
             "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==",
+            "dev": true,
             "dependencies": {
                 "punycode": "^2.3.0"
             },
@@ -17763,9 +17793,9 @@
             }
         },
         "node_modules/tslib": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-            "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+            "version": "2.5.2",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.2.tgz",
+            "integrity": "sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA=="
         },
         "node_modules/tunnel": {
             "version": "0.0.6",
@@ -18653,6 +18683,7 @@
             "version": "12.0.1",
             "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz",
             "integrity": "sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==",
+            "dev": true,
             "dependencies": {
                 "tr46": "^4.1.1",
                 "webidl-conversions": "^7.0.0"
@@ -18665,6 +18696,7 @@
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
             "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+            "dev": true,
             "engines": {
                 "node": ">=12"
             }
diff --git a/package.json b/package.json
index 98bbfb8b9..793dfa584 100644
--- a/package.json
+++ b/package.json
@@ -123,8 +123,7 @@
         "socks-proxy-agent": "6.1.1",
         "tar": "~6.1.11",
         "tcp-ping": "~0.1.1",
-        "thirty-two": "~1.0.2",
-        "whatwg-url": "^12.0.1"
+        "thirty-two": "~1.0.2"
     },
     "devDependencies": {
         "@actions/github": "~5.0.1",
@@ -186,6 +185,7 @@
         "vue-router": "~4.0.14",
         "vue-toastification": "~2.0.0-rc.5",
         "vuedraggable": "~4.1.0",
-        "wait-on": "^6.0.1"
+        "wait-on": "^6.0.1",
+        "whatwg-url": "~12.0.1"
     }
 }

From 8d05d80a5f70d34d15498f46ff7d093a6cd37f5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20Krau=C3=9F?= <max@krausshalt.com>
Date: Sun, 14 May 2023 10:36:41 +0200
Subject: [PATCH 17/26] feat: Adds message ttl to pushover notification

---
 server/notification-providers/pushover.js | 1 +
 src/components/notifications/Pushover.vue | 2 ++
 src/lang/de-CH.json                       | 1 +
 src/lang/de-DE.json                       | 1 +
 src/lang/en.json                          | 1 +
 5 files changed, 6 insertions(+)

diff --git a/server/notification-providers/pushover.js b/server/notification-providers/pushover.js
index e4f0ddb81..5f68bb8f6 100644
--- a/server/notification-providers/pushover.js
+++ b/server/notification-providers/pushover.js
@@ -16,6 +16,7 @@ class Pushover extends NotificationProvider {
             "sound": notification.pushoversounds,
             "priority": notification.pushoverpriority,
             "title": notification.pushovertitle,
+            "ttl": notification.pushoverttl,
             "retry": "30",
             "expire": "3600",
             "html": 1,
diff --git a/src/components/notifications/Pushover.vue b/src/components/notifications/Pushover.vue
index d9f24b29b..7ee0eafb6 100644
--- a/src/components/notifications/Pushover.vue
+++ b/src/components/notifications/Pushover.vue
@@ -42,6 +42,8 @@
             <option value="vibrate">{{ $t("pushoversounds vibrate") }}</option>
             <option value="none">{{ $t("pushoversounds none") }}</option>
         </select>
+        <label for="pushover-ttl" class="form-label">{{ $t("pushoverMessageTtl") }}</label>
+        <input id="pushover-ttl" v-model="$parent.notification.pushoverttl" type="number" min="0" step="1" class="form-control">
         <div class="form-text">
             <span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}
             <i18n-t tag="p" keypath="More info on:" style="margin-top: 8px;">
diff --git a/src/lang/de-CH.json b/src/lang/de-CH.json
index 3f3a860cc..84d74a24f 100644
--- a/src/lang/de-CH.json
+++ b/src/lang/de-CH.json
@@ -259,6 +259,7 @@
     "More info on:": "Mehr Infos auf: {0}",
     "pushoverDesc1": "Notfallpriorität (2) hat standardmässig 30 Sekunden Auszeit zwischen den Versuchen und läuft nach 1 Stunde ab.",
     "pushoverDesc2": "Fülle das Geräte Feld aus, wenn du Benachrichtigungen an verschiedene Geräte senden möchtest.",
+    "pushoverMessageTtl": "Message TTL (Sekunden)",
     "SMS Type": "SMS Typ",
     "octopushTypePremium": "Premium (Schnell - zur Benachrichtigung empfohlen)",
     "octopushTypeLowCost": "Kostengünstig (Langsam - manchmal vom Betreiber gesperrt)",
diff --git a/src/lang/de-DE.json b/src/lang/de-DE.json
index 48a8cd713..42460c519 100644
--- a/src/lang/de-DE.json
+++ b/src/lang/de-DE.json
@@ -259,6 +259,7 @@
     "More info on:": "Mehr Infos auf: {0}",
     "pushoverDesc1": "Notfallpriorität (2) hat standardmäßig 30 Sekunden Auszeit zwischen den Versuchen und läuft nach 1 Stunde ab.",
     "pushoverDesc2": "Fülle das Geräte Feld aus, wenn du Benachrichtigungen an verschiedene Geräte senden möchtest.",
+    "pushoverMessageTtl": "Message TTL (Sekunden)",
     "SMS Type": "SMS Typ",
     "octopushTypePremium": "Premium (Schnell - zur Benachrichtigung empfohlen)",
     "octopushTypeLowCost": "Kostengünstig (Langsam - manchmal vom Betreiber gesperrt)",
diff --git a/src/lang/en.json b/src/lang/en.json
index f33a7de37..956b120da 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -556,6 +556,7 @@
     "More info on:": "More info on: {0}",
     "pushoverDesc1": "Emergency priority (2) has default 30 second timeout between retries and will expire after 1 hour.",
     "pushoverDesc2": "If you want to send notifications to different devices, fill out Device field.",
+    "pushoverMessageTtl": "Message TTL (Seconds)",
     "SMS Type": "SMS Type",
     "octopushTypePremium": "Premium (Fast - recommended for alerting)",
     "octopushTypeLowCost": "Low Cost (Slow - sometimes blocked by operator)",

From a0d0d5b0159c9ab21f31af3fb62a0e075e127631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20Krau=C3=9F?= <max@krausshalt.com>
Date: Tue, 16 May 2023 18:31:28 +0200
Subject: [PATCH 18/26] fix: sends pushover ttl only if defined

---
 server/notification-providers/pushover.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/notification-providers/pushover.js b/server/notification-providers/pushover.js
index 5f68bb8f6..b9899e4db 100644
--- a/server/notification-providers/pushover.js
+++ b/server/notification-providers/pushover.js
@@ -16,7 +16,6 @@ class Pushover extends NotificationProvider {
             "sound": notification.pushoversounds,
             "priority": notification.pushoverpriority,
             "title": notification.pushovertitle,
-            "ttl": notification.pushoverttl,
             "retry": "30",
             "expire": "3600",
             "html": 1,
@@ -25,6 +24,9 @@ class Pushover extends NotificationProvider {
         if (notification.pushoverdevice) {
             data.device = notification.pushoverdevice;
         }
+        if (notification.pushoverttl) {
+            data.ttl = notification.pushoverttl;
+        }
 
         try {
             if (heartbeatJSON == null) {

From c1efe0f26d7e28f4c656cd05178a0af8424a5a63 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Fri, 26 May 2023 18:08:52 +0800
Subject: [PATCH 19/26] Add a warning for Node.js >= 20

---
 server/server.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/server/server.js b/server/server.js
index 12a711e80..ca046a017 100644
--- a/server/server.js
+++ b/server/server.js
@@ -19,6 +19,11 @@ const nodeVersion = parseInt(process.versions.node.split(".")[0]);
 const requiredVersion = 14;
 console.log(`Your Node.js version: ${nodeVersion}`);
 
+// See more: https://github.com/louislam/uptime-kuma/issues/3138
+if (nodeVersion >= 20) {
+    console.warn("\x1b[31m%s\x1b[0m", "Warning: Uptime Kuma is currently not stable on Node.js >= 20, please use Node.js 18.");
+}
+
 if (nodeVersion < requiredVersion) {
     console.error(`Error: Your Node.js version is not supported, please upgrade to Node.js >= ${requiredVersion}.`);
     process.exit(-1);

From 8ed2b594107fcff08111bec94adc019b07448b83 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Fri, 26 May 2023 21:38:51 +0800
Subject: [PATCH 20/26] Resolve conflict

---
 server/model/monitor.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/model/monitor.js b/server/model/monitor.js
index 6207f34d4..adeb35a04 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -1262,11 +1262,11 @@ class Monitor extends BeanModel {
      */
     async sendCertNotificationByTargetDays(certCN, certType, daysRemaining, targetDays, notificationList) {
 
-            let row = await R.getRow("SELECT * FROM notification_sent_history WHERE type = ? AND monitor_id = ? AND days <= ?", [
-                "certificate",
-                this.id,
-                targetDays,
-            ]);
+        let row = await R.getRow("SELECT * FROM notification_sent_history WHERE type = ? AND monitor_id = ? AND days <= ?", [
+            "certificate",
+            this.id,
+            targetDays,
+        ]);
 
         // Sent already, no need to send again
         if (row) {

From 85eb0843056411bd5dc44910cb92057aac9ffbda Mon Sep 17 00:00:00 2001
From: Yoswaris Lawpaiboon <22832362+kiznick@users.noreply.github.com>
Date: Mon, 29 May 2023 20:11:06 +0700
Subject: [PATCH 21/26] Setting Modal

---
 src/components/MonitorSettingDialog.vue | 123 ++++++++++++++++++++++++
 src/components/PublicGroupList.vue      |  32 ++----
 2 files changed, 129 insertions(+), 26 deletions(-)
 create mode 100644 src/components/MonitorSettingDialog.vue

diff --git a/src/components/MonitorSettingDialog.vue b/src/components/MonitorSettingDialog.vue
new file mode 100644
index 000000000..a6976853c
--- /dev/null
+++ b/src/components/MonitorSettingDialog.vue
@@ -0,0 +1,123 @@
+<template>
+    <div ref="MonitorSettingDialog" class="modal fade" tabindex="-1">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">
+                        {{ $t("Monitor Setting", [monitor.name]) }}
+                    </h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
+                </div>
+                <div class="modal-body">
+                    <div class="my-3 form-check">
+                        <input id="show-clickable-link" v-model="monitor.isClickAble" class="form-check-input" type="checkbox" @click="toggleLink(monitor.group_index, monitor.monitor_index)" />
+                        <label class="form-check-label" for="show-clickable-link">
+                            {{ $t("Show Clickable Link") }}
+                        </label>
+                        <div class="form-text">
+                            {{ $t("Show Clickable Link Description") }}
+                        </div>
+                    </div>
+
+                    <button
+                        class="btn btn-primary btn-add-group me-2"
+                        @click="$refs.badgeGeneratorDialog.show(monitor.id, monitor.name)"
+                    >
+                        <font-awesome-icon icon="certificate" />
+                        {{ $t("Open Badge Generator") }}
+                    </button>
+                </div>
+
+                <div class="modal-footer">
+                    <button type="submit" class="btn btn-danger" data-bs-dismiss="modal">
+                        {{ $t("Close") }}
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>
+    <BadgeGeneratorDialog ref="badgeGeneratorDialog" />
+</template>
+
+<script lang="ts">
+import { Modal } from "bootstrap";
+import BadgeGeneratorDialog from "./BadgeGeneratorDialog.vue";
+
+export default {
+    components: {
+        BadgeGeneratorDialog
+    },
+    props: {},
+    emits: [],
+    data() {
+        return {
+            monitor: {
+                id: null,
+                name: null,
+            },
+        };
+    },
+
+    computed: {},
+
+    mounted() {
+        this.MonitorSettingDialog = new Modal(this.$refs.MonitorSettingDialog);
+    },
+
+    methods: {
+        /**
+         * Setting monitor
+         * @param {Object} group Data of monitor
+         * @param {Object} monitor Data of monitor
+         */
+        show(group, monitor) {
+            this.monitor = {
+                id: monitor.element.id,
+                name: monitor.element.name,
+                monitor_index: monitor.index,
+                group_index: group.index,
+                isClickAble: this.showLink(monitor),
+            };
+
+            this.MonitorSettingDialog.show();
+        },
+
+        /**
+         * Toggle the value of sendUrl
+         * @param {number} groupIndex Index of group monitor is member of
+         * @param {number} index Index of monitor within group
+         */
+        toggleLink(groupIndex, index) {
+            this.$root.publicGroupList[groupIndex].monitorList[index].sendUrl = !this.$root.publicGroupList[groupIndex].monitorList[index].sendUrl;
+        },
+
+        /**
+         * Should a link to the monitor be shown?
+         * Attempts to guess if a link should be shown based upon if
+         * sendUrl is set and if the URL is default or not.
+         * @param {Object} monitor Monitor to check
+         * @param {boolean} [ignoreSendUrl=false] Should the presence of the sendUrl
+         * property be ignored. This will only work in edit mode.
+         * @returns {boolean}
+         */
+        showLink(monitor, ignoreSendUrl = false) {
+            // We must check if there are any elements in monitorList to
+            // prevent undefined errors if it hasn't been loaded yet
+            if (this.$parent.editMode && ignoreSendUrl && Object.keys(this.$root.monitorList).length) {
+                return this.$root.monitorList[monitor.element.id].type === "http" || this.$root.monitorList[monitor.element.id].type === "keyword";
+            }
+            return monitor.element.sendUrl && monitor.element.url && monitor.element.url !== "https://" && !this.editMode;
+        },
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../assets/vars.scss";
+
+.dark {
+    .modal-dialog .form-text, .modal-dialog p {
+        color: $dark-font-color;
+    }
+}
+</style>
diff --git a/src/components/PublicGroupList.vue b/src/components/PublicGroupList.vue
index 59658d6d8..e6af57eb7 100644
--- a/src/components/PublicGroupList.vue
+++ b/src/components/PublicGroupList.vue
@@ -49,26 +49,15 @@
                                                 {{ monitor.element.name }}
                                             </a>
                                             <p v-else class="item-name"> {{ monitor.element.name }} </p>
-                                            <span
-                                                v-if="showLink(monitor, true)"
-                                                title="Toggle Clickable Link"
-                                            >
-                                                <font-awesome-icon
-                                                    v-if="editMode"
-                                                    :class="{'link-active': monitor.element.sendUrl, 'btn-link': true}"
-                                                    icon="link" class="action me-3"
-                                                    @click="toggleLink(group.index, monitor.index)"
-                                                />
-                                            </span>
 
                                             <span
-                                                title="Badge Generator"
+                                                title="Setting"
                                             >
                                                 <font-awesome-icon
                                                     v-if="editMode"
                                                     :class="{'link-active': true, 'btn-link': true}"
-                                                    icon="certificate" class="action me-3"
-                                                    @click="$refs.badgeGeneratorDialog.show(monitor.element.id, monitor.element.name)"
+                                                    icon="cog" class="action me-3"
+                                                    @click="$refs.monitorSettingDialog.show(group, monitor)"
                                                 />
                                             </span>
                                         </div>
@@ -80,7 +69,7 @@
                                         <HeartbeatBar size="small" :monitor-id="monitor.element.id" />
                                     </div>
                                 </div>
-                                <BadgeGeneratorDialog ref="badgeGeneratorDialog" />
+                                <MonitorSettingDialog ref="monitorSettingDialog" />
                             </div>
                         </template>
                     </Draggable>
@@ -91,7 +80,7 @@
 </template>
 
 <script>
-import BadgeGeneratorDialog from "./BadgeGeneratorDialog.vue";
+import MonitorSettingDialog from "./MonitorSettingDialog.vue";
 import Draggable from "vuedraggable";
 import HeartbeatBar from "./HeartbeatBar.vue";
 import Uptime from "./Uptime.vue";
@@ -99,7 +88,7 @@ import Tag from "./Tag.vue";
 
 export default {
     components: {
-        BadgeGeneratorDialog,
+        MonitorSettingDialog,
         Draggable,
         HeartbeatBar,
         Uptime,
@@ -148,15 +137,6 @@ export default {
             this.$root.publicGroupList[groupIndex].monitorList.splice(index, 1);
         },
 
-        /**
-         * Toggle the value of sendUrl
-         * @param {number} groupIndex Index of group monitor is member of
-         * @param {number} index Index of monitor within group
-         */
-        toggleLink(groupIndex, index) {
-            this.$root.publicGroupList[groupIndex].monitorList[index].sendUrl = !this.$root.publicGroupList[groupIndex].monitorList[index].sendUrl;
-        },
-
         /**
          * Should a link to the monitor be shown?
          * Attempts to guess if a link should be shown based upon if

From f3c09f2bbd9edd1a674db65626b31fc2a7d72b67 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Mon, 29 May 2023 19:24:40 +0200
Subject: [PATCH 22/26] made every Notification provider supply time like
 dingding after #3152

---
 server/notification-providers/discord.js     |  8 ++++----
 server/notification-providers/feishu.js      |  6 ++----
 server/notification-providers/line.js        | 10 ++++++++--
 server/notification-providers/linenotify.js  | 10 ++++++++--
 server/notification-providers/lunasea.js     |  8 ++++++--
 server/notification-providers/mattermost.js  |  4 ++--
 server/notification-providers/pushbullet.js  |  8 ++++++--
 server/notification-providers/pushover.js    |  2 +-
 server/notification-providers/rocket-chat.js |  4 +---
 server/notification-providers/slack.js       |  3 +--
 server/notification-providers/smtp.js        |  2 +-
 11 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/server/notification-providers/discord.js b/server/notification-providers/discord.js
index b699228c9..37de0d364 100644
--- a/server/notification-providers/discord.js
+++ b/server/notification-providers/discord.js
@@ -59,8 +59,8 @@ class Discord extends NotificationProvider {
                                 value: monitorJSON["type"] === "push" ? "Heartbeat" : address,
                             },
                             {
-                                name: "Time (UTC)",
-                                value: heartbeatJSON["time"],
+                                name: `Time (${heartbeatJSON["timezone"]})`,
+                                value: heartbeatJSON["localDateTime"],
                             },
                             {
                                 name: "Error",
@@ -94,8 +94,8 @@ class Discord extends NotificationProvider {
                                 value: monitorJSON["type"] === "push" ? "Heartbeat" : address,
                             },
                             {
-                                name: "Time (UTC)",
-                                value: heartbeatJSON["time"],
+                                name: `Time (${heartbeatJSON["timezone"]})`,
+                                value: heartbeatJSON["localDateTime"],
                             },
                             {
                                 name: "Ping",
diff --git a/server/notification-providers/feishu.js b/server/notification-providers/feishu.js
index 73781ca4e..683a3653d 100644
--- a/server/notification-providers/feishu.js
+++ b/server/notification-providers/feishu.js
@@ -35,8 +35,7 @@ class Feishu extends NotificationProvider {
                                             text:
                                                 "[Down] " +
                                                 heartbeatJSON["msg"] +
-                                                "\nTime (UTC): " +
-                                                heartbeatJSON["time"],
+                                                `\nTime (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`
                                         },
                                     ],
                                 ],
@@ -62,8 +61,7 @@ class Feishu extends NotificationProvider {
                                             text:
                                                 "[Up] " +
                                                 heartbeatJSON["msg"] +
-                                                "\nTime (UTC): " +
-                                                heartbeatJSON["time"],
+                                                `\nTime (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`,
                                         },
                                     ],
                                 ],
diff --git a/server/notification-providers/line.js b/server/notification-providers/line.js
index e594e1742..10b7f2c9b 100644
--- a/server/notification-providers/line.js
+++ b/server/notification-providers/line.js
@@ -33,7 +33,10 @@ class Line extends NotificationProvider {
                     "messages": [
                         {
                             "type": "text",
-                            "text": "UptimeKuma Alert: [🔴 Down]\n" + "Name: " + monitorJSON["name"] + " \n" + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"]
+                            "text": "UptimeKuma Alert: [🔴 Down]\n" +
+                                "Name: " + monitorJSON["name"] + " \n" +
+                                heartbeatJSON["msg"] +
+                                `\nTime (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`
                         }
                     ]
                 };
@@ -44,7 +47,10 @@ class Line extends NotificationProvider {
                     "messages": [
                         {
                             "type": "text",
-                            "text": "UptimeKuma Alert: [✅ Up]\n" + "Name: " + monitorJSON["name"] + " \n" + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"]
+                            "text": "UptimeKuma Alert: [✅ Up]\n" +
+                                "Name: " + monitorJSON["name"] + " \n" +
+                                heartbeatJSON["msg"] +
+                                `\nTime (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`
                         }
                     ]
                 };
diff --git a/server/notification-providers/linenotify.js b/server/notification-providers/linenotify.js
index 8454152d8..279acb7d4 100644
--- a/server/notification-providers/linenotify.js
+++ b/server/notification-providers/linenotify.js
@@ -24,12 +24,18 @@ class LineNotify extends NotificationProvider {
                 await axios.post(lineAPIUrl, qs.stringify(testMessage), config);
             } else if (heartbeatJSON["status"] === DOWN) {
                 let downMessage = {
-                    "message": "\n[🔴 Down]\n" + "Name: " + monitorJSON["name"] + " \n" + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"]
+                    "message": "\n[🔴 Down]\n" +
+                        "Name: " + monitorJSON["name"] + " \n" +
+                        heartbeatJSON["msg"] + "\n" +
+                        `Time (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`
                 };
                 await axios.post(lineAPIUrl, qs.stringify(downMessage), config);
             } else if (heartbeatJSON["status"] === UP) {
                 let upMessage = {
-                    "message": "\n[✅ Up]\n" + "Name: " + monitorJSON["name"] + " \n" + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"]
+                    "message": "\n[✅ Up]\n" +
+                        "Name: " + monitorJSON["name"] + " \n" +
+                        heartbeatJSON["msg"] + "\n" +
+                        `Time (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`
                 };
                 await axios.post(lineAPIUrl, qs.stringify(upMessage), config);
             }
diff --git a/server/notification-providers/lunasea.js b/server/notification-providers/lunasea.js
index 4d7136f75..0a5fea7b0 100644
--- a/server/notification-providers/lunasea.js
+++ b/server/notification-providers/lunasea.js
@@ -28,7 +28,9 @@ class LunaSea extends NotificationProvider {
             if (heartbeatJSON["status"] === DOWN) {
                 let downdata = {
                     "title": "UptimeKuma Alert: " + monitorJSON["name"],
-                    "body": "[🔴 Down] " + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"],
+                    "body": "[🔴 Down] " +
+                        heartbeatJSON["msg"] +
+                        `\nTime (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`
                 };
                 await axios.post(lunaseaurl, downdata);
                 return okMsg;
@@ -37,7 +39,9 @@ class LunaSea extends NotificationProvider {
             if (heartbeatJSON["status"] === UP) {
                 let updata = {
                     "title": "UptimeKuma Alert: " + monitorJSON["name"],
-                    "body": "[✅ Up] " + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"],
+                    "body": "[✅ Up] " +
+                        heartbeatJSON["msg"] +
+                        `\nTime (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`
                 };
                 await axios.post(lunaseaurl, updata);
                 return okMsg;
diff --git a/server/notification-providers/mattermost.js b/server/notification-providers/mattermost.js
index bade6c195..d4997392c 100644
--- a/server/notification-providers/mattermost.js
+++ b/server/notification-providers/mattermost.js
@@ -88,8 +88,8 @@ class Mattermost extends NotificationProvider {
                             statusField,
                             {
                                 short: true,
-                                title: "Time (UTC)",
-                                value: heartbeatJSON.time,
+                                title: `Time (${heartbeatJSON["timezone"]})`,
+                                value: heartbeatJSON.localDateTime,
                             },
                         ],
                     },
diff --git a/server/notification-providers/pushbullet.js b/server/notification-providers/pushbullet.js
index 1346655d0..f3d95a85e 100644
--- a/server/notification-providers/pushbullet.js
+++ b/server/notification-providers/pushbullet.js
@@ -29,14 +29,18 @@ class Pushbullet extends NotificationProvider {
                 let downData = {
                     "type": "note",
                     "title": "UptimeKuma Alert: " + monitorJSON["name"],
-                    "body": "[🔴 Down] " + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"],
+                    "body": "[🔴 Down] " +
+                        heartbeatJSON["msg"] +
+                        `\nTime (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`,
                 };
                 await axios.post(pushbulletUrl, downData, config);
             } else if (heartbeatJSON["status"] === UP) {
                 let upData = {
                     "type": "note",
                     "title": "UptimeKuma Alert: " + monitorJSON["name"],
-                    "body": "[✅ Up] " + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"],
+                    "body": "[✅ Up] " +
+                        heartbeatJSON["msg"] +
+                        `\nTime (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`,
                 };
                 await axios.post(pushbulletUrl, upData, config);
             }
diff --git a/server/notification-providers/pushover.js b/server/notification-providers/pushover.js
index e4f0ddb81..398063cbf 100644
--- a/server/notification-providers/pushover.js
+++ b/server/notification-providers/pushover.js
@@ -30,7 +30,7 @@ class Pushover extends NotificationProvider {
                 await axios.post(pushoverlink, data);
                 return okMsg;
             } else {
-                data.message += "\n<b>Time (UTC)</b>:" + heartbeatJSON["time"];
+                data.message += `\n<b>Time (${heartbeatJSON["timezone"]})</b>:${heartbeatJSON["localDateTime"]}`;
                 await axios.post(pushoverlink, data);
                 return okMsg;
             }
diff --git a/server/notification-providers/rocket-chat.js b/server/notification-providers/rocket-chat.js
index fb48ce1a6..76b964a3a 100644
--- a/server/notification-providers/rocket-chat.js
+++ b/server/notification-providers/rocket-chat.js
@@ -22,8 +22,6 @@ class RocketChat extends NotificationProvider {
                 return okMsg;
             }
 
-            const time = heartbeatJSON["time"];
-
             let data = {
                 "text": "Uptime Kuma Alert",
                 "channel": notification.rocketchannel,
@@ -31,7 +29,7 @@ class RocketChat extends NotificationProvider {
                 "icon_emoji": notification.rocketiconemo,
                 "attachments": [
                     {
-                        "title": "Uptime Kuma Alert *Time (UTC)*\n" + time,
+                        "title": `Uptime Kuma Alert *Time (${heartbeatJSON["timezone"]})*\n${heartbeatJSON["localDateTime"]}`,
                         "text": "*Message*\n" + msg,
                     }
                 ]
diff --git a/server/notification-providers/slack.js b/server/notification-providers/slack.js
index da89f0f7a..12207bd4f 100644
--- a/server/notification-providers/slack.js
+++ b/server/notification-providers/slack.js
@@ -39,7 +39,6 @@ class Slack extends NotificationProvider {
                 return okMsg;
             }
 
-            const time = heartbeatJSON["time"];
             const textMsg = "Uptime Kuma Alert";
             let data = {
                 "text": `${textMsg}\n${msg}`,
@@ -65,7 +64,7 @@ class Slack extends NotificationProvider {
                                 },
                                 {
                                     "type": "mrkdwn",
-                                    "text": "*Time (UTC)*\n" + time,
+                                    "text": `*Time (${heartbeatJSON["timezone"]})*\n${heartbeatJSON["localDateTime"]}`,
                                 }],
                             }
                         ],
diff --git a/server/notification-providers/smtp.js b/server/notification-providers/smtp.js
index a6a0cc016..aae0e46c7 100644
--- a/server/notification-providers/smtp.js
+++ b/server/notification-providers/smtp.js
@@ -91,7 +91,7 @@ class SMTP extends NotificationProvider {
 
         let bodyTextContent = msg;
         if (heartbeatJSON) {
-            bodyTextContent = `${msg}\nTime (UTC): ${heartbeatJSON["time"]}`;
+            bodyTextContent = `${msg}\nTime (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`;
         }
 
         // send mail with defined transport object

From f1c184c30cc5b3977e2527fc3d86399ded6730ee Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Tue, 30 May 2023 17:37:53 +0800
Subject: [PATCH 23/26] Update README.md

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

diff --git a/README.md b/README.md
index 6cfd4f66c..7dfd3e57a 100644
--- a/README.md
+++ b/README.md
@@ -148,17 +148,18 @@ Telegram Notification Sample:
 
 If you love this project, please consider giving me a ⭐.
 
-## 🗣️ Discussion
+## 🗣️ Discussion / Ask for Help
 
-### Issues Page
+⚠️ For any general or technical questions, please don't send me an email, as I am unable to provide support in that manner. I will not response if you asked such questions.
 
-You can discuss or ask for help in [issues](https://github.com/louislam/uptime-kuma/issues).
+I recommend using Google, GitHub Issues, or Uptime Kuma's Subreddit for finding answers to your question. If you cannot find the information you need, feel free to ask:
 
-### Subreddit
+- [GitHub Issues](https://github.com/louislam/uptime-kuma/issues)
+- [Subreddit r/Uptime kuma](https://www.reddit.com/r/UptimeKuma/)
 
 My Reddit account: [u/louislamlam](https://reddit.com/u/louislamlam).  
 You can mention me if you ask a question on Reddit.
-[r/Uptime kuma](https://www.reddit.com/r/UptimeKuma/)
+
 
 ## Contribute
 

From 3ff910a8f81d5a9e7b6ddd18628db55128a946cb Mon Sep 17 00:00:00 2001
From: Yoswaris Lawpaiboon <22832362+kiznick@users.noreply.github.com>
Date: Tue, 30 May 2023 20:06:53 +0700
Subject: [PATCH 24/26] Fix Modal

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

diff --git a/src/components/PublicGroupList.vue b/src/components/PublicGroupList.vue
index e6af57eb7..00f38c5b9 100644
--- a/src/components/PublicGroupList.vue
+++ b/src/components/PublicGroupList.vue
@@ -69,7 +69,6 @@
                                         <HeartbeatBar size="small" :monitor-id="monitor.element.id" />
                                     </div>
                                 </div>
-                                <MonitorSettingDialog ref="monitorSettingDialog" />
                             </div>
                         </template>
                     </Draggable>
@@ -77,6 +76,7 @@
             </div>
         </template>
     </Draggable>
+    <MonitorSettingDialog ref="monitorSettingDialog" />
 </template>
 
 <script>

From 04806ba4f3c7d607dd5123205b0726c7a1523893 Mon Sep 17 00:00:00 2001
From: Nelson Chan <chakflying@hotmail.com>
Date: Wed, 31 May 2023 09:26:54 +0800
Subject: [PATCH 25/26] Fix: Fix incorrect modal layout

---
 src/components/APIKeyDialog.vue | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/components/APIKeyDialog.vue b/src/components/APIKeyDialog.vue
index 471203763..4bba69fec 100644
--- a/src/components/APIKeyDialog.vue
+++ b/src/components/APIKeyDialog.vue
@@ -48,15 +48,14 @@
                                 </div>
                             </div>
                         </div>
-
-                        <div class="modal-footer">
-                            <button
-                                id="monitor-submit-btn" class="btn btn-primary" type="submit"
-                                :disabled="processing"
-                            >
-                                {{ $t("Generate") }}
-                            </button>
-                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button
+                            id="monitor-submit-btn" class="btn btn-primary" type="submit"
+                            :disabled="processing"
+                        >
+                            {{ $t("Generate") }}
+                        </button>
                     </div>
                 </div>
             </div>

From 1634df5a39431275ca3820382f1193a02f267f18 Mon Sep 17 00:00:00 2001
From: Yoswaris Lawpaiboon <22832362+kiznick@users.noreply.github.com>
Date: Wed, 31 May 2023 16:00:38 +0700
Subject: [PATCH 26/26] Update en.json

---
 src/lang/en.json | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/lang/en.json b/src/lang/en.json
index 4a2fe8813..833ab6327 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -717,5 +717,29 @@
     "twilioAccountSID": "Account SID",
     "twilioAuthToken": "Auth Token",
     "twilioFromNumber": "From Number",
-    "twilioToNumber": "To Number"
+    "twilioToNumber": "To Number",
+    "Monitor Setting": "{0}'s Monitor Setting",
+    "Show Clickable Link": "Show Clickable Link",
+    "Show Clickable Link Description": "If checked everyone who have access to this status page can have access to monitor URL.",
+    "Open Badge Generator": "Open Badge Generator",
+    "Badge Generator": "{0}'s Badge Generator",
+    "Badge Type": "Badge Type",
+    "Badge Duration": "Badge Duration",
+    "Badge Label": "Badge Label",
+    "Badge Prefix": "Badge Prefix",
+    "Badge Suffix": "Badge Suffix",
+    "Badge Label Color": "Badge Label Color",
+    "Badge Color": "Badge Color",
+    "Badge Label Prefix": "Badge Label Prefix",
+    "Badge Label Suffix": "Badge Label Suffix",
+    "Badge Up Color": "Badge Up Color",
+    "Badge Down Color": "Badge Down Color",
+    "Badge Pending Color": "Badge Pending Color",
+    "Badge Maintenance Color": "Badge Maintenance Color",
+    "Badge Warn Color": "Badge Warn Color",
+    "Badge Warn Days": "Badge Warn Days",
+    "Badge Down Days": "Badge Down Days",
+    "Badge Style": "Badge Style",
+    "Badge value (For Testing only.)": "Badge value (For Testing only.)",
+    "Badge URL": "Badge URL"
 }