From ed910da2887c21fc4165dcaf63feaf298faffdfd Mon Sep 17 00:00:00 2001 From: Ludy87 Date: Fri, 7 Jun 2024 16:54:47 +0200 Subject: [PATCH 1/3] Add: Bypass for too many requests to the github api --- src/main/resources/static/js/githubVersion.js | 30 +++++++++++++++++-- .../resources/templates/fragments/navbar.html | 2 +- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/main/resources/static/js/githubVersion.js b/src/main/resources/static/js/githubVersion.js index b312fd85..bab14277 100644 --- a/src/main/resources/static/js/githubVersion.js +++ b/src/main/resources/static/js/githubVersion.js @@ -20,10 +20,34 @@ async function getLatestReleaseVersion() { const url = "https://api.github.com/repos/Stirling-Tools/Stirling-PDF/releases/latest"; try { const response = await fetch(url); - const data = await response.json(); - return data.tag_name ? data.tag_name.substring(1) : ""; + if (response.status === 200) { + const data = await response.json(); + return data.tag_name ? data.tag_name.substring(1) : ""; + } else { + // If the status is not 200, try to get the version from build.gradle + return await getCurrentVersionFromBypass(); + } } catch (error) { - console.error("Failed to fetch latest version:", error); + console.error("Failed to fetch latest version from GitHub:", error); + // If an error occurs, try to get the version from build.gradle + return await getCurrentVersionFromBypass(); + } +} + +async function getCurrentVersionFromBypass() { + const url = "https://raw.githubusercontent.com/Stirling-Tools/Stirling-PDF/main/build.gradle"; + try { + const response = await fetch(url); + if (response.status === 200) { + const text = await response.text(); + const match = text.match(/version\s*=\s*['"](\d+\.\d+\.\d+)['"]/); + if (match) { + return match[1]; + } + } + throw new Error("Version number not found"); + } catch (error) { + console.error("Failed to fetch latest version from build.gradle:", error); return ""; // Return an empty string if the fetch fails } } diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html index 0ddc0362..bb4a2934 100644 --- a/src/main/resources/templates/fragments/navbar.html +++ b/src/main/resources/templates/fragments/navbar.html @@ -5,7 +5,7 @@ const noFavourites = /*[[#{noFavourites}]]*/ ''; const updateAvailable = /*[[#{settings.updateAvailable}]]*/ ''; - +