Merge branch 'gethomepage:main' into feature/frigate-widget

src/widgets/pfsense/component.jsx

@@ -9,8 +9,12 @@ export default function Component({ service }) {
 
   const { widget } = service;
 
-  const { data: systemData, error: systemError } = useWidgetAPI(widget, "system");
-  const { data: interfaceData, error: interfaceError } = useWidgetAPI(widget, "interface");
+  const version = widget.version ?? 1;
+  const { data: systemData, error: systemError } = useWidgetAPI(widget, version === 1 ? "system" : "systemv2");
+  const { data: interfaceData, error: interfaceError } = useWidgetAPI(
+    widget,
+    version === 1 ? "interface" : "interfacev2",
+  );
 
   const showWanIP = widget.fields?.filter((f) => f !== "wanIP").length <= 4 && widget.fields?.includes("wanIP");
   const showDiskUsage = widget.fields?.filter((f) => f !== "disk").length <= 4 && widget.fields?.includes("disk");
@@ -34,14 +38,20 @@ export default function Component({ service }) {
   }
 
   const wan = interfaceData.data.filter((l) => l.hwif === widget.wan)[0];
+  let memUsage = systemData?.data.mem_usage;
+  let diskUsage = systemData.data.disk_usage;
+  if (version === 1) {
+    memUsage *= 100;
+    diskUsage *= 100;
+  }
 
   return (
     <Container service={service}>
-      <Block label="pfsense.load" value={systemData.data.load_avg[0]} />
       <Block
-        label="pfsense.memory"
-        value={t("common.percent", { value: (systemData.data.mem_usage * 100).toFixed(2) })}
+        label="pfsense.load"
+        value={version === 1 ? systemData.data.load_avg[0] : systemData.data.cpu_load_avg[0]}
       />
+      <Block label="pfsense.memory" value={t("common.percent", { value: memUsage.toFixed(2) })} />
       <Block
         label="pfsense.temp"
         value={t("common.number", { value: systemData.data.temp_c, style: "unit", unit: "celsius" })}
@@ -57,12 +67,7 @@ export default function Component({ service }) {
         }
       />
       {showWanIP && <Block label="pfsense.wanIP" value={wan.ipaddr} />}
-      {showDiskUsage && (
-        <Block
-          label="pfsense.disk"
-          value={t("common.percent", { value: (systemData.data.disk_usage * 100).toFixed(2) })}
-        />
-      )}
+      {showDiskUsage && <Block label="pfsense.disk" value={t("common.percent", { value: diskUsage.toFixed(2) })} />}
     </Container>
   );
 }

src/widgets/pfsense/widget.js

@@ -1,16 +1,24 @@
 import genericProxyHandler from "utils/proxy/handlers/generic";
 
 const widget = {
-  api: "{url}/api/v1/{endpoint}",
+  api: "{url}/api/{endpoint}",
   proxyHandler: genericProxyHandler,
 
   mappings: {
     system: {
-      endpoint: "status/system",
+      endpoint: "v1/status/system",
       validate: ["data"],
     },
     interface: {
-      endpoint: "status/interface",
+      endpoint: "v1/status/interface",
+      validate: ["data"],
+    },
+    systemv2: {
+      endpoint: "v2/status/system",
+      validate: ["data"],
+    },
+    interfacev2: {
+      endpoint: "v2/status/interfaces?limit=0&offset=0",
       validate: ["data"],
     },
   },