Add support to return CPU and fans data in live stats

webmin/webmin#2267
webmin · Oct 26, 2024 · d8f212a · d8f212a
1 parent 851f348
commit d8f212a
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 9 deletions.
diff --git a/authentic-lib.pl b/authentic-lib.pl
@@ -903,8 +903,8 @@ sub get_sysinfo_vars
                   ($cpucores > 1 ? ($theme_text{'theme_global_core'} . ' ' . (int($t->{'core'}) + 1) . ': ') : '')
                   .
                   ( get_module_config_data('system-status', 'collect_units') ?
-                      (int(($t->{'temp'} * 9.0 / 5) + 32) . "&#176;F") :
-                      (int($t->{'temp'}) . '&#176;C ')
+                      (int(($t->{'temp'} * 9.0 / 5) + 32) . " &#176;F") :
+                      (int($t->{'temp'}) . ' &#176;C ')
                   ) .
                   '</span>';
             }
@@ -935,8 +935,8 @@ sub get_sysinfo_vars
                 $hdd_temperature .= '<span class="badge-custom badge-drivestatus" data-stats="drive">' . $short . ': '
                   .
                   ( get_module_config_data('system-status', 'collect_units') ?
-                      (int(($t->{'temp'} * 9.0 / 5) + 32) . "&#176;F") :
-                      (int($t->{'temp'}) . '&#176;C ')
+                      (int(($t->{'temp'} * 9.0 / 5) + 32) . " &#176;F") :
+                      (int($t->{'temp'}) . ' &#176;C ')
                   ) .
                   $emsg . '</span>';
             }

diff --git a/extensions/stats/stats.min.js b/extensions/stats/stats.min.js
diff --git a/extensions/stats/stats.min.js.gz b/extensions/stats/stats.min.js.gz
diff --git a/extensions/stats/stats.src.js b/extensions/stats/stats.src.js
@@ -55,6 +55,8 @@ const stats = {
             dashboard: "system-status",
             slider: "info-container",
             piechart: "piechart",
+            defaultClassLabel: "bg-semi-transparent",
+            defaultSliderClassLabel: "bg-semi-transparent-dark",
         },
         // Get current data to submit to the socket
         getSocketDefs: function () {
@@ -289,6 +291,87 @@ const stats = {
                     }
                 }
 
+                // Update sensors data
+                if (target === "sensors" && vo) {
+                    // Iterate through sensors
+                    Object.entries(vo).forEach(([sensor, value]) => {
+                        let this_ = this,
+                            $lb1 = $(`#${this.selector.dashboard} span[data-stats="${sensor}"]`),
+                            $lb2 = $(`.${this.selector.slider} span[data-stats="${sensor}"]`);
+
+                        if ($lb1 && $lb1.length) {
+                            let lb_count1 = $lb1.length,
+                                lb_count2 = $lb2.length;
+
+                            // Sort the values based on 'fan' or 'core' field
+                            value.sort((a, b) =>
+                                sensor === "fans" ? a.fan - b.fan : a.core - b.core
+                            );
+
+                            // Function to update individual label
+                            const updateLabel = function ($label, data, isSingleLabel, sideSlider) {
+                                // Update the label text based on count condition
+                                if (isSingleLabel) {
+                                    // Replace only the numeric part, preserving unit (°C or RPM)
+                                    $label.html(function (_, html) {
+                                        const iSFahrenheit = html.includes("°F");
+                                        return html.replace(
+                                            /\d+/,
+                                            sensor === "fans"
+                                                ? data.rpm
+                                                : (iSFahrenheit ? Math.round((data.temp * 9) / 5 + 32) : data.temp));
+                                    });
+                                } else {
+                                    // Replace the numeric part after the colon, preserving prefix and unit
+                                    $label.html(function (_, html) {
+                                        const iSFahrenheit = html.includes("°F");
+                                        return html.replace(
+                                            /: \d+/,
+                                            `: ${sensor === "fans" ? data.rpm :
+                                                (iSFahrenheit ? Math.round((data.temp * 9) / 5 + 32) : data.temp)}`
+                                        );
+                                    });
+                                }
+
+                                const label_text = $label.text().replace(/.*?\d+:\s*/, "");
+                                let className =
+                                        HTML.label.textMaxLevels(sensor, label_text) ||
+                                        (sideSlider
+                                            ? this_.selector.defaultSliderClassLabel
+                                            : this_.selector.defaultClassLabel);
+                                if (sideSlider && className === this_.selector.defaultClassLabel) {
+                                    className = this_.selector.defaultSliderClassLabel;
+                                }
+                                // Update class based on current label text
+                                $label
+                                    .removeClass((i, c) => (c.match(/\bbg-\S+/g) || []).join(" "))
+                                    .addClass(className);
+                            };
+                            // Handle $lb1 labels
+                            if (lb_count1 === 1) {
+                                updateLabel($lb1, value[0], true);
+                            } else {
+                                // Handle multiple labels for $lb1
+                                $lb1.each((index, el) => {
+                                    if (value[index]) {
+                                        updateLabel($(el), value[index], false);
+                                    }
+                                });
+                            }
+                            // Handle $lb2 labels similarly
+                            if (lb_count2 === 1) {
+                                updateLabel($lb2, value[0], true, true);
+                            } else {
+                                $lb2.each((index, el) => {
+                                    if (value[index]) {
+                                        updateLabel($(el), value[index], false, true);
+                                    }
+                                });
+                            }
+                        }
+                    });
+                }
+
                 // Draw history graphs
                 if (cached) {
                     let lds = `${this.selector.chart.container.parent}-${this.selector.collapse}`,

diff --git a/stats-lib-funcs.pl b/stats-lib-funcs.pl
@@ -169,8 +169,7 @@ sub get_stats_now
         my ($cpu, $fans) = defined(&proc::get_current_cpu_data) ?
                 proc::get_current_cpu_data() : (undef, undef);
         if ($cpu || $fans) {
-            $data{'temp'} = [{c => $cpu, f => $fans}];
-            # $gadd->('temp', [{c => $cpu, f => $fans}]);
+            $data{'sensors'} = [{cpu => $cpu, fans => $fans}];
         }
     }
     # Reverse output for LTR users

diff --git a/unauthenticated/css/bundle.min.css b/unauthenticated/css/bundle.min.css
diff --git a/unauthenticated/css/bundle.min.css.gz b/unauthenticated/css/bundle.min.css.gz
diff --git a/unauthenticated/js/bundle.min.js b/unauthenticated/js/bundle.min.js
diff --git a/unauthenticated/js/bundle.min.js.gz b/unauthenticated/js/bundle.min.js.gz