all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH pve-manager v3 2/3] api: provide GUI versions via index and /cluster/resources
Date: Thu, 19 Nov 2026 18:09:08 +0100	[thread overview]
Message-ID: <20261119171151.475428-3-d.csapak@proxmox.com> (raw)
In-Reply-To: <20261119171151.475428-1-d.csapak@proxmox.com>

Index has these versions anyway, just expose them to the UI via the
usual `Proxmox` object.

In the /cluster/resources API call, we add that information to the node
that is handling the request (which is normally the same where the index
was loaded from).

Cache the pwt versions locally for as long as the mtime does not change.
Stat'ing should be cached by the underlying filesystem and be very
cheap. This way we don't hit the file read on every call.

With this information, the UI can detect an outdated UI version still
running.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 PVE/API2/Cluster.pm | 31 +++++++++++++++++++++++++++++++
 PVE/API2Tools.pm    | 19 ++++++++++++++++---
 www/index.html.tpl  |  6 +++++-
 3 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/PVE/API2/Cluster.pm b/PVE/API2/Cluster.pm
index aaec3ec3..114ba033 100644
--- a/PVE/API2/Cluster.pm
+++ b/PVE/API2/Cluster.pm
@@ -21,6 +21,7 @@ use PVE::RPCEnvironment;
 use PVE::SafeSyslog;
 use PVE::Storage;
 use PVE::Tools qw(extract_param);
+use PVE::pvecfg;
 
 use PVE::API2::ACMEAccount;
 use PVE::API2::ACMEPlugin;
@@ -504,6 +505,25 @@ __PACKAGE__->register_method({
                     default => 'x86_64',
                     optional => 1,
                 },
+                'versions' => {
+                    description => "Optional package versions (for type 'node').",
+                    type => 'object',
+                    optional => 1,
+                    properties => {
+                        'pve-manager' => {
+                            type => "string",
+                            optional => 1,
+                            description =>
+                                "The pve-manager version of this node. Only included for the node handling the request.",
+                        },
+                        'proxmox-widget-toolkit' => {
+                            type => "string",
+                            optional => 1,
+                            description =>
+                                "The proxmox-widget-toolkit version of this node. Only included for the node handling the request.",
+                        },
+                    },
+                },
             },
         },
     },
@@ -619,6 +639,8 @@ __PACKAGE__->register_method({
         my $static_node_info = PVE::Cluster::get_node_kv("static-info");
 
         if (!$param->{type} || $param->{type} eq 'node') {
+            my $nodename = PVE::INotify::nodename();
+
             foreach my $node (@$nodelist) {
                 my $can_audit = $rpcenv->check($authuser, "/nodes/$node", ['Sys.Audit'], 1);
                 my $entry =
@@ -635,6 +657,15 @@ __PACKAGE__->register_method({
                     $entry->{'hastate'} = $status;
                 }
 
+                if ($node eq $nodename) {
+                    my $pwt_version = PVE::API2Tools::read_pwt_version();
+
+                    $entry->{versions} = { 'pve-manager' => PVE::pvecfg::version() };
+                    # an empty version means reading failed, omit it to avoid false positives
+                    $entry->{versions}->{'proxmox-widget-toolkit'} = $pwt_version
+                        if $pwt_version ne '';
+                }
+
                 push @$res, $entry;
             }
         }
diff --git a/PVE/API2Tools.pm b/PVE/API2Tools.pm
index c53ec03f..ad769f12 100644
--- a/PVE/API2Tools.pm
+++ b/PVE/API2Tools.pm
@@ -280,10 +280,23 @@ sub pwt_base_dir {
     return $PWT_BASE_DIR;
 }
 
+my $pwt_version_cache = {};
+
 sub read_pwt_version {
-    my $wtversionraw = PVE::File::file_read_first_line($PWT_FILE) // '';
-    my $wtversion = $wtversionraw =~ m|^// (.*)$| ? $1 : '';
-    return $wtversion;
+    my $st = stat($PWT_FILE);
+    my $mtime = $st ? $st->mtime() : 0;
+
+    if (
+        !defined($pwt_version_cache->{version})
+        || $pwt_version_cache->{mtime} != $mtime
+    ) {
+        my $wtversionraw = PVE::File::file_read_first_line($PWT_FILE) // '';
+        my $wtversion = $wtversionraw =~ m|^// (.*)$| ? $1 : '';
+        $pwt_version_cache->{version} = $wtversion;
+        $pwt_version_cache->{mtime} = $mtime;
+    }
+
+    return $pwt_version_cache->{version};
 }
 
 1;
diff --git a/www/index.html.tpl b/www/index.html.tpl
index 125c1046..21345822 100644
--- a/www/index.html.tpl
+++ b/www/index.html.tpl
@@ -48,7 +48,11 @@
         NodeArch: '[% arch %]',
         UserName: '[% username %]',
         CSRFPreventionToken: '[% token %]',
-        ConsentText: '[% consenttext.squote %]'
+        ConsentText: '[% consenttext.squote %]',
+        GUIVersions: {
+            'pve-manager': '[% version %]',
+            'proxmox-widget-toolkit': '[% wtversion %]',
+        },
     };
     </script>
     <script type="text/javascript" src="/proxmoxlib.js?ver=[% wtversion %]"></script>
-- 
2.47.3





  parent reply	other threads:[~2026-11-19 17:12 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-19 17:09 [PATCH pve-manager v3 0/3] ui: prompt users for reload when web ui version changes Dominik Csapak
2026-11-19 17:09 ` [PATCH pve-manager v3 1/3] api: factor out read_pwt_version and pwt_base_dir Dominik Csapak
2026-11-19 17:09 ` Dominik Csapak [this message]
2026-11-19 17:09 ` [PATCH pve-manager v3 3/3] ui: workspace: prompt user for reload when UI packages were updated Dominik Csapak
2026-11-19 22:21 ` [PATCH pve-manager v3 0/3] ui: prompt users for reload when web ui version changes Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261119171151.475428-3-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal