Merge 2ba9337342 into 32dc76a085

Update to 1.23.15
Pin cheerio to avoid the breaking change of undici (#5142 )
2024-10-01 01:25:45 -04:00 · 2024-09-30 16:44:08 +00:00 · 2024-09-30 05:44:32 +08:00 · 2024-09-30 05:41:31 +08:00 · 2024-01-20 03:39:05 +08:00 · 2024-01-20 03:39:05 +08:00
3 changed files with 25 additions and 102 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
    "name": "uptime-kuma",
-    "version": "1.23.13",
+    "version": "1.23.14",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
        "": {
            "name": "uptime-kuma",
-            "version": "1.23.13",
+            "version": "1.23.14",
            "license": "MIT",
            "dependencies": {
                "@grpc/grpc-js": "~1.8.22",
@ -20,7 +20,7 @@
                "cacheable-lookup": "~6.0.4",
                "chardet": "~1.4.0",
                "check-password-strength": "^2.0.5",
-                "cheerio": "~1.0.0-rc.12",
+                "cheerio": "1.0.0-rc.12",
                "chroma-js": "~2.4.2",
                "command-exists": "~1.2.9",
                "compare-versions": "~3.6.0",
@ -8468,25 +8468,21 @@
            "license": "MIT"
        },
        "node_modules/cheerio": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0.tgz",
-            "integrity": "sha512-quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww==",
+            "version": "1.0.0-rc.12",
+            "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz",
+            "integrity": "sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==",
            "license": "MIT",
            "dependencies": {
                "cheerio-select": "^2.1.0",
                "dom-serializer": "^2.0.0",
                "domhandler": "^5.0.3",
-                "domutils": "^3.1.0",
-                "encoding-sniffer": "^0.2.0",
-                "htmlparser2": "^9.1.0",
-                "parse5": "^7.1.2",
-                "parse5-htmlparser2-tree-adapter": "^7.0.0",
-                "parse5-parser-stream": "^7.1.2",
-                "undici": "^6.19.5",
-                "whatwg-mimetype": "^4.0.0"
+                "domutils": "^3.0.1",
+                "htmlparser2": "^8.0.1",
+                "parse5": "^7.0.0",
+                "parse5-htmlparser2-tree-adapter": "^7.0.0"
            },
            "engines": {
-                "node": ">=18.17"
+                "node": ">= 6"
            },
            "funding": {
                "url": "https://github.com/cheeriojs/cheerio?sponsor=1"
@ -8509,15 +8505,6 @@
                "url": "https://github.com/sponsors/fb55"
            }
        },
-        "node_modules/cheerio/node_modules/undici": {
-            "version": "6.19.8",
-            "resolved": "https://registry.npmjs.org/undici/-/undici-6.19.8.tgz",
-            "integrity": "sha512-U8uCCl2x9TK3WANvmBavymRzxbfFYG+tAu+fgx3zxQy3qdagQqBLwJVrdyO1TBfUXvfKveMKJZhpvUYoOjM+4g==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=18.17"
-            }
-        },
        "node_modules/chokidar": {
            "version": "3.6.0",
            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
@ -10124,19 +10111,6 @@
                "iconv-lite": "^0.6.2"
            }
        },
-        "node_modules/encoding-sniffer": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/encoding-sniffer/-/encoding-sniffer-0.2.0.tgz",
-            "integrity": "sha512-ju7Wq1kg04I3HtiYIOrUrdfdDvkyO9s5XM8QAj/bN61Yo/Vb4vgJxy5vi4Yxk01gWHbrofpPtpxM8bKger9jhg==",
-            "license": "MIT",
-            "dependencies": {
-                "iconv-lite": "^0.6.3",
-                "whatwg-encoding": "^3.1.1"
-            },
-            "funding": {
-                "url": "https://github.com/fb55/encoding-sniffer?sponsor=1"
-            }
-        },
        "node_modules/end-of-stream": {
            "version": "1.4.4",
            "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@ -12370,9 +12344,9 @@
            }
        },
        "node_modules/htmlparser2": {
-            "version": "9.1.0",
-            "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz",
-            "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==",
+            "version": "8.0.2",
+            "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
+            "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
            "funding": [
                "https://github.com/fb55/htmlparser2?sponsor=1",
                {
@ -12384,8 +12358,8 @@
            "dependencies": {
                "domelementtype": "^2.3.0",
                "domhandler": "^5.0.3",
-                "domutils": "^3.1.0",
-                "entities": "^4.5.0"
+                "domutils": "^3.0.1",
+                "entities": "^4.4.0"
            }
        },
        "node_modules/http-cache-semantics": {
@ -17229,18 +17203,6 @@
                "url": "https://github.com/inikulin/parse5?sponsor=1"
            }
        },
-        "node_modules/parse5-parser-stream": {
-            "version": "7.1.2",
-            "resolved": "https://registry.npmjs.org/parse5-parser-stream/-/parse5-parser-stream-7.1.2.tgz",
-            "integrity": "sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==",
-            "license": "MIT",
-            "dependencies": {
-                "parse5": "^7.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/inikulin/parse5?sponsor=1"
-            }
-        },
        "node_modules/parseurl": {
            "version": "1.3.3",
            "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@ -17592,26 +17554,6 @@
                "node": "^12 || >=14"
            }
        },
-        "node_modules/postcss-html/node_modules/htmlparser2": {
-            "version": "8.0.2",
-            "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
-            "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
-            "dev": true,
-            "funding": [
-                "https://github.com/fb55/htmlparser2?sponsor=1",
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/fb55"
-                }
-            ],
-            "license": "MIT",
-            "dependencies": {
-                "domelementtype": "^2.3.0",
-                "domhandler": "^5.0.3",
-                "domutils": "^3.0.1",
-                "entities": "^4.4.0"
-            }
-        },
        "node_modules/postcss-html/node_modules/js-tokens": {
            "version": "8.0.3",
            "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-8.0.3.tgz",
@ -21593,27 +21535,6 @@
                "node": ">=12"
            }
        },
-        "node_modules/whatwg-encoding": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
-            "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
-            "license": "MIT",
-            "dependencies": {
-                "iconv-lite": "0.6.3"
-            },
-            "engines": {
-                "node": ">=18"
-            }
-        },
-        "node_modules/whatwg-mimetype": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
-            "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=18"
-            }
-        },
        "node_modules/whatwg-url": {
            "version": "12.0.1",
            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "uptime-kuma",
-    "version": "1.23.14",
+    "version": "1.23.15",
    "license": "MIT",
    "repository": {
        "type": "git",
@ -42,7 +42,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.23.14 && npm ci --production && npm run download-dist",
+        "setup": "git checkout 1.23.15 && 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",
@ -89,7 +89,7 @@
        "cacheable-lookup": "~6.0.4",
        "chardet": "~1.4.0",
        "check-password-strength": "^2.0.5",
-        "cheerio": "~1.0.0-rc.12",
+        "cheerio": "1.0.0-rc.12",
        "chroma-js": "~2.4.2",
        "command-exists": "~1.2.9",
        "compare-versions": "~3.6.0",
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@ -774,12 +774,14 @@ class Monitor extends BeanModel {
                    let res = await axios.request(options);

                    if (res.data.State.Running) {
-                        if (res.data.State.Health && res.data.State.Health.Status !== "healthy") {
-                            bean.status = PENDING;
+                        if (res.data.State.Health) {
+                            // treat empty Status as healthy to support podman: https://github.com/louislam/uptime-kuma/issues/3767
+                            const containerIsHealthy = [ "", "healthy" ].includes(res.data.State.Health.Status);
+                            bean.status = containerIsHealthy ? UP : DOWN;
                            bean.msg = res.data.State.Health.Status;
                        } else {
-                            bean.status = UP;
-                            bean.msg = res.data.State.Health ? res.data.State.Health.Status : res.data.State.Status;
+                            bean.status = DOWN;
+                            bean.msg = res.data.State.Status;
                        }
                    } else {
                        throw Error("Container State is " + res.data.State.Status);
Author	SHA1	Message	Date
Vojtěch Fošnár	8e29f8052b	Merge `2ba9337342` into `32dc76a085`	2024-09-30 16:44:08 +00:00
Louis Lam	32dc76a085	Update to 1.23.15	2024-09-30 05:44:32 +08:00
Louis Lam	c6d6061a9f	Pin cheerio to avoid the breaking change of undici (#5142 )	2024-09-30 05:41:31 +08:00
Vojtěch Fošnár	2ba9337342	Apply suggestions for docker compose healthcheck Co-authored-by: Frank Elsinga <frank@elsinga.de>	2024-01-20 03:39:05 +08:00
Vojtěch Fošnár	0b0f081a13	treat the starting state of a docker container as DOWN	2024-01-20 03:39:05 +08:00
Vojtěch Fošnár	0b478404cf	make DOWN the default fallback for docker container healthcheck	2024-01-20 03:39:05 +08:00
Vojtěch Fošnár	7f5dfcc051	fix #3767 by @nougad - treat empty healthcheck reported by podman as up	2024-01-20 03:39:05 +08:00
Vojtěch Fošnár	d73684115a	fix #4369 - treat unhealthy docker container as down	2024-01-20 03:39:05 +08:00