[empty commit] pull request for <YOUR TASK NAME>

.dockerignore

@@ -33,7 +33,7 @@ tsconfig.json
 /ecosystem.config.js
 /extra/healthcheck.exe
 /extra/healthcheck
-extra/exe-builder
+
 
 ### .gitignore content (commented rules are duplicated)
 
@@ -48,4 +48,6 @@ dist-ssr
 #!/data/.gitkeep
 #.vscode
 
+
+
 ### End of .gitignore content

.github/ISSUE_TEMPLATE/ask-for-help.yaml

@@ -26,12 +26,6 @@ body:
       label: "📝 Describe your problem"
       description: "Please walk us through it step by step."
       placeholder: "Describe what are you asking for..."
-  - type: textarea
-    id: error-msg
-    validations:
-      required: false
-    attributes:
-      label: "📝 Error Message(s) or Log"
   - type: input
     id: uptime-kuma-version
     attributes:

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -61,8 +61,8 @@ body:
     id: operating-system
     attributes:
       label: "💻 Operating System and Arch"
-      description: "Which OS is your server/device running on? (For Replit, please do not report this bug)"
-      placeholder: "Ex. Ubuntu 20.04 x64 "
+      description: "Which OS is your server/device running on?"
+      placeholder: "Ex. Ubuntu 20.04 x86"
     validations:
       required: true
   - type: input

.github/ISSUE_TEMPLATE/security.md

@@ -1,19 +0,0 @@
----
-
-name: "Security Issue"
-about: "Just for alerting @louislam, do not provide any details here"
-title: "Security Issue"
-ref: "main"
-labels:
-
-- security
-
----
-
-DO NOT PROVIDE ANY DETAILS HERE. Please privately report to https://github.com/louislam/uptime-kuma/security/advisories/new.
-
-
-Why need this issue? It is because GitHub Advisory do not send a notification to @louislam, it is a workaround to do so.
-
-Your GitHub Advisory URL:
-

.github/config/exclude.txt

@@ -1 +0,0 @@
-# This is a .gitignore style file for 'GrantBirki/json-yaml-validate' Action workflow

.github/workflows/auto-test.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest, windows-latest]
-        node: [ 14, 16, 18, 20 ]
+        node: [ 14, 16, 18, 19 ]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

.github/workflows/json-yaml-validate.yml

@@ -1,26 +0,0 @@
-name: json-yaml-validate 
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-  workflow_dispatch:
-
-permissions:
-  contents: read
-  pull-requests: write # enable write permissions for pull request comments
-
-jobs:
-  json-yaml-validate:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: json-yaml-validate
-        id: json-yaml-validate
-        uses: GrantBirki/json-yaml-validate@v1.3.0
-        with:
-          comment: "true" # enable comment mode
-          exclude_file: ".github/config/exclude.txt" # gitignore style file for exclusions

.gitignore

@@ -20,9 +20,3 @@ cypress/screenshots
 /extra/healthcheck.exe
 /extra/healthcheck
 /extra/healthcheck-armv7
-
-extra/exe-builder/bin
-extra/exe-builder/obj
-
-.vs
-.vscode

.stylelintrc

@@ -10,6 +10,5 @@
         "color-function-notation": "legacy",
         "shorthand-property-no-redundant-values": null,
         "color-hex-length": null,
-        "declaration-block-no-redundant-longhand-properties": null
     }
 }

CONTRIBUTING.md

@@ -47,17 +47,17 @@ Here are some references:
 
 ❌ Won't Merge
 - A dedicated pr for translating existing languages (You can now translate on https://weblate.kuma.pet) 
-- Do not pass the auto test
+- Do not pass auto test
 - Any breaking changes
-- Duplicated pull requests
+- Duplicated pull request
 - Buggy
 - UI/UX is not close to Uptime Kuma 
-- Modifications or deletions of existing logic without a valid reason.
-- Adding functions that is completely out of scope
-- Converting existing code into other programming languages
-- Unnecessarily large code changes that are hard to review and cause conflicts with other PRs.
+- Existing logic is completely modified or deleted for no reason
+- A function that is completely out of scope
+- Convert existing code into other programming languages
+- Unnecessary large code changes (Hard to review, causes code conflicts to other pull requests)
 
-The above cases may not cover all possible situations.
+The above cases cannot cover all situations.
 
 I (@louislam) have the final say. If your pull request does not meet my expectations, I will reject it, no matter how much time you spend on it. Therefore, it is essential to have a discussion beforehand.
 
@@ -235,13 +235,12 @@ https://github.com/louislam/uptime-kuma/issues?q=sort%3Aupdated-desc
 
 1. Draft a release note
 2. Make sure the repo is cleared
-3. If the healthcheck is updated, remember to re-compile it: `npm run build-docker-builder-go`
 3. `npm run release-final with env vars: `VERSION` and `GITHUB_TOKEN`
 4. Wait until the `Press any key to continue`
 5. `git push`
 6. Publish the release note as 1.X.X 
 7. Press any key to continue
-8. Deploy to the demo server: `npm run deploy-demo-server`
+8. SSH to demo site server and update to 1.X.X
 
 Checking:
 

README.md

@@ -49,13 +49,8 @@ Uptime Kuma is now running on http://localhost:3001
 
 ### 💪🏻 Non-Docker
 
-Requirements: 
-- Platform
-  - ✅ Major Linux distros such as Debian, Ubuntu, CentOS, Fedora and ArchLinux etc. 
-  - ✅ Windows 10 (x64), Windows Server 2012 R2 (x64) or higher
-  - ❌ Replit / Heroku
-- [Node.js](https://nodejs.org/en/download/) 14 / 16 / 18 (20 is not supported)
-- [npm](https://docs.npmjs.com/cli/) >= 7
+Required Tools: 
+- [Node.js](https://nodejs.org/en/download/) >= 14
 - [Git](https://git-scm.com/downloads) 
 - [pm2](https://pm2.keymetrics.io/) - For running Uptime Kuma in the background
 
@@ -91,10 +86,6 @@ pm2 monit
 pm2 save && pm2 startup
 ```
 
-### Windows Portable (x64)
-
-https://github.com/louislam/uptime-kuma/releases/download/1.21.0/uptime-kuma-win64-portable-1.0.0.zip
-
 ### Advanced Installation
 
 If you need more options or need to browse via a reverse proxy, please read:
@@ -152,18 +143,17 @@ Telegram Notification Sample:
 
 If you love this project, please consider giving me a ⭐.
 
-## 🗣️ Discussion / Ask for Help
+## 🗣️ Discussion
 
-⚠️ 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.
+### Issues Page
 
-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:
+You can discuss or ask for help in [issues](https://github.com/louislam/uptime-kuma/issues).
 
-- [GitHub Issues](https://github.com/louislam/uptime-kuma/issues)
-- [Subreddit r/Uptime kuma](https://www.reddit.com/r/UptimeKuma/)
+### Subreddit
 
 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
 

SECURITY.md

@@ -2,15 +2,10 @@
 
 ## Reporting a Vulnerability
 
-1. Please report security issues to https://github.com/louislam/uptime-kuma/security/advisories/new.
-1. Please also create a empty security issues for alerting me, as GitHub Advisory do not send a notification, I probably will miss without this. https://github.com/louislam/uptime-kuma/issues/new?assignees=&labels=help&template=security.md
+Please report security issues to https://github.com/louislam/uptime-kuma/security/advisories/new.
 
 Do not use the public issue tracker or discuss it in the public as it will cause more damage.
 
-## Do you accept other 3rd-party bug bounty platforms?
-
-At this moment, I DO NOT accept other bug bounty platforms, because I am not familiar with these platforms and someone have tried to send a phishing link to me by this already. To minimize my own risk, please report through GitHub Advisories only. I will ignore all 3rd-party bug bounty platforms emails.
-
 ## Supported Versions
 
 ### Uptime Kuma Versions

db/patch-add-description-monitor.sql

@@ -1,7 +0,0 @@
--- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
-BEGIN TRANSACTION;
-
-ALTER TABLE monitor
-    ADD description TEXT default null;
-
-COMMIT;

db/patch-add-parent-monitor.sql

@@ -1,6 +0,0 @@
-BEGIN TRANSACTION;
-
-ALTER TABLE monitor
-    ADD parent INTEGER REFERENCES [monitor] ([id]) ON DELETE SET NULL ON UPDATE CASCADE;
-
-COMMIT

db/patch-api-key-table.sql

@@ -1,13 +0,0 @@
--- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
-BEGIN TRANSACTION;
-CREATE TABLE [api_key] (
-    [id] INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    [key] VARCHAR(255) NOT NULL,
-    [name] VARCHAR(255) NOT NULL,
-    [user_id] INTEGER NOT NULL,
-    [created_date] DATETIME DEFAULT (DATETIME('now')) NOT NULL,
-    [active] BOOLEAN DEFAULT 1 NOT NULL,
-    [expires] DATETIME DEFAULT NULL,
-    CONSTRAINT FK_user FOREIGN KEY ([user_id]) REFERENCES [user]([id]) ON DELETE CASCADE ON UPDATE CASCADE
-);
-COMMIT;

db/patch-http-body-encoding.sql

@@ -1,12 +0,0 @@
--- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
-BEGIN TRANSACTION;
-
-ALTER TABLE monitor ADD http_body_encoding VARCHAR(25);
-
-COMMIT;
-
-BEGIN TRANSACTION;
-
-UPDATE monitor SET http_body_encoding = 'json' WHERE (type = 'http' or type = 'keyword') AND http_body_encoding IS NULL;
-
-COMMIT;

db/patch-maintenance-cron.sql

@@ -1,11 +0,0 @@
--- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
-BEGIN TRANSACTION;
-
-DROP TABLE maintenance_timeslot;
-
--- 999 characters. https://stackoverflow.com/questions/46134830/maximum-length-for-cron-job
-ALTER TABLE maintenance ADD cron TEXT;
-ALTER TABLE maintenance ADD timezone VARCHAR(255);
-ALTER TABLE maintenance ADD duration INTEGER;
-
-COMMIT;

db/patch-monitor-tls.sql

@@ -1,13 +0,0 @@
--- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
-BEGIN TRANSACTION;
-
-ALTER TABLE monitor
-    ADD tls_ca TEXT default null;
-
-ALTER TABLE monitor
-    ADD tls_cert TEXT default null;
-
-ALTER TABLE monitor
-    ADD tls_key TEXT default null;
-
-COMMIT;

docker/alpine-base.dockerfile

@@ -4,5 +4,5 @@ WORKDIR /app
 
 # Install apprise, iputils for non-root ping, setpriv
 RUN apk add --no-cache iputils setpriv dumb-init python3 py3-cryptography py3-pip py3-six py3-yaml py3-click py3-markdown py3-requests py3-requests-oauthlib git && \
-    pip3 --no-cache-dir install apprise==1.4.0 && \
+    pip3 --no-cache-dir install apprise==1.2.1 && \
     rm -rf /root/.cache

docker/debian-base.dockerfile

@@ -8,21 +8,21 @@ WORKDIR /app
 # Install Curl
 # Install Apprise, add sqlite3 cli for debugging in the future, iputils-ping for ping, util-linux for setpriv
 # Stupid python3 and python3-pip actually install a lot of useless things into Debian, specify --no-install-recommends to skip them, make the base even smaller than alpine!
-RUN apt-get update && \
-    apt-get --yes --no-install-recommends install python3 python3-pip python3-cryptography python3-six python3-yaml python3-click python3-markdown python3-requests python3-requests-oauthlib \
-        sqlite3 iputils-ping util-linux dumb-init git curl ca-certificates && \
-    pip3 --no-cache-dir install apprise==1.4.0 && \
+RUN apt update && \
+    apt --yes --no-install-recommends install python3 python3-pip python3-cryptography python3-six python3-yaml python3-click python3-markdown python3-requests python3-requests-oauthlib \
+        sqlite3 iputils-ping util-linux dumb-init git && \
+    pip3 --no-cache-dir install apprise==1.2.1 && \
     rm -rf /var/lib/apt/lists/* && \
     apt --yes autoremove
 
 # Install cloudflared
-RUN set -eux && \
-    mkdir -p --mode=0755 /usr/share/keyrings && \
-    curl --fail --show-error --silent --location --insecure https://pkg.cloudflare.com/cloudflare-main.gpg --output /usr/share/keyrings/cloudflare-main.gpg && \
-    echo 'deb [signed-by=/usr/share/keyrings/cloudflare-main.gpg] https://pkg.cloudflare.com/cloudflared buster main' | tee /etc/apt/sources.list.d/cloudflared.list && \
-    apt-get update && \
-    apt-get install --yes --no-install-recommends cloudflared && \
-    cloudflared version && \
+# dpkg --add-architecture arm: cloudflared do not provide armhf, this is workaround. Read more: https://github.com/cloudflare/cloudflared/issues/583
+COPY extra/download-cloudflared.js ./extra/download-cloudflared.js
+RUN node ./extra/download-cloudflared.js $TARGETPLATFORM && \
+    dpkg --add-architecture arm && \
+    apt update && \
+    apt --yes --no-install-recommends install ./cloudflared.deb && \
     rm -rf /var/lib/apt/lists/* && \
+    rm -f cloudflared.deb && \
     apt --yes autoremove
 

docker/dockerfile

@@ -71,7 +71,7 @@ RUN npm ci
 
 EXPOSE 3000 3001
 VOLUME ["/app/data"]
-HEALTHCHECK --interval=60s --timeout=30s --start-period=180s --retries=5 CMD extra/healthcheck
+HEALTHCHECK --interval=60s --timeout=30s --start-period=180s --retries=5 CMD node extra/healthcheck.js
 CMD ["npm", "run", "start-pr-test"]
 
 ############################################

extra/beta/update-version.js

@@ -22,8 +22,7 @@ if (! exists) {
     fs.writeFileSync("package.json", JSON.stringify(pkg, null, 4) + "\n");
 
     // Also update package-lock.json
-    const npm = /^win/.test(process.platform) ? "npm.cmd" : "npm";
-    childProcess.spawnSync(npm, [ "install" ]);
+    childProcess.spawnSync("npm", [ "install" ]);
 
     commit(version);
     tag(version);

extra/deploy-demo-server.js

@@ -1,60 +0,0 @@
-require("dotenv").config();
-const { NodeSSH } = require("node-ssh");
-const readline = require("readline");
-const rl = readline.createInterface({ input: process.stdin,
-    output: process.stdout });
-const prompt = (query) => new Promise((resolve) => rl.question(query, resolve));
-
-(async () => {
-    try {
-        console.log("SSH to demo server");
-        const ssh = new NodeSSH();
-        await ssh.connect({
-            host: process.env.UPTIME_KUMA_DEMO_HOST,
-            port: process.env.UPTIME_KUMA_DEMO_PORT,
-            username: process.env.UPTIME_KUMA_DEMO_USERNAME,
-            privateKeyPath: process.env.UPTIME_KUMA_DEMO_PRIVATE_KEY_PATH
-        });
-
-        let cwd = process.env.UPTIME_KUMA_DEMO_CWD;
-        let result;
-
-        const version = await prompt("Enter Version: ");
-
-        result = await ssh.execCommand("git fetch --all", {
-            cwd,
-        });
-        console.log(result.stdout + result.stderr);
-
-        await prompt("Press any key to continue...");
-
-        result = await ssh.execCommand(`git checkout ${version} --force`, {
-            cwd,
-        });
-        console.log(result.stdout + result.stderr);
-
-        result = await ssh.execCommand("npm run download-dist", {
-            cwd,
-        });
-        console.log(result.stdout + result.stderr);
-
-        result = await ssh.execCommand("npm install --production", {
-            cwd,
-        });
-        console.log(result.stdout + result.stderr);
-
-        /*
-        result = await ssh.execCommand("pm2 restart 1", {
-            cwd,
-        });
-        console.log(result.stdout + result.stderr);*/
-
-    } catch (e) {
-        console.log(e);
-    } finally {
-        rl.close();
-    }
-})();
-
-// When done reading prompt, exit program
-rl.on("close", () => process.exit(0));

extra/download-cloudflared.js

@@ -0,0 +1,48 @@
+//
+
+const http = require("https"); // or 'https' for https:// URLs
+const fs = require("fs");
+
+const platform = process.argv[2];
+
+if (!platform) {
+    console.error("No platform??");
+    process.exit(1);
+}
+
+let arch = null;
+
+if (platform === "linux/amd64") {
+    arch = "amd64";
+} else if (platform === "linux/arm64") {
+    arch = "arm64";
+} else if (platform === "linux/arm/v7") {
+    arch = "arm";
+} else {
+    console.error("Invalid platform?? " + platform);
+}
+
+const file = fs.createWriteStream("cloudflared.deb");
+get("https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-" + arch + ".deb");
+
+/**
+ * Download specified file
+ * @param {string} url URL to request
+ */
+function get(url) {
+    http.get(url, function (res) {
+        if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
+            console.log("Redirect to " + res.headers.location);
+            get(res.headers.location);
+        } else if (res.statusCode >= 200 && res.statusCode < 300) {
+            res.pipe(file);
+
+            res.on("end", function () {
+                console.log("Downloaded");
+            });
+        } else {
+            console.error(res.statusCode);
+            process.exit(1);
+        }
+    });
+}

extra/download-dist.js

@@ -47,7 +47,6 @@ function download(url) {
                     });
                 }
                 console.log("Done");
-                process.exit(0);
             });
 
             tarStream.on("error", () => {

extra/exe-builder/.gitignore

@@ -1 +0,0 @@
-packages/

extra/exe-builder/App.config

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
-    </startup>
-
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Diagnostics.Tracing" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Reflection" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.1" newVersion="4.1.1.1" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

extra/exe-builder/DownloadForm.Designer.cs

@@ -1,84 +0,0 @@
-using System.ComponentModel;
-
-namespace UptimeKuma {
-    partial class DownloadForm {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing) {
-            if (disposing && (components != null)) {
-                components.Dispose();
-            }
-
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent() {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DownloadForm));
-            this.progressBar = new System.Windows.Forms.ProgressBar();
-            this.label = new System.Windows.Forms.Label();
-            this.labelData = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // progressBar
-            // 
-            this.progressBar.Location = new System.Drawing.Point(12, 12);
-            this.progressBar.Name = "progressBar";
-            this.progressBar.Size = new System.Drawing.Size(472, 41);
-            this.progressBar.TabIndex = 0;
-            // 
-            // label
-            // 
-            this.label.Location = new System.Drawing.Point(12, 59);
-            this.label.Name = "label";
-            this.label.Size = new System.Drawing.Size(472, 23);
-            this.label.TabIndex = 1;
-            this.label.Text = "Preparing...";
-            // 
-            // labelData
-            // 
-            this.labelData.Location = new System.Drawing.Point(12, 82);
-            this.labelData.Name = "labelData";
-            this.labelData.Size = new System.Drawing.Size(472, 23);
-            this.labelData.TabIndex = 2;
-            // 
-            // DownloadForm
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(496, 117);
-            this.Controls.Add(this.labelData);
-            this.Controls.Add(this.label);
-            this.Controls.Add(this.progressBar);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.MaximizeBox = false;
-            this.Name = "DownloadForm";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "Uptime Kuma";
-            this.Load += new System.EventHandler(this.DownloadForm_Load);
-            this.ResumeLayout(false);
-        }
-
-        private System.Windows.Forms.Label labelData;
-
-        private System.Windows.Forms.Label label;
-
-        private System.Windows.Forms.ProgressBar progressBar;
-
-        #endregion
-    }
-}
-

extra/exe-builder/DownloadForm.cs

@@ -1,204 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.IO;
-using System.IO.Compression;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using Newtonsoft.Json;
-
-namespace UptimeKuma {
-    public partial class DownloadForm : Form {
-        private readonly Queue<DownloadItem> downloadQueue = new();
-        private readonly WebClient webClient = new();
-        private DownloadItem currentDownloadItem;
-
-        public DownloadForm() {
-            InitializeComponent();
-        }
-
-        private void DownloadForm_Load(object sender, EventArgs e) {
-            webClient.DownloadProgressChanged += DownloadProgressChanged;
-            webClient.DownloadFileCompleted += DownloadFileCompleted;
-
-            label.Text = "Reading latest version...";
-
-            // Read json from https://uptime.kuma.pet/version
-            var versionJson = new WebClient().DownloadString("https://uptime.kuma.pet/version");
-            var versionObj = JsonConvert.DeserializeObject<Version>(versionJson);
-
-            var nodeVersion = versionObj.nodejs;
-            var uptimeKumaVersion = versionObj.latest;
-            var hasUpdateFile = File.Exists("update");
-
-            if (!Directory.Exists("node")) {
-                downloadQueue.Enqueue(new DownloadItem {
-                    URL = $"https://nodejs.org/dist/v{nodeVersion}/node-v{nodeVersion}-win-x64.zip",
-                    Filename = "node.zip",
-                    TargetFolder = "node"
-                });
-            }
-
-            if (!Directory.Exists("core") || hasUpdateFile) {
-
-                // It is update, rename the core folder to core.old
-                if (Directory.Exists("core")) {
-                    // Remove the old core.old folder
-                    if (Directory.Exists("core.old")) {
-                        Directory.Delete("core.old", true);
-                    }
-
-                    Directory.Move("core", "core.old");
-                }
-
-                downloadQueue.Enqueue(new DownloadItem {
-                    URL = $"https://github.com/louislam/uptime-kuma/archive/refs/tags/{uptimeKumaVersion}.zip",
-                    Filename = "core.zip",
-                    TargetFolder = "core"
-                });
-
-                File.WriteAllText("version.json", versionJson);
-
-                // Delete the update file
-                if (hasUpdateFile) {
-                    File.Delete("update");
-                }
-            }
-
-            DownloadNextFile();
-        }
-
-        void DownloadNextFile() {
-            if (downloadQueue.Count > 0) {
-                var item = downloadQueue.Dequeue();
-
-                currentDownloadItem = item;
-
-                // Download if the zip file is not existing
-                if (!File.Exists(item.Filename)) {
-                    label.Text = item.URL;
-                    webClient.DownloadFileAsync(new Uri(item.URL), item.Filename);
-                } else {
-                    progressBar.Value = 100;
-                    label.Text = "Use local " + item.Filename;
-                    DownloadFileCompleted(null, null);
-                }
-            } else {
-                npmSetup();
-            }
-        }
-
-        void npmSetup() {
-            labelData.Text = "";
-
-            var npm = "..\\node\\npm.cmd";
-            var cmd = $"{npm} ci --production & {npm} run download-dist & exit";
-
-            var startInfo = new ProcessStartInfo {
-                FileName = "cmd.exe",
-                Arguments = $"/k \"{cmd}\"",
-                RedirectStandardOutput = false,
-                RedirectStandardError = false,
-                RedirectStandardInput = true,
-                UseShellExecute = false,
-                CreateNoWindow = false,
-                WorkingDirectory = "core"
-            };
-
-            var process = new Process();
-            process.StartInfo = startInfo;
-            process.EnableRaisingEvents = true;
-            process.Exited += (_, e) => {
-                progressBar.Value = 100;
-
-               if (process.ExitCode == 0) {
-                   Task.Delay(2000).ContinueWith(_ => {
-                       Application.Restart();
-                   });
-                   label.Text = "Done";
-               } else {
-                   label.Text = "Failed, exit code: " + process.ExitCode;
-               }
-
-            };
-            process.Start();
-            label.Text = "Installing dependencies and download dist files";
-            progressBar.Value = 50;
-            process.WaitForExit();
-        }
-
-        void DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e) {
-            progressBar.Value = e.ProgressPercentage;
-            var total = e.TotalBytesToReceive / 1024;
-            var current = e.BytesReceived / 1024;
-
-            if (total > 0) {
-                labelData.Text = $"{current}KB/{total}KB";
-            }
-        }
-
-        void DownloadFileCompleted(object sender, AsyncCompletedEventArgs e) {
-            Extract(currentDownloadItem);
-            DownloadNextFile();
-        }
-
-        void Extract(DownloadItem item) {
-            if (Directory.Exists(item.TargetFolder)) {
-                var dir = new DirectoryInfo(item.TargetFolder);
-                dir.Delete(true);
-            }
-
-            if (Directory.Exists("temp")) {
-                var dir = new DirectoryInfo("temp");
-                dir.Delete(true);
-            }
-
-            labelData.Text = $"Extracting {item.Filename}...";
-
-            ZipFile.ExtractToDirectory(item.Filename, "temp");
-
-            string[] dirList;
-
-            // Move to the correct level
-            dirList = Directory.GetDirectories("temp");
-
-
-
-            if (dirList.Length > 0) {
-                var dir = dirList[0];
-
-                // As sometime ExtractToDirectory is still locking the directory, loop until ok
-                while (true) {
-                    try {
-                        Directory.Move(dir, item.TargetFolder);
-                        break;
-                    } catch (Exception exception) {
-                        Thread.Sleep(1000);
-                    }
-                }
-
-            } else {
-                MessageBox.Show("Unexcepted Error: Cannot move extracted files, folder not found.");
-            }
-
-            labelData.Text = $"Extracted";
-
-            if (Directory.Exists("temp")) {
-                var dir = new DirectoryInfo("temp");
-                dir.Delete(true);
-            }
-
-            File.Delete(item.Filename);
-        }
-    }
-
-    public class DownloadItem {
-        public string URL { get; set; }
-        public string Filename { get; set; }
-        public string TargetFolder { get; set; }
-    }
-}
-

extra/exe-builder/DownloadForm.resx

@@ -1,377 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAMAMDAAAAEAIACoJQAANgAAACAgAAABACAAqBAAAN4lAAAQEAAAAQAgAGgEAACGNgAAKAAAADAA
-        AABgAAAAAQAgAAAAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAA////BPT09Bfu7u4e8fHxJPPz8yv19fUy9fX1M/Pz8yvx8fEk9vb2HPPz8xXMzMwFAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//
-        /wHv7+8f7u7uPPPz81Tx8fFs8fHxgPHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGB8fHxcfHx8V3x8fFI9PT0MOvr6w0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AADy8vIU8fHxS/Dw8Hbx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fFr9PT0R/Dw8CIAAAABAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAA8vLyFPHx8Vnx8fGB8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fFs9fX1Mb+/vwQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAICAgALy8vI88fHxfvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvLy8nby8vI8gICAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAzMzMBfHx8Vrx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8vLyYf///wwAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMzMwF8vLyYPHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8W/z8/MWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADv7+9R8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLw8PB26urqDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPLy8ijx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgu7w7Ifj79ud2u7PtNLrw83P677dzeu85c3r
-        u+rM67rwzOu68c7rverQ68Dj0uvD3NbuyM3b7c+64u7apujv5ZPx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxXgAAAAEAAAAAAAAAAAAAAAAAAAAA4+PjCfDw
-        8Hfx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLd7tSmzeu92MbqsvvG6bH/xumy/8fq
-        s//H6rP/yOq0/8jqtf/J6rb/yeq2/8rrt//K67j/y+u4/8vruf/M67r/zOu7/83ru//Q7MDx1u7Kz9/t
-        163s8OuJ8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgu/v7y8AAAAAAAAAAAAA
-        AAAAAAAA7u7uPfHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC5PDdl8jqtuTE6a7/xOmv/8Xp
-        sP/G6bH/xumx/8bpsv/H6rP/x+qz/8jqtP/I6rX/yeq2/8nqtv/K67f/yuu4/8vruP/L67n/zOu6/8zr
-        u//N67v/zey8/87svf/P67742e3Mx+jv5ZLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvDw
-        8HWAgIACAAAAAAAAAACqqqoD8vLyc/Hx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLf7degxOiu+cPo
-        rf/D6a7/xOmu/8Xpr//F6bD/xumx/8bpsf/G6bL/x+qz/8fqs//I6rT/yOq1/8nqtv/J6rb/yuu3/8rr
-        uP/L67j/y+u5/8zruv/M67v/zeu7/83svP/O7L3/zuy9/87svfzc7tK28fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fEkAAAAAAAAAADz8/Mq8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgunv
-        5o3D6a/0wuis/8Lorf/D6K3/xOmu/8Tprv/F6a//xemw/8bpsf/G6bH/xumy/8fqs//H6rP/yOq0/8jq
-        tf/J6rb/yeq2/8rrt//K67j/y+u4/8vruf/M67r/zOu7/83ru//N7Lz/zuy9/87svf/O7L3/3e/TtPHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLy8vJNAAAAAAAAAADy8vJM8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgszqutDB6Kv/weir/8LorP/D6K3/w+it/8Tprv/E6a7/xemv/8XpsP/G6bH/xumx/8bp
-        sv/H6rP/x+qz/8jqtP/I6rX/yeq2/8nqtv/K67f/yuu4/8vruP/L67n/zOu6/8zru//N67v/zey8/87s
-        vf/O7L3/zuy++u3w6Yzx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLy8vJ1AAAAAAAAAADx8fFr8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC6O/kjsDoqvzA6Kr/weir/8Loq//C6Kz/w+it/8Porf/E6a7/xOmu/8Xp
-        r//F6bD/xumx/8bpsf/G6bL/x+qz/8fqtP/I6rT/yOq1/8nqtv/J6rb/yuu3/8rruP/L67n/y+u5/8zr
-        uv/M67v/zeu7/83svP/O7L3/zuy9/93u07Xx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC////Bv//
-        /wfx8fGB8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC1ezJsr/nqf/A56n/weiq/8Hoq//C6Kv/wuis/8Po
-        rf/D6K3/xOmu/8Pprv+856T/uOed/7bmmv+05Zf/teWZ/7jnnf+86KP/wOio/8fqs//J6rb/yeq2/8rr
-        t//K67j/y+u5/8vruf/M67r/zOu7/83ru//N7Lz/zuy9/9buyNLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8vLyE/Ly8hPx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGCy+q6zr/nqP/A56n/wOep/8Ho
-        qv/B6Kv/wuir/8LorP+u5Y//neF2/5bgav+V4Gr/luBr/5fhbP+Y4W7/meFv/5rhcf+b4nL/nOJ0/53i
-        dv+j5H//reaM/7nnnf/E6q//y+y4/8vruf/L67n/zOu6/8zru//N67v/zey8/9Lsxd/x8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC7+/vIPb29hzx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGCx+m03L/n
-        qP+/56j/wOep/8Dnqf/B6Kr/weir/7nmn/+R32T/kt9l/5PfZ/+U4Gj/leBq/5bga/+X4W3/mOFu/5nh
-        b/+a4XH/m+Jy/5zidP+d4nX/nuN3/5/jeP+f4nn/weqq/8rruP/L67n/y+u5/8zruv/M67v/zeu7/9Ls
-        w+Lx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8PDwI/Hx8SXx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGCxeix5L/nqP+/56j/v+eo/8Dnqf/A56n/weiq/7Pllv+Q3mP/kd9k/5LfZf+T32f/lOBo/5Xg
-        av+W4Gv/l+Ft/5jhbv+Z4W//muFx/5vicv+c4nT/neJ1/57jd/+f43j/xOmu/8rrt//K67j/y+u5/8vr
-        uf/M67r/zOu7/9Tsxtfx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC9PT0GO/v7yDx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGCx+m037/nqP+/56j/v+eo/7/nqP/A56n/wOip/7TmmP+P3mH/kN5j/5Hf
-        ZP+S32b/k99n/5TgaP+V4Gr/luBr/5fhbf+Y4W7/meFw/5rhcf+b4nL/nOJ0/53idf+h5Hz/yuu2/8nq
-        t//K67f/yuu4/8vruf/L67n/zOu6/9ftysrx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC7e3tDvT0
-        9Bfx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGCyOq117/nqP+/56j/v+eo/7/nqP+/56j/wOep/7vn
-        of+O3mD/j95h/5DeY/+R32T/kt9m/5PfZ/+U4Gj/leBq/5bga/+X4W3/mOFu/5nhcP+a4nH/m+Jy/5zi
-        dP+r5Yr/yOq1/8nqtv/J6rf/yuu3/8rruP/L67n/y+u5/9zu1LHx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLz8/OA////A+7u7g/x8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGCz+q+xb/nqP+/56j/v+eo/7/n
-        qP+/56j/v+eo/8Dnqf+S4Gb/jt5g/4/eYf+Q3mP/kd9k/5LfZv+T32f/lOBo/5Xgav+W4Gv/l+Ft/5jh
-        bv+Z4XD/muJx/5vic/+4553/yOq0/8jqtf/J6rb/yeq3/8rrt//K67j/y+u5/+bw4Zfx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fFrAAAAAP///wHz8/N88fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC1+zMrr/n
-        qP+/56j/v+eo/7/nqP+/56j/v+eo/7/nqP+f4Xn/jd5f/47eYP+P3mH/kN5j/5HfZP+S32b/k99n/5Tg
-        af+V4Gr/luBr/5fhbf+Y4W7/meFw/5vic//F6rD/x+q0/8jqtP/I6rX/yeq2/8nqt//K67f/zOu88u/x
-        74Px8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLv7+9QAAAAAAAAAADw8PBm8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC5e7gk7/nqP+/56j/v+eo/7/nqP+/56j/v+eo/7/nqP+u5I//jN1d/43eX/+O3mD/j95h/5De
-        Y/+R32T/kt9m/5PfZ/+U4Gn/leBq/5bga/+X4W3/mOFu/6rliP/G6rL/x+qz/8fqtP/I6rT/yOq1/8nq
-        tv/J6rf/1OzGy/Hx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YL19fUzAAAAAAAAAADy8vJO8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgsPoru2/56j/v+eo/7/nqP+/56j/v+eo/7/nqP++6Kf/j95i/4zd
-        Xf+N3l//jt5g/4/eYv+Q3mP/kd9k/5LfZv+T32f/lOBp/5Xgav+W4Gz/l+Ft/7voov/G6bL/xuqy/8fq
-        s//H6rT/yOq1/8jqtf/J6rb/4e/Zo/Hx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLw8PARAAAAAAAA
-        AADu7u4u8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgszpvMm/56j/v+eo/7/nqP+/56j/v+eo/7/n
-        qP+/56j/q+SL/4vdXP+M3V3/jd5f/47eYP+P3mL/kN9j/5HfZP+S32b/k99n/5Tgaf+V4Gr/qOOH/8Xp
-        sP/G6bH/xumy/8bqsv/H6rP/x+q0/8jqtf/K67jy8PHwhPHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8WoAAAAAAAAAAAAAAADo6OgL8fHxgfHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxguDv2J2/56j/v+eo/7/n
-        qP+/56j/v+eo/7/nqP+/56j/v+eo/6Xjgv+L3Vz/jN1d/43eX/+O3mD/j95i/5DfY/+R32T/kt9m/5Pf
-        Z/+k44D/xOmu/8XpsP/F6bD/xumx/8bpsv/G6rL/x+qz/8fqtP/W7cnB8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvPz80AAAAAAAAAAAAAAAAAAAAAA8PDwZ/Hx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLD6K/rv+eo/7/nqP+/56j/v+eo/7/nqP+/56j/v+eo/7/nqP+u5I//kt5n/4zdXf+N3l//jt5g/4/e
-        Yv+Q32P/luFs/67kj//D6K3/xOmu/8Tpr//F6bD/xemw/8bpsf/G6bL/xuqy/8fqtP7o7+WR8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvPz8xYAAAAAAAAAAAAAAAAAAAAA8vLyPPHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLV7ci0v+eo/7/nqP+/56j/v+eo/7/nqP+/56j/v+eo/7/nqP+/56j/wOio/7Xl
-        mv+u5I7/rOSM/67kj/+35pz/wumr/8Lorf/D6K3/w+it/8Tprv/E6a//xemw/8XpsP/G6bH/xumy/9Ds
-        wNPx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8vLyZQAAAAAAAAAAAAAAAAAAAAAAAAAA////DPHx
-        8YDx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGCx+m03L/nqP+/56j/v+eo/7/nqP+/56j/v+eo/7/n
-        qP+/56j/v+eo/7/nqP+/56j/wOep/8Doqv/B6Kr/weir/8LorP/C6K3/w+it/8Porv/E6a7/xOmv/8Xp
-        sP/F6bD/yOq18uvw6Yvx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC7+/vMQAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAPHx8Vzx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC6O/ij8LorPG/56j/v+eo/7/n
-        qP+/56j/v+eo/7/nqP+/56j/v+eo/7/nqP+/56j/v+eo/8Dnqf/A6Kr/weiq/8Hoq//C6Kz/wuit/8Po
-        rf/D6K7/xOmu/8Tpr//F6bH74u/anvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLw8PB6////BQAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPPz8yrx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxguHu
-        2pnB56v2v+eo/7/nqP+/56j/v+eo/7/nqP+/56j/v+eo/7/nqP+/56j/v+eo/7/nqP/A56n/wOiq/8Ho
-        q//B6Kv/wuis/8Lorf/D6K3/w+mu/8Tprv3b7dKq8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fFJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHy8vJf8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLi7tyXwumt8L/nqP+/56j/v+eo/7/nqP+/56j/v+eo/7/nqP+/56j/v+eo/7/n
-        qP+/56j/wOep/8Doqv/B6Kv/weir/8LorP/C6K3/xOiv+d7u1aTx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvLy8nb///8KAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADv7+8Q8/Pze/Hx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC6/Dpiszqu82/56j/v+eo/7/nqP+/56j/v+eo/7/n
-        qP+/56j/v+eo/7/nqP+/56j/v+eo/8Dnqf/A6Kr/weir/8Hoq//H6bTj5e7elfHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvPz8yoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAA9fX1MvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLe7tShx+mz3r/n
-        qP+/56j/v+eo/7/nqP+/56j/v+eo/7/nqP+/56j/v+eo/7/nqP/A56n/xumy5drtz6rv8e+D8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8vLyTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPHx8Unx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgubv45DU68e2y+q6z8XoseTD6a7uweir9MPpru7F6bHly+q50tLsxLrl796U8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLy8vJh////AwAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wHx8fFZ8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8Wzf398IAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8D8/PzVfHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8PDwZujo
-        6AsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAA////AfHx8Ujx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fFa////BQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADz8/Mp8vLydvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8/PzfPHx8TcAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////CvLy8lDz8/N/8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvPz84Hx8fFa8PDwEQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AADw8PAR8vLyTvHx8X3x8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fF/8/PzVvT09BgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wXz8/Mq8/PzU/Hx8XDx8fGB8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLy8vJz8fHxWO/v7y////8IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8G7e3tHfLy
-        8ifu7u4u8PDwNPT09C/y8vIo7+/vH+Pj4wkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAP///////wAA////////AAD///////8AAP//gAf//wAA//gAAD//AAD/wAAAB/8AAP+A
-        AAAB/wAA/gAAAAB/AAD8AAAAAD8AAPgAAAAAHwAA8AAAAAAPAADwAAAAAAcAAOAAAAAABwAA4AAAAAAD
-        AADAAAAAAAMAAMAAAAAAAwAAwAAAAAABAACAAAAAAAEAAIAAAAAAAQAAgAAAAAABAACAAAAAAAEAAIAA
-        AAAAAQAAgAAAAAABAACAAAAAAAMAAMAAAAAAAwAAwAAAAAADAADAAAAAAAMAAMAAAAAABwAAwAAAAAAH
-        AADgAAAAAAcAAOAAAAAADwAA4AAAAAAPAADwAAAAAB8AAPAAAAAAHwAA+AAAAAA/AAD8AAAAAD8AAPwA
-        AAAAfwAA/gAAAAD/AAD/AAAAAf8AAP+AAAAD/wAA/8AAAAf/AAD/8AAAH/8AAP/8AAA//wAA//8AAf//
-        AAD//+AP//8AAP///////wAA////////AAD///////8AACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAgICAAu/v7xD09PQX7u7uHvDw8CP29vYb8vLyFOrq6gwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAICA
-        gALy8vIm7+/vT/Pz82fz8/N98fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvDw8Hrw8PBm7+/vUPT0
-        9C3o6OgLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOPj
-        4wnz8/NC8vLydPHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YHy8vJj8/PzKoCAgAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AADx8fEl8vLydfHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxcfHx8SUAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAA9PT0LfHx8YDx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8/PzgPLy8j0AAAABAAAAAAAA
-        AAAAAAAAAAAAAO3t7Rzx8fGA8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLr8OmM5O7emeTv
-        3Z7h79mj5fDem+nv45Tu8u6H8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvLy
-        8joAAAAAAAAAAAAAAAD///8E8fHxbvHx8YLx8fGC8fHxgvHx8YLx8fGC7vDshtns0K7N67zayeq288fq
-        s//I6rT/yOq1/8nqtv/K67f/y+u4/8vruf/P7L7w0+zF29vv0Lrn8OKX8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8/PzfvPz8xUAAAAAAAAAAPX19TLx8fGC8fHxgvHx8YLx8fGC8fHxgt3u1KXF6rHzxOmv/8Xp
-        sP/G6bH/xumy/8fqs//I6rT/yOq1/8nqtv/K67f/y+u4/8vruf/M67v/zey8/87svf/S7MPj4u7Zp/Hx
-        8YLx8fGC8fHxgvHx8YLx8fGC8/PzVQAAAAAAAAAA8fHxavHx8YLx8fGC8fHxgvHx8YLf7defwuis/cPo
-        rf/E6a7/xOmv/8XpsP/G6bH/xumy/8fqs//I6rT/yOq1/8nqtv/K67f/y+u4/8vruv/M67v/zey8/87s
-        vf/N67z/3e7SufHx8YLx8fGC8fHxgvHx8YLz8/N8////Bf///w3x8fGC8fHxgvHx8YLx8fGC8fHxgsXp
-        sOnB6Kv/wuis/8Porf/E6a7/xOmv/8XpsP/G6bH/xumy/8fqs//I6rT/yOq1/8nqtv/K67f/y+u4/8vr
-        uv/M67v/zey8/87svf/O67z96/Hoj/Hx8YLx8fGC8fHxgvHx8YLy8vIm8/PzK/Hx8YLx8fGC8fHxgvHx
-        8YLg79icwOep/8Hoqv/B6Kv/wuis/8Porf/E6a7/wuit/73opP+76KL/u+eh/77opv/D6a3/yeu1/8nq
-        tv/K67f/y+u5/8zruv/M67v/zey8/87svf/d7tSz8fHxgvHx8YLx8fGC8fHxgvHx8Tby8vI68fHxgvHx
-        8YLx8fGC8fHxgtTrxre/56j/wOep/8Hoqv/B6Kv/uOad/53idv+V4Gn/leBq/5fhbP+Y4W//muFx/5vi
-        c/+e4Xb/puWD/7PmlP/D6a3/y+u5/8zruv/M67v/zey8/9rtzsHx8fGC8fHxgvHx8YLx8fGC8/PzQfPz
-        80Lx8fGC8fHxgvHx8YLx8fGC0OvAwr/nqP+/56j/wOep/8Hoqv+o44b/kd9k/5LfZv+U4Gj/leBq/5fh
-        bf+Y4W//muFx/5vic/+d4nX/n+N3/7fnm//K67j/y+u5/8zruv/M67v/2u3QvPHx8YLx8fGC8fHxgvHx
-        8YLy8vI98/PzP/Hx8YLx8fGC8fHxgvHx8YLQ6sK/v+eo/7/nqP+/56j/wOep/6jjhv+P3mL/kd9k/5Lf
-        Zv+U4Gj/leBr/5fhbf+Y4W//muFx/5zic/+d4nX/v+mm/8nqt//K67j/y+u5/8zruv/f79au8fHxgvHx
-        8YLx8fGC8fHxgvX19TLx8fE38fHxgvHx8YLx8fGC8fHxgtTrybO/56j/v+eo/7/nqP+/56j/sOSS/47e
-        YP+P3mL/kd9k/5LfZv+U4Gj/leBr/5fhbf+Z4W//muJx/5/jd//H6bP/yeq2/8nqt//K67j/y+u5/+nv
-        45Tx8fGC8fHxgvHx8YLx8fGC7+/vIPHx8SXx8fGC8fHxgvHx8YLx8fGC4e/Zm7/nqP+/56j/v+eo/7/n
-        qP+956X/jt5h/47eYP+P3mL/kd9k/5LfZv+U4Gn/luBr/5fhbf+Z4W//q+aK/8fqs//I6rT/yeq2/8nq
-        t//N7Lvw8fHxgvHx8YLx8fGC8fHxgvPz84D///8G6+vrDfHx8YLx8fGC8fHxgvHx8YLv8e+Dweis87/n
-        qP+/56j/v+eo/7/nqP+d4XX/jN1e/47eYP+P3mL/kd9k/5PfZ/+U4Gn/luBr/5fhbf+86KP/xuqy/8fq
-        s//I6rX/yeq2/9Tsx8nx8fGC8fHxgvHx8YLx8fGC8PDwaAAAAAAAAAAA8fHxbPHx8YLx8fGC8fHxgvHx
-        8YLM6rrMv+eo/7/nqP+/56j/v+eo/7blmv+N3V//jN1e/47eYP+Q3mL/kd9k/5PfZ/+U4Gn/qeSH/8Xp
-        sP/G6bH/xuqy/8fqs//I6rX/5fDem/Hx8YLx8fGC8fHxgvHx8YLz8/M/AAAAAAAAAADz8/NB8fHxgvHx
-        8YLx8fGC8fHxgt3s06O/56j/v+eo/7/nqP+/56j/v+eo/7Xmmf+U32n/jN1e/47eYP+Q3mL/k99o/6zk
-        i//D6a7/xemv/8XpsP/G6bH/xuqy/8vqu+jx8fGC8fHxgvHx8YLx8fGC8fHxgvPz8xUAAAAAAAAAAPT0
-        9Bfx8fGC8fHxgvHx8YLx8fGC8fHvg8Tpsee/56j/v+eo/7/nqP+/56j/v+eo/7/nqP+35pz/suWV/7Xm
-        mf/A6Kj/wuit/8Porf/E6a7/xemv/8XpsP/G6bH/3e3UqvHx8YLx8fGC8fHxgvHx8YLw8PBmAAAAAAAA
-        AAAAAAAAAAAAAPHx8W7x8fGC8fHxgvHx8YLx8fGC4u7cmMHnqvm/56j/v+eo/7/nqP+/56j/v+eo/7/n
-        qP+/56j/wOep/8Hoqv/C6Kz/wuit/8Porf/E6a7/xemv/9Hrwszx8fGC8fHxgvHx8YLx8fGC8fHxgvX1
-        9TEAAAAAAAAAAAAAAAAAAAAA7u7uO/Hx8YLx8fGC8fHxgvHx8YLx8fGC3e7SpMHoqfq/56j/v+eo/7/n
-        qP+/56j/v+eo/7/nqP+/56j/wOip/8Hoq//C6Kz/wuit/8Porf/O67zV8PHwhPHx8YLx8fGC8fHxgvHx
-        8YLy8vJ2////BQAAAAAAAAAAAAAAAAAAAACqqqoD8PDwafHx8YLx8fGC8fHxgvHx8YLx8fGC4O/YnMTo
-        ruy/56j/v+eo/7/nqP+/56j/v+eo/7/nqP+/56j/wOip/8Hoq//C6Kz90uvEwe/x74Px8fGC8fHxgvHx
-        8YLx8fGC8fHxgvPz8ykAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADz8/MW8fHxfPHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8PLuhdXtyLXF6bHlv+eo/7/nqP+/56j/v+eo/7/nqP/B6Kv0zeq8zOXv4JTx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLy8vJNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADy8vIm8fHxgPHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLs8OmJ4e/Zm93u06Pf7def5+/hkvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxXf///wIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AADy8vIo8/PzffHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8VnMzMwFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAD29vYb8fHxbvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvPz83/v7+9BgICAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMzMwF8/PzQPLy8nnx8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgvPz84Hx8fFc9PT0GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////B/X19TLx8fFc8PDwevHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8fHxgPHx8Wv09PRE9PT0FwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAA7+/vEPb29hvw8PAj7+/vH/T09Be/v78EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////8B///wAA//wAAD/wAAAP4AAAB+AA
-        AAfAAAADwAAAA4AAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAADwAAAA8AAAAPAAAAH4AAAB+AA
-        AA/wAAAP+AAAH/gAAD/+AAB//wAB///AA///+B////////////8oAAAAEAAAACAAAAABACAAAAAAAAAE
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////CfDw8BH///8GAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgICAAu7u7i7x8fFe8PDwevHx8YLx8fGC8fHxgvDw
-        8Hvx8fFs7+/vT/Dw8CMAAAABAAAAAAAAAAAAAAAA5ubmCvLy8l/x8fGC8fHxgvHx8YLx8fGC8fHxgvHx
-        8YLx8fGC8fHxgvHx8YLx8fGC8/PzZu7u7g8AAAAAAAAAAPHx8V3x8fGC8fHxgunv5o7Z7c200+vFytTs
-        xc7W7cnH2+7QueLu2qbu8OyH8fHxgvHx8YLx8fFu////BfHx8STx8fGC8fHxgtrtzq3D6a/8xemw/8bp
-        sv/I6rT/yeq2/8vruP/M67v/z+u++Nzu0bjx8fGC8fHxgu/v7zDx8fFI8fHxguzw6ojC56z3wuis/8Tp
-        rv/E6q3/weiq/8fqsv/J6rb/y+u5/8zru//N67z/6/HpjfHx8YLy8vJN8fHxXPHx8YLg79icv+eo/8Ho
-        qv+k4n//lOBo/5fhbf+a4XH/n+J5/7Pmlv/L67n/zOu7/+Xw353x8fGC8fHxXvHx8Vrx8fGC4O3Zm7/n
-        qP+/56j/nuF3/5HfZP+U4Gj/l+Ft/5ricf+x5pL/yeq3/8vruf/r8emN8fHxgu/v70/x8fFK8fHxguzw
-        6ojA6Kn8v+eo/6njiP+O3mD/kd9k/5Tgaf+X4W3/vuim/8jqtP/N67zr8fHxgvHx8YLy8vI68/PzK/Hx
-        8YLx8fGCx+m03L/nqP++6Kb/meBw/47eYP+S32X/q+SL/8XpsP/G6rL/1+zLvvHx8YLz8/OB8PDwEdXV
-        1Qbx8fF98fHxgt/t1Z/A56j9v+eo/7/nqP+656H/vuim/8Lorf/E6a7/yOq18Ovw6Yvx8fGC8vLyYwAA
-        AAAAAAAA8fHxR/Hx8YLx8fGC2O3NrMDnqfq/56j/v+eo/7/nqP/B6Kv/xumy7OTu3Zfx8fGC8/PzgfLy
-        8icAAAAAAAAAAP///wPz8/Nm8fHxgvHx8YLo7+SO0+zFuczquszM6bzJ1+zMru7w7Ibx8fGC8fHxgvHx
-        8UcAAAAAAAAAAAAAAAAAAAAA4+PjCfHx8Vzx8fGC8fHxgvHx8YLx8fGC8fHxgvHx8YLx8fGC8fHxgfPz
-        80D///8BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8/PzK/Ly8mDz8/N+8fHxgvHx8YLy8vJ68vLyUezs
-        7BsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAevr6w3j4+MJAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//AAD8fwAA4AcAAMADAACAAQAAgAEAAIABAACAAQAAgAEAAIAB
-        AADAAwAAwAMAAOAHAADwDwAA/n8AAP//AAA=
-</value>
-  </data>
-</root>

extra/exe-builder/FodyWeavers.xml

@@ -1,3 +0,0 @@
-<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
-  <Costura />
-</Weavers>

extra/exe-builder/FodyWeavers.xsd

@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
-  <xs:element name="Weavers">
-    <xs:complexType>
-      <xs:all>
-        <xs:element name="Costura" minOccurs="0" maxOccurs="1">
-          <xs:complexType>
-            <xs:all>
-              <xs:element minOccurs="0" maxOccurs="1" name="ExcludeAssemblies" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-              <xs:element minOccurs="0" maxOccurs="1" name="IncludeAssemblies" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-              <xs:element minOccurs="0" maxOccurs="1" name="ExcludeRuntimeAssemblies" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-              <xs:element minOccurs="0" maxOccurs="1" name="IncludeRuntimeAssemblies" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-              <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-              <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged64Assemblies" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with line breaks.</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-              <xs:element minOccurs="0" maxOccurs="1" name="PreloadOrder" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>The order of preloaded assemblies, delimited with line breaks.</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-            </xs:all>
-            <xs:attribute name="CreateTemporaryAssemblies" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="IncludeDebugSymbols" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="IncludeRuntimeReferences" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Controls if runtime assemblies are also embedded.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="UseRuntimeReferencePaths" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Controls whether the runtime assemblies are embedded with their full path or only with their assembly name.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="DisableCompression" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="DisableCleanup" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="LoadAtModuleInit" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="IgnoreSatelliteAssemblies" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="ExcludeAssemblies" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="IncludeAssemblies" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="ExcludeRuntimeAssemblies" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="IncludeRuntimeAssemblies" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="Unmanaged32Assemblies" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="Unmanaged64Assemblies" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with |.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="PreloadOrder" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>The order of preloaded assemblies, delimited with |.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-          </xs:complexType>
-        </xs:element>
-      </xs:all>
-      <xs:attribute name="VerifyAssembly" type="xs:boolean">
-        <xs:annotation>
-          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="GenerateXsd" type="xs:boolean">
-        <xs:annotation>
-          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>

extra/exe-builder/Program.cs

@@ -1,243 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Sockets;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using Microsoft.Win32;
-using Newtonsoft.Json;
-using UptimeKuma.Properties;
-
-namespace UptimeKuma {
-    static class Program {
-        /// <summary>
-        /// The main entry point for the application.
-        /// </summary>
-        [STAThread]
-        static void Main(string[] args) {
-            var cwd = Path.GetDirectoryName(Application.ExecutablePath);
-
-            if (cwd != null) {
-                Environment.CurrentDirectory = cwd;
-            }
-
-            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new UptimeKumaApplicationContext());
-        }
-    }
-
-    public class UptimeKumaApplicationContext : ApplicationContext
-    {
-        private static Mutex mutex = null;
-
-        const string appName = "Uptime Kuma";
-
-        private NotifyIcon trayIcon;
-        private Process process;
-
-        private MenuItem statusMenuItem;
-        private MenuItem runWhenStarts;
-        private MenuItem openMenuItem;
-
-        private RegistryKey registryKey = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);
-
-
-        public UptimeKumaApplicationContext() {
-
-            // Single instance only
-            bool createdNew;
-            mutex = new Mutex(true, appName, out createdNew);
-            if (!createdNew) {
-                return;
-            }
-
-            var startingText = "Starting server...";
-            trayIcon = new NotifyIcon();
-            trayIcon.Text = startingText;
-
-            runWhenStarts = new MenuItem("Run when system starts", RunWhenStarts);
-            runWhenStarts.Checked = registryKey.GetValue(appName) != null;
-
-            statusMenuItem = new MenuItem(startingText);
-            statusMenuItem.Enabled = false;
-
-            openMenuItem = new MenuItem("Open", Open);
-            openMenuItem.Enabled = false;
-
-            trayIcon.Icon = Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
-            trayIcon.ContextMenu = new ContextMenu(new MenuItem[] {
-                statusMenuItem,
-                openMenuItem,
-                //new("Debug Console", DebugConsole),
-                runWhenStarts,
-                new("Check for Update...", CheckForUpdate),
-                new("Visit GitHub...", VisitGitHub),
-                new("About", About),
-                new("Exit", Exit),
-            });
-
-            trayIcon.MouseDoubleClick += new MouseEventHandler(Open);
-            trayIcon.Visible = true;
-
-            var hasUpdateFile = File.Exists("update");
-
-            if (!hasUpdateFile && Directory.Exists("core") && Directory.Exists("node") && Directory.Exists("core/node_modules") && Directory.Exists("core/dist")) {
-                // Go go go
-                StartProcess();
-            } else {
-                DownloadFiles();
-            }
-        }
-
-        void DownloadFiles() {
-            var form = new DownloadForm();
-            form.Closed += Exit;
-            form.Show();
-        }
-
-        private void RunWhenStarts(object sender, EventArgs e) {
-            if (registryKey == null) {
-                MessageBox.Show("Error: Unable to set startup registry key.");
-                return;
-            }
-
-            if (runWhenStarts.Checked) {
-                registryKey.DeleteValue(appName, false);
-                runWhenStarts.Checked = false;
-            } else {
-                registryKey.SetValue(appName, Application.ExecutablePath);
-                runWhenStarts.Checked = true;
-            }
-        }
-
-        void StartProcess() {
-            var startInfo = new ProcessStartInfo {
-                FileName = "node/node.exe",
-                Arguments = "server/server.js --data-dir=\"../data/\"",
-                RedirectStandardOutput = false,
-                RedirectStandardError = false,
-                UseShellExecute = false,
-                CreateNoWindow = true,
-                WorkingDirectory = "core"
-            };
-
-            process = new Process();
-            process.StartInfo = startInfo;
-            process.EnableRaisingEvents = true;
-            process.Exited += ProcessExited;
-
-            try {
-                process.Start();
-                //Open(null, null);
-
-                // Async task to check if the server is ready
-                Task.Run(() => {
-                    var runningText = "Server is running";
-                    using TcpClient tcpClient = new TcpClient();
-                    while (true) {
-                        try {
-                            tcpClient.Connect("127.0.0.1", 3001);
-                            statusMenuItem.Text = runningText;
-                            openMenuItem.Enabled = true;
-                            trayIcon.Text = runningText;
-                            break;
-                        } catch (Exception) {
-                            System.Threading.Thread.Sleep(2000);
-                        }
-                    }
-                });
-
-            } catch (Exception e) {
-                MessageBox.Show("Startup failed: " + e.Message, "Uptime Kuma Error");
-            }
-        }
-
-        void StopProcess() {
-            process?.Kill();
-        }
-
-        void Open(object sender, EventArgs e) {
-            Process.Start("http://localhost:3001");
-        }
-
-        void DebugConsole(object sender, EventArgs e) {
-
-        }
-
-        void CheckForUpdate(object sender, EventArgs e) {
-            var needUpdate = false;
-
-            // Check version.json exists
-            if (File.Exists("version.json")) {
-                // Load version.json and compare with the latest version from GitHub
-                var currentVersionObj = JsonConvert.DeserializeObject<Version>(File.ReadAllText("version.json"));
-
-                var versionJson = new WebClient().DownloadString("https://uptime.kuma.pet/version");
-                var latestVersionObj = JsonConvert.DeserializeObject<Version>(versionJson);
-
-                // Compare version, if the latest version is newer, then update
-                if (new System.Version(latestVersionObj.latest).CompareTo(new System.Version(currentVersionObj.latest)) > 0) {
-                    var result = MessageBox.Show("A new version is available. Do you want to update?", "Update", MessageBoxButtons.YesNo);
-                    if (result == DialogResult.Yes) {
-                        // Create a empty file `update`, so the app will download the core files again at startup
-                        File.Create("update").Close();
-
-                        trayIcon.Visible = false;
-                        process?.Kill();
-
-                        // Restart the app, it will download the core files again at startup
-                        Application.Restart();
-                    }
-                } else {
-                    MessageBox.Show("You are using the latest version.");
-                }
-            }
-
-
-        }
-
-        void VisitGitHub(object sender, EventArgs e)
-        {
-            Process.Start("https://github.com/louislam/uptime-kuma");
-        }
-
-        void About(object sender, EventArgs e)
-        {
-            MessageBox.Show("Uptime Kuma Windows Runtime v1.0.0" + Environment.NewLine + "© 2023 Louis Lam", "Info");
-        }
-
-        void Exit(object sender, EventArgs e)
-        {
-            // Hide tray icon, otherwise it will remain shown until user mouses over it
-            trayIcon.Visible = false;
-            process?.Kill();
-            Application.Exit();
-        }
-
-        void ProcessExited(object sender, EventArgs e) {
-
-            if (process.ExitCode != 0) {
-                var line = "";
-                while (!process.StandardOutput.EndOfStream)
-                {
-                    line += process.StandardOutput.ReadLine();
-                }
-
-                MessageBox.Show("Uptime Kuma exited unexpectedly. Exit code: " + process.ExitCode + " " + line);
-            }
-
-            trayIcon.Visible = false;
-            Application.Exit();
-        }
-
-    }
-}
-

extra/exe-builder/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Uptime Kuma")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Uptime Kuma")]
-[assembly: AssemblyCopyright("Copyright © 2023 Louis Lam")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("2DB53988-1D93-4AC0-90C4-96ADEAAC5C04")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

extra/exe-builder/Properties/Resources.Designer.cs

@@ -1,62 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace UptimeKuma.Properties {
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder",
-        "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        private static global::System.Resources.ResourceManager resourceMan;
-
-        private static global::System.Globalization.CultureInfo resourceCulture;
-
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance",
-            "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState
-            .Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if ((resourceMan == null)) {
-                    global::System.Resources.ResourceManager temp =
-                        new global::System.Resources.ResourceManager("UptimeKuma.Properties.Resources",
-                            typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-
-                return resourceMan;
-            }
-        }
-
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState
-            .Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get { return resourceCulture; }
-            set { resourceCulture = value; }
-        }
-    }
-}

extra/exe-builder/Properties/Resources.resx

@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

extra/exe-builder/Properties/Settings.Designer.cs

@@ -1,23 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace UptimeKuma.Properties {
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute(
-        "Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        private static Settings defaultInstance =
-            ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default {
-            get { return defaultInstance; }
-        }
-    }
-}

extra/exe-builder/Properties/Settings.settings

@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>

extra/exe-builder/UptimeKuma.csproj

@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Import Project="packages\Costura.Fody.5.7.0\build\Costura.Fody.props" Condition="Exists('packages\Costura.Fody.5.7.0\build\Costura.Fody.props')" />
-    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-    <PropertyGroup>
-        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-        <ProjectGuid>{2DB53988-1D93-4AC0-90C4-96ADEAAC5C04}</ProjectGuid>
-        <OutputType>WinExe</OutputType>
-        <RootNamespace>UptimeKuma</RootNamespace>
-        <AssemblyName>uptime-kuma</AssemblyName>
-        <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-        <FileAlignment>512</FileAlignment>
-        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-        <Deterministic>true</Deterministic>
-        <ApplicationIcon>..\..\public\favicon.ico</ApplicationIcon>
-        <LangVersion>9</LangVersion>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-        <PlatformTarget>AnyCPU</PlatformTarget>
-        <DebugSymbols>true</DebugSymbols>
-        <DebugType>full</DebugType>
-        <Optimize>false</Optimize>
-        <OutputPath>bin\Debug\</OutputPath>
-        <DefineConstants>DEBUG;TRACE</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-        <PlatformTarget>AnyCPU</PlatformTarget>
-        <DebugType>pdbonly</DebugType>
-        <Optimize>true</Optimize>
-        <OutputPath>bin\Release\</OutputPath>
-        <DefineConstants>TRACE</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-    </PropertyGroup>
-    <PropertyGroup>
-        <ApplicationManifest>app.manifest</ApplicationManifest>
-    </PropertyGroup>
-    <PropertyGroup>
-      <PostBuildEvent>COPY "$(SolutionDir)bin\Debug\uptime-kuma.exe" "%UserProfile%\Desktop\uptime-kuma-win64\"</PostBuildEvent>
-    </PropertyGroup>
-    <ItemGroup>
-        <Reference Include="Costura, Version=5.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-          <HintPath>packages\Costura.Fody.5.7.0\lib\netstandard1.0\Costura.dll</HintPath>
-        </Reference>
-        <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
-        </Reference>
-        <Reference Include="mscorlib" />
-        <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-          <HintPath>packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-        </Reference>
-        <Reference Include="System" />
-        <Reference Include="System.AppContext, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-          <HintPath>packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
-        </Reference>
-        <Reference Include="System.ComponentModel.Composition" />
-        <Reference Include="System.Console, Version=4.0.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.Console.4.3.1\lib\net46\System.Console.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Core" />
-        <Reference Include="System.Diagnostics.DiagnosticSource, Version=7.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-          <HintPath>packages\System.Diagnostics.DiagnosticSource.7.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
-        </Reference>
-        <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
-        </Reference>
-        <Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-          <HintPath>packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
-        </Reference>
-        <Reference Include="System.IO.Compression.FileSystem" />
-        <Reference Include="System.IO.Compression.ZipFile, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-          <HintPath>packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
-        </Reference>
-        <Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
-        </Reference>
-        <Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Linq, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.Linq.4.3.0\lib\net463\System.Linq.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Linq.Expressions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-          <HintPath>packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Numerics" />
-        <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Reflection, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Runtime, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Runtime.Extensions, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.Runtime.Extensions.4.3.1\lib\net462\System.Runtime.Extensions.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Runtime.InteropServices, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.Runtime.InteropServices.4.3.0\lib\net463\System.Runtime.InteropServices.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Text.RegularExpressions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.Text.RegularExpressions.4.3.1\lib\net463\System.Text.RegularExpressions.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Xml.Linq" />
-        <Reference Include="System.Data.DataSetExtensions" />
-        <Reference Include="Microsoft.CSharp" />
-        <Reference Include="System.Data" />
-        <Reference Include="System.Deployment" />
-        <Reference Include="System.Drawing" />
-        <Reference Include="System.Windows.Forms" />
-        <Reference Include="System.Xml" />
-        <Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
-        </Reference>
-    </ItemGroup>
-    <ItemGroup>
-        <Compile Include="DownloadForm.cs">
-          <SubType>Form</SubType>
-        </Compile>
-        <Compile Include="DownloadForm.Designer.cs">
-          <DependentUpon>DownloadForm.cs</DependentUpon>
-        </Compile>
-        <Compile Include="Program.cs" />
-        <Compile Include="Properties\AssemblyInfo.cs" />
-        <Compile Include="Version.cs" />
-        <EmbeddedResource Include="DownloadForm.resx">
-          <DependentUpon>DownloadForm.cs</DependentUpon>
-        </EmbeddedResource>
-        <EmbeddedResource Include="Properties\Resources.resx">
-            <Generator>ResXFileCodeGenerator</Generator>
-            <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-            <SubType>Designer</SubType>
-        </EmbeddedResource>
-        <Compile Include="Properties\Resources.Designer.cs">
-            <AutoGen>True</AutoGen>
-            <DependentUpon>Resources.resx</DependentUpon>
-        </Compile>
-        <None Include="..\..\public\favicon.ico">
-          <Link>favicon.ico</Link>
-        </None>
-        <None Include="packages.config" />
-        <None Include="Properties\Settings.settings">
-            <Generator>SettingsSingleFileGenerator</Generator>
-            <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-        </None>
-        <Compile Include="Properties\Settings.Designer.cs">
-            <AutoGen>True</AutoGen>
-            <DependentUpon>Settings.settings</DependentUpon>
-            <DesignTimeSharedInput>True</DesignTimeSharedInput>
-        </Compile>
-    </ItemGroup>
-    <ItemGroup>
-        <None Include="App.config" />
-    </ItemGroup>
-    <ItemGroup>
-      <Content Include=".gitignore" />
-      <Content Include="app.manifest" />
-    </ItemGroup>
-    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-    <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-      <PropertyGroup>
-        <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
-      </PropertyGroup>
-      <Error Condition="!Exists('packages\Costura.Fody.5.7.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Costura.Fody.5.7.0\build\Costura.Fody.props'))" />
-      <Error Condition="!Exists('packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Costura.Fody.5.7.0\build\Costura.Fody.targets'))" />
-      <Error Condition="!Exists('packages\Fody.6.6.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Fody.6.6.4\build\Fody.targets'))" />
-      <Error Condition="!Exists('packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
-    </Target>
-    <Import Project="packages\Costura.Fody.5.7.0\build\Costura.Fody.targets" Condition="Exists('packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" />
-    <Import Project="packages\Fody.6.6.4\build\Fody.targets" Condition="Exists('packages\Fody.6.6.4\build\Fody.targets')" />
-    <Import Project="packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
-</Project>

extra/exe-builder/UptimeKuma.sln

@@ -1,16 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UptimeKuma", "UptimeKuma.csproj", "{2DB53988-1D93-4AC0-90C4-96ADEAAC5C04}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2DB53988-1D93-4AC0-90C4-96ADEAAC5C04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2DB53988-1D93-4AC0-90C4-96ADEAAC5C04}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2DB53988-1D93-4AC0-90C4-96ADEAAC5C04}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2DB53988-1D93-4AC0-90C4-96ADEAAC5C04}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-EndGlobal

extra/exe-builder/UptimeKuma.sln.DotSettings.user

@@ -1,3 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=UptimeKuma_002FProperties_002FResources/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/Initialized/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>

extra/exe-builder/Version.cs

@@ -1,9 +0,0 @@
-namespace UptimeKuma {
-    public class Version {
-        public string latest { get; set; }
-        public string slow { get; set; }
-        public string beta { get; set; }
-        public string nodejs { get; set; }
-        public string exe { get; set; }
-    }
-}

extra/exe-builder/app.manifest

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-    <asmv3:application>
-        <asmv3:windowsSettings>
-            <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
-            <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
-        </asmv3:windowsSettings>
-    </asmv3:application>
-    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-        <security>
-            <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-                <!-- UAC Manifest Options
-                     If you want to change the Windows User Account Control level replace the
-                     requestedExecutionLevel node with one of the following.
-
-                <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
-                <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
-                <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
-
-                    Specifying requestedExecutionLevel element will disable file and registry virtualization.
-                    Remove this element if your application requires this virtualization for backwards
-                    compatibility.
-                -->
-                <requestedExecutionLevel level="asInvoker" uiAccess="false" />
-            </requestedPrivileges>
-        </security>
-    </trustInfo>
-</assembly>

extra/exe-builder/packages.config

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Costura.Fody" version="5.7.0" targetFramework="net472" developmentDependency="true" />
-  <package id="Fody" version="6.6.4" targetFramework="net472" developmentDependency="true" />
-  <package id="Microsoft.NETCore.Platforms" version="7.0.0" targetFramework="net472" />
-  <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net472" />
-  <package id="NETStandard.Library" version="2.0.3" targetFramework="net472" />
-  <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net472" />
-  <package id="System.AppContext" version="4.3.0" targetFramework="net472" />
-  <package id="System.Console" version="4.3.1" targetFramework="net472" />
-  <package id="System.Diagnostics.DiagnosticSource" version="7.0.1" targetFramework="net472" />
-  <package id="System.Net.Http" version="4.3.4" targetFramework="net472" />
-  <package id="System.Runtime.Extensions" version="4.3.1" targetFramework="net472" />
-  <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net472" />
-  <package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net472" />
-  <package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net472" />
-  <package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net472" />
-  <package id="System.Memory" version="4.5.5" targetFramework="net472" />
-  <package id="System.Net.Primitives" version="4.3.1" targetFramework="net472" />
-  <package id="System.Runtime" version="4.3.1" targetFramework="net472" />
-  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
-  <package id="System.Collections" version="4.3.0" targetFramework="net472" />
-  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net472" />
-  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net472" />
-  <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net472" />
-  <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net472" />
-  <package id="System.Globalization" version="4.3.0" targetFramework="net472" />
-  <package id="System.Globalization.Calendars" version="4.3.0" targetFramework="net472" />
-  <package id="System.IO" version="4.3.0" targetFramework="net472" />
-  <package id="System.IO.Compression" version="4.3.0" targetFramework="net472" />
-  <package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net472" />
-  <package id="System.IO.FileSystem" version="4.3.0" targetFramework="net472" />
-  <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net472" />
-  <package id="System.Linq" version="4.3.0" targetFramework="net472" />
-  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net472" />
-  <package id="System.Net.Sockets" version="4.3.0" targetFramework="net472" />
-  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
-  <package id="System.ObjectModel" version="4.3.0" targetFramework="net472" />
-  <package id="System.Reflection" version="4.3.0" targetFramework="net472" />
-  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net472" />
-  <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net472" />
-  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
-  <package id="System.Runtime.Handles" version="4.3.0" targetFramework="net472" />
-  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net472" />
-  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net472" />
-  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net472" />
-  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net472" />
-  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net472" />
-  <package id="System.Text.Encoding" version="4.3.0" targetFramework="net472" />
-  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net472" />
-  <package id="System.Threading" version="4.3.0" targetFramework="net472" />
-  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net472" />
-  <package id="System.Threading.Timer" version="4.3.0" targetFramework="net472" />
-  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net472" />
-</packages>

extra/healthcheck.js

@@ -1,8 +1,4 @@
 /*
- * ⚠️ ⚠️ ⚠️ ⚠️ Due to the weird issue in Portainer that the healthcheck script is still pointing to this script for unknown reason.
- * IT CANNOT BE DROPPED, even though it looks like it is not used.
- * See more: https://github.com/louislam/uptime-kuma/issues/2774#issuecomment-1429092359
- *
  * ⚠️ Deprecated: Changed to healthcheck.go, it will be deleted in the future.
  * This script should be run after a period of time (180s), because the server may need some time to prepare.
  */
@@ -23,17 +19,17 @@ if (sslKey && sslCert) {
 
 // If host is omitted, the server will accept connections on the unspecified IPv6 address (::) when IPv6 is available and the unspecified IPv4 address (0.0.0.0) otherwise.
 // Dual-stack support for (::)
-let hostname = process.env.UPTIME_KUMA_HOST;
+let hostname = process.env.UPTIME_KUMA_SERVICE_HOST || process.env.UPTIME_KUMA_HOST || "::";
 
 // Also read HOST if not *BSD, as HOST is a system environment variable in FreeBSD
 if (!hostname && !FBSD) {
     hostname = process.env.HOST;
 }
 
-const port = parseInt(process.env.UPTIME_KUMA_PORT || process.env.PORT || 3001);
+const port = parseInt(process.env.UPTIME_KUMA_SERVICE_PORT || process.env.UPTIME_KUMA_PORT || process.env.PORT || 3001);
 
 let options = {
-    host: hostname || "127.0.0.1",
+    host: hostname,
     port: port,
     timeout: 28 * 1000,
 };

extra/sort-contributors.js

@@ -1,22 +0,0 @@
-const fs = require("fs");
-
-// Read the file from private/sort-contributors.txt
-const file = fs.readFileSync("private/sort-contributors.txt", "utf8");
-
-// Convert to an array of lines
-let lines = file.split("\n");
-
-// Remove empty lines
-lines = lines.filter((line) => line !== "");
-
-// Remove duplicates
-lines = [ ...new Set(lines) ];
-
-// Remove @weblate and @UptimeKumaBot
-lines = lines.filter((line) => line !== "@weblate" && line !== "@UptimeKumaBot" && line !== "@louislam");
-
-// Sort the lines
-lines = lines.sort();
-
-// Output the lines, concat with " "
-console.log(lines.join(" "));

extra/update-version.js

@@ -26,8 +26,7 @@ if (! exists) {
     fs.writeFileSync("package.json", JSON.stringify(pkg, null, 4) + "\n");
 
     // Also update package-lock.json
-    const npm = /^win/.test(process.platform) ? "npm.cmd" : "npm";
-    childProcess.spawnSync(npm, [ "install" ]);
+    childProcess.spawnSync("npm", [ "install" ]);
 
     commit(newVersion);
     tag(newVersion);

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, viewport-fit=cover" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <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" />

package.json

@@ -1,13 +1,13 @@
 {
     "name": "uptime-kuma",
-    "version": "1.22.0",
+    "version": "1.20.0-beta.0",
     "license": "MIT",
     "repository": {
         "type": "git",
         "url": "https://github.com/louislam/uptime-kuma.git"
     },
     "engines": {
-        "node": "14.* || 16.* || 18.*"
+        "node": "14.* || >=16.*"
     },
     "scripts": {
         "install-legacy": "npm install",
@@ -39,7 +39,7 @@
         "build-docker-nightly-amd64": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain",
         "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test --target pr-test . --push",
         "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain",
-        "setup": "git checkout 1.22.0 && npm ci --production && npm run download-dist",
+        "setup": "git checkout 1.19.6 && npm ci --production && npm run download-dist",
         "download-dist": "node extra/download-dist.js",
         "mark-as-nightly": "node extra/mark-as-nightly.js",
         "reset-password": "node extra/reset-password.js",
@@ -63,19 +63,18 @@
         "cy:run": "npx cypress run --browser chrome --headless --config-file ./config/cypress.config.js",
         "cy:run:unit": "npx cypress run --browser chrome --headless --config-file ./config/cypress.frontend.config.js",
         "cypress-open": "concurrently -k -r \"node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/\" \"cypress open --config-file ./config/cypress.config.js\"",
-        "build-healthcheck-armv7": "cross-env GOOS=linux GOARCH=arm GOARM=7 go build -x -o ./extra/healthcheck-armv7 ./extra/healthcheck.go",
-        "deploy-demo-server": "node extra/deploy-demo-server.js",
-        "sort-contributors": "node extra/sort-contributors.js"
+        "build-healthcheck-armv7": "cross-env GOOS=linux GOARCH=arm GOARM=7 go build -x -o ./extra/healthcheck-armv7 ./extra/healthcheck.go"
     },
     "dependencies": {
         "@grpc/grpc-js": "~1.7.3",
-        "@louislam/ping": "~0.4.4-mod.0",
-        "@louislam/sqlite3": "15.1.6",
+        "@louislam/ping": "~0.4.2-mod.1",
+        "@louislam/sqlite3": "15.1.2",
         "args-parser": "~1.3.0",
         "axios": "~0.27.0",
         "axios-ntlm": "1.3.0",
         "badge-maker": "~3.3.1",
         "bcryptjs": "~2.4.3",
+        "bree": "~7.1.5",
         "cacheable-lookup": "~6.0.4",
         "chardet": "~1.4.0",
         "check-password-strength": "^2.0.5",
@@ -84,14 +83,13 @@
         "command-exists": "~1.2.9",
         "compare-versions": "~3.6.0",
         "compression": "~1.7.4",
-        "croner": "~6.0.5",
         "dayjs": "~1.11.5",
         "dotenv": "~16.0.3",
         "express": "~4.17.3",
         "express-basic-auth": "~1.2.1",
         "express-static-gzip": "~2.1.7",
         "form-data": "~4.0.0",
-        "gamedig": "~4.0.5",
+        "gamedig": "^4.0.5",
         "http-graceful-shutdown": "~3.1.7",
         "http-proxy-agent": "~5.0.0",
         "https-proxy-agent": "~5.0.1",
@@ -100,11 +98,10 @@
         "jsonwebtoken": "~9.0.0",
         "jwt-decode": "~3.1.2",
         "limiter": "~2.1.0",
-        "mongodb": "~4.14.0",
+        "mongodb": "~4.13.0",
         "mqtt": "~4.3.7",
         "mssql": "~8.1.4",
         "mysql2": "~2.3.3",
-        "nanoid": "~3.3.4",
         "node-cloudflared-tunnel": "~1.0.9",
         "node-radius-client": "~1.0.0",
         "nodemailer": "~6.6.5",
@@ -115,11 +112,10 @@
         "prom-client": "~13.2.0",
         "prometheus-api-metrics": "~3.2.1",
         "protobufjs": "~7.1.1",
-        "qs": "~6.10.4",
-        "redbean-node": "~0.3.0",
+        "redbean-node": "~0.2.0",
         "redis": "~4.5.1",
-        "socket.io": "~4.6.1",
-        "socket.io-client": "~4.6.1",
+        "socket.io": "~4.5.3",
+        "socket.io-client": "~4.5.3",
         "socks-proxy-agent": "6.1.1",
         "tar": "~6.1.11",
         "tcp-ping": "~0.1.1",
@@ -142,11 +138,10 @@
         "aedes": "^0.46.3",
         "babel-plugin-rewire": "~1.2.0",
         "bootstrap": "5.1.3",
-        "chart.js": "~4.2.1",
-        "chartjs-adapter-dayjs-4": "~1.0.4",
+        "chart.js": "~3.6.2",
+        "chartjs-adapter-dayjs": "~1.0.0",
         "concurrently": "^7.1.0",
         "core-js": "~3.26.1",
-        "cronstrue": "~2.24.0",
         "cross-env": "~7.0.3",
         "cypress": "^10.1.0",
         "delay": "^5.0.0",
@@ -155,9 +150,8 @@
         "eslint": "~8.14.0",
         "eslint-plugin-vue": "~8.7.1",
         "favico.js": "~0.3.10",
-        "jest": "~27.2.5",
         "marked": "~4.2.5",
-        "node-ssh": "~13.0.1",
+        "jest": "~27.2.5",
         "postcss-html": "~1.5.0",
         "postcss-rtlcss": "~3.7.2",
         "postcss-scss": "~4.0.4",
@@ -165,16 +159,16 @@
         "qrcode": "~1.5.0",
         "rollup-plugin-visualizer": "^5.6.0",
         "sass": "~1.42.1",
-        "stylelint": "~15.9.0",
+        "stylelint": "~14.7.1",
         "stylelint-config-standard": "~25.0.0",
         "terser": "~5.15.0",
         "timezones-list": "~3.0.1",
         "typescript": "~4.4.4",
         "v-pagination-3": "~0.1.7",
-        "vite": "~3.2.7",
+        "vite": "~3.1.0",
         "vite-plugin-compression": "^0.5.1",
-        "vue": "~3.2.47",
-        "vue-chartjs": "~5.2.0",
+        "vue": "next",
+        "vue-chart-3": "3.0.9",
         "vue-confirm-dialog": "~1.0.2",
         "vue-contenteditable": "~3.0.4",
         "vue-i18n": "~9.2.2",
@@ -185,7 +179,6 @@
         "vue-router": "~4.0.14",
         "vue-toastification": "~2.0.0-rc.5",
         "vuedraggable": "~4.1.0",
-        "wait-on": "^6.0.1",
-        "whatwg-url": "~12.0.1"
+        "wait-on": "^6.0.1"
     }
 }

server/auth.js

@@ -2,10 +2,7 @@ const basicAuth = require("express-basic-auth");
 const passwordHash = require("./password-hash");
 const { R } = require("redbean-node");
 const { setting } = require("./util-server");
-const { log } = require("../src/util");
-const { loginRateLimiter, apiRateLimiter } = require("./rate-limiter");
-const { Settings } = require("./settings");
-const dayjs = require("dayjs");
+const { loginRateLimiter } = require("./rate-limiter");
 
 /**
  * Login to web app
@@ -37,36 +34,8 @@ exports.login = async function (username, password) {
 };
 
 /**
- * Validate a provided API key
- * @param {string} key API key to verify
- */
-async function verifyAPIKey(key) {
-    if (typeof key !== "string") {
-        return false;
-    }
-
-    // uk prefix + key ID is before _
-    let index = key.substring(2, key.indexOf("_"));
-    let clear = key.substring(key.indexOf("_") + 1, key.length);
-
-    let hash = await R.findOne("api_key", " id=? ", [ index ]);
-
-    if (hash === null) {
-        return false;
-    }
-
-    let current = dayjs();
-    let expiry = dayjs(hash.expires);
-    if (expiry.diff(current) < 0 || !hash.active) {
-        return false;
-    }
-
-    return hash && passwordHash.verify(clear, hash.key);
-}
-
-/**
- * Callback for basic auth authorizers
- * @callback authCallback
+ * Callback for myAuthorizer
+ * @callback myAuthorizerCB
  * @param {any} err Any error encountered
  * @param {boolean} authorized Is the client authorized?
  */
@@ -75,35 +44,9 @@ async function verifyAPIKey(key) {
  * Custom authorizer for express-basic-auth
  * @param {string} username
  * @param {string} password
- * @param {authCallback} callback
+ * @param {myAuthorizerCB} callback
  */
-function apiAuthorizer(username, password, callback) {
-    // API Rate Limit
-    apiRateLimiter.pass(null, 0).then((pass) => {
-        if (pass) {
-            verifyAPIKey(password).then((valid) => {
-                if (!valid) {
-                    log.warn("api-auth", "Failed API auth attempt: invalid API Key");
-                }
-                callback(null, valid);
-                // Only allow a set number of api requests per minute
-                // (currently set to 60)
-                apiRateLimiter.removeTokens(1);
-            });
-        } else {
-            log.warn("api-auth", "Failed API auth attempt: rate limit exceeded");
-            callback(null, false);
-        }
-    });
-}
-
-/**
- * Custom authorizer for express-basic-auth
- * @param {string} username
- * @param {string} password
- * @param {authCallback} callback
- */
-function userAuthorizer(username, password, callback) {
+function myAuthorizer(username, password, callback) {
     // Login Rate Limit
     loginRateLimiter.pass(null, 0).then((pass) => {
         if (pass) {
@@ -111,12 +54,10 @@ function userAuthorizer(username, password, callback) {
                 callback(null, user != null);
 
                 if (user == null) {
-                    log.warn("basic-auth", "Failed basic auth attempt: invalid username/password");
                     loginRateLimiter.removeTokens(1);
                 }
             });
         } else {
-            log.warn("basic-auth", "Failed basic auth attempt: rate limit exceeded");
             callback(null, false);
         }
     });
@@ -130,7 +71,7 @@ function userAuthorizer(username, password, callback) {
  */
 exports.basicAuth = async function (req, res, next) {
     const middleware = basicAuth({
-        authorizer: userAuthorizer,
+        authorizer: myAuthorizer,
         authorizeAsync: true,
         challenge: true,
     });
@@ -143,32 +84,3 @@ exports.basicAuth = async function (req, res, next) {
         next();
     }
 };
-
-/**
- * Use use API Key if API keys enabled, else use basic auth
- * @param {express.Request} req Express request object
- * @param {express.Response} res Express response object
- * @param {express.NextFunction} next
- */
-exports.apiAuth = async function (req, res, next) {
-    if (!await Settings.get("disableAuth")) {
-        let usingAPIKeys = await Settings.get("apiKeysEnabled");
-        let middleware;
-        if (usingAPIKeys) {
-            middleware = basicAuth({
-                authorizer: apiAuthorizer,
-                authorizeAsync: true,
-                challenge: true,
-            });
-        } else {
-            middleware = basicAuth({
-                authorizer: userAuthorizer,
-                authorizeAsync: true,
-                challenge: true,
-            });
-        }
-        middleware(req, res, next);
-    } else {
-        next();
-    }
-};

server/client.js

@@ -113,31 +113,6 @@ async function sendProxyList(socket) {
     return list;
 }
 
-/**
- * Emit API key list to client
- * @param {Socket} socket Socket.io socket instance
- * @returns {Promise<void>}
- */
-async function sendAPIKeyList(socket) {
-    const timeLogger = new TimeLogger();
-
-    let result = [];
-    const list = await R.find(
-        "api_key",
-        "user_id=?",
-        [ socket.userID ],
-    );
-
-    for (let bean of list) {
-        result.push(bean.toPublicJSON());
-    }
-
-    io.to(socket.userID).emit("apiKeyList", result);
-    timeLogger.print("Sent API Key List");
-
-    return list;
-}
-
 /**
  * Emits the version information to the client.
  * @param {Socket} socket Socket.io socket instance
@@ -182,7 +157,6 @@ module.exports = {
     sendImportantHeartbeatList,
     sendHeartbeatList,
     sendProxyList,
-    sendAPIKeyList,
     sendInfo,
     sendDockerHostList
 };

server/database.js

@@ -2,6 +2,7 @@ const fs = require("fs");
 const { R } = require("redbean-node");
 const { setSetting, setting } = require("./util-server");
 const { log, sleep } = require("../src/util");
+const dayjs = require("dayjs");
 const knex = require("knex");
 const { PluginsManager } = require("./plugins-manager");
 
@@ -29,6 +30,11 @@ class Database {
      */
     static patched = false;
 
+    /**
+     * For Backup only
+     */
+    static backupPath = null;
+
     /**
      * Add patch filename in key
      * Values:
@@ -64,12 +70,6 @@ class Database {
         "patch-maintenance-table2.sql": true,
         "patch-add-gamedig-monitor.sql": true,
         "patch-add-google-analytics-status-page-tag.sql": true,
-        "patch-http-body-encoding.sql": true,
-        "patch-add-description-monitor.sql": true,
-        "patch-api-key-table.sql": true,
-        "patch-monitor-tls.sql": true,
-        "patch-maintenance-cron.sql": true,
-        "patch-add-parent-monitor.sql": true,
     };
 
     /**
@@ -194,7 +194,15 @@ class Database {
         } else {
             log.info("db", "Database patch is needed");
 
-            // Try catch anything here
+            try {
+                this.backup(version);
+            } catch (e) {
+                log.error("db", e);
+                log.error("db", "Unable to create a backup before patching the database. Please make sure you have enough space and permission.");
+                process.exit(1);
+            }
+
+            // Try catch anything here, if gone wrong, restore the backup
             try {
                 for (let i = version + 1; i <= this.latestVersion; i++) {
                     const sqlFile = `./db/patch${i}.sql`;
@@ -210,6 +218,7 @@ class Database {
                 log.error("db", "Start Uptime-Kuma failed due to issue patching the database");
                 log.error("db", "Please submit a bug report if you still encounter the problem after restart: https://github.com/louislam/uptime-kuma/issues");
 
+                this.restore();
                 process.exit(1);
             }
         }
@@ -251,6 +260,8 @@ class Database {
             log.error("db", "Start Uptime-Kuma failed due to issue patching the database");
             log.error("db", "Please submit the bug report if you still encounter the problem after restart: https://github.com/louislam/uptime-kuma/issues");
 
+            this.restore();
+
             process.exit(1);
         }
 
@@ -352,6 +363,8 @@ class Database {
                 }
             }
 
+            this.backup(dayjs().format("YYYYMMDDHHmmss"));
+
             log.info("db", sqlFilename + " is patching");
             this.patched = true;
             await this.importSQLFile("./db/" + sqlFilename);
@@ -417,9 +430,6 @@ class Database {
 
         log.info("db", "Closing the database");
 
-        // Flush WAL to main database
-        await R.exec("PRAGMA wal_checkpoint(TRUNCATE)");
-
         while (true) {
             Database.noReject = true;
             await R.close();
@@ -436,6 +446,90 @@ class Database {
         process.removeListener("unhandledRejection", listener);
     }
 
+    /**
+     * One backup one time in this process.
+     * Reset this.backupPath if you want to backup again
+     * @param {string} version Version code of backup
+     */
+    static backup(version) {
+        if (! this.backupPath) {
+            log.info("db", "Backing up the database");
+            this.backupPath = this.dataDir + "kuma.db.bak" + version;
+            fs.copyFileSync(Database.path, this.backupPath);
+
+            const shmPath = Database.path + "-shm";
+            if (fs.existsSync(shmPath)) {
+                this.backupShmPath = shmPath + ".bak" + version;
+                fs.copyFileSync(shmPath, this.backupShmPath);
+            }
+
+            const walPath = Database.path + "-wal";
+            if (fs.existsSync(walPath)) {
+                this.backupWalPath = walPath + ".bak" + version;
+                fs.copyFileSync(walPath, this.backupWalPath);
+            }
+
+            // Double confirm if all files actually backup
+            if (!fs.existsSync(this.backupPath)) {
+                throw new Error("Backup failed! " + this.backupPath);
+            }
+
+            if (fs.existsSync(shmPath)) {
+                if (!fs.existsSync(this.backupShmPath)) {
+                    throw new Error("Backup failed! " + this.backupShmPath);
+                }
+            }
+
+            if (fs.existsSync(walPath)) {
+                if (!fs.existsSync(this.backupWalPath)) {
+                    throw new Error("Backup failed! " + this.backupWalPath);
+                }
+            }
+        }
+    }
+
+    /** Restore from most recent backup */
+    static restore() {
+        if (this.backupPath) {
+            log.error("db", "Patching the database failed!!! Restoring the backup");
+
+            const shmPath = Database.path + "-shm";
+            const walPath = Database.path + "-wal";
+
+            // Delete patch failed db
+            try {
+                if (fs.existsSync(Database.path)) {
+                    fs.unlinkSync(Database.path);
+                }
+
+                if (fs.existsSync(shmPath)) {
+                    fs.unlinkSync(shmPath);
+                }
+
+                if (fs.existsSync(walPath)) {
+                    fs.unlinkSync(walPath);
+                }
+            } catch (e) {
+                log.error("db", "Restore failed; you may need to restore the backup manually");
+                process.exit(1);
+            }
+
+            // Restore backup
+            fs.copyFileSync(this.backupPath, Database.path);
+
+            if (this.backupShmPath) {
+                fs.copyFileSync(this.backupShmPath, shmPath);
+            }
+
+            if (this.backupWalPath) {
+                fs.copyFileSync(this.backupWalPath, walPath);
+            }
+
+        } else {
+            log.info("db", "Nothing to restore");
+        }
+    }
+
     /** Get the size of the database */
     static getSize() {
         log.debug("db", "Database.getSize()");

server/jobs.js

@@ -1,44 +1,41 @@
-const { UptimeKumaServer } = require("./uptime-kuma-server");
-const { clearOldData } = require("./jobs/clear-old-data");
-const Cron = require("croner");
-
+const path = require("path");
+const Bree = require("bree");
+const { SHARE_ENV } = require("worker_threads");
+const { log } = require("../src/util");
+let bree;
 const jobs = [
     {
         name: "clear-old-data",
-        interval: "14 03 * * *",
-        jobFunc: clearOldData,
-        croner: null,
+        interval: "at 03:14",
     },
 ];
 
 /**
  * Initialize background jobs
- * @returns {Promise<void>}
+ * @param {Object} args Arguments to pass to workers
+ * @returns {Bree}
  */
-const initBackgroundJobs = async function () {
-    const timezone = await UptimeKumaServer.getInstance().getTimezone();
-
-    for (const job of jobs) {
-        const cornerJob = new Cron(
-            job.interval,
-            {
-                name: job.name,
-                timezone,
-            },
-            job.jobFunc,
-        );
-        job.croner = cornerJob;
-    }
+const initBackgroundJobs = function (args) {
+    bree = new Bree({
+        root: path.resolve("server", "jobs"),
+        jobs,
+        worker: {
+            env: SHARE_ENV,
+            workerData: args,
+        },
+        workerMessageHandler: (message) => {
+            log.info("jobs", message);
+        }
+    });
 
+    bree.start();
+    return bree;
 };
 
 /** Stop all background jobs if running */
 const stopBackgroundJobs = function () {
-    for (const job of jobs) {
-        if (job.croner) {
-            job.croner.stop();
-            job.croner = null;
-        }
+    if (bree) {
+        bree.stop();
     }
 };
 

server/jobs/clear-old-data.js

@@ -1,15 +1,12 @@
+const { log, exit, connectDb } = require("./util-worker");
 const { R } = require("redbean-node");
-const { log } = require("../../src/util");
 const { setSetting, setting } = require("../util-server");
 
 const DEFAULT_KEEP_PERIOD = 180;
 
-/**
- * Clears old data from the heartbeat table of the database.
- * @return {Promise<void>} A promise that resolves when the data has been cleared.
- */
+(async () => {
+    await connectDb();
 
-const clearOldData = async () => {
     let period = await setting("keepDataPeriodDays");
 
     // Set Default Period
@@ -23,16 +20,16 @@ const clearOldData = async () => {
     try {
         parsedPeriod = parseInt(period);
     } catch (_) {
-        log.warn("clearOldData", "Failed to parse setting, resetting to default..");
+        log("Failed to parse setting, resetting to default..");
         await setSetting("keepDataPeriodDays", DEFAULT_KEEP_PERIOD, "general");
         parsedPeriod = DEFAULT_KEEP_PERIOD;
     }
 
     if (parsedPeriod < 1) {
-        log.info("clearOldData", `Data deletion has been disabled as period is less than 1. Period is ${parsedPeriod} days.`);
+        log(`Data deletion has been disabled as period is less than 1. Period is ${parsedPeriod} days.`);
     } else {
 
-        log.debug("clearOldData", `Clearing Data older than ${parsedPeriod} days...`);
+        log(`Clearing Data older than ${parsedPeriod} days...`);
 
         try {
             await R.exec(
@@ -40,11 +37,9 @@ const clearOldData = async () => {
                 [ parsedPeriod ]
             );
         } catch (e) {
-            log.error("clearOldData", `Failed to clear old data: ${e.message}`);
+            log(`Failed to clear old data: ${e.message}`);
         }
     }
-};
 
-module.exports = {
-    clearOldData,
-};
+    exit();
+})();

server/jobs/util-worker.js

@@ -0,0 +1,50 @@
+const { parentPort, workerData } = require("worker_threads");
+const Database = require("../database");
+const path = require("path");
+
+/**
+ * Send message to parent process for logging
+ * since worker_thread does not have access to stdout, this is used
+ * instead of console.log()
+ * @param {any} any The message to log
+ */
+const log = function (any) {
+    if (parentPort) {
+        parentPort.postMessage(any);
+    }
+};
+
+/**
+ * Exit the worker process
+ * @param {number} error The status code to exit
+ */
+const exit = function (error) {
+    if (error && error !== 0) {
+        process.exit(error);
+    } else {
+        if (parentPort) {
+            parentPort.postMessage("done");
+        } else {
+            process.exit(0);
+        }
+    }
+};
+
+/** Connects to the database */
+const connectDb = async function () {
+    const dbPath = path.join(
+        process.env.DATA_DIR || workerData["data-dir"] || "./data/"
+    );
+
+    Database.init({
+        "data-dir": dbPath,
+    });
+
+    await Database.connect();
+};
+
+module.exports = {
+    log,
+    exit,
+    connectDb,
+};

server/model/api_key.js

@@ -1,76 +0,0 @@
-const { BeanModel } = require("redbean-node/dist/bean-model");
-const { R } = require("redbean-node");
-const dayjs = require("dayjs");
-
-class APIKey extends BeanModel {
-    /**
-     * Get the current status of this API key
-     * @returns {string} active, inactive or expired
-     */
-    getStatus() {
-        let current = dayjs();
-        let expiry = dayjs(this.expires);
-        if (expiry.diff(current) < 0) {
-            return "expired";
-        }
-
-        return this.active ? "active" : "inactive";
-    }
-
-    /**
-     * Returns an object that ready to parse to JSON
-     * @returns {Object}
-     */
-    toJSON() {
-        return {
-            id: this.id,
-            key: this.key,
-            name: this.name,
-            userID: this.user_id,
-            createdDate: this.created_date,
-            active: this.active,
-            expires: this.expires,
-            status: this.getStatus(),
-        };
-    }
-
-    /**
-     * Returns an object that ready to parse to JSON with sensitive fields
-     * removed
-     * @returns {Object}
-     */
-    toPublicJSON() {
-        return {
-            id: this.id,
-            name: this.name,
-            userID: this.user_id,
-            createdDate: this.created_date,
-            active: this.active,
-            expires: this.expires,
-            status: this.getStatus(),
-        };
-    }
-
-    /**
-     * Create a new API Key and store it in the database
-     * @param {Object} key Object sent by client
-     * @param {int} userID ID of socket user
-     * @returns {Promise<bean>}
-     */
-    static async save(key, userID) {
-        let bean;
-        bean = R.dispense("api_key");
-
-        bean.key = key.key;
-        bean.name = key.name;
-        bean.user_id = userID;
-        bean.active = key.active;
-        bean.expires = key.expires;
-
-        await R.store(bean);
-
-        return bean;
-    }
-}
-
-module.exports = APIKey;

server/model/maintenance.js

@@ -1,10 +1,8 @@
 const { BeanModel } = require("redbean-node/dist/bean-model");
-const { parseTimeObject, parseTimeFromTimeObject, log } = require("../../src/util");
+const { parseTimeObject, parseTimeFromTimeObject, utcToLocal, localToUTC, log } = require("../../src/util");
+const { timeObjectToUTC, timeObjectToLocal } = require("../util-server");
 const { R } = require("redbean-node");
 const dayjs = require("dayjs");
-const Cron = require("croner");
-const { UptimeKumaServer } = require("../uptime-kuma-server");
-const apicache = require("../modules/apicache");
 
 class Maintenance extends BeanModel {
 
@@ -17,19 +15,16 @@ class Maintenance extends BeanModel {
 
         let dateRange = [];
         if (this.start_date) {
-            dateRange.push(this.start_date);
-        } else {
-            dateRange.push(null);
-        }
-
-        if (this.end_date) {
-            dateRange.push(this.end_date);
+            dateRange.push(utcToLocal(this.start_date));
+            if (this.end_date) {
+                dateRange.push(utcToLocal(this.end_date));
+            }
         }
 
         let timeRange = [];
-        let startTime = parseTimeObject(this.start_time);
+        let startTime = timeObjectToLocal(parseTimeObject(this.start_time));
         timeRange.push(startTime);
-        let endTime = parseTimeObject(this.end_time);
+        let endTime = timeObjectToLocal(parseTimeObject(this.end_time));
         timeRange.push(endTime);
 
         let obj = {
@@ -44,44 +39,12 @@ class Maintenance extends BeanModel {
             weekdays: (this.weekdays) ? JSON.parse(this.weekdays) : [],
             daysOfMonth: (this.days_of_month) ? JSON.parse(this.days_of_month) : [],
             timeslotList: [],
-            cron: this.cron,
-            duration: this.duration,
-            durationMinutes: parseInt(this.duration / 60),
-            timezone: await this.getTimezone(),         // Only valid timezone
-            timezoneOption: this.timezone,               // Mainly for dropdown menu, because there is a option "SAME_AS_SERVER"
-            timezoneOffset: await this.getTimezoneOffset(),
-            status: await this.getStatus(),
         };
 
-        if (this.strategy === "manual") {
-            // Do nothing, no timeslots
-        } else if (this.strategy === "single") {
-            obj.timeslotList.push({
-                startDate: this.start_date,
-                endDate: this.end_date,
-            });
-        } else {
-            // Should be cron or recurring here
-            if (this.beanMeta.job) {
-                let runningTimeslot = this.getRunningTimeslot();
+        const timeslotList = await this.getTimeslotList();
 
-                if (runningTimeslot) {
-                    obj.timeslotList.push(runningTimeslot);
-                }
-
-                let nextRunDate = this.beanMeta.job.nextRun();
-                if (nextRunDate) {
-                    let startDateDayjs = dayjs(nextRunDate);
-
-                    let startDate = startDateDayjs.toISOString();
-                    let endDate = startDateDayjs.add(this.duration, "second").toISOString();
-
-                    obj.timeslotList.push({
-                        startDate,
-                        endDate,
-                    });
-                }
-            }
+        for (let timeslot of timeslotList) {
+            obj.timeslotList.push(await timeslot.toPublicJSON());
         }
 
         if (!Array.isArray(obj.weekdays)) {
@@ -92,9 +55,54 @@ class Maintenance extends BeanModel {
             obj.daysOfMonth = [];
         }
 
+        // Maintenance Status
+        if (!obj.active) {
+            obj.status = "inactive";
+        } else if (obj.strategy === "manual") {
+            obj.status = "under-maintenance";
+        } else if (obj.timeslotList.length > 0) {
+            let currentTimestamp = dayjs().unix();
+
+            for (let timeslot of obj.timeslotList) {
+                if (dayjs.utc(timeslot.startDate).unix() <= currentTimestamp && dayjs.utc(timeslot.endDate).unix() >= currentTimestamp) {
+                    log.debug("timeslot", "Timeslot ID: " + timeslot.id);
+                    log.debug("timeslot", "currentTimestamp:" + currentTimestamp);
+                    log.debug("timeslot", "timeslot.start_date:" + dayjs.utc(timeslot.startDate).unix());
+                    log.debug("timeslot", "timeslot.end_date:" + dayjs.utc(timeslot.endDate).unix());
+
+                    obj.status = "under-maintenance";
+                    break;
+                }
+            }
+
+            if (!obj.status) {
+                obj.status = "scheduled";
+            }
+        } else if (obj.timeslotList.length === 0) {
+            obj.status = "ended";
+        } else {
+            obj.status = "unknown";
+        }
+
         return obj;
     }
 
+    /**
+     * Only get future or current timeslots only
+     * @returns {Promise<[]>}
+     */
+    async getTimeslotList() {
+        return R.convertToBeans("maintenance_timeslot", await R.getAll(`
+            SELECT maintenance_timeslot.*
+            FROM maintenance_timeslot, maintenance
+            WHERE maintenance_timeslot.maintenance_id = maintenance.id
+            AND maintenance.id = ?
+            AND ${Maintenance.getActiveAndFutureMaintenanceSQLCondition()}
+        `, [
+            this.id
+        ]));
+    }
+
     /**
      * Return an object that ready to parse to JSON
      * @param {string} timezone If not specified, the timeRange will be in UTC
@@ -118,7 +126,7 @@ class Maintenance extends BeanModel {
 
     /**
      * Get a list of days in month that maintenance is active for
-     * @returns {number[]|string[]} Array of active days in month
+     * @returns {number[]} Array of active days in month
      */
     getDayOfMonthList() {
         return JSON.parse(this.days_of_month).sort(function (a, b) {
@@ -127,10 +135,26 @@ class Maintenance extends BeanModel {
     }
 
     /**
-     * Get the duration of maintenance in seconds
+     * Get the start date and time for maintenance
+     * @returns {dayjs.Dayjs} Start date and time
+     */
+    getStartDateTime() {
+        let startOfTheDay = dayjs.utc(this.start_date).format("HH:mm");
+        log.debug("timeslot", "startOfTheDay: " + startOfTheDay);
+
+        // Start Time
+        let startTimeSecond = dayjs.utc(this.start_time, "HH:mm").diff(dayjs.utc(startOfTheDay, "HH:mm"), "second");
+        log.debug("timeslot", "startTime: " + startTimeSecond);
+
+        // Bake StartDate + StartTime = Start DateTime
+        return dayjs.utc(this.start_date).add(startTimeSecond, "second");
+    }
+
+    /**
+     * Get the duraction of maintenance in seconds
      * @returns {number} Duration of maintenance
      */
-    calcDuration() {
+    getDuration() {
         let duration = dayjs.utc(this.end_time, "HH:mm").diff(dayjs.utc(this.start_time, "HH:mm"), "second");
         // Add 24hours if it is across day
         if (duration < 0) {
@@ -145,270 +169,71 @@ class Maintenance extends BeanModel {
      * @param {Object} obj Data to fill bean with
      * @returns {Bean} Filled bean
      */
-    static async jsonToBean(bean, obj) {
+    static jsonToBean(bean, obj) {
         if (obj.id) {
             bean.id = obj.id;
         }
 
+        // Apply timezone offset to timeRange, as it cannot apply automatically.
+        if (obj.timeRange[0]) {
+            timeObjectToUTC(obj.timeRange[0]);
+            if (obj.timeRange[1]) {
+                timeObjectToUTC(obj.timeRange[1]);
+            }
+        }
+
         bean.title = obj.title;
         bean.description = obj.description;
         bean.strategy = obj.strategy;
         bean.interval_day = obj.intervalDay;
-        bean.timezone = obj.timezoneOption;
         bean.active = obj.active;
 
         if (obj.dateRange[0]) {
-            bean.start_date = obj.dateRange[0];
-        } else {
-            bean.start_date = null;
+            bean.start_date = localToUTC(obj.dateRange[0]);
+
+            if (obj.dateRange[1]) {
+                bean.end_date = localToUTC(obj.dateRange[1]);
+            }
         }
 
-        if (obj.dateRange[1]) {
-            bean.end_date = obj.dateRange[1];
-        } else {
-            bean.end_date = null;
-        }
+        bean.start_time = parseTimeFromTimeObject(obj.timeRange[0]);
+        bean.end_time = parseTimeFromTimeObject(obj.timeRange[1]);
 
-        if (bean.strategy === "cron") {
-            bean.duration = obj.durationMinutes * 60;
-            bean.cron = obj.cron;
-            this.validateCron(bean.cron);
-        }
+        bean.weekdays = JSON.stringify(obj.weekdays);
+        bean.days_of_month = JSON.stringify(obj.daysOfMonth);
 
-        if (bean.strategy.startsWith("recurring-")) {
-            bean.start_time = parseTimeFromTimeObject(obj.timeRange[0]);
-            bean.end_time = parseTimeFromTimeObject(obj.timeRange[1]);
-            bean.weekdays = JSON.stringify(obj.weekdays);
-            bean.days_of_month = JSON.stringify(obj.daysOfMonth);
-            await bean.generateCron();
-            this.validateCron(bean.cron);
-        }
         return bean;
     }
 
     /**
-     * Throw error if cron is invalid
-     * @param cron
-     * @returns {Promise<void>}
+     * SQL conditions for active maintenance
+     * @returns {string}
      */
-    static async validateCron(cron) {
-        let job = new Cron(cron, () => {});
-        job.stop();
+    static getActiveMaintenanceSQLCondition() {
+        return `
+            (
+                (maintenance_timeslot.start_date <= DATETIME('now')
+                AND maintenance_timeslot.end_date >= DATETIME('now')
+                AND maintenance.active = 1)
+                OR
+                (maintenance.strategy = 'manual' AND active = 1)
+            )
+        `;
     }
 
     /**
-     * Run the cron
+     * SQL conditions for active and future maintenance
+     * @returns {string}
      */
-    async run(throwError = false) {
-        if (this.beanMeta.job) {
-            log.debug("maintenance", "Maintenance is already running, stop it first. id: " + this.id);
-            this.stop();
-        }
-
-        log.debug("maintenance", "Run maintenance id: " + this.id);
-
-        // 1.21.2 migration
-        if (!this.cron) {
-            await this.generateCron();
-            if (!this.timezone) {
-                this.timezone = "UTC";
-            }
-            if (this.cron) {
-                await R.store(this);
-            }
-        }
-
-        if (this.strategy === "manual") {
-            // Do nothing, because it is controlled by the user
-        } else if (this.strategy === "single") {
-            this.beanMeta.job = new Cron(this.start_date, { timezone: await this.getTimezone() }, () => {
-                log.info("maintenance", "Maintenance id: " + this.id + " is under maintenance now");
-                UptimeKumaServer.getInstance().sendMaintenanceListByUserID(this.user_id);
-                apicache.clear();
-            });
-        } else if (this.cron != null) {
-            // Here should be cron or recurring
-            try {
-                this.beanMeta.status = "scheduled";
-
-                let startEvent = (customDuration = 0) => {
-                    log.info("maintenance", "Maintenance id: " + this.id + " is under maintenance now");
-
-                    this.beanMeta.status = "under-maintenance";
-                    clearTimeout(this.beanMeta.durationTimeout);
-
-                    // Check if duration is still in the window. If not, use the duration from the current time to the end of the window
-                    let duration;
-
-                    if (customDuration > 0) {
-                        duration = customDuration;
-                    } else if (this.end_date) {
-                        let d = dayjs(this.end_date).diff(dayjs(), "second");
-                        if (d < this.duration) {
-                            duration = d * 1000;
-                        }
-                    } else {
-                        duration = this.duration * 1000;
-                    }
-
-                    UptimeKumaServer.getInstance().sendMaintenanceListByUserID(this.user_id);
-
-                    this.beanMeta.durationTimeout = setTimeout(() => {
-                        // End of maintenance for this timeslot
-                        this.beanMeta.status = "scheduled";
-                        UptimeKumaServer.getInstance().sendMaintenanceListByUserID(this.user_id);
-                    }, duration);
-                };
-
-                // Create Cron
-                this.beanMeta.job = new Cron(this.cron, {
-                    timezone: await this.getTimezone(),
-                }, startEvent);
-
-                // Continue if the maintenance is still in the window
-                let runningTimeslot = this.getRunningTimeslot();
-                let current = dayjs();
-
-                if (runningTimeslot) {
-                    let duration = dayjs(runningTimeslot.endDate).diff(current, "second") * 1000;
-                    log.debug("maintenance", "Maintenance id: " + this.id + " Remaining duration: " + duration + "ms");
-                    startEvent(duration);
-                }
-
-            } catch (e) {
-                log.error("maintenance", "Error in maintenance id: " + this.id);
-                log.error("maintenance", "Cron: " + this.cron);
-                log.error("maintenance", e);
-
-                if (throwError) {
-                    throw e;
-                }
-            }
-
-        } else {
-            log.error("maintenance", "Maintenance id: " + this.id + " has no cron");
-        }
-    }
-
-    getRunningTimeslot() {
-        let start = dayjs(this.beanMeta.job.nextRun(dayjs().add(-this.duration, "second").toDate()));
-        let end = start.add(this.duration, "second");
-        let current = dayjs();
-
-        if (current.isAfter(start) && current.isBefore(end)) {
-            return {
-                startDate: start.toISOString(),
-                endDate: end.toISOString(),
-            };
-        } else {
-            return null;
-        }
-    }
-
-    stop() {
-        if (this.beanMeta.job) {
-            this.beanMeta.job.stop();
-            delete this.beanMeta.job;
-        }
-    }
-
-    async isUnderMaintenance() {
-        return (await this.getStatus()) === "under-maintenance";
-    }
-
-    async getTimezone() {
-        if (!this.timezone || this.timezone === "SAME_AS_SERVER") {
-            return await UptimeKumaServer.getInstance().getTimezone();
-        }
-        return this.timezone;
-    }
-
-    async getTimezoneOffset() {
-        return dayjs.tz(dayjs(), await this.getTimezone()).format("Z");
-    }
-
-    async getStatus() {
-        if (!this.active) {
-            return "inactive";
-        }
-
-        if (this.strategy === "manual") {
-            return "under-maintenance";
-        }
-
-        // Check if the maintenance is started
-        if (this.start_date && dayjs().isBefore(dayjs.tz(this.start_date, await this.getTimezone()))) {
-            return "scheduled";
-        }
-
-        // Check if the maintenance is ended
-        if (this.end_date && dayjs().isAfter(dayjs.tz(this.end_date, await this.getTimezone()))) {
-            return "ended";
-        }
-
-        if (this.strategy === "single") {
-            return "under-maintenance";
-        }
-
-        if (!this.beanMeta.status) {
-            return "unknown";
-        }
-
-        return this.beanMeta.status;
-    }
-
-    /**
-     * Generate Cron for recurring maintenance
-     * @returns {Promise<void>}
-     */
-    async generateCron() {
-        log.info("maintenance", "Generate cron for maintenance id: " + this.id);
-
-        if (this.strategy === "cron") {
-            // Do nothing for cron
-        } else if (!this.strategy.startsWith("recurring-")) {
-            this.cron = "";
-        } else if (this.strategy === "recurring-interval") {
-            let array = this.start_time.split(":");
-            let hour = parseInt(array[0]);
-            let minute = parseInt(array[1]);
-            this.cron = minute + " " + hour + " */" + this.interval_day + " * *";
-            this.duration = this.calcDuration();
-            log.debug("maintenance", "Cron: " + this.cron);
-            log.debug("maintenance", "Duration: " + this.duration);
-        } else if (this.strategy === "recurring-weekday") {
-            let list = this.getDayOfWeekList();
-            let array = this.start_time.split(":");
-            let hour = parseInt(array[0]);
-            let minute = parseInt(array[1]);
-            this.cron = minute + " " + hour + " * * " + list.join(",");
-            this.duration = this.calcDuration();
-        } else if (this.strategy === "recurring-day-of-month") {
-            let list = this.getDayOfMonthList();
-            let array = this.start_time.split(":");
-            let hour = parseInt(array[0]);
-            let minute = parseInt(array[1]);
-
-            let dayList = [];
-
-            for (let day of list) {
-                if (typeof day === "string" && day.startsWith("lastDay")) {
-                    if (day === "lastDay1") {
-                        dayList.push("L");
-                    }
-                    // Unfortunately, lastDay2-4 is not supported by cron
-                } else {
-                    dayList.push(day);
-                }
-            }
-
-            // Remove duplicate
-            dayList = [ ...new Set(dayList) ];
-
-            this.cron = minute + " " + hour + " " + dayList.join(",") + " * *";
-            this.duration = this.calcDuration();
-        }
-
+    static getActiveAndFutureMaintenanceSQLCondition() {
+        return `
+            (
+                ((maintenance_timeslot.end_date >= DATETIME('now')
+                AND maintenance.active = 1)
+                OR
+                (maintenance.strategy = 'manual' AND active = 1))
+            )
+        `;
     }
 }
 

server/model/maintenance_timeslot.js

@@ -0,0 +1,198 @@
+const { BeanModel } = require("redbean-node/dist/bean-model");
+const { R } = require("redbean-node");
+const dayjs = require("dayjs");
+const { log, utcToLocal, SQL_DATETIME_FORMAT_WITHOUT_SECOND, localToUTC } = require("../../src/util");
+const { UptimeKumaServer } = require("../uptime-kuma-server");
+
+class MaintenanceTimeslot extends BeanModel {
+
+    /**
+     * Return an object that ready to parse to JSON for public
+     * Only show necessary data to public
+     * @returns {Object}
+     */
+    async toPublicJSON() {
+        const serverTimezoneOffset = UptimeKumaServer.getInstance().getTimezoneOffset();
+
+        const obj = {
+            id: this.id,
+            startDate: this.start_date,
+            endDate: this.end_date,
+            startDateServerTimezone: utcToLocal(this.start_date, SQL_DATETIME_FORMAT_WITHOUT_SECOND),
+            endDateServerTimezone: utcToLocal(this.end_date, SQL_DATETIME_FORMAT_WITHOUT_SECOND),
+            serverTimezoneOffset,
+        };
+
+        return obj;
+    }
+
+    /**
+     * Return an object that ready to parse to JSON
+     * @returns {Object}
+     */
+    async toJSON() {
+        return await this.toPublicJSON();
+    }
+
+    /**
+     * @param {Maintenance} maintenance
+     * @param {dayjs} minDate (For recurring type only) Generate a next timeslot from this date.
+     * @param {boolean} removeExist Remove existing timeslot before create
+     * @returns {Promise<MaintenanceTimeslot>}
+     */
+    static async generateTimeslot(maintenance, minDate = null, removeExist = false) {
+        if (removeExist) {
+            await R.exec("DELETE FROM maintenance_timeslot WHERE maintenance_id = ? ", [
+                maintenance.id
+            ]);
+        }
+
+        if (maintenance.strategy === "manual") {
+            log.debug("maintenance", "No need to generate timeslot for manual type");
+
+        } else if (maintenance.strategy === "single") {
+            let bean = R.dispense("maintenance_timeslot");
+            bean.maintenance_id = maintenance.id;
+            bean.start_date = maintenance.start_date;
+            bean.end_date = maintenance.end_date;
+            bean.generated_next = true;
+            return await R.store(bean);
+
+        } else if (maintenance.strategy === "recurring-interval") {
+            // Prevent dead loop, in case interval_day is not set
+            if (!maintenance.interval_day || maintenance.interval_day <= 0) {
+                maintenance.interval_day = 1;
+            }
+
+            return await this.handleRecurringType(maintenance, minDate, (startDateTime) => {
+                return startDateTime.add(maintenance.interval_day, "day");
+            }, () => {
+                return true;
+            });
+
+        } else if (maintenance.strategy === "recurring-weekday") {
+            let dayOfWeekList = maintenance.getDayOfWeekList();
+            log.debug("timeslot", dayOfWeekList);
+
+            if (dayOfWeekList.length <= 0) {
+                log.debug("timeslot", "No weekdays selected?");
+                return null;
+            }
+
+            const isValid = (startDateTime) => {
+                log.debug("timeslot", "nextDateTime: " + startDateTime);
+
+                let day = startDateTime.local().day();
+                log.debug("timeslot", "nextDateTime.day(): " + day);
+
+                return dayOfWeekList.includes(day);
+            };
+
+            return await this.handleRecurringType(maintenance, minDate, (startDateTime) => {
+                while (true) {
+                    startDateTime = startDateTime.add(1, "day");
+
+                    if (isValid(startDateTime)) {
+                        return startDateTime;
+                    }
+                }
+            }, isValid);
+
+        } else if (maintenance.strategy === "recurring-day-of-month") {
+            let dayOfMonthList = maintenance.getDayOfMonthList();
+            if (dayOfMonthList.length <= 0) {
+                log.debug("timeslot", "No day selected?");
+                return null;
+            }
+
+            const isValid = (startDateTime) => {
+                let day = parseInt(startDateTime.local().format("D"));
+
+                log.debug("timeslot", "day: " + day);
+
+                // Check 1-31
+                if (dayOfMonthList.includes(day)) {
+                    return startDateTime;
+                }
+
+                // Check "lastDay1","lastDay2"...
+                let daysInMonth = startDateTime.daysInMonth();
+                let lastDayList = [];
+
+                // Small first, e.g. 28 > 29 > 30 > 31
+                for (let i = 4; i >= 1; i--) {
+                    if (dayOfMonthList.includes("lastDay" + i)) {
+                        lastDayList.push(daysInMonth - i + 1);
+                    }
+                }
+                log.debug("timeslot", lastDayList);
+                return lastDayList.includes(day);
+            };
+
+            return await this.handleRecurringType(maintenance, minDate, (startDateTime) => {
+                while (true) {
+                    startDateTime = startDateTime.add(1, "day");
+                    if (isValid(startDateTime)) {
+                        return startDateTime;
+                    }
+                }
+            }, isValid);
+        } else {
+            throw new Error("Unknown maintenance strategy");
+        }
+    }
+
+    /**
+     * Generate a next timeslot for all recurring types
+     * @param maintenance
+     * @param minDate
+     * @param {function} nextDayCallback The logic how to get the next possible day
+     * @param {function} isValidCallback Check the day whether is matched the current strategy
+     * @returns {Promise<null|MaintenanceTimeslot>}
+     */
+    static async handleRecurringType(maintenance, minDate, nextDayCallback, isValidCallback) {
+        let bean = R.dispense("maintenance_timeslot");
+
+        let duration = maintenance.getDuration();
+        let startDateTime = maintenance.getStartDateTime();
+        let endDateTime;
+
+        // Keep generating from the first possible date, until it is ok
+        while (true) {
+            log.debug("timeslot", "startDateTime: " + startDateTime.format());
+
+            // Handling out of effective date range
+            if (startDateTime.diff(dayjs.utc(maintenance.end_date)) > 0) {
+                log.debug("timeslot", "Out of effective date range");
+                return null;
+            }
+
+            endDateTime = startDateTime.add(duration, "second");
+
+            // If endDateTime is out of effective date range, use the end datetime from effective date range
+            if (endDateTime.diff(dayjs.utc(maintenance.end_date)) > 0) {
+                endDateTime = dayjs.utc(maintenance.end_date);
+            }
+
+            // If minDate is set, the endDateTime must be bigger than it.
+            // And the endDateTime must be bigger current time
+            // Is valid under current recurring strategy
+            if (
+                (!minDate || endDateTime.diff(minDate) > 0) &&
+                endDateTime.diff(dayjs()) > 0 &&
+                isValidCallback(startDateTime)
+            ) {
+                break;
+            }
+            startDateTime = nextDayCallback(startDateTime);
+        }
+
+        bean.maintenance_id = maintenance.id;
+        bean.start_date = localToUTC(startDateTime);
+        bean.end_date = localToUTC(endDateTime);
+        bean.generated_next = false;
+        return await R.store(bean);
+    }
+}
+
+module.exports = MaintenanceTimeslot;

server/model/monitor.js

@@ -2,9 +2,7 @@ const https = require("https");
 const dayjs = require("dayjs");
 const axios = require("axios");
 const { Prometheus } = require("../prometheus");
-const { log, UP, DOWN, PENDING, MAINTENANCE, flipStatus, TimeLogger, MAX_INTERVAL_SECOND, MIN_INTERVAL_SECOND,
-    SQL_DATETIME_FORMAT
-} = require("../../src/util");
+const { log, UP, DOWN, PENDING, MAINTENANCE, flipStatus, TimeLogger, MAX_INTERVAL_SECOND, MIN_INTERVAL_SECOND } = require("../../src/util");
 const { tcping, ping, dnsResolve, checkCertificate, checkStatusCode, getTotalClientInRoom, setting, mssqlQuery, postgresQuery, mysqlQuery, mqttAsync, setSetting, httpNtlm, radius, grpcQuery,
     redisPingAsync, mongodbPing,
 } = require("../util-server");
@@ -18,6 +16,7 @@ const apicache = require("../modules/apicache");
 const { UptimeKumaServer } = require("../uptime-kuma-server");
 const { CacheableDnsHttpAgent } = require("../cacheable-dns-http-agent");
 const { DockerHost } = require("../docker");
+const Maintenance = require("./maintenance");
 const { UptimeCacheList } = require("../uptime-cache-list");
 const Gamedig = require("gamedig");
 
@@ -73,18 +72,13 @@ class Monitor extends BeanModel {
         let data = {
             id: this.id,
             name: this.name,
-            description: this.description,
-            pathName: await this.getPathName(),
-            parent: this.parent,
-            childrenIDs: await Monitor.getAllChildrenIDs(this.id),
             url: this.url,
             method: this.method,
             hostname: this.hostname,
             port: this.port,
             maxretries: this.maxretries,
             weight: this.weight,
-            active: await this.isActive(),
-            forceInactive: !await Monitor.isParentActive(this.id),
+            active: this.active,
             type: this.type,
             interval: this.interval,
             retryInterval: this.retryInterval,
@@ -117,7 +111,6 @@ class Monitor extends BeanModel {
             radiusCalledStationId: this.radiusCalledStationId,
             radiusCallingStationId: this.radiusCallingStationId,
             game: this.game,
-            httpBodyEncoding: this.httpBodyEncoding
         };
 
         if (includeSensitiveData) {
@@ -138,9 +131,6 @@ class Monitor extends BeanModel {
                 mqttPassword: this.mqttPassword,
                 authWorkstation: this.authWorkstation,
                 authDomain: this.authDomain,
-                tlsCa: this.tlsCa,
-                tlsCert: this.tlsCert,
-                tlsKey: this.tlsKey,
             };
         }
 
@@ -148,22 +138,12 @@ class Monitor extends BeanModel {
         return data;
     }
 
-    /**
-	 * Checks if the monitor is active based on itself and its parents
-	 * @returns {Promise<Boolean>}
-	 */
-    async isActive() {
-        const parentActive = await Monitor.isParentActive(this.id);
-
-        return this.active && parentActive;
-    }
-
     /**
      * Get all tags applied to this monitor
      * @returns {Promise<LooseObject<any>[]>}
      */
     async getTags() {
-        return await R.getAll("SELECT mt.*, tag.name, tag.color FROM monitor_tag mt JOIN tag ON mt.tag_id = tag.id WHERE mt.monitor_id = ? ORDER BY tag.name", [ this.id ]);
+        return await R.getAll("SELECT mt.*, tag.name, tag.color FROM monitor_tag mt JOIN tag ON mt.tag_id = tag.id WHERE mt.monitor_id = ?", [ this.id ]);
     }
 
     /**
@@ -223,7 +203,7 @@ class Monitor extends BeanModel {
         let previousBeat = null;
         let retries = 0;
 
-        this.prometheus = new Prometheus(this);
+        let prometheus = new Prometheus(this);
 
         const beat = async () => {
 
@@ -273,36 +253,6 @@ class Monitor extends BeanModel {
                 if (await Monitor.isUnderMaintenance(this.id)) {
                     bean.msg = "Monitor under maintenance";
                     bean.status = MAINTENANCE;
-                } else if (this.type === "group") {
-                    const children = await Monitor.getChildren(this.id);
-
-                    if (children.length > 0) {
-                        bean.status = UP;
-                        bean.msg = "All children up and running";
-                        for (const child of children) {
-                            if (!child.active) {
-                                // Ignore inactive childs
-                                continue;
-                            }
-                            const lastBeat = await Monitor.getPreviousHeartbeat(child.id);
-
-                            // Only change state if the monitor is in worse conditions then the ones before
-                            if (bean.status === UP && (lastBeat.status === PENDING || lastBeat.status === DOWN)) {
-                                bean.status = lastBeat.status;
-                            } else if (bean.status === PENDING && lastBeat.status === DOWN) {
-                                bean.status = lastBeat.status;
-                            }
-                        }
-
-                        if (bean.status !== UP) {
-                            bean.msg = "Child inaccessible";
-                        }
-                    } else {
-                        // Set status pending if group is empty
-                        bean.status = PENDING;
-                        bean.msg = "Group empty";
-                    }
-
                 } else if (this.type === "http" || this.type === "keyword") {
                     // Do not do any queries/high loading things before the "bean.ping"
                     let startTime = dayjs().valueOf();
@@ -322,34 +272,17 @@ class Monitor extends BeanModel {
 
                     log.debug("monitor", `[${this.name}] Prepare Options for axios`);
 
-                    let contentType = null;
-                    let bodyValue = null;
-
-                    if (this.body && (typeof this.body === "string" && this.body.trim().length > 0)) {
-                        if (!this.httpBodyEncoding || this.httpBodyEncoding === "json") {
-                            try {
-                                bodyValue = JSON.parse(this.body);
-                                contentType = "application/json";
-                            } catch (e) {
-                                throw new Error("Your JSON body is invalid. " + e.message);
-                            }
-                        } else if (this.httpBodyEncoding === "xml") {
-                            bodyValue = this.body;
-                            contentType = "text/xml; charset=utf-8";
-                        }
-                    }
-
                     // Axios Options
                     const options = {
                         url: this.url,
                         method: (this.method || "get").toLowerCase(),
+                        ...(this.body ? { data: JSON.parse(this.body) } : {}),
                         timeout: this.interval * 1000 * 0.8,
                         headers: {
                             "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9",
                             "User-Agent": "Uptime-Kuma/" + version,
-                            ...(contentType ? { "Content-Type": contentType } : {}),
+                            ...(this.headers ? JSON.parse(this.headers) : {}),
                             ...(basicAuthHeader),
-                            ...(this.headers ? JSON.parse(this.headers) : {})
                         },
                         maxRedirects: this.maxredirects,
                         validateStatus: (status) => {
@@ -357,10 +290,6 @@ class Monitor extends BeanModel {
                         },
                     };
 
-                    if (bodyValue) {
-                        options.data = bodyValue;
-                    }
-
                     if (this.proxy_id) {
                         const proxy = await R.load("proxy", this.proxy_id);
 
@@ -379,18 +308,6 @@ class Monitor extends BeanModel {
                         options.httpsAgent = new https.Agent(httpsAgentOptions);
                     }
 
-                    if (this.auth_method === "mtls") {
-                        if (this.tlsCert !== null && this.tlsCert !== "") {
-                            options.httpsAgent.options.cert = Buffer.from(this.tlsCert);
-                        }
-                        if (this.tlsCa !== null && this.tlsCa !== "") {
-                            options.httpsAgent.options.ca = Buffer.from(this.tlsCa);
-                        }
-                        if (this.tlsKey !== null && this.tlsKey !== "") {
-                            options.httpsAgent.options.key = Buffer.from(this.tlsKey);
-                        }
-                    }
-
                     log.debug("monitor", `[${this.name}] Axios Options: ${JSON.stringify(options)}`);
                     log.debug("monitor", `[${this.name}] Axios Request`);
 
@@ -409,8 +326,8 @@ class Monitor extends BeanModel {
                             tlsInfo = await this.updateTlsInfo(tlsInfoObject);
 
                             if (!this.getIgnoreTls() && this.isEnabledExpiryNotification()) {
-                                log.debug("monitor", `[${this.name}] call checkCertExpiryNotifications`);
-                                await this.checkCertExpiryNotifications(tlsInfoObject);
+                                log.debug("monitor", `[${this.name}] call sendCertNotification`);
+                                await this.sendCertNotification(tlsInfoObject);
                             }
 
                         } catch (e) {
@@ -444,7 +361,7 @@ class Monitor extends BeanModel {
                             bean.msg += ", keyword is found";
                             bean.status = UP;
                         } else {
-                            data = data.replace(/<[^>]*>?|[\n\r]|\s+/gm, " ").trim();
+                            data = data.replace(/<[^>]*>?|[\n\r]|\s+/gm, " ");
                             if (data.length > 50) {
                                 data = data.substring(0, 47) + "...";
                             }
@@ -682,7 +599,9 @@ class Monitor extends BeanModel {
                 } else if (this.type === "mysql") {
                     let startTime = dayjs().valueOf();
 
-                    bean.msg = await mysqlQuery(this.databaseConnectionString, this.databaseQuery);
+                    await mysqlQuery(this.databaseConnectionString, this.databaseQuery);
+
+                    bean.msg = "";
                     bean.status = UP;
                     bean.ping = dayjs().valueOf() - startTime;
                 } else if (this.type === "mongodb") {
@@ -836,7 +755,7 @@ class Monitor extends BeanModel {
             await R.store(bean);
 
             log.debug("monitor", `[${this.name}] prometheus.update`);
-            this.prometheus?.update(bean, tlsInfo);
+            prometheus.update(bean, tlsInfo);
 
             previousBeat = bean;
 
@@ -894,6 +813,7 @@ class Monitor extends BeanModel {
                     domain: this.authDomain,
                     workstation: this.authWorkstation ? this.authWorkstation : undefined
                 });
+
             } else {
                 res = await axios.request(options);
             }
@@ -920,15 +840,15 @@ class Monitor extends BeanModel {
         clearTimeout(this.heartbeatInterval);
         this.isStop = true;
 
-        this.prometheus?.remove();
+        this.prometheus().remove();
     }
 
     /**
-     * Get prometheus instance
-     * @returns {Prometheus|undefined}
+     * Get a new prometheus instance
+     * @returns {Prometheus}
      */
-    getPrometheus() {
-        return this.prometheus;
+    prometheus() {
+        return new Prometheus(this);
     }
 
     /**
@@ -1222,18 +1142,12 @@ class Monitor extends BeanModel {
 
             for (let notification of notificationList) {
                 try {
-                    const heartbeatJSON = bean.toJSON();
-
                     // Prevent if the msg is undefined, notifications such as Discord cannot send out.
+                    const heartbeatJSON = bean.toJSON();
                     if (!heartbeatJSON["msg"]) {
                         heartbeatJSON["msg"] = "N/A";
                     }
 
-                    // Also provide the time in server timezone
-                    heartbeatJSON["timezone"] = await UptimeKumaServer.getInstance().getTimezone();
-                    heartbeatJSON["timezoneOffset"] = UptimeKumaServer.getInstance().getTimezoneOffset();
-                    heartbeatJSON["localDateTime"] = dayjs.utc(heartbeatJSON["time"]).tz(heartbeatJSON["timezone"]).format(SQL_DATETIME_FORMAT);
-
                     await Notification.send(JSON.parse(notification.config), msg, await monitor.toJSON(false), heartbeatJSON);
                 } catch (e) {
                     log.error("monitor", "Cannot send notification to " + notification.name);
@@ -1256,19 +1170,13 @@ class Monitor extends BeanModel {
     }
 
     /**
-     * checks certificate chain for expiring certificates
+     * Send notification about a certificate
      * @param {Object} tlsInfoObject Information about certificate
      */
-    async checkCertExpiryNotifications(tlsInfoObject) {
+    async sendCertNotification(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
@@ -1276,19 +1184,10 @@ class Monitor extends BeanModel {
                 notifyDays = [ 7, 14, 21 ];
             }
 
-            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;
-                    }
+            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);
                 }
             }
         }
@@ -1297,47 +1196,55 @@ class Monitor extends BeanModel {
     /**
      * Send a certificate notification when certificate expires in less
      * than target days
-     * @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} daysRemaining Number of days remaining on certifcate
      * @param {number} targetDays Number of days to alert after
      * @param {LooseObject<any>[]} notificationList List of notification providers
      * @returns {Promise<void>}
      */
-    async sendCertNotificationByTargetDays(certCN, certType, daysRemaining, targetDays, notificationList) {
+    async sendCertNotificationByTargetDays(daysRemaining, targetDays, notificationList) {
 
-        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");
+        if (daysRemaining > targetDays) {
+            log.debug("monitor", `No need to send cert notification. ${daysRemaining} > ${targetDays}`);
             return;
         }
 
-        let sent = false;
-        log.debug("monitor", "Send certificate notification");
+        if (notificationList.length > 0) {
 
-        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(?, ?, ?)", [
+            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;
+            }
+
+            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");
         }
     }
 
@@ -1361,24 +1268,18 @@ class Monitor extends BeanModel {
      * @returns {Promise<boolean>}
      */
     static async isUnderMaintenance(monitorID) {
-        const maintenanceIDList = await R.getCol(`
-            SELECT maintenance_id FROM monitor_maintenance
-            WHERE monitor_id = ?
-        `, [ monitorID ]);
-
-        for (const maintenanceID of maintenanceIDList) {
-            const maintenance = await UptimeKumaServer.getInstance().getMaintenance(maintenanceID);
-            if (maintenance && await maintenance.isUnderMaintenance()) {
-                return true;
-            }
-        }
-
-        const parent = await Monitor.getParent(monitorID);
-        if (parent != null) {
-            return await Monitor.isUnderMaintenance(parent.id);
-        }
-
-        return false;
+        let activeCondition = Maintenance.getActiveMaintenanceSQLCondition();
+        const maintenance = await R.getRow(`
+            SELECT COUNT(*) AS count
+            FROM monitor_maintenance mm
+            JOIN maintenance
+                ON mm.maintenance_id = maintenance.id
+                AND mm.monitor_id = ?
+            LEFT JOIN maintenance_timeslot
+                ON maintenance_timeslot.maintenance_id = maintenance.id
+            WHERE ${activeCondition}
+            LIMIT 1`, [ monitorID ]);
+        return maintenance.count !== 0;
     }
 
     /** Make sure monitor interval is between bounds */
@@ -1390,105 +1291,6 @@ class Monitor extends BeanModel {
             throw new Error(`Interval cannot be less than ${MIN_INTERVAL_SECOND} seconds`);
         }
     }
-
-    /**
-     * Gets Parent of the monitor
-     * @param {number} monitorID ID of monitor to get
-     * @returns {Promise<LooseObject<any>>}
-     */
-    static async getParent(monitorID) {
-        return await R.getRow(`
-            SELECT parent.* FROM monitor parent
-    		LEFT JOIN monitor child
-    			ON child.parent = parent.id
-            WHERE child.id = ?
-        `, [
-            monitorID,
-        ]);
-    }
-
-    /**
-     * Gets all Children of the monitor
-     * @param {number} monitorID ID of monitor to get
-     * @returns {Promise<LooseObject<any>>}
-     */
-    static async getChildren(monitorID) {
-        return await R.getAll(`
-            SELECT * FROM monitor
-            WHERE parent = ?
-        `, [
-            monitorID,
-        ]);
-    }
-
-    /**
-     * Gets Full Path-Name (Groups and Name)
-     * @returns {Promise<String>}
-     */
-    async getPathName() {
-        let path = this.name;
-
-        if (this.parent === null) {
-            return path;
-        }
-
-        let parent = await Monitor.getParent(this.id);
-        while (parent !== null) {
-            path = `${parent.name} / ${path}`;
-            parent = await Monitor.getParent(parent.id);
-        }
-
-        return path;
-    }
-
-    /**
-     * Gets recursive all child ids
-	 * @param {number} monitorID ID of the monitor to get
-     * @returns {Promise<Array>}
-     */
-    static async getAllChildrenIDs(monitorID) {
-        const childs = await Monitor.getChildren(monitorID);
-
-        if (childs === null) {
-            return [];
-        }
-
-        let childrenIDs = [];
-
-        for (const child of childs) {
-            childrenIDs.push(child.id);
-            childrenIDs = childrenIDs.concat(await Monitor.getAllChildrenIDs(child.id));
-        }
-
-        return childrenIDs;
-    }
-
-    /**
-     * Unlinks all children of the the group monitor
-     * @param {number} groupID ID of group to remove children of
-     * @returns {Promise<void>}
-     */
-    static async unlinkAllChildren(groupID) {
-        return await R.exec("UPDATE `monitor` SET parent = ? WHERE parent = ? ", [
-            null, groupID
-        ]);
-    }
-
-    /**
-	 * Checks recursive if parent (ancestors) are active
-	 * @param {number} monitorID ID of the monitor to get
-	 * @returns {Promise<Boolean>}
-	 */
-    static async isParentActive(monitorID) {
-        const parent = await Monitor.getParent(monitorID);
-
-        if (parent === null) {
-            return true;
-        }
-
-        const parentActive = await Monitor.isParentActive(parent.id);
-        return parent.active && parentActive;
-    }
 }
 
 module.exports = Monitor;

server/model/status_page.js

@@ -3,6 +3,7 @@ const { R } = require("redbean-node");
 const cheerio = require("cheerio");
 const { UptimeKumaServer } = require("../uptime-kuma-server");
 const jsesc = require("jsesc");
+const Maintenance = require("./maintenance");
 const googleAnalytics = require("../google-analytics");
 
 class StatusPage extends BeanModel {
@@ -59,11 +60,8 @@ class StatusPage extends BeanModel {
         }
 
         // OG Meta Tags
-        let ogTitle = $("<meta property=\"og:title\" content=\"\" />").attr("content", statusPage.title);
-        head.append(ogTitle);
-
-        let ogDescription = $("<meta property=\"og:description\" content=\"\" />").attr("content", description155);
-        head.append(ogDescription);
+        head.append(`<meta property="og:title" content="${statusPage.title}" />`);
+        head.append(`<meta property="og:description" content="${description155}" />`);
 
         // Preload data
         // Add jsesc, fix https://github.com/louislam/uptime-kuma/issues/2186
@@ -289,17 +287,21 @@ class StatusPage extends BeanModel {
         try {
             const publicMaintenanceList = [];
 
-            let maintenanceIDList = await R.getCol(`
-                SELECT DISTINCT maintenance_id
-                FROM maintenance_status_page
-                WHERE status_page_id = ?
-            `, [ statusPageId ]);
+            let activeCondition = Maintenance.getActiveMaintenanceSQLCondition();
+            let maintenanceBeanList = R.convertToBeans("maintenance", await R.getAll(`
+                SELECT DISTINCT maintenance.*
+                FROM maintenance
+                JOIN maintenance_status_page
+                    ON maintenance_status_page.maintenance_id = maintenance.id
+                    AND maintenance_status_page.status_page_id = ?
+                LEFT JOIN maintenance_timeslot
+                    ON maintenance_timeslot.maintenance_id = maintenance.id
+                WHERE ${activeCondition}
+                ORDER BY maintenance.end_date
+            `, [ statusPageId ]));
 
-            for (const maintenanceID of maintenanceIDList) {
-                let maintenance = UptimeKumaServer.getInstance().getMaintenance(maintenanceID);
-                if (maintenance && await maintenance.isUnderMaintenance()) {
-                    publicMaintenanceList.push(await maintenance.toPublicJSON());
-                }
+            for (const bean of maintenanceBeanList) {
+                publicMaintenanceList.push(await bean.toPublicJSON());
             }
 
             return publicMaintenanceList;

server/notification-providers/dingding.js

@@ -15,7 +15,7 @@ class DingDing extends NotificationProvider {
                     msgtype: "markdown",
                     markdown: {
                         title: `[${this.statusToString(heartbeatJSON["status"])}] ${monitorJSON["name"]}`,
-                        text: `## [${this.statusToString(heartbeatJSON["status"])}] ${monitorJSON["name"]} \n> ${heartbeatJSON["msg"]}\n> Time (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`,
+                        text: `## [${this.statusToString(heartbeatJSON["status"])}] ${monitorJSON["name"]} \n > ${heartbeatJSON["msg"]}  \n > Time(UTC):${heartbeatJSON["time"]}`,
                     }
                 };
                 if (this.sendToDingDing(notification, params)) {

server/notification-providers/discord.js

@@ -59,8 +59,8 @@ class Discord extends NotificationProvider {
                                 value: monitorJSON["type"] === "push" ? "Heartbeat" : address,
                             },
                             {
-                                name: `Time (${heartbeatJSON["timezone"]})`,
-                                value: heartbeatJSON["localDateTime"],
+                                name: "Time (UTC)",
+                                value: heartbeatJSON["time"],
                             },
                             {
                                 name: "Error",
@@ -94,8 +94,8 @@ class Discord extends NotificationProvider {
                                 value: monitorJSON["type"] === "push" ? "Heartbeat" : address,
                             },
                             {
-                                name: `Time (${heartbeatJSON["timezone"]})`,
-                                value: heartbeatJSON["localDateTime"],
+                                name: "Time (UTC)",
+                                value: heartbeatJSON["time"],
                             },
                             {
                                 name: "Ping",

server/notification-providers/feishu.js

@@ -35,7 +35,8 @@ class Feishu extends NotificationProvider {
                                             text:
                                                 "[Down] " +
                                                 heartbeatJSON["msg"] +
-                                                `\nTime (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`
+                                                "\nTime (UTC): " +
+                                                heartbeatJSON["time"],
                                         },
                                     ],
                                 ],
@@ -61,7 +62,8 @@ class Feishu extends NotificationProvider {
                                             text:
                                                 "[Up] " +
                                                 heartbeatJSON["msg"] +
-                                                `\nTime (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`,
+                                                "\nTime (UTC): " +
+                                                heartbeatJSON["time"],
                                         },
                                     ],
                                 ],

server/notification-providers/line.js

@@ -33,10 +33,7 @@ class Line extends NotificationProvider {
                     "messages": [
                         {
                             "type": "text",
-                            "text": "UptimeKuma Alert: [🔴 Down]\n" +
-                                "Name: " + monitorJSON["name"] + " \n" +
-                                heartbeatJSON["msg"] +
-                                `\nTime (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`
+                            "text": "UptimeKuma Alert: [🔴 Down]\n" + "Name: " + monitorJSON["name"] + " \n" + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"]
                         }
                     ]
                 };
@@ -47,10 +44,7 @@ class Line extends NotificationProvider {
                     "messages": [
                         {
                             "type": "text",
-                            "text": "UptimeKuma Alert: [✅ Up]\n" +
-                                "Name: " + monitorJSON["name"] + " \n" +
-                                heartbeatJSON["msg"] +
-                                `\nTime (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`
+                            "text": "UptimeKuma Alert: [✅ Up]\n" + "Name: " + monitorJSON["name"] + " \n" + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"]
                         }
                     ]
                 };

server/notification-providers/linenotify.js

@@ -24,18 +24,12 @@ 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"] + "\n" +
-                        `Time (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`
+                    "message": "\n[🔴 Down]\n" + "Name: " + monitorJSON["name"] + " \n" + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"]
                 };
                 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"] + "\n" +
-                        `Time (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`
+                    "message": "\n[✅ Up]\n" + "Name: " + monitorJSON["name"] + " \n" + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"]
                 };
                 await axios.post(lineAPIUrl, qs.stringify(upMessage), config);
             }

server/notification-providers/lunasea.js

@@ -8,12 +8,7 @@ class LunaSea extends NotificationProvider {
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         let okMsg = "Sent Successfully.";
-        let lunaseaurl = "";
-        if (notification.lunaseaTarget === "user") {
-            lunaseaurl = "https://notify.lunasea.app/v1/custom/user/" + notification.lunaseaUserID;
-        } else {
-            lunaseaurl = "https://notify.lunasea.app/v1/custom/device/" + notification.lunaseaDevice;
-        }
+        let lunaseadevice = "https://notify.lunasea.app/v1/custom/device/" + notification.lunaseaDevice;
 
         try {
             if (heartbeatJSON == null) {
@@ -21,29 +16,25 @@ class LunaSea extends NotificationProvider {
                     "title": "Uptime Kuma Alert",
                     "body": msg,
                 };
-                await axios.post(lunaseaurl, testdata);
+                await axios.post(lunaseadevice, testdata);
                 return okMsg;
             }
 
             if (heartbeatJSON["status"] === DOWN) {
                 let downdata = {
                     "title": "UptimeKuma Alert: " + monitorJSON["name"],
-                    "body": "[🔴 Down] " +
-                        heartbeatJSON["msg"] +
-                        `\nTime (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`
+                    "body": "[🔴 Down] " + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"],
                 };
-                await axios.post(lunaseaurl, downdata);
+                await axios.post(lunaseadevice, downdata);
                 return okMsg;
             }
 
             if (heartbeatJSON["status"] === UP) {
                 let updata = {
                     "title": "UptimeKuma Alert: " + monitorJSON["name"],
-                    "body": "[✅ Up] " +
-                        heartbeatJSON["msg"] +
-                        `\nTime (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`
+                    "body": "[✅ Up] " + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"],
                 };
-                await axios.post(lunaseaurl, updata);
+                await axios.post(lunaseadevice, updata);
                 return okMsg;
             }
 

server/notification-providers/mattermost.js

@@ -10,7 +10,7 @@ class Mattermost extends NotificationProvider {
         let okMsg = "Sent Successfully.";
         try {
             const mattermostUserName = notification.mattermostusername || "Uptime Kuma";
-            // If heartbeatJSON is null, assume non monitoring notification (Certificate warning) or testing.
+            // If heartbeatJSON is null, assume we're testing.
             if (heartbeatJSON == null) {
                 let mattermostTestData = {
                     username: mattermostUserName,
@@ -27,79 +27,97 @@ class Mattermost extends NotificationProvider {
             }
 
             const mattermostIconEmoji = notification.mattermosticonemo;
-            let mattermostIconEmojiOnline = "";
-            let mattermostIconEmojiOffline = "";
-
-            if (mattermostIconEmoji && typeof mattermostIconEmoji === "string") {
-                const emojiArray = mattermostIconEmoji.split(" ");
-                if (emojiArray.length >= 2) {
-                    mattermostIconEmojiOnline = emojiArray[0];
-                    mattermostIconEmojiOffline = emojiArray[1];
-                }
-            }
             const mattermostIconUrl = notification.mattermosticonurl;
-            let iconEmoji = mattermostIconEmoji;
-            let statusField = {
-                short: false,
-                title: "Error",
-                value: heartbeatJSON.msg,
-            };
-            let statusText = "unknown";
-            let color = "#000000";
-            if (heartbeatJSON.status === DOWN) {
-                iconEmoji = mattermostIconEmojiOffline || mattermostIconEmoji;
-                statusField = {
-                    short: false,
-                    title: "Error",
-                    value: heartbeatJSON.msg,
-                };
-                statusText = "down.";
-                color = "#FF0000";
-            } else if (heartbeatJSON.status === UP) {
-                iconEmoji = mattermostIconEmojiOnline || mattermostIconEmoji;
-                statusField = {
-                    short: false,
-                    title: "Ping",
-                    value: heartbeatJSON.ping + "ms",
-                };
-                statusText = "up!";
-                color = "#32CD32";
-            }
 
-            let mattermostdata = {
-                username: monitorJSON.name + " " + mattermostUserName,
-                channel: mattermostChannel,
-                icon_emoji: iconEmoji,
-                icon_url: mattermostIconUrl,
-                attachments: [
-                    {
-                        fallback:
-                            "Your " +
-                            monitorJSON.name +
-                            " service went " +
-                            statusText,
-                        color: color,
-                        title:
-                            monitorJSON.name +
-                            " service went " +
-                            statusText,
-                        title_link: monitorJSON.url,
-                        fields: [
-                            statusField,
-                            {
-                                short: true,
-                                title: `Time (${heartbeatJSON["timezone"]})`,
-                                value: heartbeatJSON.localDateTime,
-                            },
-                        ],
-                    },
-                ],
-            };
-            await axios.post(
-                notification.mattermostWebhookUrl,
-                mattermostdata
-            );
-            return okMsg;
+            if (heartbeatJSON["status"] === DOWN) {
+                let mattermostdowndata = {
+                    username: mattermostUserName,
+                    text: "Uptime Kuma Alert",
+                    channel: mattermostChannel,
+                    icon_emoji: mattermostIconEmoji,
+                    icon_url: mattermostIconUrl,
+                    attachments: [
+                        {
+                            fallback:
+                                "Your " +
+                                monitorJSON["name"] +
+                                " service went down.",
+                            color: "#FF0000",
+                            title:
+                                "❌ " +
+                                monitorJSON["name"] +
+                                " service went down. ❌",
+                            title_link: monitorJSON["url"],
+                            fields: [
+                                {
+                                    short: true,
+                                    title: "Service Name",
+                                    value: monitorJSON["name"],
+                                },
+                                {
+                                    short: true,
+                                    title: "Time (UTC)",
+                                    value: heartbeatJSON["time"],
+                                },
+                                {
+                                    short: false,
+                                    title: "Error",
+                                    value: heartbeatJSON["msg"],
+                                },
+                            ],
+                        },
+                    ],
+                };
+                await axios.post(
+                    notification.mattermostWebhookUrl,
+                    mattermostdowndata
+                );
+                return okMsg;
+            } else if (heartbeatJSON["status"] === UP) {
+                let mattermostupdata = {
+                    username: mattermostUserName,
+                    text: "Uptime Kuma Alert",
+                    channel: mattermostChannel,
+                    icon_emoji: mattermostIconEmoji,
+                    icon_url: mattermostIconUrl,
+                    attachments: [
+                        {
+                            fallback:
+                                "Your " +
+                                monitorJSON["name"] +
+                                " service went up!",
+                            color: "#32CD32",
+                            title:
+                                "✅ " +
+                                monitorJSON["name"] +
+                                " service went up! ✅",
+                            title_link: monitorJSON["url"],
+                            fields: [
+                                {
+                                    short: true,
+                                    title: "Service Name",
+                                    value: monitorJSON["name"],
+                                },
+                                {
+                                    short: true,
+                                    title: "Time (UTC)",
+                                    value: heartbeatJSON["time"],
+                                },
+                                {
+                                    short: false,
+                                    title: "Ping",
+                                    value: heartbeatJSON["ping"] + "ms",
+                                },
+                            ],
+                        },
+                    ],
+                };
+                await axios.post(
+                    notification.mattermostWebhookUrl,
+                    mattermostupdata
+                );
+                return okMsg;
+            }
         } catch (error) {
             this.throwGeneralAxiosError(error);
         }

server/notification-providers/ntfy.js

@@ -1,6 +1,5 @@
 const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
-const { DOWN, UP } = require("../../src/util");
 
 class Ntfy extends NotificationProvider {
 
@@ -10,54 +9,16 @@ class Ntfy extends NotificationProvider {
         let okMsg = "Sent Successfully.";
         try {
             let headers = {};
-            if (notification.ntfyAuthenticationMethod === "usernamePassword") {
+            if (notification.ntfyusername) {
                 headers = {
                     "Authorization": "Basic " + Buffer.from(notification.ntfyusername + ":" + notification.ntfypassword).toString("base64"),
                 };
-            } else if (notification.ntfyAuthenticationMethod === "accessToken") {
-                headers = {
-                    "Authorization": "Bearer " + notification.ntfyaccesstoken,
-                };
-            }
-            // If heartbeatJSON is null, assume non monitoring notification (Certificate warning) or testing.
-            if (heartbeatJSON == null) {
-                let ntfyTestData = {
-                    "topic": notification.ntfytopic,
-                    "title": (monitorJSON?.name || notification.ntfytopic) + " [Uptime-Kuma]",
-                    "message": msg,
-                    "priority": notification.ntfyPriority,
-                    "tags": [ "test_tube" ],
-                };
-                await axios.post(`${notification.ntfyserverurl}`, ntfyTestData, { headers: headers });
-                return okMsg;
-            }
-            let tags = [];
-            let status = "unknown";
-            let priority = notification.ntfyPriority || 4;
-            if ("status" in heartbeatJSON) {
-                if (heartbeatJSON.status === DOWN) {
-                    tags = [ "red_circle" ];
-                    status = "Down";
-                    // if priority is not 5, increase priority for down alerts
-                    priority = priority === 5 ? priority : priority + 1;
-                } else if (heartbeatJSON["status"] === UP) {
-                    tags = [ "green_circle" ];
-                    status = "Up";
-                }
             }
             let data = {
                 "topic": notification.ntfytopic,
-                "message": heartbeatJSON.msg,
-                "priority": priority,
-                "title": monitorJSON.name + " " + status + " [Uptime-Kuma]",
-                "tags": tags,
-                "actions": [
-                    {
-                        "action": "view",
-                        "label": "Open " + monitorJSON.name,
-                        "url": monitorJSON.url,
-                    }
-                ]
+                "message": msg,
+                "priority": notification.ntfyPriority || 4,
+                "title": "Uptime-Kuma",
             };
 
             if (notification.ntfyIcon) {

server/notification-providers/opsgenie.js

@@ -1,97 +0,0 @@
-const NotificationProvider = require("./notification-provider");
-const axios = require("axios");
-const { UP, DOWN } = require("../../src/util");
-
-const opsgenieAlertsUrlEU = "https://api.eu.opsgenie.com/v2/alerts";
-const opsgenieAlertsUrlUS = "https://api.opsgenie.com/v2/alerts";
-let okMsg = "Sent Successfully.";
-
-class Opsgenie extends NotificationProvider {
-
-    name = "Opsgenie";
-
-    /**
-     * @inheritdoc
-     */
-    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let opsgenieAlertsUrl;
-        let priority = (!notification.opsgeniePriority) ? 3 : notification.opsgeniePriority;
-        const textMsg = "Uptime Kuma Alert";
-
-        try {
-            switch (notification.opsgenieRegion) {
-                case "US":
-                    opsgenieAlertsUrl = opsgenieAlertsUrlUS;
-                    break;
-                case "EU":
-                    opsgenieAlertsUrl = opsgenieAlertsUrlEU;
-                    break;
-                default:
-                    opsgenieAlertsUrl = opsgenieAlertsUrlUS;
-            }
-
-            if (heartbeatJSON == null) {
-                let notificationTestAlias = "uptime-kuma-notification-test";
-                let data = {
-                    "message": msg,
-                    "alias": notificationTestAlias,
-                    "source": "Uptime Kuma",
-                    "priority": "P5"
-                };
-
-                return this.post(notification, opsgenieAlertsUrl, data);
-            }
-
-            if (heartbeatJSON.status === DOWN) {
-                let data = {
-                    "message": monitorJSON ? textMsg + `: ${monitorJSON.name}` : textMsg,
-                    "alias": monitorJSON.name,
-                    "description": msg,
-                    "source": "Uptime Kuma",
-                    "priority": `P${priority}`
-                };
-
-                return this.post(notification, opsgenieAlertsUrl, data);
-            }
-
-            if (heartbeatJSON.status === UP) {
-                let opsgenieAlertsCloseUrl = `${opsgenieAlertsUrl}/${encodeURIComponent(monitorJSON.name)}/close?identifierType=alias`;
-                let data = {
-                    "source": "Uptime Kuma",
-                };
-
-                return this.post(notification, opsgenieAlertsCloseUrl, data);
-            }
-        } catch (error) {
-            this.throwGeneralAxiosError(error);
-        }
-    }
-
-    /**
-     *
-     * @param {BeanModel} notification
-     * @param {string} url Request url
-     * @param {Object} data Request body
-     * @returns {Promise<string>}
-     */
-    async post(notification, url, data) {
-        let config = {
-            headers: {
-                "Content-Type": "application/json",
-                "Authorization": `GenieKey ${notification.opsgenieApiKey}`,
-            }
-        };
-
-        let res = await axios.post(url, data, config);
-        if (res.status == null) {
-            return "Opsgenie notification failed with invalid response!";
-        }
-        if (res.status < 200 || res.status >= 300) {
-            return `Opsgenie notification failed with status code ${res.status}`;
-        }
-
-        return okMsg;
-    }
-}
-
-module.exports = Opsgenie;

server/notification-providers/pagertree.js

@@ -1,91 +0,0 @@
-const NotificationProvider = require("./notification-provider");
-const axios = require("axios");
-const { UP, DOWN, getMonitorRelativeURL } = require("../../src/util");
-const { setting } = require("../util-server");
-let successMessage = "Sent Successfully.";
-
-class PagerTree extends NotificationProvider {
-    name = "PagerTree";
-
-    /**
-     * @inheritdoc
-     */
-    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        try {
-            if (heartbeatJSON == null) {
-                // general messages
-                return this.postNotification(notification, msg, monitorJSON, heartbeatJSON);
-            }
-
-            if (heartbeatJSON.status === UP && notification.pagertreeAutoResolve === "resolve") {
-                return this.postNotification(notification, null, monitorJSON, heartbeatJSON, notification.pagertreeAutoResolve);
-            }
-
-            if (heartbeatJSON.status === DOWN) {
-                const title = `Uptime Kuma Monitor "${monitorJSON.name}" is DOWN`;
-                return this.postNotification(notification, title, monitorJSON, heartbeatJSON);
-            }
-        } catch (error) {
-            this.throwGeneralAxiosError(error);
-        }
-    }
-
-    /**
-     * Check if result is successful, result code should be in range 2xx
-     * @param {Object} result Axios response object
-     * @throws {Error} The status code is not in range 2xx
-     */
-    checkResult(result) {
-        if (result.status == null) {
-            throw new Error("PagerTree notification failed with invalid response!");
-        }
-        if (result.status < 200 || result.status >= 300) {
-            throw new Error("PagerTree notification failed with status code " + result.status);
-        }
-    }
-
-    /**
-     * Send the message
-     * @param {BeanModel} notification Message title
-     * @param {string} title Message title
-     * @param {Object} monitorJSON Monitor details (For Up/Down only)
-     * @param {?string} eventAction Action event for PagerTree (create, resolve)
-     * @returns {string}
-     */
-    async postNotification(notification, title, monitorJSON, heartbeatJSON, eventAction = "create") {
-
-        if (eventAction == null) {
-            return "No action required";
-        }
-
-        const options = {
-            method: "POST",
-            url: notification.pagertreeIntegrationUrl,
-            headers: { "Content-Type": "application/json" },
-            data: {
-                event_type: eventAction,
-                id: heartbeatJSON?.monitorID || "uptime-kuma",
-                title: title,
-                urgency: notification.pagertreeUrgency,
-                heartbeat: heartbeatJSON,
-                monitor: monitorJSON
-            }
-        };
-
-        const baseURL = await setting("primaryBaseURL");
-        if (baseURL && monitorJSON) {
-            options.client = "Uptime Kuma";
-            options.client_url = baseURL + getMonitorRelativeURL(monitorJSON.id);
-        }
-
-        let result = await axios.request(options);
-        this.checkResult(result);
-        if (result.statusText != null) {
-            return "PagerTree notification succeed: " + result.statusText;
-        }
-
-        return successMessage;
-    }
-}
-
-module.exports = PagerTree;

server/notification-providers/pushbullet.js

@@ -29,18 +29,14 @@ class Pushbullet extends NotificationProvider {
                 let downData = {
                     "type": "note",
                     "title": "UptimeKuma Alert: " + monitorJSON["name"],
-                    "body": "[🔴 Down] " +
-                        heartbeatJSON["msg"] +
-                        `\nTime (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`,
+                    "body": "[🔴 Down] " + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"],
                 };
                 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 (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`,
+                    "body": "[✅ Up] " + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"],
                 };
                 await axios.post(pushbulletUrl, upData, config);
             }

server/notification-providers/pushover.js

@@ -24,16 +24,13 @@ class Pushover extends NotificationProvider {
         if (notification.pushoverdevice) {
             data.device = notification.pushoverdevice;
         }
-        if (notification.pushoverttl) {
-            data.ttl = notification.pushoverttl;
-        }
 
         try {
             if (heartbeatJSON == null) {
                 await axios.post(pushoverlink, data);
                 return okMsg;
             } else {
-                data.message += `\n<b>Time (${heartbeatJSON["timezone"]})</b>:${heartbeatJSON["localDateTime"]}`;
+                data.message += "\n<b>Time (UTC)</b>:" + heartbeatJSON["time"];
                 await axios.post(pushoverlink, data);
                 return okMsg;
             }

server/notification-providers/rocket-chat.js

@@ -22,6 +22,8 @@ class RocketChat extends NotificationProvider {
                 return okMsg;
             }
 
+            const time = heartbeatJSON["time"];
+
             let data = {
                 "text": "Uptime Kuma Alert",
                 "channel": notification.rocketchannel,
@@ -29,7 +31,7 @@ class RocketChat extends NotificationProvider {
                 "icon_emoji": notification.rocketiconemo,
                 "attachments": [
                     {
-                        "title": `Uptime Kuma Alert *Time (${heartbeatJSON["timezone"]})*\n${heartbeatJSON["localDateTime"]}`,
+                        "title": "Uptime Kuma Alert *Time (UTC)*\n" + time,
                         "text": "*Message*\n" + msg,
                     }
                 ]

server/notification-providers/slack.js

@@ -39,9 +39,10 @@ class Slack extends NotificationProvider {
                 return okMsg;
             }
 
+            const time = heartbeatJSON["time"];
             const textMsg = "Uptime Kuma Alert";
             let data = {
-                "text": `${textMsg}\n${msg}`,
+                "text": monitorJSON ? textMsg + `: ${monitorJSON.name}` : textMsg,
                 "channel": notification.slackchannel,
                 "username": notification.slackusername,
                 "icon_emoji": notification.slackiconemo,
@@ -64,7 +65,7 @@ class Slack extends NotificationProvider {
                                 },
                                 {
                                     "type": "mrkdwn",
-                                    "text": `*Time (${heartbeatJSON["timezone"]})*\n${heartbeatJSON["localDateTime"]}`,
+                                    "text": "*Time (UTC)*\n" + time,
                                 }],
                             }
                         ],

server/notification-providers/smtp.js

@@ -91,7 +91,7 @@ class SMTP extends NotificationProvider {
 
         let bodyTextContent = msg;
         if (heartbeatJSON) {
-            bodyTextContent = `${msg}\nTime (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`;
+            bodyTextContent = `${msg}\nTime (UTC): ${heartbeatJSON["time"]}`;
         }
 
         // send mail with defined transport object

server/notification-providers/telegram.js

@@ -9,27 +9,17 @@ class Telegram extends NotificationProvider {
         let okMsg = "Sent Successfully.";
 
         try {
-            let params = {
-                chat_id: notification.telegramChatID,
-                text: msg,
-                disable_notification: notification.telegramSendSilently ?? false,
-                protect_content: notification.telegramProtectContent ?? false,
-            };
-            if (notification.telegramMessageThreadID) {
-                params.message_thread_id = notification.telegramMessageThreadID;
-            }
-
             await axios.get(`https://api.telegram.org/bot${notification.telegramBotToken}/sendMessage`, {
-                params: params,
+                params: {
+                    chat_id: notification.telegramChatID,
+                    text: msg,
+                },
             });
             return okMsg;
 
         } catch (error) {
-            if (error.response && error.response.data && error.response.data.description) {
-                throw new Error(error.response.data.description);
-            } else {
-                throw new Error(error.message);
-            }
+            let msg = (error.response.data.description) ? error.response.data.description : "Error without description";
+            throw new Error(msg);
         }
     }
 }

server/notification-providers/twilio.js

@@ -1,41 +0,0 @@
-const NotificationProvider = require("./notification-provider");
-const axios = require("axios");
-
-class Twilio extends NotificationProvider {
-
-    name = "twilio";
-
-    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-
-        let okMsg = "Sent Successfully.";
-
-        let accountSID = notification.twilioAccountSID;
-        let authToken = notification.twilioAuthToken;
-
-        try {
-
-            let config = {
-                headers: {
-                    "Content-Type": "application/x-www-form-urlencoded;charset=utf-8",
-                    "Authorization": "Basic " + Buffer.from(accountSID + ":" + authToken).toString("base64"),
-                }
-            };
-
-            let data = new URLSearchParams();
-            data.append("To", notification.twilioToNumber);
-            data.append("From", notification.twilioFromNumber);
-            data.append("Body", msg);
-
-            let url = "https://api.twilio.com/2010-04-01/Accounts/" + accountSID + "/Messages.json";
-
-            await axios.post(url, data, config);
-
-            return okMsg;
-        } catch (error) {
-            this.throwGeneralAxiosError(error);
-        }
-    }
-
-}
-
-module.exports = Twilio;

server/notification.js

@@ -23,9 +23,7 @@ const Mattermost = require("./notification-providers/mattermost");
 const Ntfy = require("./notification-providers/ntfy");
 const Octopush = require("./notification-providers/octopush");
 const OneBot = require("./notification-providers/onebot");
-const Opsgenie = require("./notification-providers/opsgenie");
 const PagerDuty = require("./notification-providers/pagerduty");
-const PagerTree = require("./notification-providers/pagertree");
 const PromoSMS = require("./notification-providers/promosms");
 const Pushbullet = require("./notification-providers/pushbullet");
 const PushDeer = require("./notification-providers/pushdeer");
@@ -42,7 +40,6 @@ const Stackfield = require("./notification-providers/stackfield");
 const Teams = require("./notification-providers/teams");
 const TechulusPush = require("./notification-providers/techulus-push");
 const Telegram = require("./notification-providers/telegram");
-const Twilio = require("./notification-providers/twilio");
 const Splunk = require("./notification-providers/splunk");
 const Webhook = require("./notification-providers/webhook");
 const WeCom = require("./notification-providers/wecom");
@@ -85,9 +82,7 @@ class Notification {
             new Ntfy(),
             new Octopush(),
             new OneBot(),
-            new Opsgenie(),
             new PagerDuty(),
-            new PagerTree(),
             new PromoSMS(),
             new Pushbullet(),
             new PushDeer(),
@@ -106,7 +101,6 @@ class Notification {
             new Teams(),
             new TechulusPush(),
             new Telegram(),
-            new Twilio(),
             new Splunk(),
             new Webhook(),
             new WeCom(),

server/prometheus.js

@@ -28,7 +28,7 @@ const monitorResponseTime = new PrometheusClient.Gauge({
 
 const monitorStatus = new PrometheusClient.Gauge({
     name: "monitor_status",
-    help: "Monitor Status (1 = UP, 0= DOWN, 2= PENDING, 3= MAINTENANCE)",
+    help: "Monitor Status (1 = UP, 0= DOWN)",
     labelNames: commonLabels
 });
 

server/proxy.js

@@ -132,9 +132,6 @@ class Proxy {
                     ...httpAgentOptions,
                     ...httpsAgentOptions,
                     ...proxyOptions,
-                    tls: {
-                        rejectUnauthorized: httpsAgentOptions.rejectUnauthorized,
-                    },
                 });
 
                 httpAgent = agent;

server/rate-limiter.js

@@ -54,13 +54,6 @@ const loginRateLimiter = new KumaRateLimiter({
     errorMessage: "Too frequently, try again later."
 });
 
-const apiRateLimiter = new KumaRateLimiter({
-    tokensPerInterval: 60,
-    interval: "minute",
-    fireImmediately: true,
-    errorMessage: "Too frequently, try again later."
-});
-
 const twoFaRateLimiter = new KumaRateLimiter({
     tokensPerInterval: 30,
     interval: "minute",
@@ -70,6 +63,5 @@ const twoFaRateLimiter = new KumaRateLimiter({
 
 module.exports = {
     loginRateLimiter,
-    apiRateLimiter,
     twoFaRateLimiter,
 };

server/routers/api-router.js

@@ -1,5 +1,5 @@
 let express = require("express");
-const { allowDevAllOrigin, allowAllOrigin, percentageToColor, filterAndJoin, sendHttpError } = require("../util-server");
+const { allowDevAllOrigin, allowAllOrigin, percentageToColor, filterAndJoin, send403 } = require("../util-server");
 const { R } = require("redbean-node");
 const apicache = require("../modules/apicache");
 const Monitor = require("../model/monitor");
@@ -7,10 +7,8 @@ const dayjs = require("dayjs");
 const { UP, MAINTENANCE, DOWN, PENDING, flipStatus, log } = require("../../src/util");
 const StatusPage = require("../model/status_page");
 const { UptimeKumaServer } = require("../uptime-kuma-server");
-const { UptimeCacheList } = require("../uptime-cache-list");
 const { makeBadge } = require("badge-maker");
 const { badgeConstants } = require("../config");
-const { Prometheus } = require("../prometheus");
 
 let router = express.Router();
 
@@ -38,7 +36,7 @@ router.get("/api/push/:pushToken", async (request, response) => {
 
         let pushToken = request.params.pushToken;
         let msg = request.query.msg || "OK";
-        let ping = parseInt(request.query.ping) || null;
+        let ping = request.query.ping || null;
         let statusString = request.query.status || "up";
         let status = (statusString === "up") ? UP : DOWN;
 
@@ -88,9 +86,7 @@ router.get("/api/push/:pushToken", async (request, response) => {
         await R.store(bean);
 
         io.to(monitor.user_id).emit("heartbeat", bean.toJSON());
-        UptimeCacheList.clearCache(monitor.id);
         Monitor.sendStats(io, monitor.id, monitor.user_id);
-        new Prometheus(monitor).update(bean, undefined);
 
         response.json({
             ok: true,
@@ -149,11 +145,7 @@ router.get("/api/badge/:id/status", cache("5 minutes"), async (request, response
             const heartbeat = await Monitor.getPreviousHeartbeat(requestedMonitorId);
             const state = overrideValue !== undefined ? overrideValue : heartbeat.status;
 
-            if (label === undefined) {
-                badgeValues.label = "Status";
-            } else {
-                badgeValues.label = label;
-            }
+            badgeValues.label = label ?? "Status";
             switch (state) {
                 case DOWN:
                     badgeValues.color = downColor;
@@ -183,7 +175,7 @@ router.get("/api/badge/:id/status", cache("5 minutes"), async (request, response
         response.type("image/svg+xml");
         response.send(svg);
     } catch (error) {
-        sendHttpError(response, error.message);
+        send403(response, error.message);
     }
 });
 
@@ -230,7 +222,7 @@ router.get("/api/badge/:id/uptime/:duration?", cache("5 minutes"), async (reques
             );
 
             // limit the displayed uptime percentage to four (two, when displayed as percent) decimal digits
-            const cleanUptime = (uptime * 100).toPrecision(4);
+            const cleanUptime = parseFloat(uptime.toPrecision(4));
 
             // use a given, custom color or calculate one based on the uptime value
             badgeValues.color = color ?? percentageToColor(uptime);
@@ -241,7 +233,7 @@ router.get("/api/badge/:id/uptime/:duration?", cache("5 minutes"), async (reques
                 labelPrefix,
                 label ?? `Uptime (${requestedDuration}${labelSuffix})`,
             ]);
-            badgeValues.message = filterAndJoin([ prefix, cleanUptime, suffix ]);
+            badgeValues.message = filterAndJoin([ prefix, `${cleanUptime * 100}`, suffix ]);
         }
 
         // build the SVG based on given values
@@ -250,7 +242,7 @@ router.get("/api/badge/:id/uptime/:duration?", cache("5 minutes"), async (reques
         response.type("image/svg+xml");
         response.send(svg);
     } catch (error) {
-        sendHttpError(response, error.message);
+        send403(response, error.message);
     }
 });
 
@@ -311,7 +303,7 @@ router.get("/api/badge/:id/ping/:duration?", cache("5 minutes"), async (request,
         response.type("image/svg+xml");
         response.send(svg);
     } catch (error) {
-        sendHttpError(response, error.message);
+        send403(response, error.message);
     }
 });
 
@@ -381,7 +373,7 @@ router.get("/api/badge/:id/avg-response/:duration?", cache("5 minutes"), async (
         response.type("image/svg+xml");
         response.send(svg);
     } catch (error) {
-        sendHttpError(response, error.message);
+        send403(response, error.message);
     }
 });
 
@@ -472,7 +464,7 @@ router.get("/api/badge/:id/cert-exp", cache("5 minutes"), async (request, respon
         response.type("image/svg+xml");
         response.send(svg);
     } catch (error) {
-        sendHttpError(response, error.message);
+        send403(response, error.message);
     }
 });
 
@@ -544,7 +536,7 @@ router.get("/api/badge/:id/response", cache("5 minutes"), async (request, respon
         response.type("image/svg+xml");
         response.send(svg);
     } catch (error) {
-        sendHttpError(response, error.message);
+        send403(response, error.message);
     }
 });
 

server/routers/status-page-router.js

@@ -2,7 +2,7 @@ let express = require("express");
 const apicache = require("../modules/apicache");
 const { UptimeKumaServer } = require("../uptime-kuma-server");
 const StatusPage = require("../model/status_page");
-const { allowDevAllOrigin, sendHttpError } = require("../util-server");
+const { allowDevAllOrigin, send403 } = require("../util-server");
 const { R } = require("redbean-node");
 const Monitor = require("../model/monitor");
 
@@ -44,7 +44,10 @@ router.get("/api/status-page/:slug", cache("5 minutes"), async (request, respons
         let statusPageData = await StatusPage.getStatusPageData(statusPage);
 
         if (!statusPageData) {
-            sendHttpError(response, "Not Found");
+            response.statusCode = 404;
+            response.json({
+                msg: "Not Found"
+            });
             return;
         }
 
@@ -52,7 +55,7 @@ router.get("/api/status-page/:slug", cache("5 minutes"), async (request, respons
         response.json(statusPageData);
 
     } catch (error) {
-        sendHttpError(response, error.message);
+        send403(response, error.message);
     }
 });
 
@@ -100,7 +103,7 @@ router.get("/api/status-page/heartbeat/:slug", cache("1 minutes"), async (reques
         });
 
     } catch (error) {
-        sendHttpError(response, error.message);
+        send403(response, error.message);
     }
 });
 
@@ -116,7 +119,10 @@ router.get("/api/status-page/:slug/manifest.json", cache("1440 minutes"), async
         ]);
 
         if (!statusPage) {
-            sendHttpError(response, "Not Found");
+            response.statusCode = 404;
+            response.json({
+                msg: "Not Found"
+            });
             return;
         }
 
@@ -135,7 +141,7 @@ router.get("/api/status-page/:slug/manifest.json", cache("1440 minutes"), async
         });
 
     } catch (error) {
-        sendHttpError(response, error.message);
+        send403(response, error.message);
     }
 });
 

server/server.js

@@ -19,11 +19,6 @@ 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);
@@ -92,7 +87,7 @@ log.debug("server", "Importing Background Jobs");
 const { initBackgroundJobs, stopBackgroundJobs } = require("./jobs");
 const { loginRateLimiter, twoFaRateLimiter } = require("./rate-limiter");
 
-const { apiAuth } = require("./auth");
+const { basicAuth } = require("./auth");
 const { login } = require("./auth");
 const passwordHash = require("./password-hash");
 
@@ -134,7 +129,7 @@ if (config.demoMode) {
 }
 
 // Must be after io instantiation
-const { sendNotificationList, sendHeartbeatList, sendImportantHeartbeatList, sendInfo, sendProxyList, sendDockerHostList, sendAPIKeyList } = require("./client");
+const { sendNotificationList, sendHeartbeatList, sendImportantHeartbeatList, sendInfo, sendProxyList, sendDockerHostList } = require("./client");
 const { statusPageSocketHandler } = require("./socket-handlers/status-page-socket-handler");
 const databaseSocketHandler = require("./socket-handlers/database-socket-handler");
 const TwoFA = require("./2fa");
@@ -143,12 +138,10 @@ const { cloudflaredSocketHandler, autoStart: cloudflaredAutoStart, stop: cloudfl
 const { proxySocketHandler } = require("./socket-handlers/proxy-socket-handler");
 const { dockerSocketHandler } = require("./socket-handlers/docker-socket-handler");
 const { maintenanceSocketHandler } = require("./socket-handlers/maintenance-socket-handler");
-const { apiKeySocketHandler } = require("./socket-handlers/api-key-socket-handler");
 const { generalSocketHandler } = require("./socket-handlers/general-socket-handler");
 const { Settings } = require("./settings");
 const { CacheableDnsHttpAgent } = require("./cacheable-dns-http-agent");
 const { pluginsHandler } = require("./socket-handlers/plugins-handler");
-const apicache = require("./modules/apicache");
 
 app.use(express.json());
 
@@ -236,7 +229,7 @@ let needSetup = false;
 
     // Prometheus API metrics  /metrics
     // With Basic Auth using the first user's username/password
-    app.get("/metrics", apiAuth, prometheusAPIMetrics());
+    app.get("/metrics", basicAuth, prometheusAPIMetrics());
 
     app.use("/", expressStaticGzip("dist", {
         enableBrotli: true,
@@ -676,7 +669,6 @@ let needSetup = false;
         // Edit a monitor
         socket.on("editMonitor", async (monitor, callback) => {
             try {
-                let removeGroupChildren = false;
                 checkLogin(socket);
 
                 let bean = await R.findOne("monitor", " id = ? ", [ monitor.id ]);
@@ -685,22 +677,10 @@ let needSetup = false;
                     throw new Error("Permission denied.");
                 }
 
-                // Check if Parent is Descendant (would cause endless loop)
-                if (monitor.parent !== null) {
-                    const childIDs = await Monitor.getAllChildrenIDs(monitor.id);
-                    if (childIDs.includes(monitor.parent)) {
-                        throw new Error("Invalid Monitor Group");
-                    }
-                }
-
-                // Remove children if monitor type has changed (from group to non-group)
-                if (bean.type === "group" && monitor.type !== bean.type) {
-                    removeGroupChildren = true;
-                }
+                // Reset Prometheus labels
+                server.monitorList[monitor.id]?.prometheus()?.remove();
 
                 bean.name = monitor.name;
-                bean.description = monitor.description;
-                bean.parent = monitor.parent;
                 bean.type = monitor.type;
                 bean.url = monitor.url;
                 bean.method = monitor.method;
@@ -708,9 +688,6 @@ let needSetup = false;
                 bean.headers = monitor.headers;
                 bean.basic_auth_user = monitor.basic_auth_user;
                 bean.basic_auth_pass = monitor.basic_auth_pass;
-                bean.tlsCa = monitor.tlsCa;
-                bean.tlsCert = monitor.tlsCert;
-                bean.tlsKey = monitor.tlsKey;
                 bean.interval = monitor.interval;
                 bean.retryInterval = monitor.retryInterval;
                 bean.resendInterval = monitor.resendInterval;
@@ -752,19 +729,14 @@ let needSetup = false;
                 bean.radiusCalledStationId = monitor.radiusCalledStationId;
                 bean.radiusCallingStationId = monitor.radiusCallingStationId;
                 bean.radiusSecret = monitor.radiusSecret;
-                bean.httpBodyEncoding = monitor.httpBodyEncoding;
 
                 bean.validate();
 
                 await R.store(bean);
 
-                if (removeGroupChildren) {
-                    await Monitor.unlinkAllChildren(monitor.id);
-                }
-
                 await updateMonitorNotification(bean.id, monitor.notificationIDList);
 
-                if (bean.isActive()) {
+                if (bean.active) {
                     await restartMonitor(socket.userID, bean.id);
                 }
 
@@ -912,9 +884,6 @@ let needSetup = false;
                     socket.userID,
                 ]);
 
-                // Fix #2880
-                apicache.clear();
-
                 callback({
                     ok: true,
                     msg: "Deleted Successfully.",
@@ -1351,7 +1320,6 @@ let needSetup = false;
                             let monitor = {
                                 // Define the new variable from earlier here
                                 name: monitorListData[i].name,
-                                description: monitorListData[i].description,
                                 type: monitorListData[i].type,
                                 url: monitorListData[i].url,
                                 method: monitorListData[i].method || "GET",
@@ -1535,7 +1503,6 @@ let needSetup = false;
         proxySocketHandler(socket);
         dockerSocketHandler(socket);
         maintenanceSocketHandler(socket);
-        apiKeySocketHandler(socket);
         generalSocketHandler(socket, server);
         pluginsHandler(socket, server);
 
@@ -1581,7 +1548,7 @@ let needSetup = false;
         }
     });
 
-    await initBackgroundJobs();
+    initBackgroundJobs(args);
 
     // Start cloudflared at the end if configured
     await cloudflaredAutoStart(cloudflaredToken);
@@ -1644,7 +1611,6 @@ async function afterLogin(socket, user) {
     sendNotificationList(socket);
     sendProxyList(socket);
     sendDockerHostList(socket);
-    sendAPIKeyList(socket);
 
     await sleep(500);
 

server/socket-handlers/api-key-socket-handler.js

@@ -1,150 +0,0 @@
-const { checkLogin } = require("../util-server");
-const { log } = require("../../src/util");
-const { R } = require("redbean-node");
-const { nanoid } = require("nanoid");
-const passwordHash = require("../password-hash");
-const apicache = require("../modules/apicache");
-const APIKey = require("../model/api_key");
-const { Settings } = require("../settings");
-const { sendAPIKeyList } = require("../client");
-
-/**
- * Handlers for Maintenance
- * @param {Socket} socket Socket.io instance
- */
-module.exports.apiKeySocketHandler = (socket) => {
-    // Add a new api key
-    socket.on("addAPIKey", async (key, callback) => {
-        try {
-            checkLogin(socket);
-
-            let clearKey = nanoid(40);
-            let hashedKey = passwordHash.generate(clearKey);
-            key["key"] = hashedKey;
-            let bean = await APIKey.save(key, socket.userID);
-
-            log.debug("apikeys", "Added API Key");
-            log.debug("apikeys", key);
-
-            // Append key ID and prefix to start of key seperated by _, used to get
-            // correct hash when validating key.
-            let formattedKey = "uk" + bean.id + "_" + clearKey;
-            await sendAPIKeyList(socket);
-
-            // Enable API auth if the user creates a key, otherwise only basic
-            // auth will be used for API.
-            await Settings.set("apiKeysEnabled", true);
-
-            callback({
-                ok: true,
-                msg: "Added Successfully.",
-                key: formattedKey,
-                keyID: bean.id,
-            });
-
-        } catch (e) {
-            callback({
-                ok: false,
-                msg: e.message,
-            });
-        }
-    });
-
-    socket.on("getAPIKeyList", async (callback) => {
-        try {
-            checkLogin(socket);
-            await sendAPIKeyList(socket);
-            callback({
-                ok: true,
-            });
-        } catch (e) {
-            console.error(e);
-            callback({
-                ok: false,
-                msg: e.message,
-            });
-        }
-    });
-
-    socket.on("deleteAPIKey", async (keyID, callback) => {
-        try {
-            checkLogin(socket);
-
-            log.debug("apikeys", `Deleted API Key: ${keyID} User ID: ${socket.userID}`);
-
-            await R.exec("DELETE FROM api_key WHERE id = ? AND user_id = ? ", [
-                keyID,
-                socket.userID,
-            ]);
-
-            apicache.clear();
-
-            callback({
-                ok: true,
-                msg: "Deleted Successfully.",
-            });
-
-            await sendAPIKeyList(socket);
-
-        } catch (e) {
-            callback({
-                ok: false,
-                msg: e.message,
-            });
-        }
-    });
-
-    socket.on("disableAPIKey", async (keyID, callback) => {
-        try {
-            checkLogin(socket);
-
-            log.debug("apikeys", `Disabled Key: ${keyID} User ID: ${socket.userID}`);
-
-            await R.exec("UPDATE api_key SET active = 0 WHERE id = ? ", [
-                keyID,
-            ]);
-
-            apicache.clear();
-
-            callback({
-                ok: true,
-                msg: "Disabled Successfully.",
-            });
-
-            await sendAPIKeyList(socket);
-
-        } catch (e) {
-            callback({
-                ok: false,
-                msg: e.message,
-            });
-        }
-    });
-
-    socket.on("enableAPIKey", async (keyID, callback) => {
-        try {
-            checkLogin(socket);
-
-            log.debug("apikeys", `Enabled Key: ${keyID} User ID: ${socket.userID}`);
-
-            await R.exec("UPDATE api_key SET active = 1 WHERE id = ? ", [
-                keyID,
-            ]);
-
-            apicache.clear();
-
-            callback({
-                ok: true,
-                msg: "Enabled Successfully",
-            });
-
-            await sendAPIKeyList(socket);
-
-        } catch (e) {
-            callback({
-                ok: false,
-                msg: e.message,
-            });
-        }
-    });
-};

server/socket-handlers/general-socket-handler.js

@@ -9,10 +9,10 @@ let gameList = null;
 
 /**
  * Get a game list via GameDig
- * @returns {Object[]} list of games supported by GameDig
+ * @returns {any[]}
  */
 function getGameList() {
-    if (gameList == null) {
+    if (!gameList) {
         gameList = gameResolver._readGames().games.sort((a, b) => {
             if ( a.pretty < b.pretty ) {
                 return -1;
@@ -22,8 +22,9 @@ function getGameList() {
             }
             return 0;
         });
+    } else {
+        return gameList;
     }
-    return gameList;
 }
 
 module.exports.generalSocketHandler = (socket, server) => {

server/socket-handlers/maintenance-socket-handler.js

@@ -5,6 +5,7 @@ const apicache = require("../modules/apicache");
 const { UptimeKumaServer } = require("../uptime-kuma-server");
 const Maintenance = require("../model/maintenance");
 const server = UptimeKumaServer.getInstance();
+const MaintenanceTimeslot = require("../model/maintenance_timeslot");
 
 /**
  * Handlers for Maintenance
@@ -18,12 +19,10 @@ module.exports.maintenanceSocketHandler = (socket) => {
 
             log.debug("maintenance", maintenance);
 
-            let bean = await Maintenance.jsonToBean(R.dispense("maintenance"), maintenance);
+            let bean = Maintenance.jsonToBean(R.dispense("maintenance"), maintenance);
             bean.user_id = socket.userID;
             let maintenanceID = await R.store(bean);
-
-            server.maintenanceList[maintenanceID] = bean;
-            await bean.run(true);
+            await MaintenanceTimeslot.generateTimeslot(bean);
 
             await server.sendMaintenanceList(socket);
 
@@ -46,15 +45,17 @@ module.exports.maintenanceSocketHandler = (socket) => {
         try {
             checkLogin(socket);
 
-            let bean = server.getMaintenance(maintenance.id);
+            let bean = await R.findOne("maintenance", " id = ? ", [ maintenance.id ]);
 
             if (bean.user_id !== socket.userID) {
                 throw new Error("Permission denied.");
             }
 
-            await Maintenance.jsonToBean(bean, maintenance);
+            Maintenance.jsonToBean(bean, maintenance);
+
             await R.store(bean);
-            await bean.run(true);
+            await MaintenanceTimeslot.generateTimeslot(bean, null, true);
+
             await server.sendMaintenanceList(socket);
 
             callback({
@@ -186,7 +187,7 @@ module.exports.maintenanceSocketHandler = (socket) => {
 
             log.debug("maintenance", `Get Monitors for Maintenance: ${maintenanceID} User ID: ${socket.userID}`);
 
-            let monitors = await R.getAll("SELECT monitor.id FROM monitor_maintenance mm JOIN monitor ON mm.monitor_id = monitor.id WHERE mm.maintenance_id = ? ", [
+            let monitors = await R.getAll("SELECT monitor.id, monitor.name FROM monitor_maintenance mm JOIN monitor ON mm.monitor_id = monitor.id WHERE mm.maintenance_id = ? ", [
                 maintenanceID,
             ]);
 
@@ -235,7 +236,6 @@ module.exports.maintenanceSocketHandler = (socket) => {
             log.debug("maintenance", `Delete Maintenance: ${maintenanceID} User ID: ${socket.userID}`);
 
             if (maintenanceID in server.maintenanceList) {
-                server.maintenanceList[maintenanceID].stop();
                 delete server.maintenanceList[maintenanceID];
             }
 
@@ -267,15 +267,9 @@ module.exports.maintenanceSocketHandler = (socket) => {
 
             log.debug("maintenance", `Pause Maintenance: ${maintenanceID} User ID: ${socket.userID}`);
 
-            let maintenance = server.getMaintenance(maintenanceID);
-
-            if (!maintenance) {
-                throw new Error("Maintenance not found");
-            }
-
-            maintenance.active = false;
-            await R.store(maintenance);
-            maintenance.stop();
+            await R.exec("UPDATE maintenance SET active = 0 WHERE id = ? ", [
+                maintenanceID,
+            ]);
 
             apicache.clear();
 
@@ -300,15 +294,9 @@ module.exports.maintenanceSocketHandler = (socket) => {
 
             log.debug("maintenance", `Resume Maintenance: ${maintenanceID} User ID: ${socket.userID}`);
 
-            let maintenance = server.getMaintenance(maintenanceID);
-
-            if (!maintenance) {
-                throw new Error("Maintenance not found");
-            }
-
-            maintenance.active = true;
-            await R.store(maintenance);
-            await maintenance.run();
+            await R.exec("UPDATE maintenance SET active = 1 WHERE id = ? ", [
+                maintenanceID,
+            ]);
 
             apicache.clear();
 

server/socket-handlers/status-page-socket-handler.js

@@ -276,7 +276,7 @@ module.exports.statusPageSocketHandler = (socket) => {
             let statusPage = R.dispense("status_page");
             statusPage.slug = slug;
             statusPage.title = title;
-            statusPage.theme = "auto";
+            statusPage.theme = "light";
             statusPage.icon = "";
             await R.store(statusPage);
 

server/uptime-kuma-server.js

@@ -47,6 +47,8 @@ class UptimeKumaServer {
      */
     indexHTML = "";
 
+    generateMaintenanceTimeslotsInterval = undefined;
+
     /**
      * Plugins Manager
      * @type {PluginsManager}
@@ -72,7 +74,6 @@ class UptimeKumaServer {
         // SSL
         const sslKey = args["ssl-key"] || process.env.UPTIME_KUMA_SSL_KEY || process.env.SSL_KEY || undefined;
         const sslCert = args["ssl-cert"] || process.env.UPTIME_KUMA_SSL_CERT || process.env.SSL_CERT || undefined;
-        const sslKeyPassphrase = args["ssl-key-passphrase"] || process.env.UPTIME_KUMA_SSL_KEY_PASSPHRASE || process.env.SSL_KEY_PASSPHRASE || undefined;
 
         log.info("server", "Creating express and socket.io instance");
         this.app = express();
@@ -80,8 +81,7 @@ class UptimeKumaServer {
             log.info("server", "Server Type: HTTPS");
             this.httpServer = https.createServer({
                 key: fs.readFileSync(sslKey),
-                cert: fs.readFileSync(sslCert),
-                passphrase: sslKeyPassphrase,
+                cert: fs.readFileSync(sslCert)
             }, this.app);
         } else {
             log.info("server", "Server Type: HTTP");
@@ -110,7 +110,8 @@ class UptimeKumaServer {
         log.debug("DEBUG", "Timezone: " + process.env.TZ);
         log.debug("DEBUG", "Current Time: " + dayjs.tz().format());
 
-        await this.loadMaintenanceList();
+        await this.generateMaintenanceTimeslots();
+        this.generateMaintenanceTimeslotsInterval = setInterval(this.generateMaintenanceTimeslots, 60 * 1000);
     }
 
     /**
@@ -172,33 +173,16 @@ class UptimeKumaServer {
      */
     async getMaintenanceJSONList(userID) {
         let result = {};
-        for (let maintenanceID in this.maintenanceList) {
-            result[maintenanceID] = await this.maintenanceList[maintenanceID].toJSON();
-        }
-        return result;
-    }
-
-    /**
-     * Load maintenance list and run
-     * @param userID
-     * @returns {Promise<void>}
-     */
-    async loadMaintenanceList(userID) {
-        let maintenanceList = await R.findAll("maintenance", " ORDER BY end_date DESC, title", [
 
+        let maintenanceList = await R.find("maintenance", " user_id = ? ORDER BY end_date DESC, title", [
+            userID,
         ]);
 
         for (let maintenance of maintenanceList) {
-            this.maintenanceList[maintenance.id] = maintenance;
-            maintenance.run(this);
+            result[maintenance.id] = await maintenance.toJSON();
         }
-    }
 
-    getMaintenance(maintenanceID) {
-        if (this.maintenanceList[maintenanceID]) {
-            return this.maintenanceList[maintenanceID];
-        }
-        return null;
+        return result;
     }
 
     /**
@@ -254,7 +238,7 @@ class UptimeKumaServer {
      * Attempt to get the current server timezone
      * If this fails, fall back to environment variables and then make a
      * guess.
-     * @returns {Promise<string>}
+     * @returns {string}
      */
     async getTimezone() {
         let timezone = await Settings.get("serverTimezone");
@@ -285,9 +269,23 @@ class UptimeKumaServer {
         dayjs.tz.setDefault(timezone);
     }
 
+    /** Load the timeslots for maintenance */
+    async generateMaintenanceTimeslots() {
+
+        let list = await R.find("maintenance_timeslot", " generated_next = 0 AND start_date <= DATETIME('now') ");
+
+        for (let maintenanceTimeslot of list) {
+            let maintenance = await maintenanceTimeslot.maintenance;
+            await MaintenanceTimeslot.generateTimeslot(maintenance, maintenanceTimeslot.end_date, false);
+            maintenanceTimeslot.generated_next = true;
+            await R.store(maintenanceTimeslot);
+        }
+
+    }
+
     /** Stop the server */
     async stop() {
-
+        clearTimeout(this.generateMaintenanceTimeslotsInterval);
     }
 
     loadPlugins() {
@@ -336,4 +334,5 @@ module.exports = {
 };
 
 // Must be at the end
+const MaintenanceTimeslot = require("./model/maintenance_timeslot");
 const { MonitorType } = require("./monitor-types/monitor-type");

server/util-server.js

@@ -87,10 +87,7 @@ exports.ping = async (hostname, size = 56) => {
         return await exports.pingAsync(hostname, false, size);
     } catch (e) {
         // If the host cannot be resolved, try again with ipv6
-        console.debug("ping", "IPv6 error message: " + e.message);
-
-        // As node-ping does not report a specific error for this, try again if it is an empty message with ipv6 no matter what.
-        if (!e.message) {
+        if (e.message.includes("service not known")) {
             return await exports.pingAsync(hostname, true, size);
         } else {
             throw e;
@@ -295,23 +292,14 @@ exports.postgresQuery = function (connectionString, query) {
                 client.end();
             } else {
                 // Connected here
-                try {
-                    // No query provided by user, use SELECT 1
-                    if (!query || (typeof query === "string" && query.trim() === "")) {
-                        query = "SELECT 1";
+                client.query(query, (err, res) => {
+                    if (err) {
+                        reject(err);
+                    } else {
+                        resolve(res);
                     }
-
-                    client.query(query, (err, res) => {
-                        if (err) {
-                            reject(err);
-                        } else {
-                            resolve(res);
-                        }
-                        client.end();
-                    });
-                } catch (e) {
-                    reject(e);
-                }
+                    client.end();
+                });
             }
         });
 
@@ -322,33 +310,21 @@ exports.postgresQuery = function (connectionString, query) {
  * Run a query on MySQL/MariaDB
  * @param {string} connectionString The database connection string
  * @param {string} query The query to validate the database with
- * @returns {Promise<(string)>}
+ * @returns {Promise<(string[]|Object[]|Object)>}
  */
 exports.mysqlQuery = function (connectionString, query) {
     return new Promise((resolve, reject) => {
         const connection = mysql.createConnection(connectionString);
-
-        connection.on("error", (err) => {
-            reject(err);
-        });
-
-        connection.query(query, (err, res) => {
-            if (err) {
+        connection.promise().query(query)
+            .then(res => {
+                resolve(res);
+            })
+            .catch(err => {
                 reject(err);
-            } else {
-                if (Array.isArray(res)) {
-                    resolve("Rows: " + res.length);
-                } else {
-                    resolve("No Error, but the result is not an array. Type: " + typeof res);
-                }
-            }
-
-            try {
-                connection.end();
-            } catch (_) {
+            })
+            .finally(() => {
                 connection.destroy();
-            }
-        });
+            });
     });
 };
 
@@ -420,9 +396,6 @@ exports.redisPingAsync = function (dsn) {
         });
         client.connect().then(() => {
             client.ping().then((res, err) => {
-                if (client.isOpen) {
-                    client.disconnect();
-                }
                 if (err) {
                     reject(err);
                 } else {
@@ -524,16 +497,12 @@ 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;
         }
 
@@ -761,27 +730,15 @@ exports.filterAndJoin = (parts, connector = "") => {
 };
 
 /**
- * Send an Error response
+ * Send a 403 response
  * @param {Object} res Express response object
  * @param {string} [msg=""] Message to send
  */
-module.exports.sendHttpError = (res, msg = "") => {
-    if (msg.includes("SQLITE_BUSY") || msg.includes("SQLITE_LOCKED")) {
-        res.status(503).json({
-            "status": "fail",
-            "msg": msg,
-        });
-    } else if (msg.toLowerCase().includes("not found")) {
-        res.status(404).json({
-            "status": "fail",
-            "msg": msg,
-        });
-    } else {
-        res.status(403).json({
-            "status": "fail",
-            "msg": msg,
-        });
-    }
+module.exports.send403 = (res, msg = "") => {
+    res.status(403).json({
+        "status": "fail",
+        "msg": msg,
+    });
 };
 
 function timeObjectConvertTimezone(obj, timezone, timeObjectToUTC = true) {

src/assets/app.scss

@@ -266,11 +266,6 @@ optgroup {
         background-color: $dark-bg2;
     }
 
-    .form-select:disabled {
-        color: rgba($dark-font-color, 0.7);
-        background-color: $dark-bg;
-    }
-
     .form-control, .form-select {
         border-color: $dark-border-color;
     }
@@ -561,31 +556,6 @@ h5.settings-subheading::after {
     border-bottom: 1px solid $dark-border-color;
 }
 
-
-$shadow-box-padding: 20px;
-
-.shadow-box-with-fixed-bottom-bar {
-    padding-top: $shadow-box-padding;
-    padding-bottom: 0;
-    padding-right: $shadow-box-padding;
-    padding-left: $shadow-box-padding;
-}
-
-.fixed-bottom-bar {
-    position: sticky;
-    bottom: 0;
-    margin-left: -$shadow-box-padding;
-    margin-right: -$shadow-box-padding;
-    z-index: 100;
-    background-color: rgba(white, 0.2);
-    backdrop-filter: blur(2px);
-    border-radius: 0 0 10px 10px;
-
-    .dark & {
-        background-color: rgba($dark-header-bg, 0.9);
-    }
-}
-
 // Localization
 
 @import "localization.scss";

src/assets/multiselect.scss

@@ -1,12 +1,6 @@
 @import "vars.scss";
 @import "node_modules/vue-multiselect/dist/vue-multiselect";
 
-.multiselect {
-    .dark & {
-        color: $dark-font-color;
-    }
-}
-
 .multiselect__tags {
     border-radius: 1.5rem;
     border: 1px solid #ced4da;
@@ -20,12 +14,10 @@
 
 .multiselect__option--highlight {
     background: $primary !important;
-    color: $dark-font-color2 !important;
 }
 
 .multiselect__option--highlight::after {
     background: $primary !important;
-    color: $dark-font-color2 !important;
 }
 
 .multiselect__tag {

src/components/APIKeyDialog.vue

@@ -1,228 +0,0 @@
-<template>
-    <form @submit.prevent="submit">
-        <div ref="keyaddmodal" class="modal fade" tabindex="-1" data-bs-backdrop="static">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title">
-                            {{ $t("Add API Key") }}
-                        </h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
-                    </div>
-                    <div class="modal-body">
-                        <!-- Name -->
-                        <div class="mb-3">
-                            <label for="name" class="form-label">{{ $t("Name") }}</label>
-                            <input
-                                id="name" v-model="key.name" type="text" class="form-control"
-                                required
-                            >
-                        </div>
-
-                        <!-- Expiry -->
-                        <div class="my-3">
-                            <label class="form-label">{{ $t("Expiry date") }}</label>
-                            <div class="d-flex flex-row align-items-center">
-                                <div class="col-6">
-                                    <Datepicker
-                                        v-model="key.expires"
-                                        :dark="$root.isDark"
-                                        :monthChangeOnScroll="false"
-                                        :minDate="minDate"
-                                        format="yyyy-MM-dd HH:mm"
-                                        modelType="yyyy-MM-dd HH:mm:ss"
-                                        :required="!noExpire"
-                                        :disabled="noExpire"
-                                    />
-                                </div>
-                                <div class="col-6 ms-3">
-                                    <div class="form-check mb-0">
-                                        <input
-                                            id="no-expire" v-model="noExpire" class="form-check-input"
-                                            type="checkbox"
-                                        >
-                                        <label class="form-check-label" for="no-expire">{{
-                                            $t("Don't expire")
-                                        }}</label>
-                                    </div>
-                                </div>
-                            </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>
-        </div>
-        <div ref="keymodal" class="modal fade" tabindex="-1" data-bs-backdrop="static">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title">
-                            {{ $t("Key Added") }}
-                        </h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
-                    </div>
-
-                    <div class="modal-body">
-                        <div class="mb-3">
-                            {{ $t("apiKeyAddedMsg") }}
-                        </div>
-                        <div class="mb-3">
-                            <CopyableInput v-model="clearKey" disabled="disabled" />
-                        </div>
-                    </div>
-
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-primary" data-bs-dismiss="modal">
-                            {{ $t('Continue') }}
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </form>
-</template>
-
-<script lang="ts">
-import { Modal } from "bootstrap";
-import { useToast } from "vue-toastification";
-import dayjs from "dayjs";
-import Datepicker from "@vuepic/vue-datepicker";
-import CopyableInput from "./CopyableInput.vue";
-const toast = useToast();
-
-export default {
-    components: {
-        CopyableInput,
-        Datepicker
-    },
-    props: {},
-    // emits: [ "added" ],
-    data() {
-        return {
-            keyaddmodal: null,
-            keymodal: null,
-            processing: false,
-            key: {},
-            dark: (this.$root.theme === "dark"),
-            minDate: this.$root.date(dayjs()) + " 00:00",
-            clearKey: null,
-            noExpire: false,
-        };
-    },
-
-    mounted() {
-        this.keyaddmodal = new Modal(this.$refs.keyaddmodal);
-        this.keymodal = new Modal(this.$refs.keymodal);
-    },
-
-    methods: {
-        /**
-         * Show modal
-         */
-        show() {
-            this.id = null;
-            this.key = {
-                name: "",
-                expires: this.minDate,
-                active: 1,
-            };
-
-            this.keyaddmodal.show();
-        },
-
-        /** Submit data to server */
-        async submit() {
-            this.processing = true;
-
-            if (this.noExpire) {
-                this.key.expires = null;
-            }
-
-            this.$root.addAPIKey(this.key, async (res) => {
-                this.keyaddmodal.hide();
-                this.processing = false;
-                if (res.ok) {
-                    this.clearKey = res.key;
-                    this.keymodal.show();
-                    this.clearForm();
-                } else {
-                    toast.error(res.msg);
-                }
-            });
-        },
-
-        /** Clear Form inputs */
-        clearForm() {
-            this.key = {
-                name: "",
-                expires: this.minDate,
-                active: 1,
-            };
-            this.noExpire = false;
-        },
-    }
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../assets/vars.scss";
-
-.dark {
-    .modal-dialog .form-text, .modal-dialog p {
-        color: $dark-font-color;
-    }
-}
-
-.shadow-box {
-    padding: 20px;
-}
-
-textarea {
-    min-height: 150px;
-}
-
-.dark-calendar::-webkit-calendar-picker-indicator {
-    filter: invert(1);
-}
-
-.weekday-picker {
-    display: flex;
-    gap: 10px;
-
-    & > div {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        width: 40px;
-
-        .form-check-inline {
-            margin-right: 0;
-        }
-    }
-}
-
-.day-picker {
-    display: flex;
-    gap: 10px;
-    flex-wrap: wrap;
-
-    & > div {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        width: 40px;
-
-        .form-check-inline {
-            margin-right: 0;
-        }
-    }
-}
-</style>

src/components/BadgeGeneratorDialog.vue

@@ -1,299 +0,0 @@
-<template>
-    <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 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.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>
-    </div>
-</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,
-                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: {
-                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",
-                    "warnDays",
-                    "downDays",
-                    "labelColor",
-                ],
-                response: [
-                    "labelPrefix",
-                    "labelSuffix",
-                    "prefix",
-                    "suffix",
-                    "color",
-                    "labelColor",
-                ],
-            }
-        };
-    },
-
-    computed: {
-        badgeURL() {
-            if (!this.monitor.id || !this.badge.type) {
-                return;
-            }
-            let badgeURL = this.$root.baseURL + "/api/badge/" + this.monitor.id + "/" + this.badge.type;
-
-            let parameterList = {};
-
-            for (let parameter of this.parameters[this.badge.type] || []) {
-                if (parameter === "duration" && this.badge.duration) {
-                    badgeURL += "/" + this.badge.duration;
-                    continue;
-                }
-
-                if (this.badge[parameter]) {
-                    parameterList[parameter] = this.badge[parameter];
-                }
-            }
-
-            for (let parameter of [ "label", "style", "value" ]) {
-                if (parameter === "style" && this.badge.style === "flat") {
-                    continue;
-                }
-
-                if (this.badge[parameter]) {
-                    parameterList[parameter] = this.badge[parameter];
-                }
-            }
-
-            if (Object.keys(parameterList).length > 0) {
-                return badgeURL + "?" + new URLSearchParams(parameterList);
-            }
-
-            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>

src/components/Confirm.vue

@@ -4,7 +4,7 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <h5 id="exampleModalLabel" class="modal-title">
-                        {{ title || $t("Confirm") }}
+                        {{ $t("Confirm") }}
                     </h5>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
                 </div>
@@ -15,7 +15,7 @@
                     <button type="button" class="btn" :class="btnStyle" data-bs-dismiss="modal" @click="yes">
                         {{ yesText }}
                     </button>
-                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="no">
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
                         {{ noText }}
                     </button>
                 </div>
@@ -44,13 +44,8 @@ export default {
             type: String,
             default: "No",
         },
-        /** Title to show on modal. Defaults to translated version of "Config" */
-        title: {
-            type: String,
-            default: null,
-        }
     },
-    emits: [ "yes", "no" ],
+    emits: [ "yes" ],
     data: () => ({
         modal: null,
     }),
@@ -68,12 +63,6 @@ export default {
         yes() {
             this.$emit("yes");
         },
-        /**
-         * @emits string "no" Notify the parent when No is pressed
-         */
-        no() {
-            this.$emit("no");
-        }
     },
 };
 </script>

src/components/CopyableInput.vue

@@ -13,9 +13,6 @@
             :disabled="disabled"
         >
 
-        <!-- A hidden textarea for copying text on non-https -->
-        <textarea ref="hiddenTextarea" style="position: fixed; left: -999999px; top: -999999px;"></textarea>
-
         <a class="btn btn-outline-primary" @click="copyToClipboard(model)">
             <font-awesome-icon :icon="icon" />
         </a>
@@ -114,19 +111,24 @@ export default {
             }, 3000);
 
             // navigator clipboard api needs a secure context (https)
-            // For http, use the text area method (else part)
             if (navigator.clipboard && window.isSecureContext) {
                 // navigator clipboard api method'
                 return navigator.clipboard.writeText(textToCopy);
             } else {
                 // text area method
-                let textArea = this.$refs.hiddenTextarea;
+                let textArea = document.createElement("textarea");
                 textArea.value = textToCopy;
+                // make the textarea out of viewport
+                textArea.style.position = "fixed";
+                textArea.style.left = "-999999px";
+                textArea.style.top = "-999999px";
+                document.body.appendChild(textArea);
                 textArea.focus();
                 textArea.select();
                 return new Promise((res, rej) => {
                     // here the magic happens
                     document.execCommand("copy") ? res() : rej();
+                    textArea.remove();
                 });
             }
         }

src/components/MaintenanceTime.vue

@@ -3,23 +3,16 @@
         <div v-if="maintenance.strategy === 'manual'" class="timeslot">
             {{ $t("Manual") }}
         </div>
-        <div v-else-if="maintenance.timeslotList.length > 0">
-            <div class="timeslot">
-                {{ startDateTime }}
-                <span class="to">-</span>
-                {{ endDateTime }}
-            </div>
-            <div class="timeslot">
-                UTC{{ maintenance.timezoneOffset }} <span v-if="maintenance.timezone !== 'UTC'">{{ maintenance.timezone }}</span>
-            </div>
+        <div v-else-if="maintenance.timeslotList.length > 0" class="timeslot">
+            {{ maintenance.timeslotList[0].startDateServerTimezone }}
+            <span class="to">-</span>
+            {{ maintenance.timeslotList[0].endDateServerTimezone }}
+            (UTC{{ maintenance.timeslotList[0].serverTimezoneOffset }})
         </div>
     </div>
 </template>
 
 <script>
-import dayjs from "dayjs";
-import { SQL_DATETIME_FORMAT_WITHOUT_SECOND } from "../util.ts";
-
 export default {
     props: {
         maintenance: {
@@ -27,14 +20,6 @@ export default {
             required: true
         },
     },
-    computed: {
-        startDateTime() {
-            return dayjs(this.maintenance.timeslotList[0].startDate).tz(this.maintenance.timezone).format(SQL_DATETIME_FORMAT_WITHOUT_SECOND);
-        },
-        endDateTime() {
-            return dayjs(this.maintenance.timeslotList[0].endDate).tz(this.maintenance.timezone).format(SQL_DATETIME_FORMAT_WITHOUT_SECOND);
-        }
-    },
 };
 </script>
 
@@ -46,7 +31,6 @@ export default {
     background-color: rgba(255, 255, 255, 0.5);
     border-radius: 20px;
     padding: 0 10px;
-    margin-right: 5px;
 
     .to {
         margin: 0 6px;

src/components/MonitorList.vue

@@ -19,18 +19,43 @@
                 {{ $t("No Monitors, please") }} <router-link to="/add">{{ $t("add one") }}</router-link>
             </div>
 
-            <MonitorListItem v-for="(item, index) in sortedMonitorList" :key="index" :monitor="item" :isSearch="searchText !== ''" />
+            <router-link v-for="(item, index) in sortedMonitorList" :key="index" :to="monitorURL(item.id)" class="item" :class="{ 'disabled': ! item.active }">
+                <div class="row">
+                    <div class="col-9 col-md-8 small-padding" :class="{ 'monitor-item': $root.userHeartbeatBar == 'bottom' || $root.userHeartbeatBar == 'none' }">
+                        <div class="info">
+                            <Uptime :monitor="item" type="24" :pill="true" />
+                            {{ item.name }}
+                        </div>
+                        <div class="tags">
+                            <Tag v-for="tag in item.tags" :key="tag" :item="tag" :size="'sm'" />
+                        </div>
+                    </div>
+                    <div v-show="$root.userHeartbeatBar == 'normal'" :key="$root.userHeartbeatBar" class="col-3 col-md-4">
+                        <HeartbeatBar size="small" :monitor-id="item.id" />
+                    </div>
+                </div>
+
+                <div v-if="$root.userHeartbeatBar == 'bottom'" class="row">
+                    <div class="col-12 bottom-style">
+                        <HeartbeatBar size="small" :monitor-id="item.id" />
+                    </div>
+                </div>
+            </router-link>
         </div>
     </div>
 </template>
 
 <script>
-import MonitorListItem from "../components/MonitorListItem.vue";
+import HeartbeatBar from "../components/HeartbeatBar.vue";
+import Tag from "../components/Tag.vue";
+import Uptime from "../components/Uptime.vue";
 import { getMonitorRelativeURL } from "../util.ts";
 
 export default {
     components: {
-        MonitorListItem,
+        Uptime,
+        HeartbeatBar,
+        Tag,
     },
     props: {
         /** Should the scrollbar be shown */
@@ -66,20 +91,6 @@ export default {
         sortedMonitorList() {
             let result = Object.values(this.$root.monitorList);
 
-            // Simple filter by search text
-            // finds monitor name, tag name or tag value
-            if (this.searchText !== "") {
-                const loweredSearchText = this.searchText.toLowerCase();
-                result = result.filter(monitor => {
-                    return monitor.name.toLowerCase().includes(loweredSearchText)
-                    || monitor.tags.find(tag => tag.name.toLowerCase().includes(loweredSearchText)
-                    || tag.value?.toLowerCase().includes(loweredSearchText));
-                });
-            } else {
-                result = result.filter(monitor => monitor.parent === null);
-            }
-
-            // Filter result by active state, weight and alphabetical
             result.sort((m1, m2) => {
 
                 if (m1.active !== m2.active) {
@@ -105,6 +116,17 @@ export default {
                 return m1.name.localeCompare(m2.name);
             });
 
+            // Simple filter by search text
+            // finds monitor name, tag name or tag value
+            if (this.searchText !== "") {
+                const loweredSearchText = this.searchText.toLowerCase();
+                result = result.filter(monitor => {
+                    return monitor.name.toLowerCase().includes(loweredSearchText)
+                    || monitor.tags.find(tag => tag.name.toLowerCase().includes(loweredSearchText)
+                    || tag.value?.toLowerCase().includes(loweredSearchText));
+                });
+            }
+
             return result;
         },
     },