Update anime/hianime/source.js

anime/hianime/source.js

@@ -14,13 +14,54 @@ class HiAnime {
     };
   }
 
+  safeString(str) {
+    return typeof str === "string" ? str : "";
+  }
+
+  decodeHtml(s) {
+    return this.safeString(s)
+      .replace(/&/g, "&")
+      .replace(/"/g, '"')
+      .replace(/'/g, "'")
+      .replace(/&lt;/g, "<")
+      .replace(/&gt;/g, ">");
+  }
+
+  normalizeKey(s) {
+    return this.decodeHtml(this.safeString(s))
+      .toLowerCase()
+      .replace(/[^a-z0-9]+/g, "");
+  }
+
+  scoreTitle(queryKey, title) {
+    const t = this.normalizeKey(title);
+    if (!t) return 0;
+    if (t === queryKey) return 1000;
+    if (t.includes(queryKey) || queryKey.includes(t)) return 700;
+
+    const qTokens = queryKey.match(/[a-z0-9]+/g) || [];
+    const tTokens = t.match(/[a-z0-9]+/g) || [];
+    let inter = 0;
+    for (const tok of qTokens) {
+      if (tTokens.includes(tok)) inter++;
+    }
+    return inter * 50;
+  }
+
+  fetchAjax(url, extraHeaders) {
+    const headers = Object.assign(
+      { "X-Requested-With": "XMLHttpRequest" },
+      extraHeaders || {}
+    );
+    return fetch(url, { headers });
+  }
+
   search(query) {
     console.log("[HiAnime] search called with:", JSON.stringify(query));
 
     try {
-            const normalize = (str) => this.safeString(str).toLowerCase().replace(/[^a-z0-9]+/g, "");
-
       let searchQuery = query;
+
       if (typeof query === "string") {
         try {
           searchQuery = JSON.parse(query);
@@ -39,10 +80,15 @@ class HiAnime {
 
       const media = searchQuery.media || {};
       const startDate = media.startDate || {};
-            const year = startDate.year || new Date().getFullYear();
+      const year = startDate.year || null;
-            const month = startDate.month || 1;
+      const month = startDate.month || null;
+
+      let url = `${this.baseUrl}/search?keyword=${encodeURIComponent(
+        queryText
+      )}&sort=default`;
+      if (year) url += `&sy=${year}`;
+      if (month) url += `&sm=${month}`;
 
-            const url = `${this.baseUrl}/search?keyword=${encodeURIComponent(queryText)}&sy=${year}&sm=${month}&sort=default`;
       console.log("[HiAnime] Fetching URL:", url);
 
       const response = fetch(url);
@@ -51,43 +97,66 @@ class HiAnime {
       const html = response.text();
       console.log("[HiAnime] HTML length:", html.length);
 
-            const regex = /<a href="\/watch\/([^"]+)"[^>]+title="([^"]+)"[^>]+data-id="(\d+)"/g;
+      const regex =
+        /<a\s+[^>]*href="\/watch\/([^"]+)"[^>]*title="([^"]+)"[^>]*data-id="(\d+)"/gi;
       const matches = [...html.matchAll(regex)];
       console.log("[HiAnime] Found", matches.length, "raw matches");
 
-            const results = matches.map((m, idx) => {
+      const dubFlag = !!searchQuery.dub;
-                const id = m[3];
+      const queryKey = this.normalizeKey(queryText);
-                const pageUrl = m[1];
-                const title = m[2];
 
-                console.log(`[HiAnime] Match ${idx + 1}: id=${id}, title="${title}"`);
+      let results = matches.map((m, idx) => {
+        const watchSlug = m[1];
+        const title = this.decodeHtml(m[2]);
+        const idNum = m[3];
 
-                const jnameRegex = new RegExp(
+        console.log(
-                    `<h3 class="film-name">[\\s\\S]*?<a[^>]+href="\\/${pageUrl}[^"]*"[^>]+data-jname="([^"]+)"`,
+          `[HiAnime] Match ${idx + 1}: id=${idNum}, title="${title}"`
+        );
+
+        const imgRe = new RegExp(
+          `<a[^>]+href="\\/watch\\/${watchSlug
+            .replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
+          }"[\\s\\S]*?<img[^>]+(?:data-src|src)="([^"]+)"`,
           "i"
         );
-                const jnameMatch = html.match(jnameRegex);
+        const imgM = html.match(imgRe);
-                const jname = jnameMatch ? jnameMatch[1] : null;
+        const image = imgM ? imgM[1] : null;
-
-                const imageRegex = new RegExp(
-                    `<a href="/watch/${pageUrl.replace(/\//g, "\\/")}"[\\s\\S]*?<img[^>]+data-src="([^"]+)"`,
-                    "i"
-                );
-                const imageMatch = html.match(imageRegex);
-                const image = imageMatch ? imageMatch[1] : null;
 
         return {
-                    id: `${id}/${searchQuery.dub ? "dub" : "sub"}`,
+          id: `${idNum}/${dubFlag ? "dub" : "sub"}`,
-                    title: title,
+          title,
-                    image: image,
+          image,
-                    url: `${this.baseUrl}/${pageUrl}`,
+          url: `${this.baseUrl}/watch/${watchSlug}`,
-                    subOrDub: searchQuery.dub ? "dub" : "sub"
+          subOrDub: dubFlag ? "dub" : "sub",
+          _score: this.scoreTitle(queryKey, title)
         };
       });
 
-            console.log("[HiAnime] Returning", results.length, "results");
+      const byId = {};
-            return results;
+      for (const r of results) {
+        const key = r.id;
+        if (!byId[key] || r._score > byId[key]._score) byId[key] = r;
+      }
+      results = Object.values(byId);
 
+      results.sort((a, b) => (b._score || 0) - (a._score || 0));
+
+      results = results.map((r) => {
+        const out = Object.assign({}, r);
+        delete out._score;
+        return out;
+      });
+
+      console.log(
+        "[HiAnime] Returning",
+        results.length,
+        "results (sorted best-first)"
+      );
+      if (results[0])
+        console.log("[HiAnime] Top result:", results[0].id, results[0].title);
+
+      return results;
     } catch (error) {
       console.error("[HiAnime] search error:", error);
       throw error;
@@ -113,7 +182,7 @@ class HiAnime {
             subOrDub = "sub";
           }
         }
-            } else if (typeof animeId === "object") {
+      } else if (typeof animeId === "object" && animeId) {
         id = animeId.id || animeId.animeId;
         subOrDub = animeId.subOrDub || "sub";
       } else {
@@ -121,47 +190,75 @@ class HiAnime {
         subOrDub = "sub";
       }
 
-            if (id && id.includes("/")) {
+      if (id && id.includes("/")) [id, subOrDub] = id.split("/");
-                [id, subOrDub] = id.split("/");
-            }
 
-            console.log("[HiAnime] Parsed episode params: id=", id, "subOrDub=", subOrDub);
+      console.log(
+        "[HiAnime] Parsed episode params: id=",
+        id,
+        "subOrDub=",
+        subOrDub
+      );
 
       const url = `${this.baseUrl}/ajax/v2/episode/list/${id}`;
       console.log("[HiAnime] Fetching episodes from:", url);
 
-            const response = fetch(url, {
+      const response = this.fetchAjax(url);
-                headers: { "X-Requested-With": "XMLHttpRequest" }
-            });
-
       console.log("[HiAnime] Episodes fetch status:", response.status);
 
       const json = response.json();
       console.log("[HiAnime] Episodes JSON keys:", Object.keys(json).join(", "));
 
-            const html = json.html || "";
+      const html = this.safeString(json.html);
       console.log("[HiAnime] Episodes HTML length:", html.length);
 
       const episodes = [];
-            const regex = /<a[^>]*class="[^"]*\bep-item\b[^"]*"[^>]*data-number="(\d+)"[^>]*data-id="(\d+)"[^>]*href="([^"]+)"[\s\S]*?<div class="ep-name[^"]*"[^>]*title="([^"]+)"/g;
+
+      const regex =
+        /<a[^>]*\bep-item\b[^>]*data-number="(\d+)"[^>]*data-id="(\d+)"[^>]*href="([^"]+)"[^>]*>([\s\S]*?)<\/a>/gi;
 
       let match;
       let matchCount = 0;
+
       while ((match = regex.exec(html)) !== null) {
         matchCount++;
+
+        const number = parseInt(match[1], 10);
+        const epId = match[2];
+        const href = match[3];
+        const inner = match[4] || "";
+
+        let title = "";
+        const t1 = inner.match(/title="([^"]+)"/i);
+        if (t1) title = this.decodeHtml(t1[1]);
+        if (!title) {
+          const t2 = inner.match(/class="ep-name[^"]*"[^>]*>([^<]+)/i);
+          if (t2) title = this.decodeHtml(t2[1]);
+        }
+        if (!title) title = `Episode ${number}`;
+
         const episode = {
-                    id: `${match[2]}/${subOrDub}`,
+          id: `${epId}/${subOrDub}`,
-                    number: parseInt(match[1], 10),
+          number,
-                    url: this.baseUrl + match[3],
+          url: this.baseUrl + href,
-                    title: match[4],
+          title
         };
-                console.log(`[HiAnime] Episode ${matchCount}: num=${episode.number}, id=${episode.id}, title="${episode.title}"`);
+
+        console.log(
+          `[HiAnime] Episode ${matchCount}: num=${episode.number}, id=${episode.id}, title="${episode.title}"`
+        );
         episodes.push(episode);
       }
 
       console.log("[HiAnime] Total episodes found:", episodes.length);
-            return episodes;
 
+      if (episodes.length === 0) {
+        console.warn(
+          "[HiAnime] No episodes parsed. HTML preview:",
+          html.slice(0, 300)
+        );
+      }
+
+      return episodes;
     } catch (error) {
       console.error("[HiAnime] findEpisodes error:", error);
       throw error;
@@ -169,7 +266,12 @@ class HiAnime {
   }
 
   findEpisodeServer(episode, _server) {
-        console.log("[HiAnime] findEpisodeServer called with episode:", JSON.stringify(episode), "server:", _server);
+    console.log(
+      "[HiAnime] findEpisodeServer called with episode:",
+      JSON.stringify(episode),
+      "server:",
+      _server
+    );
 
     try {
       let episodeId, subOrDub;
@@ -187,7 +289,7 @@ class HiAnime {
             subOrDub = "sub";
           }
         }
-            } else if (typeof episode === "object") {
+      } else if (typeof episode === "object" && episode) {
         const epId = episode.id || episode.episodeId || "";
         if (epId.includes("/")) {
           [episodeId, subOrDub] = epId.split("/");
@@ -200,41 +302,55 @@ class HiAnime {
         subOrDub = "sub";
       }
 
-            if (episodeId && episodeId.includes("/")) {
+      if (episodeId && episodeId.includes("/"))
         [episodeId, subOrDub] = episodeId.split("/");
-            }
 
-            console.log("[HiAnime] Parsed server params: episodeId=", episodeId, "subOrDub=", subOrDub);
+      console.log(
+        "[HiAnime] Parsed server params: episodeId=",
+        episodeId,
+        "subOrDub=",
+        subOrDub
+      );
 
-            let serverName = (_server && _server !== "default") ? _server : "HD-1";
+      let serverName =
+        _server && _server !== "default" ? _server : "HD-1";
       console.log("[HiAnime] Using server:", serverName);
 
-            if (_server === "HD-4") {
-                console.log("[HiAnime] HD-4 not supported, returning null");
-                return null;
-            }
-
       const serversUrl = `${this.baseUrl}/ajax/v2/episode/servers?episodeId=${episodeId}`;
       console.log("[HiAnime] Fetching servers from:", serversUrl);
 
-            const serverResponse = fetch(serversUrl, {
+      const serverResponse = this.fetchAjax(serversUrl);
-                headers: { "X-Requested-With": "XMLHttpRequest" }
-            });
-
       console.log("[HiAnime] Servers fetch status:", serverResponse.status);
 
       const serverJson = serverResponse.json();
-            const serverHtml = serverJson.html || "";
+      const serverHtml = this.safeString(serverJson.html);
       console.log("[HiAnime] Server HTML length:", serverHtml.length);
 
-            const regex = new RegExp(
+      const escapedName = serverName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-                `<div[^>]*class="item server-item"[^>]*data-type="${subOrDub}"[^>]*data-id="(\\d+)"[^>]*>\\s*<a[^>]*>\\s*${serverName}\\s*</a>`,
+
+      const blockRe = new RegExp(
+        `<div[^>]*\\bserver-item\\b[^>]*data-type="${subOrDub}"[^>]*data-id="(\\d+)"[\\s\\S]*?>[\\s\\S]*?${escapedName}[\\s\\S]*?<\\/div>`,
         "i"
       );
 
-            const match = regex.exec(serverHtml);
+      let match = blockRe.exec(serverHtml);
+
       if (!match) {
-                console.error(`[HiAnime] Server "${serverName}" (${subOrDub}) not found in HTML`);
+        const altRe = new RegExp(
+          `data-type="${subOrDub}"[^>]*data-id="(\\d+)"[\\s\\S]*?>[\\s\\S]*?<a[^>]*>[\\s\\S]*?${escapedName}[\\s\\S]*?<\\/a>`,
+          "i"
+        );
+        match = altRe.exec(serverHtml);
+      }
+
+      if (!match) {
+        console.error(
+          `[HiAnime] Server "${serverName}" (${subOrDub}) not found in HTML`
+        );
+        console.warn(
+          "[HiAnime] Server HTML preview:",
+          serverHtml.slice(0, 300)
+        );
         throw new Error(`Server "${serverName}" (${subOrDub}) not found`);
       }
 
@@ -244,10 +360,7 @@ class HiAnime {
       const sourcesUrl = `${this.baseUrl}/ajax/v2/episode/sources?id=${serverId}`;
       console.log("[HiAnime] Fetching sources from:", sourcesUrl);
 
-            const sourcesResponse = fetch(sourcesUrl, {
+      const sourcesResponse = this.fetchAjax(sourcesUrl);
-                headers: { "X-Requested-With": "XMLHttpRequest" }
-            });
-
       console.log("[HiAnime] Sources fetch status:", sourcesResponse.status);
 
       const sourcesJson = sourcesResponse.json();
@@ -269,7 +382,9 @@ class HiAnime {
 
       if (!decryptData) {
         console.log("[HiAnime] Trying fallback API...");
-                const fallbackUrl = `https://ac-api.ofchaos.com/api/anime/embed/convert/v2?embedUrl=${encodeURIComponent(sourcesJson.link)}`;
+        const fallbackUrl = `https://ac-api.ofchaos.com/api/anime/embed/convert/v2?embedUrl=${encodeURIComponent(
+          sourcesJson.link
+        )}`;
         const fallbackResponse = fetch(fallbackUrl);
         console.log("[HiAnime] Fallback fetch status:", fallbackResponse.status);
 
@@ -278,15 +393,17 @@ class HiAnime {
         requiredHeaders = {
           "Referer": "https://megacloud.club/",
           "Origin": "https://megacloud.club",
-                    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/139.0.0.0 Safari/537.36",
+          "User-Agent":
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/139.0.0.0 Safari/537.36",
           "X-Requested-With": "XMLHttpRequest"
         };
         console.log("[HiAnime] Fallback succeeded");
       }
 
+      const sourcesArr = decryptData && decryptData.sources ? decryptData.sources : [];
       const streamSource =
-                (decryptData.sources || []).find((s) => s.type === "hls") ||
+        sourcesArr.find((s) => s && s.type === "hls") ||
-                (decryptData.sources || []).find((s) => s.type === "mp4");
+        sourcesArr.find((s) => s && s.type === "mp4");
 
       if (!streamSource || !streamSource.file) {
         console.error("[HiAnime] No valid stream file found in sources");
@@ -295,13 +412,14 @@ class HiAnime {
 
       console.log("[HiAnime] Stream URL:", streamSource.file);
 
-            const subtitles = (decryptData.tracks || [])
+      const tracksArr = decryptData && decryptData.tracks ? decryptData.tracks : [];
-                .filter((t) => t.kind === "captions")
+      const subtitles = tracksArr
+        .filter((t) => t && t.kind === "captions" && t.file)
         .map((track, index) => ({
           id: `sub-${index}`,
           language: track.label || "Unknown",
           url: track.file,
-                    isDefault: !!track.default,
+          isDefault: !!track.default
         }));
 
       console.log("[HiAnime] Found", subtitles.length, "subtitles");
@@ -309,35 +427,24 @@ class HiAnime {
       const result = {
         server: serverName,
         headers: requiredHeaders,
-                videoSources: [{
+        videoSources: [
+          {
             url: streamSource.file,
             type: streamSource.type === "hls" ? "m3u8" : "mp4",
             quality: "auto",
-                    subtitles: subtitles
+            subtitles
-                }]
+          }
+        ]
       };
 
       console.log("[HiAnime] Returning server result");
       return result;
-
     } catch (error) {
       console.error("[HiAnime] findEpisodeServer error:", error);
       throw error;
     }
   }
 
-    safeString(str) {
-        return (typeof str === "string" ? str : "");
-    }
-
-    normalizeSeasonParts(title) {
-        const s = this.safeString(title);
-        return s.toLowerCase()
-            .replace(/[^a-z0-9]+/g, "")
-            .replace(/\d+(st|nd|rd|th)/g, (m) => m.replace(/st|nd|rd|th/, ""))
-            .replace(/season|cour|part/g, "");
-    }
-
   extractMegaCloud(embedUrl, returnHeaders) {
     console.log("[HiAnime] extractMegaCloud called with:", embedUrl);
 
@@ -350,10 +457,11 @@ class HiAnime {
         "X-Requested-With": "XMLHttpRequest",
         "Referer": baseDomain,
         "Origin": `${url.protocol}//${url.host}`,
-                "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/139.0.0.0 Safari/537.36",
+        "User-Agent":
+          "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/139.0.0.0 Safari/537.36"
       };
 
-            const response = fetch(embedUrl, { headers: headers });
+      const response = fetch(embedUrl, { headers });
       console.log("[HiAnime] MegaCloud embed fetch status:", response.status);
 
       const html = response.text();
@@ -388,11 +496,15 @@ class HiAnime {
       const sourcesUrl = `${baseDomain}embed-2/v3/e-1/getSources?id=${fileId}&_k=${nonce}`;
       console.log("[HiAnime] Fetching sources from:", sourcesUrl);
 
-            const sourcesResponse = fetch(sourcesUrl, { headers: headers });
+      const sourcesResponse = fetch(sourcesUrl, { headers });
       console.log("[HiAnime] Sources fetch status:", sourcesResponse.status);
 
       const sourcesJson = sourcesResponse.json();
-            console.log("[HiAnime] Sources has", (sourcesJson.sources || []).length, "sources");
+      console.log(
+        "[HiAnime] Sources has",
+        (sourcesJson.sources || []).length,
+        "sources"
+      );
 
       return {
         sources: sourcesJson.sources || [],
@@ -402,7 +514,6 @@ class HiAnime {
         server: sourcesJson.server || null,
         headersProvided: returnHeaders ? headers : undefined
       };
-
     } catch (error) {
       console.error("[HiAnime] extractMegaCloud error:", error);
       throw error;