OpenSource/homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Benoit 2022-12-29 15:38:01 +01:00
parent 5bdcc34299
commit fc263be8ad
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/widgets/opnsense/component.jsx
View File

@ -52,7 +52,11 @@ export default function Component({ service }) {
const { t } = useTranslation(); const { t } = useTranslation();
const { widget } = service; 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: activityData, error: activityError } = useWidgetAPI(widget, "activity");
const { data: interfaceData, error: interfaceError } = useWidgetAPI(widget, "interface"); 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 wanUpload = interfaceData.interfaces.wan['bytes transmitted'];
const wanDownload = interfaceData.interfaces.wan['bytes received']; const wanDownload = interfaceData.interfaces.wan['bytes received'];
const datas = localStorage.getItem('opnsensewidgetdatas'); const datas = localStorage.getItem(dataStorage);
let wanUploadRate = 0; let wanUploadRate = 0;
let wanDownloadRate = 0; let wanDownloadRate = 0;
@ -92,21 +96,21 @@ export default function Component({ service }) {
if (wanUploadDiff > 0 || wanDownloadDiff > 0) { if (wanUploadDiff > 0 || wanDownloadDiff > 0) {
const specialTimeValue = new Date().getTime(); const specialTimeValue = new Date().getTime();
console.log("Special time: ", specialTimeValue); console.log("Special time: ", specialTimeValue);
const specialTime = localStorage.getItem('opnsensewidgettime'); const specialTime = localStorage.getItem(timeStorage);
if (specialTime !== null) { if (specialTime !== null) {
const specialTimeObj = JSON.parse(specialTime); const specialTimeObj = JSON.parse(specialTime);
const timeDif = specialTimeValue - specialTimeObj.specialtime; const timeDif = specialTimeValue - specialTimeObj.specialtime;
wanUploadRate = 8 * wanUploadDiff / (timeDif / 1000); wanUploadRate = 8 * wanUploadDiff / (timeDif / 1000);
wanDownloadRate = 8 * wanDownloadDiff / (timeDif / 1000); wanDownloadRate = 8 * wanDownloadDiff / (timeDif / 1000);
localStorage.setItem('opnsensewidgetrate', JSON.stringify({ localStorage.setItem(rateStorage, JSON.stringify({
wanUploadRate, wanUploadRate,
wanDownloadRate wanDownloadRate
})); }));
console.log("Time diff: ", timeDif, "wanUploadRate: ", wanUploadRate, "wanDownloadRate: ", 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 { } else {
const rate = localStorage.getItem('opnsensewidgetrate'); const rate = localStorage.getItem(rateStorage);
if (rate !== null) { if (rate !== null) {
const rateObj = JSON.parse(rate); const rateObj = JSON.parse(rate);
wanUploadRate = rateObj.wanUploadRate; wanUploadRate = rateObj.wanUploadRate;
@ -116,7 +120,7 @@ export default function Component({ service }) {
console.log("wanUploadDiff:", wanUploadDiff); console.log("wanUploadDiff:", wanUploadDiff);
console.log("wanDownloadDiff:", wanDownloadDiff); console.log("wanDownloadDiff:", wanDownloadDiff);
} }
localStorage.setItem('opnsensewidgetdatas', JSON.stringify({ localStorage.setItem(dataStorage, JSON.stringify({
wanUpload, wanUpload,
wanDownload, wanDownload,
time: Date.now()})); time: Date.now()}));
@ -127,7 +131,6 @@ export default function Component({ service }) {
<Block label="opnsense.memory" value={t("common.percent", { value: memory})} /> <Block label="opnsense.memory" value={t("common.percent", { value: memory})} />
<Block label="opnsense.wanUpload" value={t("common.bytes", { value: wanUpload})} /> <Block label="opnsense.wanUpload" value={t("common.bytes", { value: wanUpload})} />
<Block label="opnsense.wanDownload" value={t("common.bytes", { value: wanDownload })} /> <Block label="opnsense.wanDownload" value={t("common.bytes", { value: wanDownload })} />
<Block label="opnsense.wanUploadRate" value={t("common.bitrate", { value: wanUploadRate})} /> <Block label="opnsense.wanUploadRate" value={t("common.bitrate", { value: wanUploadRate})} />
<Block label="opnsense.wanDownloadRate" value={t("common.bitrate", { value: wanDownloadRate})} /> <Block label="opnsense.wanDownloadRate" value={t("common.bitrate", { value: wanDownloadRate})} />
</Container> </Container>