Fan speed, autoreload

C-D-Lewis · Oct 23, 2024 · db2d45c · db2d45c
1 parent 036bdca
commit db2d45c
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 18 deletions.
diff --git a/apps/monitor/src/plugins/system-metrics.js b/apps/monitor/src/plugins/system-metrics.js
@@ -48,6 +48,25 @@ const getFrequencyPerc = () => {
   }
 };
 
+/**
+ * Get current fan speed.
+ *
+ * @returns {number} Fan speed in RPM.
+ */
+const getFanSpeed = () => {
+  try {
+    const speed = parseInt(
+      execSync('cat /sys/devices/platform/cooling_fan/hwmon/*/fan1_input').toString(),
+      10,
+    );
+
+    return speed || 0;
+  } catch (e) {
+    log.error(e);
+    return 0;
+  }
+};
+
 /**
  * Log metrics for system stats.
  *
@@ -69,6 +88,8 @@ module.exports = async (args = {}) => {
 
     const freqPerc = getFrequencyPerc();
 
+    const fanSpeed = getFanSpeed();
+
     // Metrics with 'Perc' in the name are treated as a 0-100% range in the dashboard
     updateMetrics({
       cpu: cpuMinute,
@@ -78,6 +99,7 @@ module.exports = async (args = {}) => {
       diskPerc,
       tempRaw,
       freqPerc,
+      fanSpeed,
     });
   } catch (e) {
     log.error(e);

diff --git a/dashboard2/src/components/AppArea.ts b/dashboard2/src/components/AppArea.ts
@@ -1,9 +1,10 @@
-import { Fabricate } from 'fabricate.js';
+import { Fabricate, FabricateComponent } from 'fabricate.js';
 import { AppState } from '../types';
 import StatRow from './StatRow';
 import AppLoader from './AppLoader';
 import AppCard from './AppCard';
 import DeviceMetrics from './DeviceMetrics';
+import { fetchMetricNames } from '../services/conduitService';
 
 declare const fabricate: Fabricate<AppState>;
 
@@ -20,6 +21,38 @@ const NoDeviceLabel = () => fabricate('Text')
   }))
   .setText('No device selected');
 
+/**
+ * RefreshProgressBar component.
+ *
+ * @returns {FabricateComponent} RefreshProgressBar component.
+ */
+const RefreshProgressBar = () => {
+  let handle: NodeJS.Timer;
+  let progress = 100;
+
+  return fabricate('div')
+    .setStyles(({ palette }) => ({
+      width: '100%',
+      height: '5px',
+      backgroundColor: palette.secondary,
+      transition: '0.5s',
+    }))
+    .onCreate((el, state) => {
+      handle = setInterval(() => {
+        el.setStyles({ width: `${progress}%` });
+
+        // 30s
+        progress = Math.max(0, progress - 1.67);
+        if (progress === 0) {
+          progress = 100;
+
+          fetchMetricNames(state);
+        }
+      }, 1000);
+    })
+    .onDestroy(() => clearInterval(handle));
+};
+
 /**
  * AppArea component.
  *
@@ -63,6 +96,7 @@ const AppArea = () => {
       el.setChildren([
         StatRow({ device: selectedDevice }),
         fabricate.conditional((s) => !areAppsLoaded(s), AppLoader),
+        fabricate.conditional(areAppsLoaded, RefreshProgressBar),
         fabricate.conditional(areAppsLoaded, DeviceMetrics),
         fabricate.conditional(areAppsLoaded, AppCardList),
       ]);

diff --git a/dashboard2/src/components/DeviceMetrics.ts b/dashboard2/src/components/DeviceMetrics.ts
@@ -4,7 +4,7 @@ import {
 } from '../types';
 import Theme from '../theme';
 import { BUCKET_SIZE } from '../constants';
-import { fetchMetric, sendConduitPacket } from '../services/conduitService';
+import { fetchMetric, fetchMetricNames } from '../services/conduitService';
 
 declare const fabricate: Fabricate<AppState>;
 
@@ -21,6 +21,7 @@ const METRIC_NAME_MAP: Record<string, string> = {
   discPerc: 'Disk (%)',
   tempRaw: 'Temperature',
   freqPerc: 'CPU Frequency (%)',
+  fanSpeed: 'Fan Speed (RPM)',
 };
 
 /**
@@ -175,7 +176,6 @@ const MetricContainer = ({ name } : { name: string }) => fabricate('Column')
     border: `solid 2px ${palette.grey6}`,
   }))
   .setNarrowStyles({
-    width: '100%',
     margin: '10px 0px',
   })
   .setChildren([
@@ -204,11 +204,7 @@ const DeviceMetrics = () => fabricate('Row')
   })
   .onCreate(async (el, state) => {
     // Get the metrics available, each graph loads its own
-    fabricate.update({ metricNames: [] });
-    const {
-      message: metricNames,
-    } = await sendConduitPacket(state, { to: 'monitor', topic: 'getMetricNames' });
-    fabricate.update({ metricNames });
+    fetchMetricNames(state);
   })
   .onUpdate(async (el, state, keys) => {
     const { selectedDevice, metricNames } = state;

diff --git a/dashboard2/src/services/conduitService.ts b/dashboard2/src/services/conduitService.ts
@@ -138,16 +138,16 @@ export const fetchDeviceApps = async (state: AppState, device: Device) => {
  */
 export const fetchMetric = async (state: AppState, name: string) => {
   const dataKey = fabricate.buildKey('metricData', name);
-  fabricate.update(
-    dataKey,
-    {
-      buckets: [],
-      minTime: 0,
-      maxTime: 0,
-      minValue: 0,
-      maxValue: 0,
-    },
-  );
+  // fabricate.update(
+  //   dataKey,
+  //   {
+  //     buckets: [],
+  //     minTime: 0,
+  //     maxTime: 0,
+  //     minValue: 0,
+  //     maxValue: 0,
+  //   },
+  // );
 
   const res = await sendConduitPacket(
     state,
@@ -214,3 +214,15 @@ export const fetchMetric = async (state: AppState, name: string) => {
     },
   );
 };
+
+/**
+ * Fetch metric names, triggering update of graphs if they are shown.
+ *
+ * @param {AppState} state - App state.
+ */
+export const fetchMetricNames = async (state: AppState) => {
+  const {
+    message: metricNames,
+  } = await sendConduitPacket(state, { to: 'monitor', topic: 'getMetricNames' });
+  fabricate.update({ metricNames });
+};