chore: update firmware-selector, fix theme.js

Author: classicrocker883

_includes/head.html

@@ -106,7 +106,7 @@
     {% if site.pwa.enabled %}
       <script
         defer
-        src="{{ '' | relative_url }}?baseurl={{ site.baseurl | default: '' }}&register={{ site.pwa.cache.enabled }}"
+        src="{{ '/app.min.js' | relative_url }}?baseurl={{ site.baseurl | default: '' }}&register={{ site.pwa.cache.enabled }}"
       ></script>
     {% endif %}
 

_layouts/default.html

@@ -83,5 +83,7 @@
     {% endfor %}
 
     {% include_cached search-loader.html lang=lang %}
+
+    <script src="{{ '/assets/js/theme.js' | relative_url }}"></script>
   </body>
 </html>

_posts/2024-06-23-firmware-selector.md

@@ -217,7 +217,7 @@ image:
         <option>Loading...</option>
     </select>
     <div id="releases-container" style="display: none;">
-        <p></p><p></p><label>Select one to load:</label>
+        <p></p><p></p><p>Select one to load:</p>
         <div id="release-list"></div>
         <p></p><p></p><sup>✶</sup>Older Releases may not be fully compatible with the Selector
     </div>
@@ -233,7 +233,7 @@ image:
             <label for="broadenSearch"><i class="icon fas fa-magnifying-glass-plus"></i> Broaden Search Results?</label>
         </div>
         <div class="select-container">
-            <select id="broadenSearch" onchange="updateCandidates()">
+            <select id="broadenSearch">
                 <option value="Yes" title="Use broader filtering">Yes</option>
                 <option value="No" title="Use strict filtering">No</option>
             </select>
@@ -244,7 +244,7 @@ image:
             <label for="model"><i class="icon fas fa-cubes"></i> Model:</label>
         </div>
         <div class="select-container">
-            <select id="model" onchange="updateModelSelections()">
+            <select id="model">
                 <option value="none" title="May help to choose a model first">--Select Model--</option>
                 <option value="Aquila" title="Aquila OG/X2">Aquila</option>
                 <option value="Aquila X3" title="Aquila X3/S3 Induction Probe">Aquila X3/S3</option>
@@ -259,7 +259,7 @@ image:
             <label for="proUIExtraFeatures"><i class="icon fas fa-shield-halved"></i> ProUI Extra Features:</label>
         </div>
         <div class="select-container">
-            <select id="proUIExtraFeatures" onchange="updateCandidates()">
+            <select id="proUIExtraFeatures">
                 <option value="-ProUI" title="ProUI-EX">Yes</option>
                 <option value="" title="No ProUI Extra Features">No</option>
             </select>
@@ -270,7 +270,7 @@ image:
             <label for="screen"><i class="icon fas fa-mobile-screen-button"></i> LCD Display:</label>
         </div>
         <div class="select-container">
-            <select id="screen" onchange="updateCandidates()">
+            <select id="screen">
                 <option value="" title="No specific display selected">--Select--</option>
                 <option value="DWIN">DWIN</option>
                 <option value="TJC-" title="TJC-">TJC</option>
@@ -283,7 +283,7 @@ image:
             <label for="type"><i class="icon fas fa-microchip"></i> Board Type:</label>
         </div>
         <div class="select-container">
-            <select id="type" onchange="updateCandidates()">
+            <select id="type">
                 <option value="" title="No specific board type">--Select--</option>
                 <option value="_GD32" title="_GD32">GD32</option>
                 <option value="_N32" title="_N32">N32</option>
@@ -302,7 +302,7 @@ image:
             <label for="features"><i class="icon fas fa-bars"></i> Features:</label>
         </div>
         <div class="select-container">
-            <select id="features" onchange="updateCandidates()">
+            <select id="features">
                 <option value="none" title="No specific features">--Select--</option>
                 <option value="" title="Bed Probe Only">CR/3D/BL-Touch Only</option>
                 <option value="_BMP" title="_BMP">BIQU MicroProbe V2</option>
@@ -318,7 +318,7 @@ image:
                 <label for="secondaryFeatures"><i class="icon fas fa-bars-staggered"></i> Secondary Features:</label>
             </div>
             <div class="select-container">
-                <select id="secondaryFeatures" onchange="updateCandidates()">
+                <select id="secondaryFeatures">
                     <option value="" title="No specific secondary features">--Select--</option>
                     <option value="_BMP" title="_BMP">BIQU MicroProbe V2</option>
                     <option value="_IND" title="_IND">Induction Probe</option>
@@ -333,7 +333,7 @@ image:
             <label for="leveling"><i class="icon fas fa-layer-group"></i> Leveling:</label>
         </div>
         <div class="select-container">
-            <select id="leveling" onchange="updateCandidates()">
+            <select id="leveling">
                 <option value="" title="Choose bed leveling">--Select--</option>
                 <option value="_UBL" title="_UBL">Unified Bed Leveling</option>
                 <option value="_BLT" title="_BLT">Bilinear Bed Leveling</option>
@@ -347,7 +347,7 @@ image:
             <label for="options"><i class="icon fas fa-gears"></i> Options:</label>
         </div>
         <div class="select-container">
-            <select id="options" onchange="updateCandidates(); handleOptionsChange();">
+            <select id="options">
                 <option value="" title="No specific options">--Select--</option>
                 <option value="-MPC" title="-MPC">MPC</option>
                 <option value="-IS" title="-IS">Input Shaping</option>
@@ -361,7 +361,7 @@ image:
                 <label for="secondaryOptions"><i class="icon fas fa-gear"></i> Secondary Options:</label>
             </div>
             <div class="select-container">
-                <select id="secondaryOptions" onchange="updateCandidates(); handleOptionsChange();">
+                <select id="secondaryOptions">
                     <option value="" title="No specific secondary options">--Select--</option>
                     <option value="-MPC" title="-MPC">MPC</option>
                     <option value="-IS" title="-IS">Input Shaping</option>
@@ -387,6 +387,10 @@ image:
             <span class="icon2">🔄</span>
         </button>
     </div>
+    <br>
+    <hr>
+    <p style="text-align: center; font-size: 1.1em;">If you find there is an error loading after many attempts, <br>
+        you may have reached the <a href="#api-rate-limit-header">API limit</a>.</p>
     <hr>
     <div class="candidates-header-text">
         <a href="#" style="font-size: 26px;" class="icon fas fa-rectangle-list"></a><strong>&nbsp;Candidates:</strong><br>
@@ -551,7 +555,40 @@ image:
     <sup><sup>✶</sup>Reminder: Do not use `Input Shaping` (file suffix <i>-IS</i>) <b>unless</b> you do the necessary
         calibration.<p>
         Prints will be effected regardless. May require a special breakout board or test prints to calibrate.
+    </p>
     </sup>
+    <hr>
+    <h2 id="api-rate-limit-header">GitHub API Rate Limit</h2>
+    <h3>Enter your GitHub &nbsp;<i>Personal Access Token</i> :</h3>
+    <input type="password" id="tokenInput" placeholder="Paste your token here" size="40" />
+    <button id="fetchBtn">Enter</button>
+    <p>
+        <h4>Setting a personal access token <strong>(PAT)</strong></h4>
+        <p>Select one to create a new token:</p>
+        <ol style="list-style-type: upper-roman;">
+            <li><a href="https://github.com/settings/personal-access-tokens/new"><strong>Fine-Grained PAT</strong></a></li>
+            <ul>
+                <li><strong>Repository access:</strong></li>
+                <ul>
+                    <li>
+                        <em>Public repositories</em>
+                        <span style="padding-left: 40px; font-size: 0.8em;">Read-only access to public repositories.</span>
+                    </li>
+                </ul>
+            </ul>
+            <li><a href="https://github.com/settings/tokens/new"><strong>Classic PAT</strong></a></li>
+            <ul>
+                <li><strong>Repository Permissions:</strong></li>
+                <ul>
+                    <li>
+                        <em>read:public_key</em>
+                        <span style="padding-left: 40px; font-size: 0.8em;">Read user public keys</span>
+                    </li>
+                </ul>
+            </ul>
+        </ol>
+    </p>
+    <pre id="output"></pre>
     <script>
         document.addEventListener("DOMContentLoaded", () => {
             const selectMonth = document.getElementById("month-select");
@@ -567,7 +604,9 @@ image:
             let releaseTag = "latest";
             const repoUrl = '/assets/data/releases.json';
             let allReleasesData = [];
+            let cachedLatestTagName = null;
             let proUIExtraFeaturesWasForcedToNo = false;
+            const getToken = () => document.getElementById('tokenInput').value.trim();
             async function fetchAllReleases(url) {
                 try {
                     const response = await fetch(url);
@@ -583,7 +622,16 @@ image:
             }
             async function fetchLatestReleaseDetails() {
                 try {
-                    const response = await fetch('https://api.github.com/repos/classicrocker883/MRiscoCProUI/releases/latest');
+                    const tokenValue = getToken();
+                    if (!tokenValue) {
+                        console.warn("No token provided for fetchLatestReleaseDetails.");
+                        const response = await fetch('https://api.github.com/repos/classicrocker883/MRiscoCProUI/releases/latest');
+                    }
+                    const response = await fetch('https://api.github.com/repos/classicrocker883/MRiscoCProUI/releases/latest', {
+                        headers: {
+                          'Authorization': `token ${tokenValue}`
+                        }
+                    });
                     if (!response.ok) {
                         throw new Error(`HTTP error! status: ${response.status}`);
                     }
@@ -648,11 +696,9 @@ image:
                     const selectedScreen = document.getElementById("screen").value;
                     let actualBaseTagName = currentBaseTag;
                     if (currentBaseTag === "latest") {
-                        const latestRelease = await fetchLatestReleaseDetails();
-                        if (latestRelease) {
-                            actualBaseTagName = latestRelease.tag_name;
-                        } else {
-                            console.error("Could not determine actual latest release tag.");
+                        actualBaseTagName = cachedLatestTagName;
+                        if (!actualBaseTagName) {
+                            console.error("Could not determine actual latest release tag from cache.");
                             selectedReleaseTagDiv.textContent = "Error loading tag";
                             totalDownloads.innerHTML = `<label><img alt='GitHub Downloads (all assets)' src='https://img.shields.io/github/downloads/classicrocker883/MRiscoCProUI/latest/total'> - Total</label>`;
                             return;
@@ -711,7 +757,15 @@ image:
             }
             async function initializeDropdowns() {
                 try {
+                    const latestReleaseFromApi = await fetchLatestReleaseDetails();
+                    if (latestReleaseFromApi) {
+                        cachedLatestTagName = latestReleaseFromApi.tag_name;
+                    }
                     allReleasesData = await fetchAllReleases(repoUrl);
+                    if (!cachedLatestTagName && allReleasesData.length > 0) {
+                        allReleasesData.sort((a, b) => new Date(b.published_at) - new Date(a.published_at));
+                        cachedLatestTagName = allReleasesData[0].tag_name;
+                    }
                     if (allReleasesData.length > 0) {
                         const releaseMonths = getReleaseMonths(allReleasesData);
                         populateMonthOptions(releaseMonths);
@@ -737,13 +791,11 @@ image:
                         return { assets: selectedRelease.assets || [], actualTagNameUsed: currentReleaseTag };
                     } else {
                         console.error("Selected specific release not found in local data:", currentReleaseTag);
-                        const latestRelease = await fetchLatestReleaseDetails();
-                        actualBaseTagName = latestRelease ? latestRelease.tag_name : null;
-                        console.warn("Falling back to latest release as explicit tag was not found.");
+                        actualBaseTagName = cachedLatestTagName;
+                        console.warn("Falling back to cached latest release as explicit tag was not found.");
                     }
                 } else {
-                    const latestRelease = await fetchLatestReleaseDetails();
-                    actualBaseTagName = latestRelease ? latestRelease.tag_name : null;
+                    actualBaseTagName = cachedLatestTagName;
                 }
                 if (!actualBaseTagName) {
                     console.error("Could not determine actual base release tag for fetching assets.");
@@ -774,21 +826,33 @@ image:
                 potentialApiTags = [...new Set(potentialApiTags)];
                 console.log("Attempting to fetch assets with tags (in order of preference):", potentialApiTags);
                 for (const tagToTry of potentialApiTags) {
+                    const tokenValue = getToken();
+                    const headers = tokenValue ? { 'Authorization': `token ${tokenValue}` } : {};
                     const apiUrl = `https://api.github.com/repos/classicrocker883/MRiscoCProUI/releases/tags/${tagToTry}`;
                     try {
-                        const response = await fetch(apiUrl);
+                        const response = tokenValue
+                            ? await fetch(apiUrl, { headers: headers })
+                            : await fetch(apiUrl);
                         if (response.ok) {
                             const data = await response.json();
                             if (data.assets && data.assets.length > 0) {
-                                console.log(`Successfully fetched assets for tag: ${tagToTry}`);
+                                console.log(`Successfully fetched assets from Live API for tag: ${tagToTry}`);
                                 return { assets: data.assets, actualTagNameUsed: tagToTry };
                             }
                         }
                     } catch (error) {
-                        console.warn(`Attempting tag ${tagToTry} failed or returned no assets. Trying next...`, error);
+                        console.warn(`Live API attempt for tag ${tagToTry} failed. Trying local cache as fallback.`);
                     }
                 }
-                console.error("No release assets found for the selected model and revisions after all attempts.");
+                console.warn("Live API failed for all potential tags. Falling back to local releases.json for assets.");
+                for (const tagToTry of potentialApiTags) {
+                     const localRelease = allReleasesData.find(release => release.tag_name === tagToTry);
+                    if (localRelease && localRelease.assets && localRelease.assets.length > 0) {
+                        console.log(`Successfully fetched assets from local cache for tag: ${tagToTry}`);
+                        return { assets: localRelease.assets, actualTagNameUsed: tagToTry };
+                    }
+                }
+                console.error("No release assets found in Live API or local data for the determined tag and selected model.");
                 return { assets: [], actualTagNameUsed: null };
             }
             async function updateCandidates() {
@@ -1116,20 +1180,35 @@ image:
                     deprecatedPopup.style.display = "none";
                 }
             }
+            document.getElementById('fetchBtn').addEventListener('click', async () => {
+                const token = document.getElementById('tokenInput').value.trim();
+                document.getElementById('output').textContent = '';
+                if (token) {
+                    alert('GitHub Token has been applied for subsequent firmware selector searches and release fetching.');
+                } else {
+                    alert('Token input cleared. Searching will proceed without GitHub API authorization.');
+                }
+                await updateCandidates();
+            });
             document.getElementById("features").addEventListener("change", () => {
                 document.getElementById("secondaryFeatures").value = "";
+                updateCandidates();
             });
             document.getElementById("options").addEventListener("change", () => {
                 document.getElementById("secondaryOptions").value = "";
                 if (releaseTag === "latest") {
                     handleOptionsChange();
                 }
+                updateCandidates();
             });
             document.getElementById("secondaryOptions").addEventListener("change", () => {
                 if (releaseTag === "latest") {
                     handleOptionsChange();
                 }
+                updateCandidates();
             });
+            document.getElementById("model").addEventListener("change", updateModelSelections);
+            document.querySelectorAll('#broadenSearch, #proUIExtraFeatures, #screen, #type, #secondaryFeatures, #leveling').forEach(input => input.addEventListener("change", updateCandidates));
             selectMonth.addEventListener("change", async (event) => {
                 const selectedMonth = event.target.value;
                 if (selectedMonth === "latest") {
@@ -1149,13 +1228,10 @@ image:
             resetButton.addEventListener("mousedown", () => resetButton.style.animationPlayState = "running");
             resetButton.addEventListener("mouseup", () => resetButton.style.animationPlayState = "paused");
             resetButton.addEventListener("click", resetSelections);
-            document.getElementById("model").addEventListener("change", updateModelSelections);
-            document.querySelectorAll('#broadenSearch, #proUIExtraFeatures, #screen, #type, #features, #secondaryFeatures, #leveling, #options, #secondaryOptions').forEach(input => input.addEventListener("change", updateCandidates));
             okButton.addEventListener("click", () => {
                 deprecatedPopup.style.display = "none";
             });
             initializeDropdowns();
         });
     </script>
-</body>
 </html>