mirror of
https://github.com/louislam/uptime-kuma.git
synced 2024-11-25 02:46:05 +03:00
Merge branch 'louislam:master' into master
This commit is contained in:
Vasilis The Pikachu
GitHub
commit
91f9e10c94
54 changed files with 612 additions and 1978 deletions
|
|
@ -27,7 +27,7 @@ The frontend code build into "dist" directory. The server (express.js) exposes t
|
|||
|
||||
## Can I create a pull request for Uptime Kuma?
|
||||
|
||||
Yes or no, it depends on what you will try to do. Since I don't want to waste your time, be sure to **create empty draft pull request or open an issue, so we can discuss first**. Especially for a large pull request or you don't know it will be merged or not.
|
||||
Yes or no, it depends on what you will try to do. Since I don't want to waste your time, be sure to **create an empty draft pull request or open an issue, so we can discuss first**. Especially for a large pull request or you don't know it will be merged or not.
|
||||
|
||||
Here are some references:
|
||||
|
||||
|
|
@ -48,7 +48,7 @@ Here are some references:
|
|||
- UI/UX is not close to Uptime Kuma
|
||||
- Existing logic is completely modified or deleted for no reason
|
||||
- A function that is completely out of scope
|
||||
- Unnesscary large code changes (Hard to review, casuse code conflicts to other pull requests)
|
||||
- Unnecessary large code changes (Hard to review, causes code conflicts to other pull requests)
|
||||
|
||||
I will mark your pull request in the [milestones](https://github.com/louislam/uptime-kuma/milestones), if I am plan to review and merge it.
|
||||
|
||||
|
|
@ -183,7 +183,7 @@ By default, the Chromium window will be shown up during the test. Specifying `HE
|
|||
|
||||
## Dependencies
|
||||
|
||||
Both frontend and backend share the same package.json. However, the frontend dependencies are eventually not be used in production environment, because it is usually also baked into dist files. So:
|
||||
Both frontend and backend share the same package.json. However, the frontend dependencies are eventually not used in the production environment, because it is usually also baked into dist files. So:
|
||||
|
||||
- Frontend dependencies = "devDependencies"
|
||||
- Examples: vue, chart.js
|
||||
|
|
|
|||
|
|
@ -15,11 +15,10 @@ It is a self-hosted monitoring tool like "Uptime Robot".
|
|||
|
||||
Try it!
|
||||
|
||||
https://demo.uptime.kuma.pet
|
||||
- Tokyo Demo Server: https://demo.uptime.kuma.pet (Sponsored by [Uptime Kuma Sponsors](https://github.com/louislam/uptime-kuma#%EF%B8%8F-sponsors))
|
||||
- Europe Demo Server: https://demo.uptime-kuma.karimi.dev:27000 (Provided by [@mhkarimi1383](https://github.com/mhkarimi1383))
|
||||
|
||||
It is a temporary live demo, all data will be deleted after 10 minutes. The server is located in Tokyo, so if you live far from there, it may affect your experience. I suggest that you should install and try it out for the best demo experience.
|
||||
|
||||
VPS is sponsored by Uptime Kuma sponsors on [Open Collective](https://opencollective.com/uptime-kuma)! Thank you so much!
|
||||
It is a temporary live demo, all data will be deleted after 10 minutes. Use the one that is closer to you, but I suggest that you should install and try it out for the best demo experience.
|
||||
|
||||
## ⭐ Features
|
||||
|
||||
|
|
|
|||
28
config/cypress.config.js
Normal file
28
config/cypress.config.js
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
const { defineConfig } = require("cypress");
|
||||
|
||||
module.exports = defineConfig({
|
||||
projectId: "vyjuem",
|
||||
e2e: {
|
||||
experimentalStudio: true,
|
||||
setupNodeEvents(on, config) {
|
||||
|
||||
},
|
||||
fixturesFolder: "test/cypress/fixtures",
|
||||
screenshotsFolder: "test/cypress/screenshots",
|
||||
videosFolder: "test/cypress/videos",
|
||||
downloadsFolder: "test/cypress/downloads",
|
||||
supportFile: "test/cypress/support/e2e.js",
|
||||
baseUrl: "http://localhost:3002",
|
||||
defaultCommandTimeout: 10000,
|
||||
pageLoadTimeout: 60000,
|
||||
viewportWidth: 1920,
|
||||
viewportHeight: 1080,
|
||||
specPattern: [
|
||||
"test/cypress/e2e/setup.cy.js",
|
||||
"test/cypress/e2e/**/*.js"
|
||||
],
|
||||
},
|
||||
env: {
|
||||
baseUrl: "http://localhost:3002",
|
||||
},
|
||||
});
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
const PuppeteerEnvironment = require("jest-environment-puppeteer");
|
||||
const util = require("util");
|
||||
|
||||
class DebugEnv extends PuppeteerEnvironment {
|
||||
async handleTestEvent(event, state) {
|
||||
const ignoredEvents = [
|
||||
"setup",
|
||||
"add_hook",
|
||||
"start_describe_definition",
|
||||
"add_test",
|
||||
"finish_describe_definition",
|
||||
"run_start",
|
||||
"run_describe_start",
|
||||
"test_start",
|
||||
"hook_start",
|
||||
"hook_success",
|
||||
"test_fn_start",
|
||||
"test_fn_success",
|
||||
"test_done",
|
||||
"run_describe_finish",
|
||||
"run_finish",
|
||||
"teardown",
|
||||
"test_fn_failure",
|
||||
];
|
||||
if (!ignoredEvents.includes(event.name)) {
|
||||
console.log(
|
||||
new Date().toString() + ` Unhandled event [${event.name}] ` + util.inspect(event)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = DebugEnv;
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
module.exports = {
|
||||
"rootDir": "..",
|
||||
"testRegex": "./test/frontend.spec.js",
|
||||
};
|
||||
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
module.exports = {
|
||||
"launch": {
|
||||
"dumpio": true,
|
||||
"slowMo": 500,
|
||||
"headless": process.env.HEADLESS_TEST || false,
|
||||
"userDataDir": "./data/test-chrome-profile",
|
||||
args: [
|
||||
"--disable-setuid-sandbox",
|
||||
"--disable-gpu",
|
||||
"--disable-dev-shm-usage",
|
||||
"--no-default-browser-check",
|
||||
"--no-experiments",
|
||||
"--no-first-run",
|
||||
"--no-pings",
|
||||
"--no-sandbox",
|
||||
"--no-zygote",
|
||||
"--single-process",
|
||||
],
|
||||
}
|
||||
};
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
module.exports = {
|
||||
"verbose": true,
|
||||
"preset": "jest-puppeteer",
|
||||
"globals": {
|
||||
"__DEV__": true
|
||||
},
|
||||
"testRegex": "./test/e2e.spec.js",
|
||||
"testEnvironment": "./config/jest-debug-env.js",
|
||||
"rootDir": "..",
|
||||
"testTimeout": 30000,
|
||||
};
|
||||
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
import { defineConfig } from "cypress";
|
||||
|
||||
export default defineConfig({
|
||||
e2e: {
|
||||
baseUrl: "http://localhost:3002",
|
||||
defaultCommandTimeout: 10000,
|
||||
pageLoadTimeout: 60000,
|
||||
viewportWidth: 1920,
|
||||
viewportHeight: 1080,
|
||||
specPattern: ["cypress/e2e/setup.cy.ts", "cypress/e2e/**/*.ts"],
|
||||
},
|
||||
env: {
|
||||
baseUrl: "http://localhost:3002",
|
||||
},
|
||||
});
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
import { actor } from "../support/actors/actor";
|
||||
import { DEFAULT_USER_DATA } from "../support/const/user-data";
|
||||
import { DashboardPage } from "../support/pages/dasboard-page";
|
||||
import { SetupPage } from "../support/pages/setup-page";
|
||||
|
||||
describe("user can create a new account on setup page", () => {
|
||||
before(() => {
|
||||
cy.visit("/setup");
|
||||
});
|
||||
|
||||
it("user can create new account", () => {
|
||||
cy.url().should("be.equal", SetupPage.url);
|
||||
actor.setupTask.fillAndSubmitSetupForm(
|
||||
DEFAULT_USER_DATA.username,
|
||||
DEFAULT_USER_DATA.password,
|
||||
DEFAULT_USER_DATA.password
|
||||
);
|
||||
|
||||
cy.url().should("be.equal", DashboardPage.url);
|
||||
cy.get('[role="alert"]')
|
||||
.should("be.visible")
|
||||
.and("contain.text", "Added Successfully.");
|
||||
});
|
||||
});
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
import { SetupTask } from "../tasks/setup-task";
|
||||
|
||||
class Actor {
|
||||
setupTask: SetupTask = new SetupTask();
|
||||
}
|
||||
|
||||
const actor = new Actor();
|
||||
export { actor };
|
||||
|
|
@ -1 +0,0 @@
|
|||
import "./commands";
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
import { SetupPage } from "../pages/setup-page";
|
||||
|
||||
export class SetupTask {
|
||||
fillAndSubmitSetupForm(
|
||||
username: string,
|
||||
password: string,
|
||||
passwordRepeat: string
|
||||
) {
|
||||
cy.get(SetupPage.usernameInput).type(username);
|
||||
cy.get(SetupPage.passWordInput).type(password);
|
||||
cy.get(SetupPage.passwordRepeatInput).type(passwordRepeat);
|
||||
|
||||
cy.get(SetupPage.submitSetupForm).click();
|
||||
}
|
||||
}
|
||||
1404
package-lock.json
generated
1404
package-lock.json
generated
File diff suppressed because it is too large
Load diff
16
package.json
16
package.json
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "uptime-kuma",
|
||||
"version": "1.18.0",
|
||||
"version": "1.18.3",
|
||||
"license": "MIT",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
|
@ -23,11 +23,9 @@
|
|||
"start-server": "node server/server.js",
|
||||
"start-server-dev": "cross-env NODE_ENV=development node server/server.js",
|
||||
"build": "vite build --config ./config/vite.config.js",
|
||||
"test": "node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/ --test",
|
||||
"test": "node test/prepare-test-server.js && npm run jest-backend",
|
||||
"test-with-build": "npm run build && npm test",
|
||||
"jest": "node test/prepare-jest.js && npm run jest-frontend && npm run jest-backend",
|
||||
"jest-frontend": "cross-env TEST_FRONTEND=1 jest --config=./config/jest-frontend.config.js",
|
||||
"jest-backend": "cross-env TEST_BACKEND=1 jest --config=./config/jest-backend.config.js",
|
||||
"jest-backend": "cross-env TEST_BACKEND=1 jest --runInBand --detectOpenHandles --forceExit --config=./config/jest-backend.config.js",
|
||||
"tsc": "tsc",
|
||||
"vite-preview-dist": "vite preview --host --config ./config/vite.config.js",
|
||||
"build-docker": "npm run build && npm run build-docker-debian && npm run build-docker-alpine",
|
||||
|
|
@ -40,7 +38,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.18.0 && npm ci --production && npm run download-dist",
|
||||
"setup": "git checkout 1.18.3 && 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",
|
||||
|
|
@ -62,7 +60,8 @@
|
|||
"build-dist-and-restart": "npm run build && npm run start-server-dev",
|
||||
"start-pr-test": "node extra/checkout-pr.js && npm install && npm run dev",
|
||||
"cy:test": "node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/ --e2e",
|
||||
"cy:run": "npx cypress run --browser chrome --headless"
|
||||
"cy:run": "npx cypress run --browser chrome --headless --config-file ./config/cypress.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\""
|
||||
},
|
||||
"dependencies": {
|
||||
"@louislam/sqlite3": "~15.0.6",
|
||||
|
|
@ -89,6 +88,7 @@
|
|||
"http-proxy-agent": "^5.0.0",
|
||||
"https-proxy-agent": "^5.0.0",
|
||||
"iconv-lite": "^0.6.3",
|
||||
"jsesc": "^3.0.2",
|
||||
"jsonwebtoken": "~8.5.1",
|
||||
"jwt-decode": "^3.1.2",
|
||||
"limiter": "^2.1.0",
|
||||
|
|
@ -139,12 +139,10 @@
|
|||
"eslint-plugin-vue": "~8.7.1",
|
||||
"favico.js": "^0.3.10",
|
||||
"jest": "~27.2.5",
|
||||
"jest-puppeteer": "~6.0.3",
|
||||
"postcss-html": "~1.5.0",
|
||||
"postcss-rtlcss": "~3.7.2",
|
||||
"postcss-scss": "~4.0.4",
|
||||
"prismjs": "^1.27.0",
|
||||
"puppeteer": "~13.1.3",
|
||||
"qrcode": "~1.5.0",
|
||||
"rollup-plugin-visualizer": "^5.6.0",
|
||||
"sass": "~1.42.1",
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ class DockerHost {
|
|||
if (dockerHost.dockerType === "socket") {
|
||||
options.socketPath = dockerHost.dockerDaemon;
|
||||
} else if (dockerHost.dockerType === "tcp") {
|
||||
options.baseURL = dockerHost.dockerDaemon;
|
||||
options.baseURL = DockerHost.patchDockerURL(dockerHost.dockerDaemon);
|
||||
}
|
||||
|
||||
let res = await axios.request(options);
|
||||
|
|
@ -99,6 +99,18 @@ class DockerHost {
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Since axios 0.27.X, it does not accept `tcp://` protocol.
|
||||
* Change it to `http://` on the fly in order to fix it. (https://github.com/louislam/uptime-kuma/issues/2165)
|
||||
*/
|
||||
static patchDockerURL(url) {
|
||||
if (typeof url === "string") {
|
||||
// Replace the first occurrence only with g
|
||||
return url.replace(/tcp:\/\//g, "http://");
|
||||
}
|
||||
return url;
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ const version = require("../../package.json").version;
|
|||
const apicache = require("../modules/apicache");
|
||||
const { UptimeKumaServer } = require("../uptime-kuma-server");
|
||||
const { CacheableDnsHttpAgent } = require("../cacheable-dns-http-agent");
|
||||
const { DockerHost } = require("../docker");
|
||||
|
||||
/**
|
||||
* status:
|
||||
|
|
@ -498,7 +499,7 @@ class Monitor extends BeanModel {
|
|||
if (dockerHost._dockerType === "socket") {
|
||||
options.socketPath = dockerHost._dockerDaemon;
|
||||
} else if (dockerHost._dockerType === "tcp") {
|
||||
options.baseURL = dockerHost._dockerDaemon;
|
||||
options.baseURL = DockerHost.patchDockerURL(dockerHost._dockerDaemon);
|
||||
}
|
||||
|
||||
log.debug(`[${this.name}] Axios Request`);
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ const { BeanModel } = require("redbean-node/dist/bean-model");
|
|||
const { R } = require("redbean-node");
|
||||
const cheerio = require("cheerio");
|
||||
const { UptimeKumaServer } = require("../uptime-kuma-server");
|
||||
const jsesc = require("jsesc");
|
||||
|
||||
class StatusPage extends BeanModel {
|
||||
|
||||
|
|
@ -56,13 +57,19 @@ class StatusPage extends BeanModel {
|
|||
head.append(`<meta property="og:description" content="${description155}" />`);
|
||||
|
||||
// Preload data
|
||||
const json = JSON.stringify(await StatusPage.getStatusPageData(statusPage));
|
||||
head.append(`
|
||||
<script>
|
||||
window.preloadData = ${json}
|
||||
// Add jsesc, fix https://github.com/louislam/uptime-kuma/issues/2186
|
||||
const escapedJSONObject = jsesc(JSON.stringify(await StatusPage.getStatusPageData(statusPage)), {
|
||||
"isScriptContext": true
|
||||
});
|
||||
|
||||
const script = $(`
|
||||
<script id="preload-data" data-json="{}">
|
||||
window.preloadData = ${escapedJSONObject};
|
||||
</script>
|
||||
`);
|
||||
|
||||
head.append(script);
|
||||
|
||||
// manifest.json
|
||||
$("link[rel=manifest]").attr("href", `/api/status-page/${statusPage.slug}/manifest.json`);
|
||||
|
||||
|
|
|
|||
24
server/notification-providers/freemobile.js
Normal file
24
server/notification-providers/freemobile.js
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
const NotificationProvider = require("./notification-provider");
|
||||
const axios = require("axios");
|
||||
|
||||
class FreeMobile extends NotificationProvider {
|
||||
|
||||
name = "FreeMobile";
|
||||
|
||||
async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
|
||||
let okMsg = "Sent Successfully.";
|
||||
try {
|
||||
await axios.post(`https://smsapi.free-mobile.fr/sendmsg?msg=${encodeURIComponent(msg.replace("🔴", "⛔️"))}`, {
|
||||
"user": notification.freemobileUser,
|
||||
"pass": notification.freemobilePass,
|
||||
});
|
||||
|
||||
return okMsg;
|
||||
|
||||
} catch (error) {
|
||||
this.throwGeneralAxiosError(error);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = FreeMobile;
|
||||
|
|
@ -8,12 +8,19 @@ class Ntfy extends NotificationProvider {
|
|||
async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
|
||||
let okMsg = "Sent Successfully.";
|
||||
try {
|
||||
await axios.post(`${notification.ntfyserverurl}`, {
|
||||
let headers = {};
|
||||
if (notification.ntfyusername) {
|
||||
headers = {
|
||||
"Authorization": "Basic " + Buffer.from(notification.ntfyusername + ":" + notification.ntfypassword).toString("base64"),
|
||||
};
|
||||
}
|
||||
let data = {
|
||||
"topic": notification.ntfytopic,
|
||||
"message": msg,
|
||||
"priority": notification.ntfyPriority || 4,
|
||||
"title": "Uptime-Kuma",
|
||||
});
|
||||
};
|
||||
await axios.post(`${notification.ntfyserverurl}`, data, { headers: headers });
|
||||
|
||||
return okMsg;
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ class Octopush extends NotificationProvider {
|
|||
|
||||
try {
|
||||
// Default - V2
|
||||
if (notification.octopushVersion === 2 || !notification.octopushVersion) {
|
||||
if (notification.octopushVersion === "2" || !notification.octopushVersion) {
|
||||
let config = {
|
||||
headers: {
|
||||
"api-key": notification.octopushAPIKey,
|
||||
|
|
@ -31,7 +31,7 @@ class Octopush extends NotificationProvider {
|
|||
"sender": notification.octopushSenderName
|
||||
};
|
||||
await axios.post("https://api.octopush.com/v1/public/sms-campaign/send", data, config);
|
||||
} else if (notification.octopushVersion === 1) {
|
||||
} else if (notification.octopushVersion === "1") {
|
||||
let data = {
|
||||
"user_login": notification.octopushDMLogin,
|
||||
"api_key": notification.octopushDMAPIKey,
|
||||
|
|
@ -49,7 +49,15 @@ class Octopush extends NotificationProvider {
|
|||
},
|
||||
params: data
|
||||
};
|
||||
await axios.post("https://www.octopush-dm.com/api/sms/json", {}, config);
|
||||
|
||||
// V1 API returns 200 even on error so we must check
|
||||
// response data
|
||||
let response = await axios.post("https://www.octopush-dm.com/api/sms/json", {}, config);
|
||||
if ("error_code" in response.data) {
|
||||
if (response.data.error_code !== "000") {
|
||||
this.throwGeneralAxiosError(`Octopush error ${JSON.stringify(response.data)}`);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
throw new Error("Unknown Octopush version!");
|
||||
}
|
||||
|
|
|
|||
76
server/notification-providers/squadcast.js
Normal file
76
server/notification-providers/squadcast.js
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
const NotificationProvider = require("./notification-provider");
|
||||
const axios = require("axios");
|
||||
const { DOWN } = require("../../src/util");
|
||||
|
||||
class Squadcast extends NotificationProvider {
|
||||
|
||||
name = "squadcast";
|
||||
|
||||
async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
|
||||
let okMsg = "Sent Successfully.";
|
||||
|
||||
try {
|
||||
|
||||
let config = {};
|
||||
let data = {
|
||||
message: msg,
|
||||
description: "",
|
||||
tags: {},
|
||||
heartbeat: heartbeatJSON,
|
||||
source: "uptime-kuma"
|
||||
};
|
||||
|
||||
if (heartbeatJSON !== null) {
|
||||
data.description = heartbeatJSON["msg"];
|
||||
data.event_id = heartbeatJSON["monitorID"];
|
||||
|
||||
if (heartbeatJSON["status"] === DOWN) {
|
||||
data.message = `${monitorJSON["name"]} is DOWN`;
|
||||
data.status = "trigger";
|
||||
} else {
|
||||
data.message = `${monitorJSON["name"]} is UP`;
|
||||
data.status = "resolve";
|
||||
}
|
||||
|
||||
let address;
|
||||
switch (monitorJSON["type"]) {
|
||||
case "ping":
|
||||
address = monitorJSON["hostname"];
|
||||
break;
|
||||
case "port":
|
||||
case "dns":
|
||||
case "steam":
|
||||
address = monitorJSON["hostname"];
|
||||
if (monitorJSON["port"]) {
|
||||
address += ":" + monitorJSON["port"];
|
||||
}
|
||||
break;
|
||||
default:
|
||||
address = monitorJSON["url"];
|
||||
break;
|
||||
}
|
||||
|
||||
data.tags["AlertAddress"] = address;
|
||||
|
||||
monitorJSON["tags"].forEach(tag => {
|
||||
data.tags[tag["name"]] = {
|
||||
value: tag["value"]
|
||||
};
|
||||
if (tag["color"] !== null) {
|
||||
data.tags[tag["name"]]["color"] = tag["color"];
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
await axios.post(notification.squadcastWebhookURL, data, config);
|
||||
return okMsg;
|
||||
|
||||
} catch (error) {
|
||||
this.throwGeneralAxiosError(error);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
module.exports = Squadcast;
|
||||
|
|
@ -63,7 +63,7 @@ class Teams extends NotificationProvider {
|
|||
});
|
||||
}
|
||||
|
||||
if (monitorUrl) {
|
||||
if (monitorUrl && monitorUrl !== "https://") {
|
||||
facts.push({
|
||||
name: "URL",
|
||||
value: monitorUrl,
|
||||
|
|
@ -127,13 +127,17 @@ class Teams extends NotificationProvider {
|
|||
|
||||
let url;
|
||||
|
||||
if (monitorJSON["type"] === "port") {
|
||||
url = monitorJSON["hostname"];
|
||||
if (monitorJSON["port"]) {
|
||||
url += ":" + monitorJSON["port"];
|
||||
}
|
||||
} else {
|
||||
url = monitorJSON["url"];
|
||||
switch (monitorJSON["type"]) {
|
||||
case "http":
|
||||
case "keywork":
|
||||
url = monitorJSON["url"];
|
||||
break;
|
||||
case "docker":
|
||||
url = monitorJSON["docker_host"];
|
||||
break;
|
||||
default:
|
||||
url = monitorJSON["hostname"];
|
||||
break;
|
||||
}
|
||||
|
||||
const payload = this._notificationPayloadFactory({
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ const ClickSendSMS = require("./notification-providers/clicksendsms");
|
|||
const DingDing = require("./notification-providers/dingding");
|
||||
const Discord = require("./notification-providers/discord");
|
||||
const Feishu = require("./notification-providers/feishu");
|
||||
const FreeMobile = require("./notification-providers/freemobile");
|
||||
const GoogleChat = require("./notification-providers/google-chat");
|
||||
const Gorush = require("./notification-providers/gorush");
|
||||
const Gotify = require("./notification-providers/gotify");
|
||||
|
|
@ -32,6 +33,7 @@ const SerwerSMS = require("./notification-providers/serwersms");
|
|||
const Signal = require("./notification-providers/signal");
|
||||
const Slack = require("./notification-providers/slack");
|
||||
const SMTP = require("./notification-providers/smtp");
|
||||
const Squadcast = require("./notification-providers/squadcast");
|
||||
const Stackfield = require("./notification-providers/stackfield");
|
||||
const Teams = require("./notification-providers/teams");
|
||||
const TechulusPush = require("./notification-providers/techulus-push");
|
||||
|
|
@ -62,6 +64,7 @@ class Notification {
|
|||
new DingDing(),
|
||||
new Discord(),
|
||||
new Feishu(),
|
||||
new FreeMobile(),
|
||||
new GoogleChat(),
|
||||
new Gorush(),
|
||||
new Gotify(),
|
||||
|
|
@ -87,6 +90,7 @@ class Notification {
|
|||
new SMSManager(),
|
||||
new Slack(),
|
||||
new SMTP(),
|
||||
new Squadcast(),
|
||||
new Stackfield(),
|
||||
new Teams(),
|
||||
new TechulusPush(),
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ Ping.prototype.send = function (callback) {
|
|||
let _exited;
|
||||
let _errored;
|
||||
|
||||
this._ping = spawn(this._bin, this._args); // spawn the binary
|
||||
this._ping = spawn(this._bin, this._args, { windowsHide: true }); // spawn the binary
|
||||
|
||||
this._ping.on("error", function (err) { // handle binary errors
|
||||
_errored = true;
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ module.exports.dockerSocketHandler = (socket) => {
|
|||
let amount = await DockerHost.testDockerHost(dockerHost);
|
||||
let msg;
|
||||
|
||||
if (amount > 1) {
|
||||
if (amount >= 1) {
|
||||
msg = "Connected Successfully. Amount of containers: " + amount;
|
||||
} else {
|
||||
msg = "Connected Successfully, but there are no containers?";
|
||||
|
|
|
|||
|
|
@ -138,7 +138,9 @@ class UptimeKumaServer {
|
|||
}
|
||||
|
||||
if (await Settings.get("trustProxy")) {
|
||||
return socket.client.conn.request.headers["x-forwarded-for"]
|
||||
const forwardedFor = socket.client.conn.request.headers["x-forwarded-for"];
|
||||
|
||||
return (typeof forwardedFor === "string" ? forwardedFor.split(",")[0].trim() : null)
|
||||
|| socket.client.conn.request.headers["x-real-ip"]
|
||||
|| clientIP.replace(/^.*:/, "");
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -557,7 +557,7 @@ exports.doubleCheckPassword = async (socket, currentPassword) => {
|
|||
exports.startUnitTest = async () => {
|
||||
console.log("Starting unit test...");
|
||||
const npm = /^win/.test(process.platform) ? "npm.cmd" : "npm";
|
||||
const child = childProcess.spawn(npm, [ "run", "jest" ]);
|
||||
const child = childProcess.spawn(npm, [ "run", "jest-backend" ]);
|
||||
|
||||
child.stdout.on("data", (data) => {
|
||||
console.log(data.toString());
|
||||
|
|
|
|||
|
|
@ -30,7 +30,8 @@
|
|||
{{ $t("Examples") }}:
|
||||
<ul>
|
||||
<li>/var/run/docker.sock</li>
|
||||
<li>tcp://localhost:2375</li>
|
||||
<li>http://localhost:2375</li>
|
||||
<li>https://localhost:2376 (TLS)</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
12
src/components/notifications/FreeMobile.vue
Normal file
12
src/components/notifications/FreeMobile.vue
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
<template>
|
||||
<div class="mb-3">
|
||||
<label for="freemobileUser" class="form-label">{{ $t("Free Mobile User Identifier") }}<span style="color: red;"><sup>*</sup></span></label>
|
||||
<input id="freemobileUser" v-model="$parent.notification.freemobileUser" type="text" class="form-control" required>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="freemobilePass" class="form-label">{{ $t("Free Mobile API Key") }}<span style="color: red;"><sup>*</sup></span></label>
|
||||
<input id="freemobilePass" v-model="$parent.notification.freemobilePass" type="text" class="form-control" required>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -11,15 +11,31 @@
|
|||
<input id="ntfy-server-url" v-model="$parent.notification.ntfyserverurl" type="text" class="form-control" required>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="ntfy-priority" class="form-label">{{ $t("Priority") }}</label>
|
||||
<input id="ntfy-priority" v-model="$parent.notification.ntfyPriority" type="number" class="form-control" required min="1" max="5" step="1">
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label for="ntfy-username" class="form-label">{{ $t("Username") }} ({{ $t("Optional") }})</label>
|
||||
<div class="input-group mb-3">
|
||||
<input id="ntfy-username" v-model="$parent.notification.ntfyusername" type="text" class="form-control" required>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label for="ntfy-password" class="form-label">{{ $t("Password") }} ({{ $t("Optional") }})</label>
|
||||
<div class="input-group mb-3">
|
||||
<HiddenInput id="ntfy-password" v-model="$parent.notification.ntfypassword" autocomplete="new-password"></HiddenInput>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import HiddenInput from "../HiddenInput.vue";
|
||||
|
||||
export default {
|
||||
components: {
|
||||
HiddenInput,
|
||||
},
|
||||
mounted() {
|
||||
if (typeof this.$parent.notification.ntfyPriority === "undefined") {
|
||||
this.$parent.notification.ntfyserverurl = "https://ntfy.sh";
|
||||
|
|
|
|||
6
src/components/notifications/Squadcast.vue
Normal file
6
src/components/notifications/Squadcast.vue
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
<template>
|
||||
<div class="mb-3">
|
||||
<label for="webhook-url" class="form-label">{{ $t("Post URL") }}</label>
|
||||
<input id="webhook-url" v-model="$parent.notification.squadcastWebhookURL" type="url" pattern="https?://.+" class="form-control" required>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -7,6 +7,7 @@ import ClickSendSMS from "./ClickSendSMS.vue";
|
|||
import DingDing from "./DingDing.vue";
|
||||
import Discord from "./Discord.vue";
|
||||
import Feishu from "./Feishu.vue";
|
||||
import FreeMobile from "./FreeMobile.vue";
|
||||
import GoogleChat from "./GoogleChat.vue";
|
||||
import Gorush from "./Gorush.vue";
|
||||
import Gotify from "./Gotify.vue";
|
||||
|
|
@ -31,6 +32,7 @@ import SerwerSMS from "./SerwerSMS.vue";
|
|||
import Signal from "./Signal.vue";
|
||||
import SMSManager from "./SMSManager.vue";
|
||||
import Slack from "./Slack.vue";
|
||||
import Squadcast from "./Squadcast.vue";
|
||||
import Stackfield from "./Stackfield.vue";
|
||||
import STMP from "./SMTP.vue";
|
||||
import Teams from "./Teams.vue";
|
||||
|
|
@ -55,6 +57,7 @@ const NotificationFormList = {
|
|||
"DingDing": DingDing,
|
||||
"discord": Discord,
|
||||
"Feishu": Feishu,
|
||||
"FreeMobile": FreeMobile,
|
||||
"GoogleChat": GoogleChat,
|
||||
"gorush": Gorush,
|
||||
"gotify": Gotify,
|
||||
|
|
@ -79,6 +82,7 @@ const NotificationFormList = {
|
|||
"signal": Signal,
|
||||
"SMSManager": SMSManager,
|
||||
"slack": Slack,
|
||||
"squadcast": Squadcast,
|
||||
"smtp": STMP,
|
||||
"stackfield": Stackfield,
|
||||
"teams": Teams,
|
||||
|
|
|
|||
|
|
@ -562,4 +562,24 @@ export default {
|
|||
"Docker Host": "Docker хост",
|
||||
"Docker Hosts": "Docker хостове",
|
||||
trustProxyDescription: "Trust 'X-Forwarded-*' headers. Ако искате да получавате правилния IP адрес на клиента, а Uptime Kuma е зад системи като Nginx или Apache, трябва да разрешите тази опция.",
|
||||
Examples: "Примери",
|
||||
"Home Assistant URL": "Home Assistant URL адрес",
|
||||
"Long-Lived Access Token": "Long-Lived Access Token",
|
||||
"Long-Lived Access Token can be created by clicking on your profile name (bottom left) and scrolling to the bottom then click Create Token. ": "Long-Lived Access Token можете да създадете, като кликнете върху името на профила си (долу ляво) и превъртите до най-долу, след това кликнете върху Създаване на токен. ",
|
||||
"Notification Service": "Услуга за известяване",
|
||||
"default: notify all devices": "по подразбиране: извести всички устройства",
|
||||
"A list of Notification Services can be found in Home Assistant under \"Developer Tools > Services\" search for \"notification\" to find your device/phone name.": "Списък с услугите за известяване може да бъде намерен в Home Assistant под \"Developer Tools > Services\", там потърсете \"notification\", за да намерите името на вашето устройство/телефон.",
|
||||
"Automations can optionally be triggered in Home Assistant:": "Автоматизациите могат да се задействат при нужда в Home Assistant:",
|
||||
"Trigger type:": "Задействане тип:",
|
||||
"Event type:": "Събитие тип:",
|
||||
"Event data:": "Събитие данни:",
|
||||
"Then choose an action, for example switch the scene to where an RGB light is red.": "След което изберете действие, например да превключите сцената, където RGB светлината е червена.",
|
||||
"Frontend Version": "Фронтенд версия",
|
||||
"Frontend Version do not match backend version!": "Фронтенд версията не съвпада с Бекенд версията!",
|
||||
"Base URL": "Базов URL адрес",
|
||||
goAlertInfo: "GoAlert е приложение с отворен код за планиране на повиквания, автоматизирани ескалации и известия (като SMS или гласови повиквания). Автоматично ангажирайте точния човек, по точния начин и в точното време! {0}",
|
||||
goAlertIntegrationKeyInfo: "Вземете общ API интеграционен ключ за услугата във формат \"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\" обикновено стойността на параметъра token на копирания URL адрес.",
|
||||
goAlert: "GoAlert",
|
||||
backupOutdatedWarning: "Отпаднало: Тъй като са добавени много функции, тази опция за архивиране не е достатъчно поддържана и не може да генерира или възстанови пълен архив.",
|
||||
backupRecommend: "Моля, архивирайте дяла или папката (./data/) директно вместо това.",
|
||||
};
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ export default {
|
|||
Timezone: "Zeitzone",
|
||||
"Search Engine Visibility": "Sichtbarkeit für Suchmaschinen",
|
||||
"Allow indexing": "Indizierung zulassen",
|
||||
"Discourage search engines from indexing site": "Halte Suchmaschinen von der Indexierung der Seite ab",
|
||||
"Discourage search engines from indexing site": "Suchmaschinen darum bitten, die Seite nicht zu indizieren",
|
||||
"Change Password": "Passwort ändern",
|
||||
"Current Password": "Aktuelles Passwort",
|
||||
"New Password": "Neues Passwort",
|
||||
|
|
@ -78,7 +78,7 @@ export default {
|
|||
"Disable Auth": "Authentifizierung deaktivieren",
|
||||
"Enable Auth": "Authentifizierung aktivieren",
|
||||
"disableauth.message1": "Bist du sicher das du die <strong>Authentifizierung deaktivieren</strong> möchtest?",
|
||||
"disableauth.message2": "Es ist für <strong>jemanden der eine externe Authentifizierung</strong> vor Uptime Kuma geschaltet hat, wie z.B. Cloudflare Access.",
|
||||
"disableauth.message2": "Dies ist für Szenarien gedacht, <strong>in denen man eine externe Authentifizierung</strong> vor Uptime Kuma geschaltet hat, wie z.B. Cloudflare Access, Authelia oder andere Authentifizierungsmechanismen.",
|
||||
"Please use this option carefully!": "Bitte mit Vorsicht nutzen.",
|
||||
Logout: "Ausloggen",
|
||||
notificationDescription: "Benachrichtigungen müssen einem Monitor zugewiesen werden, damit diese funktionieren.",
|
||||
|
|
@ -559,7 +559,7 @@ export default {
|
|||
"ntfy Topic": "ntfy Thema",
|
||||
Domain: "Domain",
|
||||
Workstation: "Workstation",
|
||||
disableCloudflaredNoAuthMsg: "Du bist im nicht-authentifizieren modus, ein Passwort wird nicht benötigt.",
|
||||
disableCloudflaredNoAuthMsg: "Du bist im nicht-authentifizieren Modus, ein Passwort wird nicht benötigt.",
|
||||
trustProxyDescription: "Vertraue 'X-Forwarded-*' headern. Wenn man die richtige client IP haben möchte und Uptime Kuma hinter einem Proxy wie Nginx or Apache läuft, wollte dies aktiviert werden.",
|
||||
wayToGetLineNotifyToken: "Du kannst hier ein Token erhalten: {0}",
|
||||
Examples: "Beispiele",
|
||||
|
|
|
|||
|
|
@ -582,4 +582,6 @@ export default {
|
|||
goAlert: "GoAlert",
|
||||
backupOutdatedWarning: "Deprecated: Since a lot of features added and this backup feature is a bit unmaintained, it cannot generate or restore a complete backup.",
|
||||
backupRecommend: "Please backup the volume or the data folder (./data/) directly instead.",
|
||||
"Optional": "Optional",
|
||||
squadcast: "Squadcast",
|
||||
};
|
||||
|
|
|
|||
|
|
@ -200,7 +200,7 @@ export default {
|
|||
chatIDNotFound: "ID du salon introuvable, envoyez un message via le bot avant",
|
||||
webhook: "Webhook",
|
||||
"Post URL": "Post URL",
|
||||
"Content Type": "Content Type",
|
||||
"Content Type": "Type de contenu",
|
||||
webhookJsonDesc: "{0} est bien/bon pour tous les serveurs HTTP modernes comme express.js",
|
||||
webhookFormDataDesc: "{multipart} est bien/bon pour du PHP, vous avez juste besoin de mettre le json via/depuis {decodeFunction}",
|
||||
smtp: "Email (SMTP)",
|
||||
|
|
@ -227,8 +227,8 @@ export default {
|
|||
wayToCheckSignalURL: "Vous pouvez regarder l'URL sur comment le mettre en place :",
|
||||
signalImportant: "IMPORTANT : Vous ne pouvez pas mixer les groupes et les numéros en destinataires !",
|
||||
gotify: "Gotify",
|
||||
"Application Token": "Application Token",
|
||||
"Server URL": "Server URL",
|
||||
"Application Token": "Jeton d'application",
|
||||
"Server URL": "URL du serveur",
|
||||
Priority: "Priorité",
|
||||
slack: "Slack",
|
||||
"Icon Emoji": "Icon Emoji",
|
||||
|
|
@ -287,7 +287,7 @@ export default {
|
|||
promosmsTypeSpeed: "SMS SPEED - La plus haute des priorités dans le système. Très rapide et fiable mais cher (environ le double du prix d'un SMS FULL).",
|
||||
promosmsPhoneNumber: "Numéro de téléphone (Poiur les déstinataires Polonais, vous pouvez enlever les codes interna.)",
|
||||
promosmsSMSSender: "SMS Expéditeur : Nom pré-enregistré ou l'un de base : InfoSMS, SMS Info, MaxSMS, INFO, SMS",
|
||||
"Primary Base URL": "Primary Base URL",
|
||||
"Primary Base URL": "URL principale",
|
||||
emailCustomSubject: "Sujet personalisé",
|
||||
clicksendsms: "ClickSend SMS",
|
||||
checkPrice: "Vérification {0} tarifs :",
|
||||
|
|
@ -342,13 +342,13 @@ export default {
|
|||
Title: "Titre",
|
||||
Content: "Contenu",
|
||||
Style: "Style",
|
||||
info: "info",
|
||||
info: "Info",
|
||||
warning: "Attention",
|
||||
danger: "danger",
|
||||
danger: "Danger",
|
||||
error: "Erreur",
|
||||
critical: "critique",
|
||||
primary: "primaire",
|
||||
light: "blanc",
|
||||
critical: "Critique",
|
||||
primary: "Primaire",
|
||||
light: "Blanc",
|
||||
dark: "Noir",
|
||||
Post: "Post",
|
||||
"Please input title and content": "Veuillez entrer le titre et le contenu",
|
||||
|
|
@ -390,7 +390,7 @@ export default {
|
|||
Installed: "Installé",
|
||||
"Not installed": "Pas installé",
|
||||
"Remove Token": "Supprimer le jeton",
|
||||
Slug: "chemin",
|
||||
Slug: "Chemin",
|
||||
"The slug is already taken. Please choose another slug.": "Le chemin est déjà pris. Veuillez choisir un autre chemin.",
|
||||
Authentication: "Authentication",
|
||||
"Page Not Found": "Page non trouvée",
|
||||
|
|
@ -431,4 +431,104 @@ export default {
|
|||
"Trigger type:": "Type de déclencheur:",
|
||||
"Event type:": "Type d'événement:",
|
||||
"Event data:": "Données d'événement:",
|
||||
topic: "Topic",
|
||||
topicExplanation: "MQTT sujet à surveiller",
|
||||
successMessage: "Message de réussite",
|
||||
successMessageExplanation: "MQTT message qui sera considéré comme un succès",
|
||||
"Powered by": "Propulsé par",
|
||||
serwersms: "SerwerSMS.pl",
|
||||
stackfield: "Stackfield",
|
||||
smtpDkimSettings: "Paramètres DKIM",
|
||||
smtpDkimDesc: "Veuillez vous référer au Nodemailer DKIM {0} pour l'utilisation.",
|
||||
documentation: "Documentation",
|
||||
smtpDkimDomain: "Nom de domaine",
|
||||
smtpDkimKeySelector: "Sélecteur de clé",
|
||||
smtpDkimPrivateKey: "Clé privée",
|
||||
smtpDkimHashAlgo: "Algorithme de hachage (facultatif)",
|
||||
smtpDkimheaderFieldNames: "Clés d'en-tête à signer (facultatif)",
|
||||
smtpDkimskipFields: "Clés d'en-tête à ne pas signer (facultatif)",
|
||||
wayToGetPagerDutyKey: "Vous pouvez l'obtenir en allant dans Service -> Annuaire des services -> (Sélectionner un service) -> Intégrations -> Ajouter une intégration. Ici, vous pouvez rechercher \"Events API V2\". Plus d'infos {0}",
|
||||
"Integration Key": "Clé d'intégration",
|
||||
"Integration URL": "URL d'intégration",
|
||||
"Auto resolve or acknowledged": "Résolution automatique ou accusé de réception",
|
||||
"do nothing": "ne fais rien",
|
||||
"auto acknowledged": "accusé de réception automatique",
|
||||
"auto resolve": "résolution automatique",
|
||||
AccessKeyId: "ID de clé d'accès",
|
||||
SecretAccessKey: "Clé secrète d'accès",
|
||||
PhoneNumbers: "Les numéros de téléphone",
|
||||
SignName: "Signature",
|
||||
"Sms template must contain parameters: ": "Le modèle de SMS doit contenir des paramètres : ",
|
||||
SecretKey: "Clé secrète",
|
||||
"For safety, must use secret key": "Pour la sécurité, doit utiliser la clé secrète",
|
||||
"Device Token": "Jeton d'appareil",
|
||||
Platform: "Plateforme",
|
||||
Retry: "Recommencez",
|
||||
Topic: "Topic",
|
||||
"Proxy server has authentication": "Le serveur proxy a une authentification",
|
||||
Running: "Fonctionne",
|
||||
"Not running": "Ne fonctionne pas",
|
||||
Start: "Start",
|
||||
Stop: "Stop",
|
||||
"Uptime Kuma": "Uptime Kuma",
|
||||
"No Proxy": "Pas de Proxy",
|
||||
"HTTP Basic Auth": "Authentification de base HTTP",
|
||||
"Reverse Proxy": "Proxy inverse",
|
||||
wayToGetCloudflaredURL: "(Télécharger cloudflared depuis {0})",
|
||||
cloudflareWebsite: "le site Cloudflare ",
|
||||
"Message:": "Message:",
|
||||
"Don't know how to get the token? Please read the guide:": "Vous ne savez pas comment obtenir le jeton ? Veuillez lire le guide:",
|
||||
"The current connection may be lost if you are currently connecting via Cloudflare Tunnel. Are you sure want to stop it? Type your current password to confirm it.": "La connexion actuelle peut être perdue si vous vous connectez actuellement via Cloudflare Tunnel. Êtes-vous sûr de vouloir l'arrêter ? Tapez votre mot de passe actuel pour le confirmer.",
|
||||
"HTTP Headers": "En-têtes HTTP",
|
||||
"Trust Proxy": "Proxy de confiance",
|
||||
"Other Software": "Autres logiciels",
|
||||
"For example: nginx, Apache and Traefik.": "Par exemple : nginx, Apache et Traefik.",
|
||||
"Please read": "S'il vous plaît Lisez",
|
||||
"Valid To:": "Valable pour:",
|
||||
"Days Remaining:": "Jours restant:",
|
||||
"Domain Name Expiry Notification": "Notification d'expiration de nom de domaine",
|
||||
"Date Created": "Date de création",
|
||||
HomeAssistant: "Home Assistant",
|
||||
onebotHttpAddress: "Adresse HTTP OneBot",
|
||||
onebotMessageType: "Type de message OneBot",
|
||||
onebotGroupMessage: "Groupe",
|
||||
onebotUserOrGroupId: "ID de groupe/utilisateur",
|
||||
onebotSafetyTips: "Pour des raisons de sécurité, vous devez définir un jeton d'accès",
|
||||
"PushDeer Key": "Clé PushDeer",
|
||||
"Show Powered By": "Afficher \"Propulsé par\"",
|
||||
RadiusSecretDescription: "Secret partagé entre le client et le serveur",
|
||||
RadiusCalledStationId: "Identifiant de la station appelée",
|
||||
RadiusCalledStationIdDescription: "Identifiant de l'appareil appelé",
|
||||
RadiusCallingStationId: "Identifiant de la station appelante",
|
||||
RadiusCallingStationIdDescription: "Identifiant de l'appareil appelant",
|
||||
"Certificate Expiry Notification": "Notification d'expiration du certificat",
|
||||
"API Username": "Nom d'utilisateur de l'API",
|
||||
"API Key": "clé API",
|
||||
"Recipient Number": "Numéro du destinataire",
|
||||
"From Name/Number": "De Nom/Numéro",
|
||||
"Leave blank to use a shared sender number.": "Laisser vide pour utiliser un numéro d'expéditeur partagé.",
|
||||
"Octopush API Version": "Version de l'API Octopush",
|
||||
octopushAPIKey: "\"Clé API\" à partir des informations d'identification de l'API HTTP dans le panneau de configuration",
|
||||
octopushLogin: "\"Connexion\" à partir des informations d'identification de l'API HTTP dans le panneau de configuration",
|
||||
"Using a Reverse Proxy?": "Utiliser un proxy inverse ?",
|
||||
"Check how to config it for WebSocket": "Vérifiez comment le configurer pour WebSocket",
|
||||
wayToGetClickSendSMSToken: "Vous pouvez obtenir le nom d'utilisateur API et la clé API à partir de {0} .",
|
||||
"Connection String": "Chaîne de connexion",
|
||||
Query: "Requête",
|
||||
tcp: "TCP / HTTP",
|
||||
"Docker Container": "Conteneur Docker",
|
||||
Workstation: "Poste de travail",
|
||||
disableCloudflaredNoAuthMsg: "Vous êtes en mode No Auth, un mot de passe n'est pas nécessaire.",
|
||||
"Long-Lived Access Token": "Jeton d'accès de longue durée",
|
||||
"Then choose an action, for example switch the scene to where an RGB light is red.": "Ensuite, choisissez une action, par exemple basculer la scène là où une lumière RVB est rouge.",
|
||||
"Frontend Version": "Frontend Version",
|
||||
"Frontend Version do not match backend version!": "La version frontale ne correspond pas à la version principale !",
|
||||
"Base URL": "URL de base",
|
||||
goAlertInfo: "GoAlert est une application open source pour la planification des appels, les escalades automatisées et les notifications (comme les SMS ou les appels vocaux). Engagez automatiquement la bonne personne, de la bonne manière et au bon moment ! {0}",
|
||||
goAlertIntegrationKeyInfo: "Obtenez la clé d'intégration d'API générique pour le service dans ce format \"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\" généralement la valeur du paramètre de jeton de l'URL copiée.",
|
||||
goAlert: "GoAlert",
|
||||
backupOutdatedWarning: "Obsolète : étant donné que de nombreuses fonctionnalités ont été ajoutées et que cette fonctionnalité de sauvegarde est un peu non maintenue, elle ne peut pas générer ou restaurer une sauvegarde complète.",
|
||||
backupRecommend: "Veuillez sauvegarder le volume ou le dossier de données (./data/) directement à la place.",
|
||||
Optional: "Optionnel",
|
||||
squadcast: "Squadcast",
|
||||
};
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ export default {
|
|||
"Repeat Password": "Ulangi Sandi",
|
||||
"Import Backup": "Impor Cadangan",
|
||||
"Export Backup": "Expor Cadangan",
|
||||
Export: "Expor",
|
||||
Export: "Ekspor",
|
||||
Import: "Impor",
|
||||
respTime: "Tanggapan. Waktu (milidetik)",
|
||||
notAvailableShort: "N/A",
|
||||
|
|
@ -192,7 +192,7 @@ export default {
|
|||
"Status Pages": "Halaman Status",
|
||||
defaultNotificationName: "{notification} saya Peringatan ({number})",
|
||||
here: "di sini",
|
||||
Required: "Dibutuhkan",
|
||||
Required: "Wajib",
|
||||
telegram: "Telegram",
|
||||
"Bot Token": "Bot Token",
|
||||
wayToGetTelegramToken: "Anda dapat mendapatkan token dari {0}.",
|
||||
|
|
@ -210,9 +210,9 @@ export default {
|
|||
secureOptionNone: "None / STARTTLS (25, 587)",
|
||||
secureOptionTLS: "TLS (465)",
|
||||
"Ignore TLS Error": "Abaikan Kesalahan TLS",
|
||||
"From Email": "Dari Surel",
|
||||
"From Email": "Dari Email",
|
||||
emailCustomSubject: "Subjek",
|
||||
"To Email": "Ke Surel",
|
||||
"To Email": "Ke Email",
|
||||
smtpCC: "CC",
|
||||
smtpBCC: "BCC",
|
||||
discord: "Discord",
|
||||
|
|
@ -232,7 +232,7 @@ export default {
|
|||
signalImportant: "PENTING: Anda tidak dapat mencampur grup dan nomor di penerima!",
|
||||
gotify: "Gotify",
|
||||
"Application Token": "Token Aplikasi",
|
||||
"Server URL": "URL Peladen",
|
||||
"Server URL": "URL Server",
|
||||
Priority: "Prioritas",
|
||||
slack: "Slack",
|
||||
"Icon Emoji": "Ikon Emoji",
|
||||
|
|
@ -274,9 +274,9 @@ export default {
|
|||
"LunaSea Device ID": "LunaSea Device ID",
|
||||
"Apprise URL": "Apprise URL",
|
||||
"Example:": "Contoh: {0}",
|
||||
"Read more:": "Baca lebih lajut: {0}",
|
||||
"Read more:": "Baca lebih lanjut: {0}",
|
||||
"Status:": "Status: {0}",
|
||||
"Read more": "Baca lebih lajut",
|
||||
"Read more": "Baca lebih lanjut",
|
||||
appriseInstalled: "Apprise diinstall.",
|
||||
appriseNotInstalled: "Apprise tidak diinstall. {0}",
|
||||
"Access Token": "Token Akses",
|
||||
|
|
@ -310,7 +310,7 @@ export default {
|
|||
BodyInvalidFormat: "Request Body memiliki format JSON yang tidak sesuai: ",
|
||||
"Monitor History": "Riyawat Monitor",
|
||||
clearDataOlderThan: "Simpan data riwayat monitoring selama {0} hari.",
|
||||
PasswordsDoNotMatch: "Passwords tidak sama.",
|
||||
PasswordsDoNotMatch: "Password tidak sama.",
|
||||
records: "catatan",
|
||||
"One record": "Satu catatan",
|
||||
steamApiKeyDescription: "Untuk monitoring Steam Game Server Anda membutuhkan kunci Steam Web-API. Anda dapat mendaftarkan Kunci API Anda melalui: ",
|
||||
|
|
@ -322,7 +322,7 @@ export default {
|
|||
recent: "Baru saja",
|
||||
Done: "Selesai",
|
||||
Info: "Info",
|
||||
Security: "Keamaan",
|
||||
Security: "Keamanan",
|
||||
"Steam API Key": "Steam API Key",
|
||||
"Shrink Database": "Shrink Database",
|
||||
"Pick a RR-Type...": "Pilih RR-Type...",
|
||||
|
|
@ -393,7 +393,7 @@ export default {
|
|||
alertaAlertState: "Status Siaga",
|
||||
alertaRecoverState: "Status Pemulihan",
|
||||
deleteStatusPageMsg: "Apakah Anda yakin untuk menghapus halaman status berikut?",
|
||||
Proxies: "Proxies",
|
||||
Proxies: "Proxy",
|
||||
default: "Bawaan",
|
||||
enabled: "Diaktifkan",
|
||||
setAsDefault: "Tetapkan sebagai bawaan",
|
||||
|
|
@ -403,7 +403,7 @@ export default {
|
|||
setAsDefaultProxyDescription: "Proxy berikut akan diaktifkan sebagai bawaan untuk monitor baru. Anda masih dapat menonaktifkan proxy secara terpisah untuk setiap monitor.",
|
||||
"Certificate Chain": "Certificate Chain",
|
||||
Valid: "Sahih",
|
||||
Invalid: "Tidak Sahih",
|
||||
Invalid: "Tidak Valid",
|
||||
AccessKeyId: "AccessKey ID",
|
||||
SecretAccessKey: "AccessKey Secret",
|
||||
PhoneNumbers: "Nomor Telepon",
|
||||
|
|
@ -433,7 +433,7 @@ export default {
|
|||
Installed: "Terpasang",
|
||||
"Not installed": "Tidak terpasang",
|
||||
Running: "Berlari",
|
||||
"Not running": "Tidak berlari",
|
||||
"Not running": "Tidak berjalan",
|
||||
"Remove Token": "Hapus Token",
|
||||
Start: "Mulai",
|
||||
Stop: "Berhenti",
|
||||
|
|
@ -444,7 +444,7 @@ export default {
|
|||
startOrEndWithOnly: "Mulai atau akhiri hanya dengan {0}",
|
||||
"No consecutive dashes": "Tanda hubung tidak berurutan",
|
||||
Next: "Selanjutnya",
|
||||
"The slug is already taken. Please choose another slug.": "Slug is telah digunakan. Silakan pilih slug lain.",
|
||||
"The slug is already taken. Please choose another slug.": "Slug telah digunakan. Silakan pilih slug lain.",
|
||||
"No Proxy": "TIdak ada Proxy",
|
||||
Authentication: "Autentikasi",
|
||||
"HTTP Basic Auth": "HTTP Basic Auth",
|
||||
|
|
|
|||
|
|
@ -224,7 +224,7 @@ export default {
|
|||
teams: "Microsoft Teams",
|
||||
"Webhook URL": "Webhook URL",
|
||||
wayToGetTeamsURL: "Bir webhook URL'sinin nasıl oluşturulacağını öğrenebilirsiniz {0}.",
|
||||
signal: "Signal",
|
||||
signal: "Sinyal",
|
||||
Number: "Numara",
|
||||
Recipients: "Alıcılar",
|
||||
needSignalAPI: "REST API ile bir signal istemciniz olması gerekiyor.",
|
||||
|
|
@ -552,14 +552,14 @@ export default {
|
|||
deleteDockerHostMsg: "Bu docker ana bilgisayarını tüm monitörler için silmek istediğinizden emin misiniz?",
|
||||
socket: "Soket",
|
||||
tcp: "TCP / HTTP",
|
||||
"Docker Container": "Docker Konteyneri",
|
||||
"Docker Container": "Docker Konteyner",
|
||||
"Container Name / ID": "Konteyner Adı / Kimliği",
|
||||
"Docker Host": "Docker Ana Bilgisayarı",
|
||||
"Docker Hosts": "Docker Ana Bilgisayarları",
|
||||
"ntfy Topic": "ntfy Konu",
|
||||
Domain: "Domain",
|
||||
Workstation: "İş İstasyonu",
|
||||
disableCloudflaredNoAuthMsg: "Yetki Yok modundasınız, şifre gerekli değil.",
|
||||
disableCloudflaredNoAuthMsg: "Yetki yok modundasınız, şifre gerekli değil.",
|
||||
trustProxyDescription: "'X-Forwarded-*' başlıklarına güvenin. Doğru istemci IP'sini almak istiyorsanız ve Uptime Kuma'nız Nginx veya Apache'nin arkasındaysa, bunu etkinleştirmelisiniz.",
|
||||
wayToGetLineNotifyToken: "{0} adresinden bir erişim jetonu alabilirsiniz.",
|
||||
Examples: "Örnekler",
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@ export default {
|
|||
languageName: "繁體中文 (台灣)",
|
||||
checkEverySecond: "每 {0} 秒檢查一次",
|
||||
retryCheckEverySecond: "每 {0} 秒重試一次",
|
||||
resendEveryXTimes: "每 {0} 次便重新傳送",
|
||||
resendDisabled: "重新傳送已停用",
|
||||
retriesDescription: "在服務被標記為離線並傳送通知前的最大重試次數",
|
||||
ignoreTLSError: "忽略 HTTPS 網站的 TLS/SSL 錯誤",
|
||||
upsideDownModeDescription: "反轉顯示狀態。若服務可以連線，將顯示離線。",
|
||||
|
|
@ -72,6 +74,7 @@ export default {
|
|||
"Heartbeat Interval": "心跳間隔",
|
||||
Retries: "重試次數",
|
||||
"Heartbeat Retry Interval": "心跳重試間隔",
|
||||
"Resend Notification if Down X times consequently": "若 X 次心跳皆離線，重新傳送通知",
|
||||
Advanced: "進階",
|
||||
"Upside Down Mode": "顛倒模式",
|
||||
"Max. Redirects": "最大重新導向次數",
|
||||
|
|
@ -455,6 +458,8 @@ export default {
|
|||
"Message:": "訊息：",
|
||||
"Don't know how to get the token? Please read the guide:": "不知道如何取得權杖嗎？請閱讀指南：",
|
||||
"The current connection may be lost if you are currently connecting via Cloudflare Tunnel. Are you sure want to stop it? Type your current password to confirm it.": "如果您目前正透過 Cloudflare Tunnel 連線，可能會導致連線中斷。您確定要停止嗎？請輸入密碼以確認。",
|
||||
"HTTP Headers": "HTTP 標頭",
|
||||
"Trust Proxy": "信任的 Proxy",
|
||||
"Other Software": "其他軟體",
|
||||
"For example: nginx, Apache and Traefik.": "例如 nginx、Apache 和 Traefik。",
|
||||
"Please read": "請閱覽",
|
||||
|
|
@ -467,6 +472,7 @@ export default {
|
|||
"Domain Name Expiry Notification": "網域名稱到期通知",
|
||||
Proxy: "Proxy",
|
||||
"Date Created": "建立日期",
|
||||
HomeAssistant: "Home Assistant",
|
||||
onebotHttpAddress: "OneBot HTTP 位址",
|
||||
onebotMessageType: "OneBot 訊息類型",
|
||||
onebotGroupMessage: "群組",
|
||||
|
|
@ -479,6 +485,12 @@ export default {
|
|||
"Domain Names": "網域名稱",
|
||||
signedInDisp: "以 {0} 身分登入",
|
||||
signedInDispDisabled: "驗證已停用。",
|
||||
RadiusSecret: "Radius Secret",
|
||||
RadiusSecretDescription: "客戶端與伺服器端的共享機密",
|
||||
RadiusCalledStationId: "被叫站 Id",
|
||||
RadiusCalledStationIdDescription: "被呼叫裝置的識別碼",
|
||||
RadiusCallingStationId: "呼叫站 Id",
|
||||
RadiusCallingStationIdDescription: "呼叫裝置的識別碼",
|
||||
"Certificate Expiry Notification": "憑證到期通知",
|
||||
"API Username": "API 使用者名稱",
|
||||
"API Key": "API 金鑰",
|
||||
|
|
@ -488,8 +500,8 @@ export default {
|
|||
"Octopush API Version": "Octopush API 版本",
|
||||
"Legacy Octopush-DM": "舊版 Octopush-DM",
|
||||
"endpoint": "端",
|
||||
octopushAPIKey: "\"API key\" from HTTP API credentials in control panel",
|
||||
octopushLogin: "\"Login\" from HTTP API credentials in control panel",
|
||||
octopushAPIKey: "在控制台的 HTTP API 憑證取得的 \"API 金鑰\"",
|
||||
octopushLogin: "在控制台的 HTTP API 憑證取得的 \"Login\"",
|
||||
promosmsLogin: "API 登入名稱",
|
||||
promosmsPassword: "API 密碼",
|
||||
"pushoversounds pushover": "Pushover (預設)",
|
||||
|
|
@ -504,9 +516,9 @@ export default {
|
|||
"pushoversounds intermission": "中場休息",
|
||||
"pushoversounds magic": "魔法",
|
||||
"pushoversounds mechanical": "機械",
|
||||
"pushoversounds pianobar": "Piano Bar",
|
||||
"pushoversounds siren": "Siren",
|
||||
"pushoversounds spacealarm": "Space Alarm",
|
||||
"pushoversounds pianobar": "鋼琴酒吧",
|
||||
"pushoversounds siren": "警鈴",
|
||||
"pushoversounds spacealarm": "太空鬧鐘",
|
||||
"pushoversounds tugboat": "汽笛",
|
||||
"pushoversounds alien": "外星鬧鐘 (長)",
|
||||
"pushoversounds climb": "爬升 (長)",
|
||||
|
|
@ -531,11 +543,43 @@ export default {
|
|||
"Coming Soon": "即將推出",
|
||||
wayToGetClickSendSMSToken: "您可以從 {0} 取得 API 使用者名稱和金鑰。",
|
||||
"Connection String": "連線字串",
|
||||
"Query": "查詢",
|
||||
Query: "查詢",
|
||||
settingsCertificateExpiry: "TLS 憑證到期",
|
||||
certificationExpiryDescription: "TLS 將於 X 天後到期時觸發 HTTPS 監測器通知：",
|
||||
"Setup Docker Host": "設定 Docker 主機",
|
||||
"Connection Type": "連線類型",
|
||||
"Docker Daemon": "Docker 精靈",
|
||||
deleteDockerHostMsg: "您確定要為所有監測器刪除此 Docker 主機嗎？",
|
||||
socket: "通訊端",
|
||||
tcp: "TCP / HTTP",
|
||||
"Docker Container": "Docker 容器",
|
||||
"Container Name / ID": "容器名稱 / ID",
|
||||
"Docker Host": "Docker 主機",
|
||||
"Docker Hosts": "Docker 主機",
|
||||
"ntfy Topic": "ntfy 主題",
|
||||
"Domain": "網域",
|
||||
"Workstation": "工作站",
|
||||
Domain: "網域",
|
||||
Workstation: "工作站",
|
||||
disableCloudflaredNoAuthMsg: "您處於無驗證模式。無須輸入密碼。",
|
||||
trustProxyDescription: "信任 'X-Forwarded-*' 標頭。如果您想要取得正確的客戶端 IP，且您的 Uptime Kuma 架設於 Nginx 或 Apache 後方，您應啟用此選項。",
|
||||
wayToGetLineNotifyToken: "您可以從 {0} 取得存取權杖",
|
||||
Examples: "範例",
|
||||
"Home Assistant URL": "Home Assistant 網址",
|
||||
"Long-Lived Access Token": "長期有效存取權杖",
|
||||
"Long-Lived Access Token can be created by clicking on your profile name (bottom left) and scrolling to the bottom then click Create Token. ": "若要建立長期有效存取權杖，請點擊您的個人檔案名稱 (左下角)，捲動至最下方，然後點擊建立權杖。",
|
||||
"Notification Service": "通知服務",
|
||||
"default: notify all devices": "預設：通知所有服務",
|
||||
"A list of Notification Services can be found in Home Assistant under \"Developer Tools > Services\" search for \"notification\" to find your device/phone name.": "您可以在 Home Assistant 中查看通知服務的列表，在\"開發者工具 > 服務\"下搜尋\"通知\"來找到您的裝置/手機的名稱。",
|
||||
"Automations can optionally be triggered in Home Assistant:": "可以選擇在 Home Assistant 中觸發自動化程序：",
|
||||
"Trigger type:": "觸發器類型：",
|
||||
"Event type:": "事件類型：",
|
||||
"Event data:": "事件資料：",
|
||||
"Then choose an action, for example switch the scene to where an RGB light is red.": "然後選擇動作，例如切換至 RGB 燈為紅色的場景。",
|
||||
"Frontend Version": "前端版本",
|
||||
"Frontend Version do not match backend version!": "前端版本與後端版本不符！",
|
||||
"Base URL": "基底網址",
|
||||
goAlertInfo: "GoAlert 是用於待命排程、升級自動化，以及通知 (如簡訊或語音通話) 的開源應用程式。自動在正確的時間、用洽當的方法、聯絡合適的人！ {0}",
|
||||
goAlertIntegrationKeyInfo: "取得服務的通用 API 整合金鑰，格式為 \"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\"。通常是已複製的網址的權杖參數值。",
|
||||
goAlert: "GoAlert",
|
||||
backupOutdatedWarning: "過時：由於新功能的增加，且未妥善維護，故此備份功能無法產生或復原完整備份。",
|
||||
backupRecommend: "請直接備份磁碟區或 ./data/ 資料夾。",
|
||||
};
|
||||
|
|
|
|||
|
|
@ -280,9 +280,9 @@ function getCryptoRandomInt(min, max) {
|
|||
}
|
||||
exports.getCryptoRandomInt = getCryptoRandomInt;
|
||||
/**
|
||||
* Generate a secret
|
||||
* @param length Lenght of secret to generate
|
||||
* @returns
|
||||
* Generate a random alphanumeric string of fixed length
|
||||
* @param length Length of string to generate
|
||||
* @returns string
|
||||
*/
|
||||
function genSecret(length = 64) {
|
||||
let secret = "";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,11 @@
|
|||
const { genSecret, DOWN } = require("../src/util");
|
||||
const { genSecret, DOWN, log} = require("../src/util");
|
||||
const utilServerRewire = require("../server/util-server");
|
||||
const Discord = require("../server/notification-providers/discord");
|
||||
const axios = require("axios");
|
||||
const { UptimeKumaServer } = require("../server/uptime-kuma-server");
|
||||
const Database = require("../server/database");
|
||||
const {Settings} = require("../server/settings");
|
||||
const fs = require("fs");
|
||||
|
||||
jest.mock("axios");
|
||||
|
||||
|
|
@ -225,3 +229,80 @@ describe("The function filterAndJoin", () => {
|
|||
expect(result).toBe("");
|
||||
});
|
||||
});
|
||||
|
||||
describe("Test uptimeKumaServer.getClientIP()", () => {
|
||||
it("should able to get a correct client IP", async () => {
|
||||
Database.init({
|
||||
"data-dir": "./data/test"
|
||||
});
|
||||
|
||||
if (! fs.existsSync(Database.path)) {
|
||||
log.info("server", "Copying Database");
|
||||
fs.copyFileSync(Database.templatePath, Database.path);
|
||||
}
|
||||
|
||||
await Database.connect(true);
|
||||
await Database.patch();
|
||||
|
||||
const fakeSocket = {
|
||||
client: {
|
||||
conn: {
|
||||
remoteAddress: "192.168.10.10",
|
||||
request: {
|
||||
headers: {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
const server = Object.create(UptimeKumaServer.prototype);
|
||||
let ip = await server.getClientIP(fakeSocket);
|
||||
|
||||
await Settings.set("trustProxy", false);
|
||||
expect(await Settings.get("trustProxy")).toBe(false);
|
||||
expect(ip).toBe("192.168.10.10");
|
||||
|
||||
fakeSocket.client.conn.request.headers["x-forwarded-for"] = "10.10.10.10";
|
||||
ip = await server.getClientIP(fakeSocket);
|
||||
expect(ip).toBe("192.168.10.10");
|
||||
|
||||
fakeSocket.client.conn.request.headers["x-real-ip"] = "20.20.20.20";
|
||||
ip = await server.getClientIP(fakeSocket);
|
||||
expect(ip).toBe("192.168.10.10");
|
||||
|
||||
await Settings.set("trustProxy", true);
|
||||
expect(await Settings.get("trustProxy")).toBe(true);
|
||||
|
||||
fakeSocket.client.conn.request.headers["x-forwarded-for"] = "10.10.10.10";
|
||||
ip = await server.getClientIP(fakeSocket);
|
||||
expect(ip).toBe("10.10.10.10");
|
||||
|
||||
// x-real-ip
|
||||
delete fakeSocket.client.conn.request.headers["x-forwarded-for"];
|
||||
ip = await server.getClientIP(fakeSocket);
|
||||
expect(ip).toBe("20.20.20.20");
|
||||
|
||||
fakeSocket.client.conn.request.headers["x-forwarded-for"] = "2001:db8:85a3:8d3:1319:8a2e:370:7348";
|
||||
ip = await server.getClientIP(fakeSocket);
|
||||
expect(ip).toBe("2001:db8:85a3:8d3:1319:8a2e:370:7348");
|
||||
|
||||
fakeSocket.client.conn.request.headers["x-forwarded-for"] = "203.0.113.195";
|
||||
ip = await server.getClientIP(fakeSocket);
|
||||
expect(ip).toBe("203.0.113.195");
|
||||
|
||||
fakeSocket.client.conn.request.headers["x-forwarded-for"] = "203.0.113.195, 2001:db8:85a3:8d3:1319:8a2e:370:7348";
|
||||
ip = await server.getClientIP(fakeSocket);
|
||||
expect(ip).toBe("203.0.113.195");
|
||||
|
||||
fakeSocket.client.conn.request.headers["x-forwarded-for"] = "203.0.113.195,2001:db8:85a3:8d3:1319:8a2e:370:7348,150.172.238.178";
|
||||
ip = await server.getClientIP(fakeSocket);
|
||||
expect(ip).toBe("203.0.113.195");
|
||||
|
||||
// Elements are comma-separated, with optional whitespace surrounding the commas.
|
||||
fakeSocket.client.conn.request.headers["x-forwarded-for"] = "203.0.113.195 , 2001:db8:85a3:8d3:1319:8a2e:370:7348,150.172.238.178";
|
||||
ip = await server.getClientIP(fakeSocket);
|
||||
expect(ip).toBe("203.0.113.195");
|
||||
|
||||
await Database.close();
|
||||
}, 120000);
|
||||
});
|
||||
|
|
|
|||
18
test/cypress/e2e/setup.cy.js
Normal file
18
test/cypress/e2e/setup.cy.js
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
const actor = require("../support/actors/actor");
|
||||
const userData = require("../support/const/user-data");
|
||||
const dashboardPage = require("../support/pages/dashboard-page");
|
||||
const setupPage = require("../support/pages/setup-page");
|
||||
|
||||
describe("user can create a new account on setup page", () => {
|
||||
before(() => {
|
||||
cy.visit("/setup");
|
||||
});
|
||||
it("user can create new account", () => {
|
||||
cy.url().should("be.equal", setupPage.SetupPage.url);
|
||||
actor.actor.setupTask.fillAndSubmitSetupForm(userData.DEFAULT_USER_DATA.username, userData.DEFAULT_USER_DATA.password, userData.DEFAULT_USER_DATA.password);
|
||||
cy.url().should("be.equal", dashboardPage.DashboardPage.url);
|
||||
cy.get('[role="alert"]')
|
||||
.should("be.visible")
|
||||
.and("contain.text", "Added Successfully.");
|
||||
});
|
||||
});
|
||||
8
test/cypress/support/actors/actor.js
Normal file
8
test/cypress/support/actors/actor.js
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
const setupTask = require("../tasks/setup-task");
|
||||
class Actor {
|
||||
constructor() {
|
||||
this.setupTask = new setupTask.SetupTask();
|
||||
}
|
||||
}
|
||||
const actor = new Actor();
|
||||
exports.actor = actor;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
export const DEFAULT_USER_DATA = {
|
||||
exports.DEFAULT_USER_DATA = {
|
||||
username: "testuser",
|
||||
password: "testuser123",
|
||||
};
|
||||
1
test/cypress/support/e2e.js
Normal file
1
test/cypress/support/e2e.js
Normal file
|
|
@ -0,0 +1 @@
|
|||
require("./commands");
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
export const DashboardPage = {
|
||||
exports.DashboardPage = {
|
||||
url: Cypress.env("baseUrl") + "/dashboard",
|
||||
};
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
export const SetupPage = {
|
||||
exports.SetupPage = {
|
||||
url: Cypress.env("baseUrl") + "/setup",
|
||||
usernameInput: '[data-cy="username-input"]',
|
||||
passWordInput: '[data-cy="password-input"]',
|
||||
11
test/cypress/support/tasks/setup-task.js
Normal file
11
test/cypress/support/tasks/setup-task.js
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
const setupPage = require("../pages/setup-page");
|
||||
|
||||
class SetupTask {
|
||||
fillAndSubmitSetupForm(username, password, passwordRepeat) {
|
||||
cy.get(setupPage.SetupPage.usernameInput).type(username);
|
||||
cy.get(setupPage.SetupPage.passWordInput).type(password);
|
||||
cy.get(setupPage.SetupPage.passwordRepeatInput).type(passwordRepeat);
|
||||
cy.get(setupPage.SetupPage.submitSetupForm).click();
|
||||
}
|
||||
}
|
||||
exports.SetupTask = SetupTask;
|
||||
329
test/e2e.spec.js
329
test/e2e.spec.js
|
|
@ -1,329 +0,0 @@
|
|||
// eslint-disable-next-line no-unused-vars
|
||||
const { Page, Browser } = require("puppeteer");
|
||||
const { sleep } = require("../src/util");
|
||||
|
||||
/**
|
||||
* Set back the correct data type for page object
|
||||
* @type {Page}
|
||||
*/
|
||||
page;
|
||||
|
||||
/**
|
||||
* @type {Browser}
|
||||
*/
|
||||
browser;
|
||||
|
||||
beforeAll(async () => {
|
||||
await page.setViewport({
|
||||
width: 1280,
|
||||
height: 720,
|
||||
deviceScaleFactor: 1,
|
||||
});
|
||||
});
|
||||
|
||||
afterAll(() => {
|
||||
|
||||
});
|
||||
|
||||
const baseURL = "http://127.0.0.1:3002";
|
||||
|
||||
describe("Init", () => {
|
||||
const title = "Uptime Kuma";
|
||||
|
||||
beforeAll(async () => {
|
||||
await page.goto(baseURL);
|
||||
});
|
||||
|
||||
it(`should be titled "${title}"`, async () => {
|
||||
await expect(page.title()).resolves.toEqual(title);
|
||||
});
|
||||
|
||||
// Setup Page
|
||||
it("Setup", async () => {
|
||||
// Create an Admin
|
||||
await page.waitForSelector("#floatingInput");
|
||||
await page.waitForSelector("#repeat");
|
||||
await page.click("#floatingInput");
|
||||
await page.type("#floatingInput", "admin");
|
||||
await page.type("#floatingPassword", "admin123");
|
||||
await page.type("#repeat", "admin123");
|
||||
await page.click(".btn-primary[type=submit]");
|
||||
await sleep(3000);
|
||||
|
||||
// Go to /setup again
|
||||
await page.goto(baseURL + "/setup");
|
||||
await sleep(3000);
|
||||
let pathname = await page.evaluate(() => location.pathname);
|
||||
expect(pathname).toEqual("/dashboard");
|
||||
|
||||
// Go to /
|
||||
await page.goto(baseURL);
|
||||
await page.waitForSelector("h1.mb-3");
|
||||
pathname = await page.evaluate(() => location.pathname);
|
||||
expect(pathname).toEqual("/dashboard");
|
||||
});
|
||||
|
||||
it("should create monitor", async () => {
|
||||
// Create monitor
|
||||
await page.goto(baseURL + "/add");
|
||||
await page.waitForSelector("#name");
|
||||
|
||||
await page.type("#name", "Myself");
|
||||
await page.waitForSelector("#url");
|
||||
await page.click("#url", { clickCount: 3 });
|
||||
await page.keyboard.type(baseURL);
|
||||
await page.keyboard.press("Enter");
|
||||
|
||||
await page.waitForFunction(() => {
|
||||
const badge = document.querySelector("span.badge");
|
||||
return badge && badge.innerText == "100%";
|
||||
}, { timeout: 5000 });
|
||||
|
||||
});
|
||||
|
||||
// Settings Page
|
||||
/*
|
||||
describe("Settings", () => {
|
||||
beforeEach(async () => {
|
||||
await page.goto(baseURL + "/settings");
|
||||
});
|
||||
|
||||
it("Change Language", async () => {
|
||||
await page.goto(baseURL + "/settings/appearance");
|
||||
await page.waitForSelector("#language");
|
||||
|
||||
await page.select("#language", "zh-HK");
|
||||
let languageTitle = await page.evaluate(() => document.querySelector("[for=language]").innerText);
|
||||
expect(languageTitle).toEqual("語言");
|
||||
|
||||
await page.select("#language", "en");
|
||||
languageTitle = await page.evaluate(() => document.querySelector("[for=language]").innerText);
|
||||
expect(languageTitle).toEqual("Language");
|
||||
});
|
||||
|
||||
it("Change Theme", async () => {
|
||||
await page.goto(baseURL + "/settings/appearance");
|
||||
|
||||
// Dark
|
||||
await click(page, ".btn[for=btncheck2]");
|
||||
await page.waitForSelector("div.dark");
|
||||
|
||||
await page.waitForSelector(".btn[for=btncheck1]");
|
||||
|
||||
// Light
|
||||
await click(page, ".btn[for=btncheck1]");
|
||||
await page.waitForSelector("div.light");
|
||||
});
|
||||
|
||||
it("Change Heartbeat Bar Style", async () => {
|
||||
await page.goto(baseURL + "/settings/appearance");
|
||||
|
||||
// Bottom
|
||||
await click(page, ".btn[for=btncheck5]");
|
||||
await page.waitForSelector("div.hp-bar-big");
|
||||
|
||||
// None
|
||||
await click(page, ".btn[for=btncheck6]");
|
||||
await page.waitForSelector("div.hp-bar-big", {
|
||||
hidden: true,
|
||||
timeout: 1000
|
||||
});
|
||||
});
|
||||
|
||||
// TODO: Timezone
|
||||
|
||||
it("Search Engine Visibility", async () => {
|
||||
// Default
|
||||
let res = await axios.get(baseURL + "/robots.txt");
|
||||
expect(res.data).toContain("Disallow: /");
|
||||
|
||||
// Yes
|
||||
await click(page, "#searchEngineIndexYes");
|
||||
await click(page, "form > div > .btn[type=submit]");
|
||||
await sleep(1000);
|
||||
res = await axios.get(baseURL + "/robots.txt");
|
||||
expect(res.data).not.toContain("Disallow: /");
|
||||
|
||||
// No
|
||||
await click(page, "#searchEngineIndexNo");
|
||||
await click(page, "form > div > .btn[type=submit]");
|
||||
await sleep(1000);
|
||||
res = await axios.get(baseURL + "/robots.txt");
|
||||
expect(res.data).toContain("Disallow: /");
|
||||
});
|
||||
|
||||
it("Entry Page", async () => {
|
||||
const newPage = await browser.newPage();
|
||||
|
||||
// Default
|
||||
await newPage.goto(baseURL);
|
||||
await newPage.waitForSelector("h1.mb-3", { timeout: 3000 });
|
||||
let pathname = await newPage.evaluate(() => location.pathname);
|
||||
expect(pathname).toEqual("/dashboard");
|
||||
|
||||
// Status Page
|
||||
await click(page, "#entryPageNo");
|
||||
await click(page, "form > div > .btn[type=submit]");
|
||||
await sleep(1000);
|
||||
await newPage.goto(baseURL);
|
||||
await newPage.waitForSelector("img.logo", { timeout: 3000 });
|
||||
pathname = await newPage.evaluate(() => location.pathname);
|
||||
expect(pathname).toEqual("/status");
|
||||
|
||||
// Back to Dashboard
|
||||
await click(page, "#entryPageYes");
|
||||
await click(page, "form > div > .btn[type=submit]");
|
||||
await sleep(1000);
|
||||
await newPage.goto(baseURL);
|
||||
await newPage.waitForSelector("h1.mb-3", { timeout: 3000 });
|
||||
pathname = await newPage.evaluate(() => location.pathname);
|
||||
expect(pathname).toEqual("/dashboard");
|
||||
|
||||
await newPage.close();
|
||||
});
|
||||
|
||||
it("Change Password (wrong current password)", async () => {
|
||||
await page.goto(baseURL + "/settings/security");
|
||||
await page.waitForSelector("#current-password");
|
||||
|
||||
await page.type("#current-password", "wrong_passw$$d");
|
||||
await page.type("#new-password", "new_password123");
|
||||
await page.type("#repeat-new-password", "new_password123");
|
||||
|
||||
// Save
|
||||
await click(page, "form > div > .btn[type=submit]", 0);
|
||||
await sleep(1000);
|
||||
|
||||
await click(page, "#logout-btn");
|
||||
await login("admin", "new_password123");
|
||||
let elementCount = await page.evaluate(() => document.querySelectorAll("#floatingPassword").length);
|
||||
expect(elementCount).toEqual(1);
|
||||
|
||||
await login("admin", "admin123");
|
||||
});
|
||||
|
||||
it("Change Password (wrong repeat)", async () => {
|
||||
await page.goto(baseURL + "/settings/security");
|
||||
await page.waitForSelector("#current-password");
|
||||
|
||||
await page.type("#current-password", "admin123");
|
||||
await page.type("#new-password", "new_password123");
|
||||
await page.type("#repeat-new-password", "new_password1234567898797898");
|
||||
|
||||
await click(page, "form > div > .btn[type=submit]", 0);
|
||||
await sleep(1000);
|
||||
|
||||
await click(page, "#logout-btn");
|
||||
await login("admin", "new_password123");
|
||||
|
||||
let elementCount = await page.evaluate(() => document.querySelectorAll("#floatingPassword").length);
|
||||
expect(elementCount).toEqual(1);
|
||||
|
||||
await login("admin", "admin123");
|
||||
await page.waitForSelector("#current-password");
|
||||
let pathname = await page.evaluate(() => location.pathname);
|
||||
expect(pathname).toEqual("/settings/security");
|
||||
});
|
||||
|
||||
// TODO: 2FA
|
||||
|
||||
// TODO: Export Backup
|
||||
|
||||
// TODO: Import Backup
|
||||
|
||||
it("Should disable & enable auth", async () => {
|
||||
await page.goto(baseURL + "/settings/security");
|
||||
await click(page, "#disableAuth-btn");
|
||||
await click(page, ".btn.btn-danger[data-bs-dismiss='modal']", 2); // Not a good way to do it
|
||||
await page.waitForSelector("#enableAuth-btn", { timeout: 3000 });
|
||||
await page.waitForSelector("#logout-btn", {
|
||||
hidden: true,
|
||||
timeout: 3000
|
||||
});
|
||||
|
||||
const newPage = await browser.newPage();
|
||||
await newPage.goto(baseURL);
|
||||
await newPage.waitForSelector("span.badge", { timeout: 3000 });
|
||||
newPage.close();
|
||||
|
||||
await click(page, "#enableAuth-btn");
|
||||
await login("admin", "admin123");
|
||||
await page.waitForSelector("#disableAuth-btn", { timeout: 3000 });
|
||||
});
|
||||
|
||||
// it("Should clear all statistics", async () => {
|
||||
// await page.goto(baseURL + "/settings/monitor-history");
|
||||
// await click(page, "#clearAllStats-btn");
|
||||
// await click(page, ".btn.btn-danger");
|
||||
// await page.waitForFunction(() => {
|
||||
// const badge = document.querySelector("span.badge");
|
||||
// return badge && badge.innerText == "0%";
|
||||
// }, { timeout: 3000 });
|
||||
// });
|
||||
});
|
||||
*/
|
||||
|
||||
/*
|
||||
* TODO
|
||||
* Create Monitor - All type
|
||||
* Edit Monitor
|
||||
* Delete Monitor
|
||||
*
|
||||
* Create Notification (token problem, maybe hard to test)
|
||||
*
|
||||
*/
|
||||
|
||||
describe("Status Page", () => {
|
||||
const title = "Uptime Kuma";
|
||||
beforeAll(async () => {
|
||||
await page.goto(baseURL + "/status");
|
||||
});
|
||||
it(`should be titled "${title}"`, async () => {
|
||||
await expect(page.title()).resolves.toEqual(title);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
/**
|
||||
* Test login
|
||||
* @param {string} username
|
||||
* @param {string} password
|
||||
*/
|
||||
async function login(username, password) {
|
||||
await input(page, "#floatingInput", username);
|
||||
await input(page, "#floatingPassword", password);
|
||||
await page.click(".btn-primary[type=submit]");
|
||||
await sleep(5000);
|
||||
}
|
||||
|
||||
/**
|
||||
* Click on an element on the page
|
||||
* @param {Page} page Puppeteer page instance
|
||||
* @param {string} selector
|
||||
* @param {number} elementIndex
|
||||
* @returns {Promise<any>}
|
||||
*/
|
||||
async function click(page, selector, elementIndex = 0) {
|
||||
await page.waitForSelector(selector, {
|
||||
timeout: 5000,
|
||||
});
|
||||
return await page.evaluate((s, i) => {
|
||||
return document.querySelectorAll(s)[i].click();
|
||||
}, selector, elementIndex);
|
||||
}
|
||||
|
||||
/**
|
||||
* Input text into selected field
|
||||
* @param {Page} page Puppeteer page instance
|
||||
* @param {string} selector
|
||||
* @param {string} text Text to input
|
||||
*/
|
||||
async function input(page, selector, text) {
|
||||
await page.waitForSelector(selector, {
|
||||
timeout: 5000,
|
||||
});
|
||||
const element = await page.$(selector);
|
||||
await element.click({ clickCount: 3 });
|
||||
await page.keyboard.press("Backspace");
|
||||
await page.type(selector, text);
|
||||
}
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
// eslint-disable-next-line no-global-assign
|
||||
global.localStorage = {};
|
||||
global.navigator = {
|
||||
language: "en"
|
||||
};
|
||||
|
||||
const { currentLocale } = require("../src/i18n");
|
||||
|
||||
describe("Test i18n.js", () => {
|
||||
|
||||
it("currentLocale()", () => {
|
||||
expect(currentLocale()).toEqual("en");
|
||||
|
||||
navigator.language = "zh-HK";
|
||||
expect(currentLocale()).toEqual("zh-HK");
|
||||
|
||||
// Note that in Safari on iOS prior to 10.2, the country code returned is lowercase: "en-us", "fr-fr" etc.
|
||||
// https://developer.mozilla.org/en-US/docs/Web/API/Navigator/language
|
||||
navigator.language = "zh-hk";
|
||||
expect(currentLocale()).toEqual("en");
|
||||
|
||||
navigator.language = "en-US";
|
||||
expect(currentLocale()).toEqual("en");
|
||||
|
||||
navigator.language = "ja-ZZ";
|
||||
expect(currentLocale()).toEqual("ja");
|
||||
|
||||
navigator.language = "zz";
|
||||
expect(currentLocale()).toEqual("en");
|
||||
|
||||
navigator.language = "zz-ZZ";
|
||||
expect(currentLocale()).toEqual("en");
|
||||
|
||||
localStorage.locale = "en";
|
||||
expect(currentLocale()).toEqual("en");
|
||||
|
||||
localStorage.locale = "zh-HK";
|
||||
expect(currentLocale()).toEqual("zh-HK");
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
const fs = require("fs");
|
||||
const rmSync = require("../extra/fs-rmSync.js");
|
||||
|
||||
const path = "./data/test-chrome-profile";
|
||||
|
||||
if (fs.existsSync(path)) {
|
||||
rmSync(path, {
|
||||
recursive: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -11,11 +11,9 @@
|
|||
"removeComments": false,
|
||||
"preserveConstEnums": true,
|
||||
"sourceMap": false,
|
||||
"strict": true,
|
||||
"types": ["cypress"]
|
||||
"strict": true
|
||||
},
|
||||
"files": [
|
||||
"./src/util.ts",
|
||||
],
|
||||
"include": ["cypress/**/*.ts"]
|
||||
"./src/util.ts"
|
||||
]
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue