From c526fa5c6cb1631fb282bb1e0445bddde7a3722a Mon Sep 17 00:00:00 2001 From: Benoit Date: Sat, 24 Dec 2022 16:04:34 +0100 Subject: [PATCH 01/13] OPNSense widget : initial version, memory usage is inaccurate. --- public/locales/en/common.json | 7 ++++ src/widgets/components.js | 1 + src/widgets/opnsense/component.jsx | 53 ++++++++++++++++++++++++++++++ src/widgets/opnsense/widget.js | 21 ++++++++++++ src/widgets/widgets.js | 2 ++ 5 files changed, 84 insertions(+) create mode 100644 src/widgets/opnsense/component.jsx create mode 100644 src/widgets/opnsense/widget.js diff --git a/public/locales/en/common.json b/public/locales/en/common.json index a1f9df9c..62c1724d 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -401,5 +401,12 @@ "memoryUsed": "Memory Used", "uptime": "Uptime", "numberOfLeases": "Leases" + }, + "opnsense": { + "cpu": "CPU Load", + "memory": "Memory Used", + "uptime": "Uptime", + "wanUpload": "WAN Upload", + "wanDownload": "WAN Download" } } diff --git a/src/widgets/components.js b/src/widgets/components.js index a2a26332..4d8a3454 100644 --- a/src/widgets/components.js +++ b/src/widgets/components.js @@ -29,6 +29,7 @@ const components = { nzbget: dynamic(() => import("./nzbget/component")), omada: dynamic(() => import("./omada/component")), ombi: dynamic(() => import("./ombi/component")), + opnsense: dynamic(() => import("./opnsense/component")), overseerr: dynamic(() => import("./overseerr/component")), paperlessngx: dynamic(() => import("./paperlessngx/component")), pihole: dynamic(() => import("./pihole/component")), diff --git a/src/widgets/opnsense/component.jsx b/src/widgets/opnsense/component.jsx new file mode 100644 index 00000000..1757d68f --- /dev/null +++ b/src/widgets/opnsense/component.jsx @@ -0,0 +1,53 @@ +import { useTranslation } from "next-i18next"; + +import Container from "components/services/widget/container"; +import Block from "components/services/widget/block"; +import useWidgetAPI from "utils/proxy/use-widget-api"; + +export default function Component({ service }) { + const { t } = useTranslation(); + + const { widget } = service; + + const { data: activityData, error: activityError } = useWidgetAPI(widget, "activity"); + const { data: interfaceData, error: interfaceError } = useWidgetAPI(widget, "interface"); + + if (activityError || interfaceError) { + const finalError = activityError ?? interfaceError; + return ; + } + + if (!activityData || !interfaceData) { + return ( + + + + + + + + ); + } + + const cpuInfos = activityData.headers[2].split(" "); + const cpu = parseFloat(cpuInfos[2]) + parseFloat(cpuInfos[5]) + parseFloat(cpuInfos[8]) + parseFloat(cpuInfos[11]); + const uptimeInfos = activityData.headers[0].match(/.* up ([0-9+:]*) .*/); + const uptime = uptimeInfos[1]; + const memoryInfos = activityData.headers[3].split(" "); + const totalMemory = parseFloat(memoryInfos[1]) + parseFloat(memoryInfos[3]) + parseFloat(memoryInfos[5]) + parseFloat(memoryInfos[7]) + parseFloat(memoryInfos[9])/1024 + parseFloat(memoryInfos[11]); + const memory = ( 1 - parseFloat(memoryInfos[11]) / totalMemory) * 100; + + const wanUpload = interfaceData.interfaces.wan['bytes transmitted']; + const wanDownload = interfaceData.interfaces.wan['bytes received']; + + return ( + + + + + + + + + ); +} diff --git a/src/widgets/opnsense/widget.js b/src/widgets/opnsense/widget.js new file mode 100644 index 00000000..2f2d7951 --- /dev/null +++ b/src/widgets/opnsense/widget.js @@ -0,0 +1,21 @@ + +import genericProxyHandler from "utils/proxy/handlers/generic"; + +const widget = { + api: "{url}/api/{endpoint}", + proxyHandler: genericProxyHandler, + + mappings: { + version: { + endpoint: "core/firmware/status", + }, + activity: { + endpoint: "diagnostics/activity/getActivity", + }, + interface: { + endpoint: "diagnostics/traffic/interface", + } + }, +}; + +export default widget; diff --git a/src/widgets/widgets.js b/src/widgets/widgets.js index 523ba9c2..b4a90378 100644 --- a/src/widgets/widgets.js +++ b/src/widgets/widgets.js @@ -24,6 +24,7 @@ import npm from "./npm/widget"; import nzbget from "./nzbget/widget"; import omada from "./omada/widget"; import ombi from "./ombi/widget"; +import opnsense from "./opnsense/widget"; import overseerr from "./overseerr/widget"; import paperlessngx from "./paperlessngx/widget"; import pihole from "./pihole/widget"; @@ -79,6 +80,7 @@ const widgets = { nzbget, omada, ombi, + opnsense, overseerr, paperlessngx, pihole, From 84affae10d6de149a1f21d5207ed020ae0ecdd04 Mon Sep 17 00:00:00 2001 From: Benoit Date: Sun, 25 Dec 2022 20:13:55 +0100 Subject: [PATCH 02/13] OPNSense widget : code cleanup in widget.js. Firewall is no longer displayed, so it did not need to be queried. --- src/widgets/opnsense/widget.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/widgets/opnsense/widget.js b/src/widgets/opnsense/widget.js index 2f2d7951..56ad0733 100644 --- a/src/widgets/opnsense/widget.js +++ b/src/widgets/opnsense/widget.js @@ -6,9 +6,6 @@ const widget = { proxyHandler: genericProxyHandler, mappings: { - version: { - endpoint: "core/firmware/status", - }, activity: { endpoint: "diagnostics/activity/getActivity", }, From f4ceb74f72635798f233a41290172a133f5bfa70 Mon Sep 17 00:00:00 2001 From: Benoit SERRA Date: Sun, 25 Dec 2022 20:15:18 +0100 Subject: [PATCH 03/13] Opnsense widget (#2) * OPNSense widget : initial version, memory usage is inaccurate. * OPNSense widget : code cleanup in widget.js. Firewall is no longer displayed, so it did not need to be queried. --- public/locales/en/common.json | 7 ++++ src/widgets/components.js | 1 + src/widgets/opnsense/component.jsx | 53 ++++++++++++++++++++++++++++++ src/widgets/opnsense/widget.js | 18 ++++++++++ src/widgets/widgets.js | 2 ++ 5 files changed, 81 insertions(+) create mode 100644 src/widgets/opnsense/component.jsx create mode 100644 src/widgets/opnsense/widget.js diff --git a/public/locales/en/common.json b/public/locales/en/common.json index a1f9df9c..62c1724d 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -401,5 +401,12 @@ "memoryUsed": "Memory Used", "uptime": "Uptime", "numberOfLeases": "Leases" + }, + "opnsense": { + "cpu": "CPU Load", + "memory": "Memory Used", + "uptime": "Uptime", + "wanUpload": "WAN Upload", + "wanDownload": "WAN Download" } } diff --git a/src/widgets/components.js b/src/widgets/components.js index a2a26332..4d8a3454 100644 --- a/src/widgets/components.js +++ b/src/widgets/components.js @@ -29,6 +29,7 @@ const components = { nzbget: dynamic(() => import("./nzbget/component")), omada: dynamic(() => import("./omada/component")), ombi: dynamic(() => import("./ombi/component")), + opnsense: dynamic(() => import("./opnsense/component")), overseerr: dynamic(() => import("./overseerr/component")), paperlessngx: dynamic(() => import("./paperlessngx/component")), pihole: dynamic(() => import("./pihole/component")), diff --git a/src/widgets/opnsense/component.jsx b/src/widgets/opnsense/component.jsx new file mode 100644 index 00000000..1757d68f --- /dev/null +++ b/src/widgets/opnsense/component.jsx @@ -0,0 +1,53 @@ +import { useTranslation } from "next-i18next"; + +import Container from "components/services/widget/container"; +import Block from "components/services/widget/block"; +import useWidgetAPI from "utils/proxy/use-widget-api"; + +export default function Component({ service }) { + const { t } = useTranslation(); + + const { widget } = service; + + const { data: activityData, error: activityError } = useWidgetAPI(widget, "activity"); + const { data: interfaceData, error: interfaceError } = useWidgetAPI(widget, "interface"); + + if (activityError || interfaceError) { + const finalError = activityError ?? interfaceError; + return ; + } + + if (!activityData || !interfaceData) { + return ( + + + + + + + + ); + } + + const cpuInfos = activityData.headers[2].split(" "); + const cpu = parseFloat(cpuInfos[2]) + parseFloat(cpuInfos[5]) + parseFloat(cpuInfos[8]) + parseFloat(cpuInfos[11]); + const uptimeInfos = activityData.headers[0].match(/.* up ([0-9+:]*) .*/); + const uptime = uptimeInfos[1]; + const memoryInfos = activityData.headers[3].split(" "); + const totalMemory = parseFloat(memoryInfos[1]) + parseFloat(memoryInfos[3]) + parseFloat(memoryInfos[5]) + parseFloat(memoryInfos[7]) + parseFloat(memoryInfos[9])/1024 + parseFloat(memoryInfos[11]); + const memory = ( 1 - parseFloat(memoryInfos[11]) / totalMemory) * 100; + + const wanUpload = interfaceData.interfaces.wan['bytes transmitted']; + const wanDownload = interfaceData.interfaces.wan['bytes received']; + + return ( + + + + + + + + + ); +} diff --git a/src/widgets/opnsense/widget.js b/src/widgets/opnsense/widget.js new file mode 100644 index 00000000..56ad0733 --- /dev/null +++ b/src/widgets/opnsense/widget.js @@ -0,0 +1,18 @@ + +import genericProxyHandler from "utils/proxy/handlers/generic"; + +const widget = { + api: "{url}/api/{endpoint}", + proxyHandler: genericProxyHandler, + + mappings: { + activity: { + endpoint: "diagnostics/activity/getActivity", + }, + interface: { + endpoint: "diagnostics/traffic/interface", + } + }, +}; + +export default widget; diff --git a/src/widgets/widgets.js b/src/widgets/widgets.js index 523ba9c2..b4a90378 100644 --- a/src/widgets/widgets.js +++ b/src/widgets/widgets.js @@ -24,6 +24,7 @@ import npm from "./npm/widget"; import nzbget from "./nzbget/widget"; import omada from "./omada/widget"; import ombi from "./ombi/widget"; +import opnsense from "./opnsense/widget"; import overseerr from "./overseerr/widget"; import paperlessngx from "./paperlessngx/widget"; import pihole from "./pihole/widget"; @@ -79,6 +80,7 @@ const widgets = { nzbget, omada, ombi, + opnsense, overseerr, paperlessngx, pihole, From e056298f4479cd039b9e0068fb8806cd7e3ca1e7 Mon Sep 17 00:00:00 2001 From: Benoit Date: Sun, 25 Dec 2022 21:09:42 +0100 Subject: [PATCH 04/13] OPNSense widget : fixing the CPU code to make it more reliable. --- src/widgets/opnsense/component.jsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/widgets/opnsense/component.jsx b/src/widgets/opnsense/component.jsx index 1757d68f..ebac928a 100644 --- a/src/widgets/opnsense/component.jsx +++ b/src/widgets/opnsense/component.jsx @@ -29,8 +29,10 @@ export default function Component({ service }) { ); } - const cpuInfos = activityData.headers[2].split(" "); - const cpu = parseFloat(cpuInfos[2]) + parseFloat(cpuInfos[5]) + parseFloat(cpuInfos[8]) + parseFloat(cpuInfos[11]); + const cpuidle = activityData.headers[2].substring(60,64); + + const cpu = 100 - parseFloat(cpuidle); + const uptimeInfos = activityData.headers[0].match(/.* up ([0-9+:]*) .*/); const uptime = uptimeInfos[1]; const memoryInfos = activityData.headers[3].split(" "); @@ -43,7 +45,7 @@ export default function Component({ service }) { return ( - + From aeca42db118465564970976105492101c5575a8a Mon Sep 17 00:00:00 2001 From: Benoit Date: Mon, 26 Dec 2022 07:28:04 +0100 Subject: [PATCH 05/13] OPNSense widget : fixing the CPU code to make it more reliable. Removing uptime info --- src/widgets/opnsense/component.jsx | 9 +++------ src/widgets/opnsense/widget.js | 6 ++++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/widgets/opnsense/component.jsx b/src/widgets/opnsense/component.jsx index ebac928a..d53e31fb 100644 --- a/src/widgets/opnsense/component.jsx +++ b/src/widgets/opnsense/component.jsx @@ -20,7 +20,7 @@ export default function Component({ service }) { if (!activityData || !interfaceData) { return ( - + @@ -30,11 +30,8 @@ export default function Component({ service }) { } const cpuidle = activityData.headers[2].substring(60,64); - const cpu = 100 - parseFloat(cpuidle); - const uptimeInfos = activityData.headers[0].match(/.* up ([0-9+:]*) .*/); - const uptime = uptimeInfos[1]; const memoryInfos = activityData.headers[3].split(" "); const totalMemory = parseFloat(memoryInfos[1]) + parseFloat(memoryInfos[3]) + parseFloat(memoryInfos[5]) + parseFloat(memoryInfos[7]) + parseFloat(memoryInfos[9])/1024 + parseFloat(memoryInfos[11]); const memory = ( 1 - parseFloat(memoryInfos[11]) / totalMemory) * 100; @@ -44,8 +41,8 @@ export default function Component({ service }) { return ( - - + + diff --git a/src/widgets/opnsense/widget.js b/src/widgets/opnsense/widget.js index 56ad0733..a144ee4c 100644 --- a/src/widgets/opnsense/widget.js +++ b/src/widgets/opnsense/widget.js @@ -8,9 +8,15 @@ const widget = { mappings: { activity: { endpoint: "diagnostics/activity/getActivity", + validate: [ + "headers" + ] }, interface: { endpoint: "diagnostics/traffic/interface", + validate: [ + "interfaces" + ] } }, }; From b44a5ac54e07163e263a70e8886f0b1fef3c029a Mon Sep 17 00:00:00 2001 From: Benoit Date: Tue, 27 Dec 2022 17:05:16 +0100 Subject: [PATCH 06/13] OPNsense widget : reporting a correct value for memory usage --- src/widgets/opnsense/component.jsx | 55 ++++++++++++++++++++++++++---- 1 file changed, 49 insertions(+), 6 deletions(-) diff --git a/src/widgets/opnsense/component.jsx b/src/widgets/opnsense/component.jsx index d9e64929..9afd5f7c 100644 --- a/src/widgets/opnsense/component.jsx +++ b/src/widgets/opnsense/component.jsx @@ -5,6 +5,51 @@ import Block from "components/services/widget/block"; import useWidgetAPI from "utils/proxy/use-widget-api"; export default function Component({ service }) { + function toKb(value, unit) { + console.log("toKB : value: ", value, " Unit:", unit); + switch (unit) { + case "K": + return parseInt(value, 10); + case "M": + return parseInt(value, 10) * 1024; + case "G": + return parseInt(value, 10) * 1024 * 1024; + default: + return parseInt(value, 10); + } + } + + function sumMemory(meminfos) { + let result; + let sumused=0; + let sumfree=0; + + const idused = ["Active", "Wired", "Laundry", "Buf"]; + const idfree = ["Inact", "Free"]; + const size = "([0-9]+)([KMG])"; + + for (let id = 0; id < idused.length;id+=1 ) { + const re = new RegExp(`${size } ${ idused[id] }`); + result = re.exec(meminfos); + + if (result) { + sumused += toKb(result[1], result[2]); + } + } + + for (let id = 0; id < idfree.length; id+=1 ) { + const re = new RegExp(`${size } ${ idfree[id] }`); + result = re.exec(meminfos); + + if (result) { + sumfree += toKb(result[1], result[2]); + } + } + + return 100*(sumused / (sumused + sumfree)); + + } + const { t } = useTranslation(); const { widget } = service; @@ -29,11 +74,9 @@ export default function Component({ service }) { } - const cpuidle = activityData.headers[2].substring(60,64); - const cpu = 100 - parseFloat(cpuidle); - const memoryInfos = activityData.headers[3].split(" "); - const totalMemory = parseFloat(memoryInfos[1]) + parseFloat(memoryInfos[3]) + parseFloat(memoryInfos[5]) + parseFloat(memoryInfos[7]) + parseFloat(memoryInfos[9])/1024 + parseFloat(memoryInfos[11]); - const memory = ( 1 - parseFloat(memoryInfos[11]) / totalMemory) * 100; + const cpuIdle = activityData.headers[2].match(/ ([0-9.]+)% idle/)[1]; + const cpu = 100 - parseFloat(cpuIdle); + const memory = sumMemory(activityData.headers[3]); const wanUpload = interfaceData.interfaces.wan['bytes transmitted']; const wanDownload = interfaceData.interfaces.wan['bytes received']; @@ -41,7 +84,7 @@ export default function Component({ service }) { return ( - + From 5bdcc342990f0ddb0b7cc75c5ef1e594cb5e38f4 Mon Sep 17 00:00:00 2001 From: Benoit Date: Thu, 29 Dec 2022 13:47:11 +0100 Subject: [PATCH 07/13] OPNsense widget : reporting a correct value for memory usage, added two fields for wan upload & download rate. Still working on those, code is not ready to use. --- public/locales/en/common.json | 5 +++- src/widgets/opnsense/component.jsx | 46 ++++++++++++++++++++++++++++-- 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/public/locales/en/common.json b/public/locales/en/common.json index 62c1724d..40854c60 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -407,6 +407,9 @@ "memory": "Memory Used", "uptime": "Uptime", "wanUpload": "WAN Upload", - "wanDownload": "WAN Download" + "wanDownload": "WAN Download", + "wanUploadRate": "WAN Upload Rate", + "wanDownloadRate": "WAN Download Rate" + } } diff --git a/src/widgets/opnsense/component.jsx b/src/widgets/opnsense/component.jsx index 9afd5f7c..cb0fad60 100644 --- a/src/widgets/opnsense/component.jsx +++ b/src/widgets/opnsense/component.jsx @@ -6,7 +6,6 @@ import useWidgetAPI from "utils/proxy/use-widget-api"; export default function Component({ service }) { function toKb(value, unit) { - console.log("toKB : value: ", value, " Unit:", unit); switch (unit) { case "K": return parseInt(value, 10); @@ -80,14 +79,57 @@ export default function Component({ service }) { const wanUpload = interfaceData.interfaces.wan['bytes transmitted']; const wanDownload = interfaceData.interfaces.wan['bytes received']; + const datas = localStorage.getItem('opnsensewidgetdatas'); + + let wanUploadRate = 0; + let wanDownloadRate = 0; + if (datas !== null) { + const datasObj = JSON.parse(datas); + console.log("Dataobj:", datasObj); + const wanUploadDiff = wanUpload - datasObj.wanUpload; + const wanDownloadDiff = wanDownload - datasObj.wanDownload; + + if (wanUploadDiff > 0 || wanDownloadDiff > 0) { + const specialTimeValue = new Date().getTime(); + console.log("Special time: ", specialTimeValue); + const specialTime = localStorage.getItem('opnsensewidgettime'); + if (specialTime !== null) { + const specialTimeObj = JSON.parse(specialTime); + const timeDif = specialTimeValue - specialTimeObj.specialtime; + wanUploadRate = 8 * wanUploadDiff / (timeDif / 1000); + wanDownloadRate = 8 * wanDownloadDiff / (timeDif / 1000); + localStorage.setItem('opnsensewidgetrate', JSON.stringify({ + wanUploadRate, + wanDownloadRate + })); + console.log("Time diff: ", timeDif, "wanUploadRate: ", wanUploadRate, "wanDownloadRate: ", wanDownloadRate); + } + localStorage.setItem('opnsensewidgettime', JSON.stringify({specialtime: specialTimeValue})); + } else { + const rate = localStorage.getItem('opnsensewidgetrate'); + if (rate !== null) { + const rateObj = JSON.parse(rate); + wanUploadRate = rateObj.wanUploadRate; + wanDownloadRate = rateObj.wanDownloadRate; + } + } + console.log("wanUploadDiff:", wanUploadDiff); + console.log("wanDownloadDiff:", wanDownloadDiff); + } + localStorage.setItem('opnsensewidgetdatas', JSON.stringify({ + wanUpload, + wanDownload, + time: Date.now()})); return ( - + + + ); } From fc263be8ad03cd9f59cee8d568b8115b97ce023a Mon Sep 17 00:00:00 2001 From: Benoit Date: Thu, 29 Dec 2022 15:38:01 +0100 Subject: [PATCH 08/13] OPNsense widget : wan upload & download rate now work when multiple widgets are in use. Still working on those fields, code is not ready to use. Refactor needed for localStorage use. --- src/widgets/opnsense/component.jsx | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/widgets/opnsense/component.jsx b/src/widgets/opnsense/component.jsx index cb0fad60..8cb29838 100644 --- a/src/widgets/opnsense/component.jsx +++ b/src/widgets/opnsense/component.jsx @@ -52,7 +52,11 @@ export default function Component({ service }) { const { t } = useTranslation(); const { widget } = service; - + const wid = widget.service_name + "." + widget.service_group; + const rateStorage = `${wid}rate`; + const dataStorage = `${wid}data`; + const timeStorage = `${wid}time`; + console.log("service: ", service, " wid: ", wid); const { data: activityData, error: activityError } = useWidgetAPI(widget, "activity"); const { data: interfaceData, error: interfaceError } = useWidgetAPI(widget, "interface"); @@ -79,7 +83,7 @@ export default function Component({ service }) { const wanUpload = interfaceData.interfaces.wan['bytes transmitted']; const wanDownload = interfaceData.interfaces.wan['bytes received']; - const datas = localStorage.getItem('opnsensewidgetdatas'); + const datas = localStorage.getItem(dataStorage); let wanUploadRate = 0; let wanDownloadRate = 0; @@ -92,21 +96,21 @@ export default function Component({ service }) { if (wanUploadDiff > 0 || wanDownloadDiff > 0) { const specialTimeValue = new Date().getTime(); console.log("Special time: ", specialTimeValue); - const specialTime = localStorage.getItem('opnsensewidgettime'); + const specialTime = localStorage.getItem(timeStorage); if (specialTime !== null) { const specialTimeObj = JSON.parse(specialTime); const timeDif = specialTimeValue - specialTimeObj.specialtime; wanUploadRate = 8 * wanUploadDiff / (timeDif / 1000); wanDownloadRate = 8 * wanDownloadDiff / (timeDif / 1000); - localStorage.setItem('opnsensewidgetrate', JSON.stringify({ + localStorage.setItem(rateStorage, JSON.stringify({ wanUploadRate, wanDownloadRate })); console.log("Time diff: ", timeDif, "wanUploadRate: ", wanUploadRate, "wanDownloadRate: ", wanDownloadRate); } - localStorage.setItem('opnsensewidgettime', JSON.stringify({specialtime: specialTimeValue})); + localStorage.setItem(timeStorage, JSON.stringify({specialtime: specialTimeValue})); } else { - const rate = localStorage.getItem('opnsensewidgetrate'); + const rate = localStorage.getItem(rateStorage); if (rate !== null) { const rateObj = JSON.parse(rate); wanUploadRate = rateObj.wanUploadRate; @@ -116,18 +120,17 @@ export default function Component({ service }) { console.log("wanUploadDiff:", wanUploadDiff); console.log("wanDownloadDiff:", wanDownloadDiff); } - localStorage.setItem('opnsensewidgetdatas', JSON.stringify({ + localStorage.setItem(dataStorage, JSON.stringify({ wanUpload, wanDownload, time: Date.now()})); return ( - + - From 86f21afe1ed471a2e81dbebca3a7c237d94312b1 Mon Sep 17 00:00:00 2001 From: Benoit Date: Thu, 29 Dec 2022 16:29:02 +0100 Subject: [PATCH 09/13] OPNsense widget : all datas are locally stored in a single localStorage object. --- src/widgets/opnsense/component.jsx | 81 ++++++++++++------------------ 1 file changed, 31 insertions(+), 50 deletions(-) diff --git a/src/widgets/opnsense/component.jsx b/src/widgets/opnsense/component.jsx index 8cb29838..3f1ea951 100644 --- a/src/widgets/opnsense/component.jsx +++ b/src/widgets/opnsense/component.jsx @@ -52,11 +52,8 @@ export default function Component({ service }) { const { t } = useTranslation(); const { widget } = service; - const wid = widget.service_name + "." + widget.service_group; - const rateStorage = `${wid}rate`; - const dataStorage = `${wid}data`; - const timeStorage = `${wid}time`; - console.log("service: ", service, " wid: ", wid); + const wid = `${widget.service_name}.${widget.service_group}`; + const dataStorage = `${wid}datas`; const { data: activityData, error: activityError } = useWidgetAPI(widget, "activity"); const { data: interfaceData, error: interfaceError } = useWidgetAPI(widget, "interface"); @@ -81,58 +78,42 @@ export default function Component({ service }) { const cpu = 100 - parseFloat(cpuIdle); const memory = sumMemory(activityData.headers[3]); - const wanUpload = interfaceData.interfaces.wan['bytes transmitted']; - const wanDownload = interfaceData.interfaces.wan['bytes received']; - const datas = localStorage.getItem(dataStorage); + const wanUpload = parseFloat(interfaceData.interfaces.wan['bytes transmitted']); + const wanDownload = parseFloat(interfaceData.interfaces.wan['bytes received']); + const dataStored = localStorage.getItem(dataStorage); + let datas; - let wanUploadRate = 0; - let wanDownloadRate = 0; - if (datas !== null) { - const datasObj = JSON.parse(datas); - console.log("Dataobj:", datasObj); - const wanUploadDiff = wanUpload - datasObj.wanUpload; - const wanDownloadDiff = wanDownload - datasObj.wanDownload; - - if (wanUploadDiff > 0 || wanDownloadDiff > 0) { - const specialTimeValue = new Date().getTime(); - console.log("Special time: ", specialTimeValue); - const specialTime = localStorage.getItem(timeStorage); - if (specialTime !== null) { - const specialTimeObj = JSON.parse(specialTime); - const timeDif = specialTimeValue - specialTimeObj.specialtime; - wanUploadRate = 8 * wanUploadDiff / (timeDif / 1000); - wanDownloadRate = 8 * wanDownloadDiff / (timeDif / 1000); - localStorage.setItem(rateStorage, JSON.stringify({ - wanUploadRate, - wanDownloadRate - })); - console.log("Time diff: ", timeDif, "wanUploadRate: ", wanUploadRate, "wanDownloadRate: ", wanDownloadRate); - } - localStorage.setItem(timeStorage, JSON.stringify({specialtime: specialTimeValue})); - } else { - const rate = localStorage.getItem(rateStorage); - if (rate !== null) { - const rateObj = JSON.parse(rate); - wanUploadRate = rateObj.wanUploadRate; - wanDownloadRate = rateObj.wanDownloadRate; - } + if (dataStored === null) { + datas = { + wanUpload : 0, + wanDownload : 0, + updateTime : 0, + wanUploadRate : 0, + wanDownloadRate : 0 } - console.log("wanUploadDiff:", wanUploadDiff); - console.log("wanDownloadDiff:", wanDownloadDiff); + } else { + datas = JSON.parse(dataStored); } - localStorage.setItem(dataStorage, JSON.stringify({ - wanUpload, - wanDownload, - time: Date.now()})); - + const wanUploadDiff = wanUpload - datas.wanUpload; + const wanDownloadDiff = wanDownload - datas.wanDownload; + if (wanUploadDiff > 0 || wanDownloadDiff > 0) { + const specialTimeValue = new Date().getTime(); + const timeDif = specialTimeValue - datas.updateTime; + datas.wanUploadRate = 8 * wanUploadDiff / (timeDif / 1000); + datas.wanDownloadRate = 8 * wanDownloadDiff / (timeDif / 1000); + datas.updateTime = specialTimeValue; + } + datas.wanUpload = wanUpload; + datas.wanDownload = wanDownload; + localStorage.setItem(dataStorage, JSON.stringify(datas)); return ( - - - - + + + + ); } From a08d0c6e60792d54d152880254b15dfcb2a12931 Mon Sep 17 00:00:00 2001 From: Benoit Date: Thu, 5 Jan 2023 18:57:23 +0100 Subject: [PATCH 10/13] Synology widget : working on code stability --- public/locales/en/common.json | 5 +++- src/widgets/opnsense/component.jsx | 5 ++-- src/widgets/synology/component.jsx | 6 ++-- src/widgets/synology/proxy.js | 45 ++++++++++++++++++++---------- 4 files changed, 42 insertions(+), 19 deletions(-) diff --git a/public/locales/en/common.json b/public/locales/en/common.json index a6622533..b1481caa 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -415,7 +415,10 @@ }, "synology": { "uptime": "Uptime", - "volumeUsage": "Volume Usage" + "volumeUsage": "Volume Usage", + "cpuLoad": "CPU Load", + "memoryUsage": "Memory Usage", + "status": "Status" }, "opnsense": { "cpu": "CPU Load", diff --git a/src/widgets/opnsense/component.jsx b/src/widgets/opnsense/component.jsx index 3f1ea951..698d2d30 100644 --- a/src/widgets/opnsense/component.jsx +++ b/src/widgets/opnsense/component.jsx @@ -52,8 +52,7 @@ export default function Component({ service }) { const { t } = useTranslation(); const { widget } = service; - const wid = `${widget.service_name}.${widget.service_group}`; - const dataStorage = `${wid}datas`; + const dataStorage = `${widget.service_name}.${widget.service_group}datas`; const { data: activityData, error: activityError } = useWidgetAPI(widget, "activity"); const { data: interfaceData, error: interfaceError } = useWidgetAPI(widget, "interface"); @@ -69,6 +68,8 @@ export default function Component({ service }) { + + ); } diff --git a/src/widgets/synology/component.jsx b/src/widgets/synology/component.jsx index f2d662a1..fd832c8e 100644 --- a/src/widgets/synology/component.jsx +++ b/src/widgets/synology/component.jsx @@ -20,7 +20,8 @@ export default function Component({ service }) { - + + ); } @@ -30,7 +31,8 @@ export default function Component({ service }) { - + + ); } diff --git a/src/widgets/synology/proxy.js b/src/widgets/synology/proxy.js index 39dbf8c1..9e42d355 100644 --- a/src/widgets/synology/proxy.js +++ b/src/widgets/synology/proxy.js @@ -2,43 +2,42 @@ import { formatApiCall } from "utils/proxy/api-helpers"; import { httpProxy } from "utils/proxy/http"; import createLogger from "utils/logger"; import getServiceWidget from "utils/config/service-helpers"; +import {console} from "next/dist/compiled/@edge-runtime/primitives/console"; const proxyName = "synologyProxyHandler"; const logger = createLogger(proxyName); -const authApi = "{url}/webapi/entry.cgi?api=SYNO.API.Auth&version=7&method=login&account={username}&passwd={password}&format=cookie" function formatUptime(uptime) { const [hour, minutes, seconds] = uptime.split(":"); const days = Math.floor(hour/24); const hours = hour % 24; - return `${days} days ${hours}:${minutes}:${seconds}` + return `${days} d ${hours}h${minutes}m${seconds}s` } async function getApiInfo(api, widget) { - const infoAPI = "{url}/webapi/entry.cgi?api=SYNO.API.Info&version=1&method=query" + const infoAPI = "{url}/webapi/query.cgi?api=SYNO.API.Info&version=1&method=query" + const infoUrl = formatApiCall(infoAPI, widget); // eslint-disable-next-line no-unused-vars const [status, contentType, data] = await httpProxy(infoUrl); - let path = "Method unavailable"; - let minVersion = 0; - let maxVersion = 0; if (status === 200) { const json = JSON.parse(data.toString()); if (json.data[api]) { - path = json.data[api].path; - minVersion = json.data[api].minVersion; - maxVersion = json.data[api].maxVersion; + const { path, minVersion, maxVersion } = json.data[api]; + return [ path, minVersion, maxVersion ]; } } - - return [path, minVersion, maxVersion]; + return [null, null, null]; } async function login(widget) { + // eslint-disable-next-line no-unused-vars + const [path, minVersion, maxVersion] = await getApiInfo("SYNO.API.Auth", widget); + const authApi = `{url}/webapi/${path}?api=SYNO.API.Auth&version=${maxVersion}&method=login&account={username}&passwd={password}&format=cookie` const loginUrl = formatApiCall(authApi, widget); const [status, contentType, data] = await httpProxy(loginUrl); if (status !== 200) { @@ -69,11 +68,15 @@ export default async function synologyProxyHandler(req, res) { let [status, contentType, data] = await login(widget); const { sid }=JSON.parse(data.toString()).data; - const api = "SYNO.Core.System"; + let api = "SYNO.Core.System"; // eslint-disable-next-line no-unused-vars - const [ path, minVersion, maxVersion] = await getApiInfo(api, widget); + let [ path, minVersion, maxVersion] = await getApiInfo(api, widget); + const storageUrl = `${widget.url}/webapi/${path}?api=${api}&version=${maxVersion}&method=info&type="storage"&_sid=${sid}`; + [status, contentType, data] = await httpProxy(storageUrl ); + + let usedVolume = 0; if (status !== 200) { return res.status(status).set("Content-Type", contentType).send(data); @@ -86,6 +89,7 @@ export default async function synologyProxyHandler(req, res) { const healthUrl = `${widget.url}/webapi/${path}?api=${api}&version=${maxVersion}&method=info&_sid=${sid}`; [status, contentType, data] = await httpProxy(healthUrl); + if (status !== 200) { return res.status(status).set("Content-Type", contentType).send(data); } @@ -94,11 +98,24 @@ export default async function synologyProxyHandler(req, res) { return res.status(401).json({ error: "Error getting uptime" }); } const uptime = formatUptime(json.data.up_time); + api = "SYNO.Core.System.Utilization"; + // eslint-disable-next-line no-unused-vars + [ path, minVersion, maxVersion] = await getApiInfo(api, widget); + const sysUrl = `${widget.url}/webapi/${path}?api=${api}&version=${maxVersion}&method=get&_sid=${sid}`; + [status, contentType, data] = await httpProxy(sysUrl ); + + const memoryUsage = 100 - (100 * (parseFloat(JSON.parse(data.toString()).data.memory.avail_real) + parseFloat(JSON.parse(data.toString()).data.memory.cached)) / parseFloat(JSON.parse(data.toString()).data.memory.total_real)); + const cpuLoad = parseFloat(JSON.parse(data.toString()).data.cpu.user_load) + parseFloat(JSON.parse(data.toString()).data.cpu.system_load); + + const resdata = { uptime, - usedVolume + usedVolume, + memoryUsage, + cpuLoad, } if (contentType) res.setHeader("Content-Type", contentType); + console.log("Response Data: ", resdata); return res.status(status).send(JSON.stringify(resdata)); } From 96080eaaeb64ef87998f0da10757af9b893da46e Mon Sep 17 00:00:00 2001 From: Benoit Date: Sat, 7 Jan 2023 12:20:38 +0100 Subject: [PATCH 11/13] Synology widget: code cleanup --- src/widgets/synology/proxy.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/widgets/synology/proxy.js b/src/widgets/synology/proxy.js index 9e42d355..b0590ca7 100644 --- a/src/widgets/synology/proxy.js +++ b/src/widgets/synology/proxy.js @@ -1,8 +1,8 @@ + import { formatApiCall } from "utils/proxy/api-helpers"; import { httpProxy } from "utils/proxy/http"; import createLogger from "utils/logger"; import getServiceWidget from "utils/config/service-helpers"; -import {console} from "next/dist/compiled/@edge-runtime/primitives/console"; const proxyName = "synologyProxyHandler"; @@ -116,6 +116,5 @@ export default async function synologyProxyHandler(req, res) { cpuLoad, } if (contentType) res.setHeader("Content-Type", contentType); - console.log("Response Data: ", resdata); return res.status(status).send(JSON.stringify(resdata)); } From 0ea1362462c75af8ea5e4ff44b212ee51fdb75e8 Mon Sep 17 00:00:00 2001 From: Benoit Date: Sat, 7 Jan 2023 17:28:33 +0100 Subject: [PATCH 12/13] Synology widget: code cleanup --- src/widgets/synology/proxy.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/widgets/synology/proxy.js b/src/widgets/synology/proxy.js index b0590ca7..4c4d600a 100644 --- a/src/widgets/synology/proxy.js +++ b/src/widgets/synology/proxy.js @@ -107,8 +107,6 @@ export default async function synologyProxyHandler(req, res) { const memoryUsage = 100 - (100 * (parseFloat(JSON.parse(data.toString()).data.memory.avail_real) + parseFloat(JSON.parse(data.toString()).data.memory.cached)) / parseFloat(JSON.parse(data.toString()).data.memory.total_real)); const cpuLoad = parseFloat(JSON.parse(data.toString()).data.cpu.user_load) + parseFloat(JSON.parse(data.toString()).data.cpu.system_load); - - const resdata = { uptime, usedVolume, From a86f832be9c02bbfad32d2854f7ba249eb3e1da2 Mon Sep 17 00:00:00 2001 From: Benoit Date: Thu, 5 Jan 2023 18:57:23 +0100 Subject: [PATCH 13/13] Synology widget : working on code stability --- public/locales/en/common.json | 5 +++- src/widgets/opnsense/component.jsx | 5 ++-- src/widgets/synology/component.jsx | 6 +++-- src/widgets/synology/proxy.js | 42 ++++++++++++++++++++---------- 4 files changed, 39 insertions(+), 19 deletions(-) diff --git a/public/locales/en/common.json b/public/locales/en/common.json index a6622533..b1481caa 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -415,7 +415,10 @@ }, "synology": { "uptime": "Uptime", - "volumeUsage": "Volume Usage" + "volumeUsage": "Volume Usage", + "cpuLoad": "CPU Load", + "memoryUsage": "Memory Usage", + "status": "Status" }, "opnsense": { "cpu": "CPU Load", diff --git a/src/widgets/opnsense/component.jsx b/src/widgets/opnsense/component.jsx index 3f1ea951..698d2d30 100644 --- a/src/widgets/opnsense/component.jsx +++ b/src/widgets/opnsense/component.jsx @@ -52,8 +52,7 @@ export default function Component({ service }) { const { t } = useTranslation(); const { widget } = service; - const wid = `${widget.service_name}.${widget.service_group}`; - const dataStorage = `${wid}datas`; + const dataStorage = `${widget.service_name}.${widget.service_group}datas`; const { data: activityData, error: activityError } = useWidgetAPI(widget, "activity"); const { data: interfaceData, error: interfaceError } = useWidgetAPI(widget, "interface"); @@ -69,6 +68,8 @@ export default function Component({ service }) { + + ); } diff --git a/src/widgets/synology/component.jsx b/src/widgets/synology/component.jsx index f2d662a1..fd832c8e 100644 --- a/src/widgets/synology/component.jsx +++ b/src/widgets/synology/component.jsx @@ -20,7 +20,8 @@ export default function Component({ service }) { - + + ); } @@ -30,7 +31,8 @@ export default function Component({ service }) { - + + ); } diff --git a/src/widgets/synology/proxy.js b/src/widgets/synology/proxy.js index 39dbf8c1..4c4d600a 100644 --- a/src/widgets/synology/proxy.js +++ b/src/widgets/synology/proxy.js @@ -1,3 +1,4 @@ + import { formatApiCall } from "utils/proxy/api-helpers"; import { httpProxy } from "utils/proxy/http"; import createLogger from "utils/logger"; @@ -7,38 +8,36 @@ const proxyName = "synologyProxyHandler"; const logger = createLogger(proxyName); -const authApi = "{url}/webapi/entry.cgi?api=SYNO.API.Auth&version=7&method=login&account={username}&passwd={password}&format=cookie" function formatUptime(uptime) { const [hour, minutes, seconds] = uptime.split(":"); const days = Math.floor(hour/24); const hours = hour % 24; - return `${days} days ${hours}:${minutes}:${seconds}` + return `${days} d ${hours}h${minutes}m${seconds}s` } async function getApiInfo(api, widget) { - const infoAPI = "{url}/webapi/entry.cgi?api=SYNO.API.Info&version=1&method=query" + const infoAPI = "{url}/webapi/query.cgi?api=SYNO.API.Info&version=1&method=query" + const infoUrl = formatApiCall(infoAPI, widget); // eslint-disable-next-line no-unused-vars const [status, contentType, data] = await httpProxy(infoUrl); - let path = "Method unavailable"; - let minVersion = 0; - let maxVersion = 0; if (status === 200) { const json = JSON.parse(data.toString()); if (json.data[api]) { - path = json.data[api].path; - minVersion = json.data[api].minVersion; - maxVersion = json.data[api].maxVersion; + const { path, minVersion, maxVersion } = json.data[api]; + return [ path, minVersion, maxVersion ]; } } - - return [path, minVersion, maxVersion]; + return [null, null, null]; } async function login(widget) { + // eslint-disable-next-line no-unused-vars + const [path, minVersion, maxVersion] = await getApiInfo("SYNO.API.Auth", widget); + const authApi = `{url}/webapi/${path}?api=SYNO.API.Auth&version=${maxVersion}&method=login&account={username}&passwd={password}&format=cookie` const loginUrl = formatApiCall(authApi, widget); const [status, contentType, data] = await httpProxy(loginUrl); if (status !== 200) { @@ -69,11 +68,15 @@ export default async function synologyProxyHandler(req, res) { let [status, contentType, data] = await login(widget); const { sid }=JSON.parse(data.toString()).data; - const api = "SYNO.Core.System"; + let api = "SYNO.Core.System"; // eslint-disable-next-line no-unused-vars - const [ path, minVersion, maxVersion] = await getApiInfo(api, widget); + let [ path, minVersion, maxVersion] = await getApiInfo(api, widget); + const storageUrl = `${widget.url}/webapi/${path}?api=${api}&version=${maxVersion}&method=info&type="storage"&_sid=${sid}`; + [status, contentType, data] = await httpProxy(storageUrl ); + + let usedVolume = 0; if (status !== 200) { return res.status(status).set("Content-Type", contentType).send(data); @@ -86,6 +89,7 @@ export default async function synologyProxyHandler(req, res) { const healthUrl = `${widget.url}/webapi/${path}?api=${api}&version=${maxVersion}&method=info&_sid=${sid}`; [status, contentType, data] = await httpProxy(healthUrl); + if (status !== 200) { return res.status(status).set("Content-Type", contentType).send(data); } @@ -94,10 +98,20 @@ export default async function synologyProxyHandler(req, res) { return res.status(401).json({ error: "Error getting uptime" }); } const uptime = formatUptime(json.data.up_time); + api = "SYNO.Core.System.Utilization"; + // eslint-disable-next-line no-unused-vars + [ path, minVersion, maxVersion] = await getApiInfo(api, widget); + const sysUrl = `${widget.url}/webapi/${path}?api=${api}&version=${maxVersion}&method=get&_sid=${sid}`; + [status, contentType, data] = await httpProxy(sysUrl ); + + const memoryUsage = 100 - (100 * (parseFloat(JSON.parse(data.toString()).data.memory.avail_real) + parseFloat(JSON.parse(data.toString()).data.memory.cached)) / parseFloat(JSON.parse(data.toString()).data.memory.total_real)); + const cpuLoad = parseFloat(JSON.parse(data.toString()).data.cpu.user_load) + parseFloat(JSON.parse(data.toString()).data.cpu.system_load); const resdata = { uptime, - usedVolume + usedVolume, + memoryUsage, + cpuLoad, } if (contentType) res.setHeader("Content-Type", contentType); return res.status(status).send(JSON.stringify(resdata));