mirror of
https://github.com/NginxProxyManager/nginx-proxy-manager.git
synced 2025-11-13 05:45:15 +00:00
Space scandal retified (hopefully)
This commit is contained in:
7heMech
GitHub
@@ -17,9 +17,9 @@ import usersRoutes from "./users.js";
|
|||||||
import versionRoutes from "./version.js";
|
import versionRoutes from "./version.js";
|
||||||
|
|
||||||
const router = express.Router({
|
const router = express.Router({
|
||||||
caseSensitive: true,
|
caseSensitive: true,
|
||||||
strict: true,
|
strict: true,
|
||||||
mergeParams: true,
|
mergeParams: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -27,18 +27,18 @@ const router = express.Router({
|
|||||||
* GET /api
|
* GET /api
|
||||||
*/
|
*/
|
||||||
router.get("/", async (_, res /*, next*/) => {
|
router.get("/", async (_, res /*, next*/) => {
|
||||||
const version = pjson.version.split("-").shift().split(".");
|
const version = pjson.version.split("-").shift().split(".");
|
||||||
const setup = await isSetup();
|
const setup = await isSetup();
|
||||||
|
|
||||||
res.status(200).send({
|
res.status(200).send({
|
||||||
status: "OK",
|
status: "OK",
|
||||||
setup,
|
setup,
|
||||||
version: {
|
version: {
|
||||||
major: Number.parseInt(version.shift(), 10),
|
major: Number.parseInt(version.shift(), 10),
|
||||||
minor: Number.parseInt(version.shift(), 10),
|
minor: Number.parseInt(version.shift(), 10),
|
||||||
revision: Number.parseInt(version.shift(), 10),
|
revision: Number.parseInt(version.shift(), 10),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
router.use("/schema", schemaRoutes);
|
router.use("/schema", schemaRoutes);
|
||||||
@@ -61,8 +61,8 @@ router.use("/nginx/certificates", certificatesHostsRoutes);
|
|||||||
* ALL /api/*
|
* ALL /api/*
|
||||||
*/
|
*/
|
||||||
router.all(/(.+)/, (req, _, next) => {
|
router.all(/(.+)/, (req, _, next) => {
|
||||||
req.params.page = req.params["0"];
|
req.params.page = req.params["0"];
|
||||||
next(new errs.ItemNotFoundError(req.params.page));
|
next(new errs.ItemNotFoundError(req.params.page));
|
||||||
});
|
});
|
||||||
|
|
||||||
export default router;
|
export default router;
|
||||||
|
|||||||
@@ -5,97 +5,97 @@ import https from "node:https";
|
|||||||
import { ProxyAgent } from "proxy-agent";
|
import { ProxyAgent } from "proxy-agent";
|
||||||
|
|
||||||
const router = express.Router({
|
const router = express.Router({
|
||||||
caseSensitive: true,
|
caseSensitive: true,
|
||||||
strict: true,
|
strict: true,
|
||||||
mergeParams: true,
|
mergeParams: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* /api/version/check
|
* /api/version/check
|
||||||
*/
|
*/
|
||||||
router
|
router
|
||||||
.route("/check")
|
.route("/check")
|
||||||
.options((_, res) => {
|
.options((_, res) => {
|
||||||
res.sendStatus(204);
|
res.sendStatus(204);
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* GET /api/version/check
|
* GET /api/version/check
|
||||||
*
|
*
|
||||||
* Check for available updates
|
* Check for available updates
|
||||||
*/
|
*/
|
||||||
.get(async (req, res, next) => {
|
.get(async (req, res, next) => {
|
||||||
try {
|
try {
|
||||||
const agent = new ProxyAgent();
|
const agent = new ProxyAgent();
|
||||||
const url = "https://api.github.com/repos/NginxProxyManager/nginx-proxy-manager/releases/latest";
|
const url = "https://api.github.com/repos/NginxProxyManager/nginx-proxy-manager/releases/latest";
|
||||||
|
|
||||||
const data = await new Promise((resolve, reject) => {
|
const data = await new Promise((resolve, reject) => {
|
||||||
https
|
https
|
||||||
.get(url, { agent }, (response) => {
|
.get(url, { agent }, (response) => {
|
||||||
if (response.statusCode !== 200) {
|
if (response.statusCode !== 200) {
|
||||||
reject(new Error(`GitHub API returned ${response.statusCode}`));
|
reject(new Error(`GitHub API returned ${response.statusCode}`));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
response.setEncoding("utf8");
|
response.setEncoding("utf8");
|
||||||
let raw_data = "";
|
let raw_data = "";
|
||||||
|
|
||||||
response.on("data", (chunk) => {
|
response.on("data", (chunk) => {
|
||||||
raw_data += chunk;
|
raw_data += chunk;
|
||||||
});
|
});
|
||||||
|
|
||||||
response.on("end", () => {
|
response.on("end", () => {
|
||||||
try {
|
try {
|
||||||
resolve(JSON.parse(raw_data));
|
resolve(JSON.parse(raw_data));
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
reject(err);
|
reject(err);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
.on("error", (err) => {
|
.on("error", (err) => {
|
||||||
reject(err);
|
reject(err);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
const latestVersion = data.tag_name;
|
const latestVersion = data.tag_name;
|
||||||
|
|
||||||
const version = pjson.version.split("-").shift().split(".");
|
const version = pjson.version.split("-").shift().split(".");
|
||||||
const currentVersion = `v${version[0]}.${version[1]}.${version[2]}`;
|
const currentVersion = `v${version[0]}.${version[1]}.${version[2]}`;
|
||||||
|
|
||||||
res.status(200).send({
|
res.status(200).send({
|
||||||
current: currentVersion,
|
current: currentVersion,
|
||||||
latest: latestVersion,
|
latest: latestVersion,
|
||||||
updateAvailable: compareVersions(currentVersion, latestVersion),
|
updateAvailable: compareVersions(currentVersion, latestVersion),
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
debug(logger, `${req.method.toUpperCase()} ${req.path}: ${error}`);
|
debug(logger, `${req.method.toUpperCase()} ${req.path}: ${error}`);
|
||||||
res.status(200).send({
|
res.status(200).send({
|
||||||
current: null,
|
current: null,
|
||||||
latest: null,
|
latest: null,
|
||||||
updateAvailable: false,
|
updateAvailable: false,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Compare two version strings
|
* Compare two version strings
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
function compareVersions(current, latest) {
|
function compareVersions(current, latest) {
|
||||||
const cleanCurrent = current.replace(/^v/, "");
|
const cleanCurrent = current.replace(/^v/, "");
|
||||||
const cleanLatest = latest.replace(/^v/, "");
|
const cleanLatest = latest.replace(/^v/, "");
|
||||||
|
|
||||||
const currentParts = cleanCurrent.split(".").map(Number);
|
const currentParts = cleanCurrent.split(".").map(Number);
|
||||||
const latestParts = cleanLatest.split(".").map(Number);
|
const latestParts = cleanLatest.split(".").map(Number);
|
||||||
|
|
||||||
for (let i = 0; i < Math.max(currentParts.length, latestParts.length); i++) {
|
for (let i = 0; i < Math.max(currentParts.length, latestParts.length); i++) {
|
||||||
const curr = currentParts[i] || 0;
|
const curr = currentParts[i] || 0;
|
||||||
const lat = latestParts[i] || 0;
|
const lat = latestParts[i] || 0;
|
||||||
|
|
||||||
if (lat > curr) return true;
|
if (lat > curr) return true;
|
||||||
if (lat < curr) return false;
|
if (lat < curr) return false;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
export default router;
|
export default router;
|
||||||
|
|||||||
@@ -3,97 +3,97 @@ import { useHealth } from "src/hooks";
|
|||||||
import { T } from "src/locale";
|
import { T } from "src/locale";
|
||||||
|
|
||||||
export function SiteFooter() {
|
export function SiteFooter() {
|
||||||
const health = useHealth();
|
const health = useHealth();
|
||||||
const [latestVersion, setLatestVersion] = useState<string | null>(null);
|
const [latestVersion, setLatestVersion] = useState<string | null>(null);
|
||||||
const [isNewVersionAvailable, setIsNewVersionAvailable] = useState(false);
|
const [isNewVersionAvailable, setIsNewVersionAvailable] = useState(false);
|
||||||
|
|
||||||
const getVersion = () => {
|
const getVersion = () => {
|
||||||
if (!health.data) {
|
if (!health.data) {
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
const v = health.data.version;
|
const v = health.data.version;
|
||||||
return `v${v.major}.${v.minor}.${v.revision}`;
|
return `v${v.major}.${v.minor}.${v.revision}`;
|
||||||
};
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const checkForUpdates = async () => {
|
const checkForUpdates = async () => {
|
||||||
try {
|
try {
|
||||||
const response = await fetch("/api/version/check");
|
const response = await fetch("/api/version/check");
|
||||||
if (response.ok) {
|
if (response.ok) {
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
setLatestVersion(data.latest);
|
setLatestVersion(data.latest);
|
||||||
setIsNewVersionAvailable(data.updateAvailable);
|
setIsNewVersionAvailable(data.updateAvailable);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.debug("Could not check for updates:", error);
|
console.debug("Could not check for updates:", error);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
if (health.data) {
|
if (health.data) {
|
||||||
checkForUpdates();
|
checkForUpdates();
|
||||||
}
|
}
|
||||||
}, [health.data]);
|
}, [health.data]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<footer className="footer d-print-none py-3">
|
<footer className="footer d-print-none py-3">
|
||||||
<div className="container-xl">
|
<div className="container-xl">
|
||||||
<div className="row text-center align-items-center flex-row-reverse">
|
<div className="row text-center align-items-center flex-row-reverse">
|
||||||
<div className="col-lg-auto ms-lg-auto">
|
<div className="col-lg-auto ms-lg-auto">
|
||||||
<ul className="list-inline list-inline-dots mb-0">
|
<ul className="list-inline list-inline-dots mb-0">
|
||||||
<li className="list-inline-item">
|
<li className="list-inline-item">
|
||||||
<a
|
<a
|
||||||
href="https://github.com/NginxProxyManager/nginx-proxy-manager"
|
href="https://github.com/NginxProxyManager/nginx-proxy-manager"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
className="link-secondary"
|
className="link-secondary"
|
||||||
rel="noopener"
|
rel="noopener"
|
||||||
>
|
>
|
||||||
<T id="footer.github-fork" />
|
<T id="footer.github-fork" />
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div className="col-12 col-lg-auto mt-3 mt-lg-0">
|
<div className="col-12 col-lg-auto mt-3 mt-lg-0">
|
||||||
<ul className="list-inline list-inline-dots mb-0">
|
<ul className="list-inline list-inline-dots mb-0">
|
||||||
<li className="list-inline-item">
|
<li className="list-inline-item">
|
||||||
© 2025{" "}
|
© 2025{" "}
|
||||||
<a href="https://jc21.com" rel="noreferrer" target="_blank" className="link-secondary">
|
<a href="https://jc21.com" rel="noreferrer" target="_blank" className="link-secondary">
|
||||||
jc21.com
|
jc21.com
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li className="list-inline-item">
|
<li className="list-inline-item">
|
||||||
Theme by{" "}
|
Theme by{" "}
|
||||||
<a href="https://tabler.io" rel="noreferrer" target="_blank" className="link-secondary">
|
<a href="https://tabler.io" rel="noreferrer" target="_blank" className="link-secondary">
|
||||||
Tabler
|
Tabler
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li className="list-inline-item">
|
<li className="list-inline-item">
|
||||||
<a
|
<a
|
||||||
href={`https://github.com/NginxProxyManager/nginx-proxy-manager/releases/tag/${getVersion()}`}
|
href={`https://github.com/NginxProxyManager/nginx-proxy-manager/releases/tag/${getVersion()}`}
|
||||||
className="link-secondary"
|
className="link-secondary"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
rel="noopener"
|
rel="noopener"
|
||||||
>
|
>
|
||||||
{" "}
|
{" "}
|
||||||
{getVersion()}{" "}
|
{getVersion()}{" "}
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
{isNewVersionAvailable && latestVersion && (
|
{isNewVersionAvailable && latestVersion && (
|
||||||
<li className="list-inline-item">
|
<li className="list-inline-item">
|
||||||
<a
|
<a
|
||||||
href={`https://github.com/NginxProxyManager/nginx-proxy-manager/releases/tag/${latestVersion}`}
|
href={`https://github.com/NginxProxyManager/nginx-proxy-manager/releases/tag/${latestVersion}`}
|
||||||
className="link-warning fw-bold"
|
className="link-warning fw-bold"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
rel="noopener"
|
rel="noopener"
|
||||||
title={`New version ${latestVersion} is available`}
|
title={`New version ${latestVersion} is available`}
|
||||||
>
|
>
|
||||||
Update Available: ({latestVersion})
|
Update Available: ({latestVersion})
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
)}
|
)}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user