From 954e05b72f3c565957e88237270de176c4a219ca Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Sat, 18 Nov 2023 11:33:34 +0800 Subject: [PATCH 1/2] Fix #4051 --- package.json | 3 ++- server/model/monitor.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index f55d12a88d..59797ad872 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,8 @@ "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" + "sort-contributors": "node extra/sort-contributors.js", + "start-server-node14-win": "private\\node14\\node.exe server/server.js" }, "dependencies": { "@grpc/grpc-js": "~1.7.3", diff --git a/server/model/monitor.js b/server/model/monitor.js index 194980a123..f7cbff3035 100644 --- a/server/model/monitor.js +++ b/server/model/monitor.js @@ -22,6 +22,7 @@ const { UptimeCacheList } = require("../uptime-cache-list"); const Gamedig = require("gamedig"); const jsonata = require("jsonata"); const jwt = require("jsonwebtoken"); +const crypto = require("crypto"); const rootCertificates = rootCertificatesFingerprints(); From c1aaad0d8554253fcc3ba15a1c41c7469dc7424f Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Sat, 18 Nov 2023 11:37:14 +0800 Subject: [PATCH 2/2] Update to 1.23.6 --- package-lock.json | 4 ++-- package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index c25c4de75a..81bfcf76fe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "uptime-kuma", - "version": "1.23.5", + "version": "1.23.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "uptime-kuma", - "version": "1.23.5", + "version": "1.23.6", "license": "MIT", "dependencies": { "@grpc/grpc-js": "~1.7.3", diff --git a/package.json b/package.json index 59797ad872..b6c7c22d35 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uptime-kuma", - "version": "1.23.5", + "version": "1.23.6", "license": "MIT", "repository": { "type": "git", @@ -40,7 +40,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.5 && npm ci --production && npm run download-dist", + "setup": "git checkout 1.23.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",