}
+
}
{integrationData && activeData &&
{data.activityFailed ? t("failed") : (data.lastActivity === null || !data.lastActivity - ? t("integrations.activity.never_executed") : t("integrations.activity.last_run") + generateRelativeTime(data.lastActivity))}
+ ? t("integrations.activity.never_executed") : t("integrations.activity.last_run") + lastActivity)}
+ {props.isOpen &&
-
{speedtests.map ? speedtests.map(test => {
- let date = new Date(Date.parse(test.created));
+ const dateArray = test.created.split("-").map((value) => parseInt(value));
+ const date = test.type === "average" ? new Date(dateArray[0], dateArray[1] - 1, dateArray[2])
+ : new Date(Date.parse(test.created));
let item = localStorage.getItem("testTime");
if ((item === "3" || item === "4") && test.type !== "average") return;
diff --git a/client/src/pages/Nodes/components/NodeHeader/NodeHeader.jsx b/client/src/pages/Nodes/components/NodeHeader/NodeHeader.jsx
index a277ec50..f50c817d 100644
--- a/client/src/pages/Nodes/components/NodeHeader/NodeHeader.jsx
+++ b/client/src/pages/Nodes/components/NodeHeader/NodeHeader.jsx
@@ -3,7 +3,7 @@ import "./styles.sass";
export const NodeHeader = () => {
return (
"
+ "acceptOoklaLicense": "false"
}
module.exports.insertDefaults = async () => {
diff --git a/server/integrations/gotify.js b/server/integrations/gotify.js
new file mode 100644
index 00000000..7afb7429
--- /dev/null
+++ b/server/integrations/gotify.js
@@ -0,0 +1,39 @@
+const axios = require("axios");
+const {replaceVariables} = require("../util/variables");
+
+const defaults = {
+ finished: "A speedtest is finished:\nPing: %ping% ms\nUpload: %upload% Mbps\nDownload: %download% Mbps",
+ failed: "A speedtest has failed. Reason: %error%"
+}
+
+const postWebhook = async (url, key, triggerActivity, message, priority) => {
+ axios.post(`${url}/message`, {message, priority}, {headers: {"Authorization": "Bearer " + key}})
+ .then(() => triggerActivity())
+ .catch(() => triggerActivity(true));
+}
+
+module.exports = (registerEvent) => {
+ registerEvent('testFinished', async (integration, data, activity) => {
+ if (integration.data.send_finished)
+ await postWebhook(integration.data.url, integration.data.key, activity,
+ replaceVariables(integration.data.finished_message || defaults.finished, data), 3);
+ });
+
+ registerEvent('testFailed', async (integration, error, activity) => {
+ if (integration.data.send_failed)
+ await postWebhook(integration.data.url, integration.data.key, activity,
+ replaceVariables(integration.data.failed_message || defaults.failed, {error}), 8);
+ });
+
+ return {
+ icon: "fa-solid fa-bell",
+ fields: [
+ {name: "url", type: "text", required: true, regex: /https?:\/\/.+/},
+ {name: "key", type: "text", required: true, regex: /^.{15}$/},
+ {name: "send_finished", type: "boolean", required: false},
+ {name: "finished_message", type: "textarea", required: false},
+ {name: "send_failed", type: "boolean", required: false},
+ {name: "error_message", type: "textarea", required: false}
+ ]
+ };
+}
\ No newline at end of file
diff --git a/server/integrations/webhook.js b/server/integrations/webhook.js
index 4f612c46..c81f449c 100644
--- a/server/integrations/webhook.js
+++ b/server/integrations/webhook.js
@@ -34,7 +34,7 @@ module.exports = (registerEvent) => {
return {
icon: "fa-solid fa-globe",
fields: [
- {name: "url", type: "text", required: true, regex: /https:\/\/.+/},
+ {name: "url", type: "text", required: true, regex: /https?:\/\/.+/},
{name: "send_started", type: "boolean", required: false},
{name: "send_finished", type: "boolean", required: false},
{name: "send_alive", type: "boolean", required: false},
diff --git a/server/routes/config.js b/server/routes/config.js
index 4395e9b6..6deaf398 100644
--- a/server/routes/config.js
+++ b/server/routes/config.js
@@ -8,7 +8,7 @@ const password = require('../middlewares/password');
app.get("/", password(true), async (req, res) => {
let configValues = {};
(await config.list()).forEach(row => {
- if (row.key !== "password" && !(req.viewMode && ["healthChecksUrl", "serverId", "cron", "passwordLevel"].includes(row.key)))
+ if (row.key !== "password" && !(req.viewMode && ["serverId", "cron", "passwordLevel"].includes(row.key)))
configValues[row.key] = row.value;
});
configValues['viewMode'] = req.viewMode;
diff --git a/server/routes/integrations.js b/server/routes/integrations.js
index 701f28e4..ec9e4a23 100644
--- a/server/routes/integrations.js
+++ b/server/routes/integrations.js
@@ -3,14 +3,9 @@ const integrations = require('../controller/integrations');
const password = require('../middlewares/password');
const {validateInput} = require("../controller/integrations");
-app.get("/", password(false), (req, res) => {
- return res.json(integrations.getIntegrations());
-});
+app.get("/", password(false), (req, res) => res.json(integrations.getIntegrations()));
-app.get("/active", password(false), async (req, res) => {
- const active = await integrations.getActive();
- return res.json(active);
-});
+app.get("/active", password(false), async (req, res) => res.json(await integrations.getActive()));
app.put("/:integrationName", password(false), async (req, res) => {
const integration = integrations.getIntegration(req.params.integrationName);
diff --git a/server/tasks/integrations.js b/server/tasks/integrations.js
index 8208e9bf..6d6e594f 100644
--- a/server/tasks/integrations.js
+++ b/server/tasks/integrations.js
@@ -9,7 +9,7 @@ module.exports.setState = (state = "ping") => {
currentState = state;
}
-// Send a ping to the provided healthcheck server
+// Send a ping to the event system
module.exports.sendPing = async (type, message) => {
await triggerEvent("minutePassed", {type, message});
}
@@ -19,16 +19,17 @@ module.exports.sendCurrent = async () => {
if (currentState === "ping") await this.sendPing();
}
-// Sends an error to the healthcheck server
+// Sends an 'error' ping to the event system
module.exports.sendError = async (error = "Unknown error") => {
await triggerEvent("testFailed", error);
}
-// Sends a 'running' ping to the healthcheck server
+// Sends a 'running' ping to the event system
module.exports.sendRunning = async () => {
await triggerEvent("testStarted");
}
+// Sends a 'finished' ping to the event system
module.exports.sendFinished = async (data) => {
await triggerEvent("testFinished", data);
}
- 
+ 
)
diff --git a/client/vite.config.js b/client/vite.config.js
index 114582f7..81ae74d1 100644
--- a/client/vite.config.js
+++ b/client/vite.config.js
@@ -1,18 +1,27 @@
-import react from '@vitejs/plugin-react'
-import path from "path";
+import react from "@vitejs/plugin-react";
import {VitePWA} from "vite-plugin-pwa";
+import path from "path";
export default {
plugins: [
- VitePWA({ injectRegister: 'auto' }),
+ VitePWA({injectRegister: "auto", manifest: false}),
react()
],
build: {
- outDir: 'build'
+ outDir: "build",
+ chunkSizeWarningLimit: 1600,
+ rollupOptions: {
+ output: {
+ manualChunks(id) {
+ if (id.includes('node_modules'))
+ return id.includes('@fortawesome') ? 'icons' : 'vendor';
+ }
+ }
+ }
},
resolve: {
alias: {
- '@': path.resolve(__dirname, './src'),
+ "@": path.resolve(__dirname, "./src"),
},
},
server: {
diff --git a/package-lock.json b/package-lock.json
index 0bac4e56..829dffb4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "myspeed",
- "version": "1.0.7",
+ "version": "1.0.8",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "myspeed",
- "version": "1.0.7",
+ "version": "1.0.8",
"dependencies": {
"axios": "^1.4.0",
"bcrypt": "^5.1.0",
diff --git a/package.json b/package.json
index c31f7fe6..839d4b0e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "myspeed",
- "version": "1.0.7",
+ "version": "1.0.8",
"scripts": {
"client": "cd client && npm run dev",
"server": "nodemon server",
@@ -17,8 +17,8 @@
"express": "^4.18.2",
"node-schedule": "^2.1.1",
"sequelize": "^6.31.1",
- "tmp": "^0.2.1",
- "sqlite3": "^5.1.6"
+ "sqlite3": "^5.1.6",
+ "tmp": "^0.2.1"
},
"devDependencies": {
"concurrently": "^8.0.1",
diff --git a/server/controller/config.js b/server/controller/config.js
index 59c6e994..4f7b264e 100644
--- a/server/controller/config.js
+++ b/server/controller/config.js
@@ -9,8 +9,7 @@ const configDefaults = {
"serverId": "none",
"password": "none",
"passwordLevel": "none",
- "acceptOoklaLicense": "false",
- "healthChecksUrl": "https://hc-ping.com/
+