update to 1.3.1

This reverts commit b53582a812.

.eslintrc.js

@@ -71,5 +71,8 @@ module.exports = {
         "eol-last": ["error", "always"],
         //'prefer-template': 'error',
         "comma-dangle": ["warn", "only-multiline"],
+        "no-empty": ["error", {
+            "allowEmptyCatch": true
+        }],
     },
 }

README.md

@@ -36,6 +36,11 @@ docker run -d --restart=always -p 3001:3001 -v uptime-kuma:/app/data --name upti
 
 Browse to http://localhost:3001 after started.
 
+### ☸️ Kubernetes
+
+See more [here](kubernetes/README.md) 
+
+
 ### Advanced Installation
 
 If you need more options or need to browse via a reserve proxy, please read:
@@ -43,7 +48,6 @@ If you need more options or need to browse via a reserve proxy, please read:
 https://github.com/louislam/uptime-kuma/wiki/%F0%9F%94%A7-How-to-Install
 
 
-
 ## 🆙 How to Update
 
 Please read:

extra/update-version.js

@@ -25,9 +25,6 @@ if (! exists) {
     pkg.scripts["build-docker"] = pkg.scripts["build-docker"].replaceAll(oldVersion, newVersion);
     fs.writeFileSync("package.json", JSON.stringify(pkg, null, 4) + "\n");
 
-    // Process README.md
-    fs.writeFileSync("README.md", fs.readFileSync("README.md", "utf8").replaceAll(oldVersion, newVersion));
-
     commit(newVersion);
     tag(newVersion);
 } else {

kubernetes/README.md

@@ -0,0 +1,28 @@
+# Uptime-Kuma K8s Deployment
+## How does it work?
+
+Kustomize is a tool which builds a complete deployment file for all config elements.
+You can edit the files in the ```uptime-kuma``` folder except the ```kustomization.yml``` until you know what you're doing.
+If you want to choose another namespace you can edit the ```kustomization.yml``` in the ```kubernetes```-Folder and change the ```namespace: uptime-kuma``` to something you like.
+
+It creates a certificate with the specified Issuer and creates the Ingress for the Uptime-Kuma ClusterIP-Service
+
+## What do i have to edit?
+You have to edit the ```ingressroute.yml``` to your needs.
+This ingressroute.yml is for the [nginx-ingress-controller](https://kubernetes.github.io/ingress-nginx/) in combination with the [cert-manager](https://cert-manager.io/).
+
+- host
+- secrets and secret names
+- (Cluster)Issuer (optional)
+- the Version in the Deployment-File
+  - update:
+    - change to newer version and run the above commands, it will update the pods one after another
+
+## How To use:
+
+- install [kustomize](https://kubectl.docs.kubernetes.io/installation/kustomize/)
+- Edit files mentioned above to your needs
+- run ```kustomize build > apply.yml```
+- run ```kubectl apply -f apply.yml```
+
+Now you should see some k8s magic and Uptime-Kuma should be available at the specified address.

kubernetes/kustomization.yml

@@ -0,0 +1,10 @@
+namespace: uptime-kuma
+namePrefix: uptime-kuma-
+
+commonLabels:
+  app: uptime-kuma
+
+bases:
+   - uptime-kuma
+
+

kubernetes/uptime-kuma/deployment.yml

@@ -0,0 +1,42 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    component: uptime-kuma
+  name: deployment
+spec:
+  selector:
+    matchLabels:
+      component: uptime-kuma
+  replicas: 1
+  strategy:
+    type: Recreate
+
+  template:
+    metadata:
+      labels:
+        component: uptime-kuma
+    spec:
+      containers:
+        - name: app
+          image: louislam/uptime-kuma:1
+          ports:
+            - containerPort: 3001
+          volumeMounts:
+            - mountPath: /app/data
+              name: storage
+          livenessProbe:
+            exec:
+              command:
+                - node
+                - extra/healthcheck.js
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 3001
+              scheme: HTTP
+
+      volumes:
+        - name: storage
+          persistentVolumeClaim:
+            claimName: pvc

kubernetes/uptime-kuma/ingressroute.yml

@@ -0,0 +1,39 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    kubernetes.io/ingress.class: nginx
+    cert-manager.io/cluster-issuer: letsencrypt-prod
+    nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"
+    nginx.ingress.kubernetes.io/proxy-send-timeout: "3600"
+    nginx.ingress.kubernetes.io/server-snippets: |
+      location / {
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_http_version 1.1;
+        proxy_set_header X-Forwarded-Host $http_host;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-Forwarded-For $remote_addr;
+        proxy_set_header Host $host;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Upgrade $http_upgrade;
+        proxy_cache_bypass $http_upgrade;
+        }
+  name: ingress
+spec:
+  tls:
+  - hosts:
+    - example.com
+    secretName: example-com-tls
+  rules:
+  - host: example.com
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: service
+            port:
+              number: 3001

kubernetes/uptime-kuma/kustomization.yml

@@ -0,0 +1,5 @@
+resources:
+  - deployment.yml
+  - service.yml
+  - ingressroute.yml
+  - pvc.yml

kubernetes/uptime-kuma/pvc.yml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: pvc
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 4Gi

kubernetes/uptime-kuma/service.yml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:  
+  name: service
+spec:
+  selector:    
+    component: uptime-kuma
+  type: ClusterIP
+  ports:  
+  - name: http
+    port: 3001
+    targetPort: 3001
+    protocol: TCP

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "uptime-kuma",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "uptime-kuma",
-            "version": "1.2.0",
+            "version": "1.3.0",
             "license": "MIT",
             "dependencies": {
                 "@fortawesome/fontawesome-svg-core": "^1.2.36",
@@ -22,6 +22,7 @@
                 "chart.js": "^3.5.0",
                 "chartjs-adapter-dayjs": "^1.0.0",
                 "command-exists": "^1.2.9",
+                "compare-versions": "^3.6.0",
                 "dayjs": "^1.10.6",
                 "express": "^4.17.1",
                 "express-basic-auth": "^1.2.0",
@@ -2430,6 +2431,11 @@
                 "node": ">= 6"
             }
         },
+        "node_modules/compare-versions": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz",
+            "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA=="
+        },
         "node_modules/component-emitter": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
@@ -10971,6 +10977,11 @@
             "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
             "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA=="
         },
+        "compare-versions": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz",
+            "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA=="
+        },
         "component-emitter": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "uptime-kuma",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -17,10 +17,10 @@
         "update": "",
         "build": "vite build",
         "vite-preview-dist": "vite preview --host",
-        "build-docker": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.3.0 --target release . --push",
+        "build-docker": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.3.1 --target release . --push",
         "build-docker-nightly": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push",
         "build-docker-nightly-amd64": "docker buildx build --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push",
-        "setup": "git checkout 1.3.0 && npm install && npm run build",
+        "setup": "git checkout 1.3.1 && npm install && npm run build",
         "update-version": "node extra/update-version.js",
         "mark-as-nightly": "node extra/mark-as-nightly.js",
         "reset-password": "node extra/reset-password.js",
@@ -45,6 +45,7 @@
         "chart.js": "^3.5.0",
         "chartjs-adapter-dayjs": "^1.0.0",
         "command-exists": "^1.2.9",
+        "compare-versions": "^3.6.0",
         "dayjs": "^1.10.6",
         "express": "^4.17.1",
         "express-basic-auth": "^1.2.0",

server/check-version.js

@@ -0,0 +1,44 @@
+const { setSetting } = require("./util-server");
+const axios = require("axios");
+const { isDev } = require("../src/util");
+
+exports.version = require("../package.json").version;
+exports.latestVersion = null;
+
+let interval;
+
+exports.startInterval = () => {
+    let check = async () => {
+        try {
+            const res = await axios.get("https://raw.githubusercontent.com/louislam/uptime-kuma/master/package.json");
+
+            if (typeof res.data === "string") {
+                res.data = JSON.parse(res.data);
+            }
+
+            // For debug
+            if (process.env.TEST_CHECK_VERSION === "1") {
+                res.data.version = "1000.0.0"
+            }
+
+            exports.latestVersion = res.data.version;
+            console.log("Latest Version: " + exports.latestVersion);
+        } catch (_) { }
+
+    };
+
+    check();
+    interval = setInterval(check, 3600 * 48);
+};
+
+exports.enableCheckUpdate = async (value) => {
+    await setSetting("checkUpdate", value);
+
+    clearInterval(interval);
+
+    if (value) {
+        exports.startInterval();
+    }
+};
+
+exports.socket = null;

server/database.js

@@ -1,5 +1,5 @@
 const fs = require("fs");
-const { sleep } = require("../src/util");
+const { sleep, debug, isDev } = require("../src/util");
 const { R } = require("redbean-node");
 const { setSetting, setting } = require("./util-server");
 const knex = require("knex");
@@ -23,20 +23,37 @@ class Database {
         const Dialect = require("knex/lib/dialects/sqlite3/index.js");
         Dialect.prototype._driver = () => sqlite3;
 
-        // Disable Pool by overriding acquireConnection()
-        Dialect.prototype.acquireConnection = async () => {
-            return this.sqliteInstance;
+        if (isDev) {
+            Dialect.prototype.acquireConnectionOrg = Dialect.prototype.acquireConnection;
+
+            Dialect.prototype.acquireConnection = async function () {
+                let a = await this.acquireConnectionOrg();
+                debug("acquired Connection");
+                return a;
+            };
         }
-        Dialect.prototype.releaseConnection = async () => { }
+
+        // Always return same connection.
+        Dialect.prototype.acquireRawConnection = async function () {
+            return Database.sqliteInstance;
+        };
+
+        Dialect.prototype.destroyRawConnection = async () => { }
 
         const knexInstance = knex({
             client: Dialect,
-            connection: {
-                filename: Database.path,
-            },
+            connection: { },        // Do not remove, Leave it empty is ok
             useNullAsDefault: true,
+            pool: {
+                min: 1,
+                max: 5,
+                idleTimeoutMillis: 30000,
+            }
         });
 
+        console.log( knexInstance.pool)
+        console.log("pool size")
+
         R.setup(knexInstance);
 
         if (process.env.SQL_LOG === "1") {

server/server.js

@@ -39,16 +39,14 @@ const passwordHash = require("./password-hash");
 
 const args = require("args-parser")(process.argv);
 
-const version = require("../package.json").version;
+const checkVersion = require("./check-version");
+console.info("Version: " + checkVersion.version);
 
 // 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 (::)
 const hostname = process.env.HOST || args.host;
-
 const port = parseInt(process.env.PORT || args.port || 3001);
 
-console.info("Version: " + version)
-
 console.log("Creating express and socket.io instance")
 const app = express();
 const server = http.createServer(app);
@@ -119,7 +117,8 @@ let indexHTML = fs.readFileSync("./dist/index.html").toString();
     io.on("connection", async (socket) => {
 
         socket.emit("info", {
-            version,
+            version: checkVersion.version,
+            latestVersion: checkVersion.latestVersion,
         })
 
         totalClient++;
@@ -584,6 +583,7 @@ let indexHTML = fs.readFileSync("./dist/index.html").toString();
             console.log(`Listening on ${port}`);
         }
         startMonitors();
+        checkVersion.startInterval();
     });
 
 })();

src/assets/app.scss

@@ -72,7 +72,13 @@ h2 {
     }
 }
 
+.btn-info {
+    color: white;
 
+    &:hover, &:active, &:focus, &.active {
+        color: white;
+    }
+}
 
 // Dark Theme override here
 .dark {
@@ -99,6 +105,10 @@ h2 {
     .table,
     .nav-link {
         color: $dark-font-color;
+
+        &.btn-info {
+            color: white;
+        }
     }
 
     .form-control,

src/icon.js

@@ -1,10 +1,10 @@
 import { library } from "@fortawesome/fontawesome-svg-core"
-import { faCog, faEdit, faList, faPause, faPlay, faPlus, faTachometerAlt, faTrash } from "@fortawesome/free-solid-svg-icons"
+import { faCog, faEdit, faPlus, faPause, faPlay, faTachometerAlt, faTrash, faList, faArrowAltCircleUp } from "@fortawesome/free-solid-svg-icons"
 //import { fa } from '@fortawesome/free-regular-svg-icons'
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"
 
 // Add Free Font Awesome Icons here
 // https://fontawesome.com/v5.15/icons?d=gallery&p=2&s=solid&m=free
-library.add(faCog, faTachometerAlt, faEdit, faPlus, faPause, faPlay, faTrash, faList)
+library.add(faCog, faEdit, faPlus, faPause, faPlay, faTachometerAlt, faTrash, faList, faArrowAltCircleUp);
 
 export { FontAwesomeIcon }

src/layouts/Layout.vue

@@ -13,6 +13,10 @@
                 <span class="fs-4 title">Uptime Kuma</span>
             </router-link>
 
+            <a v-if="hasNewVersion" target="_blank" href="https://github.com/louislam/uptime-kuma/releases" class="btn btn-info me-3">
+                <font-awesome-icon icon="arrow-alt-circle-up" /> New Update
+            </a>
+
             <ul class="nav nav-pills">
                 <li class="nav-item">
                     <router-link to="/dashboard" class="nav-link">
@@ -77,6 +81,7 @@
 
 <script>
 import Login from "../components/Login.vue";
+import compareVersions from "compare-versions";
 
 export default {
 
@@ -96,7 +101,15 @@ export default {
             classes[this.$root.theme] = true;
             classes["mobile"] = this.$root.isMobile;
             return classes;
-        }
+        },
+
+        hasNewVersion() {
+            if (this.$root.info.latestVersion && this.$root.info.version) {
+                return compareVersions(this.$root.info.latestVersion, this.$root.info.version) >= 1;
+            } else {
+                return false;
+            }
+        },
 
     },