Update server.js

server.js

@@ -39,120 +39,144 @@ function toBookId(name) {
 
 /* ---------- Simple token-bucket rate-limiter for Bible-API (15 req / 30 s) ---------- */
 let tokens = 15;
-setInterval(() => {
-  tokens = 15;
-}, 30_000); // reset every 30 s
-
+setInterval(() => (tokens = 15), 30_000);
 async function limitedFetch(url, opts) {
   while (tokens === 0) await delay(200);
   tokens--;
-
   const r = await fetch(url, opts);
-
   if (r.status === 429) {
     const retry = parseInt(r.headers.get("Retry-After") || "5", 10) * 1000;
-    console.warn("429 kaptunk, várok", retry, "ms-t és újrapróbálom →", url);
     await delay(retry);
-    return limitedFetch(url, opts); // single retry
+    return limitedFetch(url, opts);
   }
-
   return r;
 }
 
-/* ---------- In-memory verse cache (5 perc) ---------- */
-const verseCache = new Map();
-function cacheGet(key) {
-  const v = verseCache.get(key);
-  return v && v.exp > Date.now() ? v.text : undefined;
+/* ---------- In-memory verse & meta cache ---------- */
+const verseCache = new Map(); // key → {text, exp}
+const metaCache = new Map();  // book → {chapters:[n], exp}
+function cacheGet(map, key) {
+  const v = map.get(key);
+  return v && v.exp > Date.now() ? v.data : undefined;
 }
-function cacheSet(key, text, ttl = 300_000) {
-  verseCache.set(key, { text, exp: Date.now() + ttl });
+function cacheSet(map, key, data, ttl = 300_000) {
+  map.set(key, { data, exp: Date.now() + ttl });
 }
 
 /* ---------- Fetch English KJV verse ---------- */
 async function fetchEnglishVerse(book, ch, v) {
   const ref = `${book} ${ch}:${v}`;
-  const cached = cacheGet(ref);
+  const cached = cacheGet(verseCache, ref);
   if (cached) return cached;
-
-  const url = "https://bible-api.com/" + encodeURIComponent(ref) + "?translation=kjv";
-  console.log("Vers lekérése ezzel az URL-lel:", url);
-
+  const url = `https://bible-api.com/${encodeURIComponent(ref)}?translation=kjv`;
   const r = await limitedFetch(url);
-  if (!r.ok) {
-    console.error("Bible API hiba státuszkód:", r.status, r.statusText);
-    throw new Error("bible-api hiba");
-  }
+  if (!r.ok) throw new Error(`bible-api verse error ${r.status}`);
   const j = await r.json();
   const text = j.text.trim();
-  cacheSet(ref, text);
+  cacheSet(verseCache, ref, text);
   return text;
 }
 
-/* ---------- /api/analyze ---------- */
+/* ---------- Robust /api/meta ---------- */
+async function fetchMetaChapters(book) {
+  const cached = cacheGet(metaCache, book);
+  if (cached) return cached;
+
+  const bookId = toBookId(book);
+  const url = `https://bible-api.com/data/kjv/${bookId}`;
+  let chapters = [];
+  try {
+    const r = await limitedFetch(url);
+    if (r.ok) {
+      const j = await r.json();
+      if (Array.isArray(j.chapters)) {
+        chapters = j.chapters.map(c => parseInt(c.verses_count ?? c.verse_count ?? (c.verse_ids?.length ?? 0), 10));
+      } else if (j.chapters && typeof j.chapters === "object") {
+        chapters = Object.keys(j.chapters).sort((a, b) => a - b).map(k => {
+          const obj = j.chapters[k];
+          return parseInt(obj.verses_count ?? obj.verse_count ?? (obj.verse_ids?.length ?? 0), 10);
+        });
+      } else if (Array.isArray(j.chapter_ids)) {
+        // we know count of chapters but not verses, will fetch first+last verse per chapter below
+        chapters = await Promise.all(
+          j.chapter_ids.map(async id => {
+            const parts = id.split(".");
+            const chNum = parts[1] || id; // fallback
+            return await fetchChapterVerseCount(bookId, chNum);
+          })
+        );
+      }
+    }
+  } catch (e) {
+    console.error("/data API parse fail, falling back", e);
+  }
+
+  // fallback if still empty → step through chapters until 404
+  if (!chapters.length) {
+    chapters = await bruteForceChapters(book);
+  }
+
+  if (!chapters.length) throw new Error("meta fetch failed");
+  cacheSet(metaCache, book, chapters, 3600_000); // 1 óra cache
+  return chapters;
+}
+
+async function fetchChapterVerseCount(bookId, ch) {
+  const url = `https://bible-api.com/data/kjv/${bookId}/${ch}`;
+  const r = await limitedFetch(url);
+  if (!r.ok) return 0;
+  const j = await r.json();
+  if (Array.isArray(j.verses)) return j.verses.length;
+  if (Array.isArray(j.verse_ids)) return j.verse_ids.length;
+  if (j.verses_count || j.verse_count) return parseInt(j.verses_count ?? j.verse_count, 10);
+  return 0;
+}
+
+async function bruteForceChapters(book) {
+  const chapters = [];
+  for (let ch = 1; ch <= 200; ch++) {
+    const url = `https://bible-api.com/${encodeURIComponent(book + " " + ch)}?translation=kjv`;
+    const r = await limitedFetch(url);
+    if (!r.ok) break; // 404 signals end
+    const j = await r.json();
+    const versesInChapter = j.verses[j.verses.length - 1].verse;
+    chapters.push(versesInChapter);
+  }
+  return chapters;
+}
+
+/* ---------- Routes ---------- */
 app.post("/api/analyze", async (req, res) => {
   const { book, chapter, verse } = req.body || {};
-  console.log("Bemenő /api/analyze kérés:", { book, chapter, verse });
-
   try {
     const engVerse = await fetchEnglishVerse(book, chapter, verse);
-    const ref = `${book} ${chapter}:${verse}`;
-
     const aiRes = await fetch("https://api.openai.com/v1/chat/completions", {
       method: "POST",
       headers: { "Content-Type": "application/json", Authorization: "Bearer " + process.env.OPENAI_KEY },
       body: JSON.stringify({
         model: "gpt-4o-mini",
         messages: [
-          {
-            role: "system",
-            content: "Fordítsd magyarra a megadott Biblia-verset, majd első szám első személyben, legfeljebb két rövid bekezdésben magyarázd el, hogyan kapcsolódik a mai mesterséges intelligencia dilemmáihoz."
-          },
-          { role: "user", content: `Verse (KJV): \"${engVerse}\" — ${ref}` }
+          { role: "system", content: "Fordítsd magyarra a megadott Biblia-verset, majd első szám első személyben, legfeljebb két rövid bekezdésben magyarázd el, hogyan kapcsolódik a mai mesterséges intelligencia dilemmáihoz." },
+          { role: "user", content: `Verse (KJV): \"${engVerse}\" — ${book} ${chapter}:${verse}` }
         ],
         temperature: 0.9,
         max_tokens: 300
       })
     });
-
     if (!aiRes.ok) throw new Error("OpenAI API hiba");
     const data = await aiRes.json();
     res.json({ output: data.choices[0].message.content.trim() });
-
   } catch (err) {
     console.error(err);
-    res.status(500).json({ error: err.message || "Ismeretlen hiba" });
+    res.status(500).json({ error: err.message });
   }
 });
 
-/* ---------- /api/meta – 1 fetch a teljes könyvre ---------- */
 app.get("/api/meta", async (req, res) => {
-  const book = req.query.book;
+  const { book } = req.query;
   if (!book) return res.status(400).json({ error: "Missing book" });
-
   try {
-    const bookId = toBookId(book);
-    const url = `https://bible-api.com/data/kjv/${bookId}`;
-    console.log("Meta lekérése ezzel az URL-lel:", url);
-
-    const r = await limitedFetch(url);
-    if (!r.ok) throw new Error("meta fetch error");
-    const j = await r.json();
-
-    // normalize chapters structure to [verseCountPerChapter]
-    let chapters = [];
-    if (Array.isArray(j.chapters)) {
-      chapters = j.chapters.map(c => parseInt(c.verses_count ?? c.verse_count ?? c.verses ?? 0, 10));
-    } else if (j.chapters && typeof j.chapters === "object") {
-      chapters = Object.keys(j.chapters)
-        .sort((a, b) => a - b)
-        .map(k => parseInt(j.chapters[k].verses_count ?? j.chapters[k].verse_count ?? j.chapters[k].verses ?? 0, 10));
-    }
-
-    if (!chapters.length || chapters.some(n => isNaN(n) || n === 0)) {
-      throw new Error("Üres vagy hibás chapters adat");
-    }
-
+    const chapters = await fetchMetaChapters(book);
     res.json({ chapters });
   } catch (err) {
     console.error(err);