mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-09 22:26:09 +00:00
MHSanaei
e4b881e58a
A dev build now shows its `dev+<commit>` identity instead of a misleading stable-looking version in the sidebar badge, dashboard card, update modal, Telegram status report, startup log, and `x-ui -v`. Adds a shared formatPanelVersion helper (single v prefix; dev labels shown verbatim) and fixes the mobile-tag double-v. Renames the version getters for clarity: config.GetVersion to GetBaseVersion (raw embedded version), config.GetReportedVersion to GetPanelVersion (advertised/displayed), and the xray process GetVersion to GetXrayVersion.
42 lines
1.7 KiB
TypeScript
42 lines
1.7 KiB
TypeScript
// Mirror of web/service/panel.go isNewerVersion: parse a vMAJOR.MINOR.PATCH tag
|
|
// and report whether `latest` is ahead of `current`. When either side isn't a
|
|
// clean three-part numeric tag, fall back to a normalized string inequality —
|
|
// the same heuristic the Go side uses so the node "update available" badge
|
|
// agrees with what the server would decide.
|
|
function parseVersionParts(version: string): [number, number, number] | null {
|
|
const parts = version.trim().replace(/^v/, '').split('.');
|
|
if (parts.length !== 3) return null;
|
|
const out: number[] = [];
|
|
for (const part of parts) {
|
|
if (!/^\d+$/.test(part)) return null;
|
|
out.push(Number(part));
|
|
}
|
|
return [out[0], out[1], out[2]];
|
|
}
|
|
|
|
// Format a panel version for display. Dev builds report a "dev+<commit>"
|
|
// identity (see config.GetPanelVersion); show those — and any other
|
|
// non-numeric label — verbatim. Semantic versions get a single normalized "v"
|
|
// prefix, so a raw "v3.4.0" tag and a bare "3.4.0" both render as "v3.4.0"
|
|
// instead of doubling up to "vv3.4.0".
|
|
export function formatPanelVersion(version: string | undefined | null): string {
|
|
const v = (version || '').trim();
|
|
if (!v) return '';
|
|
const normalized = v.replace(/^v/i, '');
|
|
return /^\d/.test(normalized) ? `v${normalized}` : v;
|
|
}
|
|
|
|
export function isPanelUpdateAvailable(latest: string, current: string): boolean {
|
|
if (!latest || !current) return false;
|
|
const a = parseVersionParts(latest);
|
|
const b = parseVersionParts(current);
|
|
if (!a || !b) {
|
|
return latest.trim().replace(/^v/, '') !== current.trim().replace(/^v/, '');
|
|
}
|
|
for (let i = 0; i < 3; i++) {
|
|
if (a[i] > b[i]) return true;
|
|
if (a[i] < b[i]) return false;
|
|
}
|
|
return false;
|
|
}
|