Merge bbc6e3383c into 20820f5a5a

chore(deps): upgrade http/https/socks proxy agents (#5548 )
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-02-20 02:25:56 +00:00 · 2025-01-26 13:21:51 +00:00 · 2025-01-26 14:21:40 +01:00 · 2025-01-26 13:58:38 +01:00 · 2025-01-26 11:52:12 +01:00 · 2025-01-08 12:30:18 +01:00
8 changed files with 278 additions and 157 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
    "name": "uptime-kuma",
-    "version": "2.0.0-beta.0",
+    "version": "2.0.0-beta.1",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
        "": {
            "name": "uptime-kuma",
-            "version": "2.0.0-beta.0",
+            "version": "2.0.0-beta.1",
            "license": "MIT",
            "dependencies": {
                "@grpc/grpc-js": "~1.8.22",
@ -37,8 +37,8 @@
                "html-escaper": "^3.0.3",
                "http-cookie-agent": "~5.0.4",
                "http-graceful-shutdown": "~3.1.7",
-                "http-proxy-agent": "~5.0.0",
-                "https-proxy-agent": "~5.0.1",
+                "http-proxy-agent": "~7.0.2",
+                "https-proxy-agent": "~7.0.6",
                "iconv-lite": "~0.6.3",
                "isomorphic-ws": "^5.0.0",
                "jsesc": "~3.0.2",
@ -60,7 +60,7 @@
                "node-cloudflared-tunnel": "~1.0.9",
                "node-radius-client": "~1.0.0",
                "nodemailer": "~6.9.13",
-                "nostr-tools": "^1.13.1",
+                "nostr-tools": "^2.10.4",
                "notp": "~2.0.3",
                "openid-client": "^5.4.2",
                "password-hash": "~1.2.2",
@ -77,7 +77,7 @@
                "semver": "~7.5.4",
                "socket.io": "~4.8.0",
                "socket.io-client": "~4.8.0",
-                "socks-proxy-agent": "6.1.1",
+                "socks-proxy-agent": "~8.0.5",
                "tar": "~6.2.1",
                "tcp-ping": "~0.1.1",
                "thirty-two": "~1.0.2",
@ -1052,32 +1052,6 @@
                "node": ">=18.0.0"
            }
        },
-        "node_modules/@azure/core-rest-pipeline/node_modules/http-proxy-agent": {
-            "version": "7.0.2",
-            "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
-            "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
-            "license": "MIT",
-            "dependencies": {
-                "agent-base": "^7.1.0",
-                "debug": "^4.3.4"
-            },
-            "engines": {
-                "node": ">= 14"
-            }
-        },
-        "node_modules/@azure/core-rest-pipeline/node_modules/https-proxy-agent": {
-            "version": "7.0.6",
-            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
-            "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
-            "license": "MIT",
-            "dependencies": {
-                "agent-base": "^7.1.2",
-                "debug": "4"
-            },
-            "engines": {
-                "node": ">= 14"
-            }
-        },
        "node_modules/@azure/core-tracing": {
            "version": "1.2.0",
            "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.2.0.tgz",
@ -2827,6 +2801,29 @@
                "node-pre-gyp": "bin/node-pre-gyp"
            }
        },
+        "node_modules/@mapbox/node-pre-gyp/node_modules/agent-base": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+            "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+            "dependencies": {
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 6.0.0"
+            }
+        },
+        "node_modules/@mapbox/node-pre-gyp/node_modules/https-proxy-agent": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+            "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+            "dependencies": {
+                "agent-base": "6",
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
        "node_modules/@mongodb-js/saslprep": {
            "version": "1.1.9",
            "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.9.tgz",
@ -2838,9 +2835,9 @@
            }
        },
        "node_modules/@noble/ciphers": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/@noble/ciphers/-/ciphers-0.2.0.tgz",
-            "integrity": "sha512-6YBxJDAapHSdd3bLDv6x2wRPwq4QFMUaB3HvljNBUTThDd12eSm7/3F+2lnfzx2jvM+S6Nsy0jEt9QbPqSwqRw==",
+            "version": "0.5.3",
+            "resolved": "https://registry.npmjs.org/@noble/ciphers/-/ciphers-0.5.3.tgz",
+            "integrity": "sha512-B0+6IIHiqEs3BPMT0hcRmHvEj2QHOLu+uwt+tqDDeVd0oyVzh7BPrDcPjRnV1PV/5LaknXJJQvOuRGR0zQJz+w==",
            "license": "MIT",
            "funding": {
                "url": "https://paulmillr.com/funding/"
@ -4270,15 +4267,6 @@
                "testcontainers": "^10.16.0"
            }
        },
-        "node_modules/@tootallnate/once": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-            "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 10"
-            }
-        },
        "node_modules/@types/accepts": {
            "version": "1.3.7",
            "resolved": "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.7.tgz",
@ -10117,29 +10105,15 @@
            }
        },
        "node_modules/http-proxy-agent": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-            "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
-            "license": "MIT",
+            "version": "7.0.2",
+            "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+            "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
            "dependencies": {
-                "@tootallnate/once": "2",
-                "agent-base": "6",
-                "debug": "4"
+                "agent-base": "^7.1.0",
+                "debug": "^4.3.4"
            },
            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/http-proxy-agent/node_modules/agent-base": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-            "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-            "license": "MIT",
-            "dependencies": {
-                "debug": "4"
-            },
-            "engines": {
-                "node": ">= 6.0.0"
+                "node": ">= 14"
            }
        },
        "node_modules/http2-wrapper": {
@ -10156,28 +10130,15 @@
            }
        },
        "node_modules/https-proxy-agent": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-            "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-            "license": "MIT",
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+            "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
            "dependencies": {
-                "agent-base": "6",
+                "agent-base": "^7.1.2",
                "debug": "4"
            },
            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/https-proxy-agent/node_modules/agent-base": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-            "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-            "license": "MIT",
-            "dependencies": {
-                "debug": "4"
-            },
-            "engines": {
-                "node": ">= 6.0.0"
+                "node": ">= 14"
            }
        },
        "node_modules/human-signals": {
@ -11679,6 +11640,33 @@
                "node": ">= 6"
            }
        },
+        "node_modules/make-fetch-happen/node_modules/https-proxy-agent": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+            "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+            "optional": true,
+            "dependencies": {
+                "agent-base": "6",
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/make-fetch-happen/node_modules/socks-proxy-agent": {
+            "version": "6.2.1",
+            "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz",
+            "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==",
+            "optional": true,
+            "dependencies": {
+                "agent-base": "^6.0.2",
+                "debug": "^4.3.3",
+                "socks": "^2.6.2"
+            },
+            "engines": {
+                "node": ">= 10"
+            }
+        },
        "node_modules/map-obj": {
            "version": "4.3.0",
            "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
@ -12582,18 +12570,21 @@
            }
        },
        "node_modules/nostr-tools": {
-            "version": "1.17.0",
-            "resolved": "https://registry.npmjs.org/nostr-tools/-/nostr-tools-1.17.0.tgz",
-            "integrity": "sha512-LZmR8GEWKZeElbFV5Xte75dOeE9EFUW/QLI1Ncn3JKn0kFddDKEfBbFN8Mu4TMs+L4HR/WTPha2l+PPuRnJcMw==",
+            "version": "2.10.4",
+            "resolved": "https://registry.npmjs.org/nostr-tools/-/nostr-tools-2.10.4.tgz",
+            "integrity": "sha512-biU7sk+jxHgVASfobg2T5ttxOGGSt69wEVBC51sHHOEaKAAdzHBLV/I2l9Rf61UzClhliZwNouYhqIso4a3HYg==",
            "license": "Unlicense",
            "dependencies": {
-                "@noble/ciphers": "0.2.0",
-                "@noble/curves": "1.1.0",
+                "@noble/ciphers": "^0.5.1",
+                "@noble/curves": "1.2.0",
                "@noble/hashes": "1.3.1",
                "@scure/base": "1.1.1",
                "@scure/bip32": "1.3.1",
                "@scure/bip39": "1.2.1"
            },
+            "optionalDependencies": {
+                "nostr-wasm": "0.1.0"
+            },
            "peerDependencies": {
                "typescript": ">=5.0.0"
            },
@ -12603,6 +12594,37 @@
                }
            }
        },
+        "node_modules/nostr-tools/node_modules/@noble/curves": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.2.0.tgz",
+            "integrity": "sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw==",
+            "license": "MIT",
+            "dependencies": {
+                "@noble/hashes": "1.3.2"
+            },
+            "funding": {
+                "url": "https://paulmillr.com/funding/"
+            }
+        },
+        "node_modules/nostr-tools/node_modules/@noble/curves/node_modules/@noble/hashes": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.2.tgz",
+            "integrity": "sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 16"
+            },
+            "funding": {
+                "url": "https://paulmillr.com/funding/"
+            }
+        },
+        "node_modules/nostr-wasm": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/nostr-wasm/-/nostr-wasm-0.1.0.tgz",
+            "integrity": "sha512-78BTryCLcLYv96ONU8Ws3Q1JzjlAt+43pWQhIl86xZmWeegYCNLPml7yQ+gG3vR6V5h4XGj+TxO+SS5dsThQIA==",
+            "license": "MIT",
+            "optional": true
+        },
        "node_modules/notp": {
            "version": "2.0.3",
            "resolved": "https://registry.npmjs.org/notp/-/notp-2.0.3.tgz",
@ -15227,29 +15249,16 @@
            }
        },
        "node_modules/socks-proxy-agent": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz",
-            "integrity": "sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew==",
-            "license": "MIT",
+            "version": "8.0.5",
+            "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz",
+            "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==",
            "dependencies": {
-                "agent-base": "^6.0.2",
-                "debug": "^4.3.1",
-                "socks": "^2.6.1"
+                "agent-base": "^7.1.2",
+                "debug": "^4.3.4",
+                "socks": "^2.8.3"
            },
            "engines": {
-                "node": ">= 10"
-            }
-        },
-        "node_modules/socks-proxy-agent/node_modules/agent-base": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-            "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-            "license": "MIT",
-            "dependencies": {
-                "debug": "4"
-            },
-            "engines": {
-                "node": ">= 6.0.0"
+                "node": ">= 14"
            }
        },
        "node_modules/sortablejs": {
--- a/package.json
+++ b/package.json
@ -95,8 +95,8 @@
        "html-escaper": "^3.0.3",
        "http-cookie-agent": "~5.0.4",
        "http-graceful-shutdown": "~3.1.7",
-        "http-proxy-agent": "~5.0.0",
-        "https-proxy-agent": "~5.0.1",
+        "http-proxy-agent": "~7.0.2",
+        "https-proxy-agent": "~7.0.6",
        "iconv-lite": "~0.6.3",
        "isomorphic-ws": "^5.0.0",
        "jsesc": "~3.0.2",
@ -118,7 +118,7 @@
        "node-cloudflared-tunnel": "~1.0.9",
        "node-radius-client": "~1.0.0",
        "nodemailer": "~6.9.13",
-        "nostr-tools": "^1.13.1",
+        "nostr-tools": "^2.10.4",
        "notp": "~2.0.3",
        "openid-client": "^5.4.2",
        "password-hash": "~1.2.2",
@ -135,7 +135,7 @@
        "semver": "~7.5.4",
        "socket.io": "~4.8.0",
        "socket.io-client": "~4.8.0",
-        "socks-proxy-agent": "6.1.1",
+        "socks-proxy-agent": "~8.0.5",
        "tar": "~6.2.1",
        "tcp-ping": "~0.1.1",
        "thirty-two": "~1.0.2",
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@ -980,7 +980,15 @@ class Monitor extends BeanModel {
            await R.store(bean);

            log.debug("monitor", `[${this.name}] prometheus.update`);
-            this.prometheus?.update(bean, tlsInfo);
+            let uptimeMetrics = {};
+            let data24h = await uptimeCalculator.get24Hour();
+            let data30d = await uptimeCalculator.get30Day();
+            let data1y = await uptimeCalculator.get1Year();
+            uptimeMetrics.avgPing = data24h.avgPing ? Number(data24h.avgPing.toFixed(2)) : null;
+            uptimeMetrics.data24h = data24h.uptime;
+            uptimeMetrics.data30d = data30d.uptime;
+            uptimeMetrics.data1y = data1y.uptime;
+            this.prometheus?.update(bean, tlsInfo, uptimeMetrics);

            previousBeat = bean;

@ -1730,7 +1738,7 @@ class Monitor extends BeanModel {
     */
    async handleTlsInfo(tlsInfo) {
        await this.updateTlsInfo(tlsInfo);
-        this.prometheus?.update(null, tlsInfo);
+        this.prometheus?.update(null, tlsInfo, null);

        if (!this.getIgnoreTls() && this.isEnabledExpiryNotification()) {
            log.debug("monitor", `[${this.name}] call checkCertExpiryNotifications`);
--- a/server/notification-providers/nostr.js
+++ b/server/notification-providers/nostr.js
@ -1,11 +1,10 @@
 const NotificationProvider = require("./notification-provider");
 const {
-    relayInit,
-    getPublicKey,
-    getEventHash,
-    getSignature,
+    finalizeEvent,
+    Relay,
+    kinds,
    nip04,
-    nip19
+    nip19,
 } = require("nostr-tools");

 // polyfills for node versions
@ -31,7 +30,6 @@ class Nostr extends NotificationProvider {
        const createdAt = Math.floor(Date.now() / 1000);

        const senderPrivateKey = await this.getPrivateKey(notification.sender);
-        const senderPublicKey = getPublicKey(senderPrivateKey);
        const recipientsPublicKeys = await this.getPublicKeys(notification.recipients);

        // Create NIP-04 encrypted direct message event for each recipient
@ -39,34 +37,41 @@ class Nostr extends NotificationProvider {
        for (const recipientPublicKey of recipientsPublicKeys) {
            const ciphertext = await nip04.encrypt(senderPrivateKey, recipientPublicKey, msg);
            let event = {
-                kind: 4,
-                pubkey: senderPublicKey,
+                kind: kinds.EncryptedDirectMessage,
                created_at: createdAt,
                tags: [[ "p", recipientPublicKey ]],
                content: ciphertext,
            };
-            event.id = getEventHash(event);
-            event.sig = getSignature(event, senderPrivateKey);
-            events.push(event);
+            const signedEvent = finalizeEvent(event, senderPrivateKey);
+            events.push(signedEvent);
        }

        // Publish events to each relay
        const relays = notification.relays.split("\n");
        let successfulRelays = 0;
-
-        // Connect to each relay
        for (const relayUrl of relays) {
-            const relay = relayInit(relayUrl);
-            try {
-                await relay.connect();
-                successfulRelays++;
+            const relay = await Relay.connect(relayUrl);
+            let eventIndex = 0;

-                // Publish events
-                for (const event of events) {
-                    relay.publish(event);
-                }
+            // Authenticate to the relay, if required
+            try {
+                await relay.publish(events[0]);
+                eventIndex = 1;
            } catch (error) {
-                continue;
+                if (relay.challenge) {
+                    await relay.auth(async (evt) => {
+                        return finalizeEvent(evt, senderPrivateKey);
+                    });
+                }
+            }
+
+            try {
+                for (let i = eventIndex; i < events.length; i++) {
+                    await relay.publish(events[i]);
+                }
+                successfulRelays++;
+            } catch (error) {
+                console.error(`Failed to publish event to ${relayUrl}:`, error);
            } finally {
                relay.close();
            }
@ -90,7 +95,7 @@ class Nostr extends NotificationProvider {
            const { data } = senderDecodeResult;
            return data;
        } catch (error) {
-            throw new Error(`Failed to get private key: ${error.message}`);
+            throw new Error(`Failed to decode private key for sender ${sender}: ${error.message}`);
        }
    }

@ -109,10 +114,10 @@ class Nostr extends NotificationProvider {
                if (type === "npub") {
                    publicKeys.push(data);
                } else {
-                    throw new Error("not an npub");
+                    throw new Error(`Recipient ${recipient} is not an npub`);
                }
            } catch (error) {
-                throw new Error(`Error decoding recipient: ${error}`);
+                throw new Error(`Error decoding recipient ${recipient}: ${error}`);
            }
        }
        return publicKeys;
--- a/server/notification-providers/pushdeer.js
+++ b/server/notification-providers/pushdeer.js
@ -11,7 +11,8 @@ class PushDeer extends NotificationProvider {
    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
        const okMsg = "Sent Successfully.";
        const serverUrl = notification.pushdeerServer || "https://api2.pushdeer.com";
-        const url = `${serverUrl.trim().replace(/\/*$/, "")}/message/push`;
+        // capture group below is nessesary to prevent an ReDOS-attack
+        const url = `${serverUrl.trim().replace(/([^/])\/+$/, "$1")}/message/push`;

        let valid = msg != null && monitorJSON != null && heartbeatJSON != null;

--- a/server/notification-providers/whapi.js
+++ b/server/notification-providers/whapi.js
@ -24,7 +24,7 @@ class Whapi extends NotificationProvider {
                "body": msg,
            };

-            let url = (notification.whapiApiUrl || "https://gate.whapi.cloud/").replace(/\/+$/, "") + "/messages/text";
+            let url = (notification.whapiApiUrl || "https://gate.whapi.cloud/").replace(/([^/])\/+$/, "$1") + "/messages/text";

            await axios.post(url, data, config);

--- a/server/prometheus.js
+++ b/server/prometheus.js
@ -20,6 +20,31 @@ const monitorCertIsValid = new PrometheusClient.Gauge({
    help: "Is the certificate still valid? (1 = Yes, 0= No)",
    labelNames: commonLabels
 });
+
+const monitorUptime1y = new PrometheusClient.Gauge({
+    name: "monitor_uptime_1y",
+    help: "Monitor Uptime 1y (%)",
+    labelNames: commonLabels,
+});
+
+const monitorUptime30d = new PrometheusClient.Gauge({
+    name: "monitor_uptime_30d",
+    help: "Monitor Uptime 30d (%)",
+    labelNames: commonLabels,
+});
+
+const monitorUptime24h = new PrometheusClient.Gauge({
+    name: "monitor_uptime_24h",
+    help: "Monitor Uptime 24h (%)",
+    labelNames: commonLabels,
+});
+
+const monitorAverageResponseTime = new PrometheusClient.Gauge({
+    name: "monitor_average_response_time",
+    help: "Monitor Average Response Time (ms)",
+    labelNames: commonLabels,
+});
+
 const monitorResponseTime = new PrometheusClient.Gauge({
    name: "monitor_response_time",
    help: "Monitor Response Time (ms)",
@ -54,7 +79,7 @@ class Prometheus {
     * @param {object} tlsInfo TLS details
     * @returns {void}
     */
-    update(heartbeat, tlsInfo) {
+    update(heartbeat, tlsInfo, uptime) {

        if (typeof tlsInfo !== "undefined") {
            try {
@ -80,6 +105,76 @@ class Prometheus {
            }
        }

+        if (uptime) {
+            if (typeof uptime.avgPing !== "undefined") {
+                try {
+                    if (typeof uptime.avgPing === "number") {
+                        monitorAverageResponseTime.set(
+                            this.monitorLabelValues,
+                            uptime.avgPing
+                        );
+                    } else {
+                        // Is it good?
+                        monitorAverageResponseTime.set(
+                            this.monitorLabelValues,
+                            -1
+                        );
+                    }
+                } catch (e) {
+                    log.error("prometheus", "Caught error");
+                    log.error("prometheus", e);
+                }
+            }
+            if (typeof uptime.data24h !== "undefined") {
+                try {
+                    if (typeof uptime.data24h === "number") {
+                        monitorUptime24h.set(
+                            this.monitorLabelValues,
+                            uptime.data24h
+                        );
+                    } else {
+                        // Is it good?
+                        monitorUptime24h.set(this.monitorLabelValues, -1);
+                    }
+                } catch (e) {
+                    log.error("prometheus", "Caught error");
+                    log.error("prometheus", e);
+                }
+            }
+            if (typeof uptime.data30d !== "undefined") {
+                try {
+                    if (typeof uptime.data30d === "number") {
+                        monitorUptime30d.set(
+                            this.monitorLabelValues,
+                            uptime.data30d
+                        );
+                    } else {
+                        // Is it good?
+                        monitorUptime30d.set(this.monitorLabelValues, -1);
+                    }
+                } catch (e) {
+                    log.error("prometheus", "Caught error");
+                    log.error("prometheus", e);
+                }
+            }
+            if (typeof uptime.data1y !== "undefined") {
+                try {
+                    if (typeof uptime.data1y === "number") {
+                        monitorUptime1y.set(
+                            this.monitorLabelValues,
+                            uptime.data1y
+                        );
+                    } else {
+                        // Is it good?
+                        monitorUptime1y.set(this.monitorLabelValues, -1);
+                    }
+                } catch (e) {
+                    log.error("prometheus", "Caught error");
+                    log.error("prometheus", e);
+                }
+            }
+        }
+
        if (heartbeat) {
            try {
                monitorStatus.set(this.monitorLabelValues, heartbeat.status);
@ -110,6 +205,10 @@ class Prometheus {
        try {
            monitorCertDaysRemaining.remove(this.monitorLabelValues);
            monitorCertIsValid.remove(this.monitorLabelValues);
+            monitorUptime1y.remove(this.monitorLabelValues);
+            monitorUptime30d.remove(this.monitorLabelValues);
+            monitorUptime24h.remove(this.monitorLabelValues);
+            monitorAverageResponseTime.remove(this.monitorLabelValues);
            monitorResponseTime.remove(this.monitorLabelValues);
            monitorStatus.remove(this.monitorLabelValues);
        } catch (e) {
--- a/server/proxy.js
+++ b/server/proxy.js
@ -1,7 +1,7 @@
 const { R } = require("redbean-node");
-const HttpProxyAgent = require("http-proxy-agent");
-const HttpsProxyAgent = require("https-proxy-agent");
-const SocksProxyAgent = require("socks-proxy-agent");
+const { HttpProxyAgent } = require("http-proxy-agent");
+const { HttpsProxyAgent } = require("https-proxy-agent");
+const { SocksProxyAgent } = require("socks-proxy-agent");
 const { debug } = require("../src/util");
 const { UptimeKumaServer } = require("./uptime-kuma-server");
 const { CookieJar } = require("tough-cookie");
@ -100,17 +100,17 @@ class Proxy {
        let jar = new CookieJar();

        const proxyOptions = {
-            protocol: proxy.protocol,
-            host: proxy.host,
-            port: proxy.port,
            cookies: { jar },
        };

+        const proxyUrl = new URL(`${proxy.protocol}://${proxy.host}:${proxy.port}`);
+
        if (proxy.auth) {
-            proxyOptions.auth = `${proxy.username}:${proxy.password}`;
+            proxyUrl.username = proxy.username;
+            proxyUrl.password = proxy.password;
        }

-        debug(`Proxy Options: ${JSON.stringify(proxyOptions)}`);
+        debug(`Proxy URL: ${proxyUrl.toString()}`);
        debug(`HTTP Agent Options: ${JSON.stringify(httpAgentOptions)}`);
        debug(`HTTPS Agent Options: ${JSON.stringify(httpsAgentOptions)}`);

@ -122,15 +122,15 @@ class Proxy {
                // eslint-disable-next-line no-case-declarations
                const HttpsCookieProxyAgent = createCookieAgent(HttpsProxyAgent);

-                httpAgent = new HttpCookieProxyAgent({
-                    ...httpAgentOptions || {},
+                httpAgent = new HttpCookieProxyAgent(proxyUrl.toString(), {
+                    ...(httpAgentOptions || {}),
+                    ...proxyOptions,
+                });
+                httpsAgent = new HttpsCookieProxyAgent(proxyUrl.toString(), {
+                    ...(httpsAgentOptions || {}),
                    ...proxyOptions,
                });

-                httpsAgent = new HttpsCookieProxyAgent({
-                    ...httpsAgentOptions || {},
-                    ...proxyOptions,
-                });
                break;
            case "socks":
            case "socks5":
@ -138,10 +138,9 @@ class Proxy {
            case "socks4":
                // eslint-disable-next-line no-case-declarations
                const SocksCookieProxyAgent = createCookieAgent(SocksProxyAgent);
-                agent = new SocksCookieProxyAgent({
+                agent = new SocksCookieProxyAgent(proxyUrl.toString(), {
                    ...httpAgentOptions,
                    ...httpsAgentOptions,
-                    ...proxyOptions,
                    tls: {
                        rejectUnauthorized: httpsAgentOptions.rejectUnauthorized,
                    },
Author	SHA1	Message	Date
François HONORE	f378adc258	Merge `bbc6e3383c` into `20820f5a5a`	2025-01-26 13:21:51 +00:00
Boro Vukovic	20820f5a5a	chore(deps): upgrade http/https/socks proxy agents (#5548 ) Some checks failed Auto Test / check-linters (push) Has been cancelled Details Auto Test / e2e-test (push) Has been cancelled Details Auto Test / armv7-simple-test (18, ARMv7) (push) Has been cancelled Details Auto Test / armv7-simple-test (20, ARMv7) (push) Has been cancelled Details CodeQL / Analyze (push) Has been cancelled Details Merge Conflict Labeler / Labeling (push) Has been cancelled Details validate / json-yaml-validate (push) Has been cancelled Details validate / validate (push) Has been cancelled Details Auto Test / auto-test (18, ARM64) (push) Has been cancelled Details Auto Test / auto-test (18, macos-latest) (push) Has been cancelled Details Auto Test / auto-test (18, ubuntu-latest) (push) Has been cancelled Details Auto Test / auto-test (18, windows-latest) (push) Has been cancelled Details Auto Test / auto-test (20, ARM64) (push) Has been cancelled Details Auto Test / auto-test (20, macos-latest) (push) Has been cancelled Details Auto Test / auto-test (20, ubuntu-latest) (push) Has been cancelled Details Auto Test / auto-test (20, windows-latest) (push) Has been cancelled Details Co-authored-by: Frank Elsinga <frank@elsinga.de>	2025-01-26 14:21:40 +01:00
zappityzap	66908c7055	chore(deps): update nostr notification provider (#5495 ) Co-authored-by: zappityzap <zappityzap@proton.me> Co-authored-by: Frank Elsinga <frank@elsinga.de>	2025-01-26 13:58:38 +01:00
DayShift	7a9191761d	fix: make sure that stripping backslashes for notification urls cannot cause catastophic backtracking (ReDOS) (#5573 ) Co-authored-by: Frank Elsinga <frank@elsinga.de>	2025-01-26 11:52:12 +01:00
François HONORE	bbc6e3383c	add 4 uptime metrics in prometheus	2025-01-08 12:30:18 +01:00