Update 1.5.3 - Removed force refresh feature and improve rate limit handling

- Remove forceRefreshCivilizations function and related UI button as the feature is no longer needed
- Update rate limit handling in update-default-data.js to dynamically adjust based on API response
- Increase page size limit from 250 to 500 items per request

Author: Muhaddil

.github/scripts/update-default-data.js

@@ -6,7 +6,7 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 const apiPath = 'https://nomanssky.fandom.com/api.php';
-const MIN_REQUEST_INTERVAL = 35000; // 35 seconds between fetchs
+let MIN_REQUEST_INTERVAL = 35000; // default, it will be changed if the rate limit is modified
 
 const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
 
@@ -20,6 +20,29 @@ const filterValidData = (data) => {
   );
 };
 
+const getRateLimit = async () => {
+  const url = `${apiPath}?action=query&meta=userinfo&uiprop=ratelimits&format=json&origin=*`;
+  const res = await fetch(url);
+  if (!res.ok) throw new Error(`HTTP error getting rate limit: ${res.status}`);
+  const data = await res.json();
+
+  const cargoLimits = data?.query?.userinfo?.ratelimits?.["cargo-query"];
+  if (!cargoLimits) return MIN_REQUEST_INTERVAL;
+
+  let maxInterval = 0;
+  for (const key in cargoLimits) {
+    const limit = cargoLimits[key]; // { hits, seconds }
+    if (limit.hits && limit.seconds) {
+      const interval = limit.seconds / limit.hits;
+      if (interval > maxInterval) maxInterval = interval;
+    }
+  }
+
+  const intervalMs = Math.ceil(maxInterval * 1000) + 5000;
+  console.log(`Cargo-query rate limits: ${JSON.stringify(cargoLimits)}, using interval ${intervalMs}ms`);
+  return intervalMs;
+};
+
 const fetchCivilizationsPage = async (offset = 0) => {
   const params = new URLSearchParams();
   params.append('action', 'cargoquery');
@@ -38,10 +61,7 @@ const fetchCivilizationsPage = async (offset = 0) => {
   console.log(`Fetching page with offset: ${offset}`);
 
   const response = await fetch(url);
-  if (!response.ok) {
-    throw new Error(`HTTP error! status: ${response.status}`);
-  }
-
+  if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`);
   const data = await response.json();
   return data.cargoquery || [];
 };
@@ -69,16 +89,13 @@ const fetchAllCivilizationsAndRegions = async () => {
 
         console.log(`Total valid items so far: ${allData.length}`);
 
-        if (pageData.length < 250) {
+        if (pageData.length < 500) {
           hasMore = false;
           console.log('Last page reached');
         } else {
           offset += 500;
-          
-          if (hasMore) {
-            console.log(`Waiting ${MIN_REQUEST_INTERVAL}ms before next request...`);
-            await sleep(MIN_REQUEST_INTERVAL);
-          }
+          console.log(`Waiting ${MIN_REQUEST_INTERVAL}ms before next request...`);
+          await sleep(MIN_REQUEST_INTERVAL);
         }
       }
     } catch (error) {
@@ -129,6 +146,8 @@ const fetchAllCivilizationsAndRegions = async () => {
 const main = async () => {
   try {
     console.log('=== Starting defaultData.json update ===');
+
+    MIN_REQUEST_INTERVAL = await getRateLimit();
 
     const result = await fetchAllCivilizationsAndRegions();
 

JS/glyphgeneratorV3.js

@@ -519,68 +519,6 @@ const showNotification = (message, type) => {
   }, 3000);
 };
 
-function mergeCivilizationData(oldData, newData) {
-  const merged = JSON.parse(JSON.stringify(oldData));
-
-  for (const galaxy of newData.galaxies) {
-    if (!merged.galaxies.includes(galaxy)) {
-      merged.galaxies.push(galaxy);
-    }
-  }
-
-  for (const [galaxyName, galaxyInfo] of Object.entries(newData.data)) {
-    if (!merged.data[galaxyName]) {
-      merged.data[galaxyName] = galaxyInfo;
-      continue;
-    }
-
-    const oldGalaxy = merged.data[galaxyName];
-
-    for (const civ of galaxyInfo.civilizations) {
-      if (!oldGalaxy.civilizations.includes(civ)) {
-        oldGalaxy.civilizations.push(civ);
-      }
-    }
-
-    for (const civ of galaxyInfo.civilizations) {
-      if (!oldGalaxy.regions[civ]) {
-        oldGalaxy.regions[civ] = galaxyInfo.regions[civ];
-        continue;
-      }
-
-      const oldRegions = oldGalaxy.regions[civ];
-      const newRegions = galaxyInfo.regions[civ];
-
-      for (const r of newRegions) {
-        if (!oldRegions.some(or => or.name === r.name)) {
-          oldRegions.push(r);
-        }
-      }
-    }
-  }
-
-  return merged;
-}
-
-const forceRefreshCivilizations = async () => {
-  console.log("🔄 Forzando actualización y merge de datos…");
-  showNotification(i18next.t("updatingInfo"), "info");
-
-  const defaultData = await loadDefaultData();
-
-  const freshData = await fetchAllCivilizationsAndRegions(true);
-  const merged = mergeCivilizationData(defaultData, freshData);
-
-  setCachedData(CIVILIZATIONS_CACHE_KEY, merged);
-
-  console.log("✅ Merge completado. JSON actualizado sin borrar datos.");
-  showNotification(i18next.t("updatingFinish"), "success");
-
-  return merged;
-};
-
-window.forceRefreshCivilizations = forceRefreshCivilizations;
-
 const populateGalaxySelect = async () => {
   const select = document.getElementById("galaxySelect");
   const loadingOption = document.createElement("option");

index.html

@@ -74,8 +74,6 @@ <h1 data-i18n="header">Generador de Glifos NMS</h1>
       <button id="generateButton" class="primary" onclick="displayRandomGlyphs()" data-i18n="button">Generar
         Glifos</button>
       <button id="copyButton" onclick="copyToClipboard()" disabled data-i18n="copyButton">Copiar Código</button>
-      <button id="refreshCivilizationsButton" onclick="forceRefreshCivilizations()"
-        data-i18n="refreshCivilizations">Actualizar Regiones</button>
     </div>
 
     <div class="glyph-output" id="glyphOutputContainer">