better-ani-scraped 1.0.0 → 1.1.1

package/README.md

@@ -5,8 +5,6 @@ Better-Ani-Scraped
 A set of utility functions for scraping anime data from multiple sources. This tool allows you to search for anime, retrieve information, get episodes, and more.
 <p>
 <p align="center">
-  <a href="https://www.npmjs.com/package/ani-scraped"><img src="https://img.shields.io/npm/v/ani-scraped"></a>
-  <a href="https://www.npmjs.com/package/ani-scraped"><img src="https://img.shields.io/npm/dw/ani-scraped"></a>
 <p>
 
 <p align="center">
@@ -45,4 +43,4 @@ Please make sure you review the websites' terms of service and obtain permission
 
 
 ### Special thanks to
-- [Hxpe Dev](https://github.com/hxpe_dev)
+- [Hxpe Dev](https://github.com/hxpe-dev)

package/examples/example_usage_01.js

@@ -16,7 +16,7 @@ const main = async () => {
   ]);
   console.log("Embed Links:", embeds);
 
-  const videoUrl = await getVideoUrlFromEmbed("sibnet", embeds[11])
+  const videoUrl = await getVideoUrlFromEmbed("sibnet", embeds[11].url)
   console.log("Video URL:", videoUrl);
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-ani-scraped",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "description": "Scrape anime data from different sources (only anime-sama.fr for the moment)",
   "main": "index.js",
   "scripts": {
@@ -17,6 +17,7 @@
   "license": "MIT",
   "type": "module",
   "dependencies": {
+    "ani-scraped": "^1.2.8",
     "axios": "^1.8.4",
     "cheerio": "^1.0.0",
     "puppeteer": "^24.6.1"

package/scrapers/animesama.js

@@ -124,7 +124,7 @@ export async function getSeasons(animeUrl, language = "vostfr") {
   return seasons;
 }
 
-async function getEpisodeTitles(animeUrl) {
+export async function getEpisodeTitles(animeUrl) {
     let browser;
     try {
         browser = await puppeteer.launch({
@@ -156,51 +156,56 @@ async function getEpisodeTitles(animeUrl) {
     }
 }
 
-export async function getEmbed(animeUrl, hostPriority = ["sibnet", "vidmoly"]) {
-    let res, episodesJs;
-    try {
-        res = await axios.get(animeUrl, {
-            headers: getHeaders(animeUrl.split("/").slice(0, 5).join("/")),
-        });
+export async function getEmbed(animeUrl, hostPriority = ["vidmoly"]) {
+  const res = await axios.get(animeUrl, {
+    headers: getHeaders(animeUrl.split("/").slice(0, 5).join("/")),
+  });
+  const $ = cheerio.load(res.data);
 
-        const $ = cheerio.load(res.data);
-        const scriptTag = $('script[src*="episodes.js"]').attr("src");
+  const scriptTag = $('script[src*="episodes.js"]').attr("src");
+  if (!scriptTag) throw new Error("No episodes script found");
 
-        if (!scriptTag) throw new Error("No episodes script found");
-        const scriptUrl = animeUrl.endsWith("/") ? animeUrl + scriptTag : animeUrl + "/" + scriptTag;
-    
-        episodesJs = await axios.get(scriptUrl, { headers: getHeaders(animeUrl) }).then(r => r.data);
+  const scriptUrl = animeUrl.endsWith("/")
+    ? animeUrl + scriptTag
+    : animeUrl + "/" + scriptTag;
 
-        const match = episodesJs.match(/var\s+eps\d+\s*=\s*(\[[^\]]+\])/);
-        if (!match) throw new Error("No episode array found");
+  const episodesJs = await axios
+    .get(scriptUrl, { headers: getHeaders(animeUrl) })
+    .then((r) => r.data);
 
-        const arrayString = match[1];
-        let links = [];
+  const matches = [
+    ...episodesJs.matchAll(/var\s+(eps\d+)\s*=\s*(\[[^\]]+\])/g),
+  ];
+  if (!matches.length) throw new Error("No episode arrays found");
 
-        try {
-            links = eval(arrayString); 
-        } catch (e) {
-            console.warn("Could not parse episode links array:", e);
-        }
-        const titles = await getEpisodeTitles(animeUrl);
-
-        const results = titles.slice(0, links.length).map((title, i) => ({
-            title,
-            url: [links[i]]
-        }));
-        for (const host of hostPriority) {
-            const filtered = results.filter(ep =>
-                ep.url.some(link => link.includes(host))
-            );
-            if (filtered.length) return filtered;
-        }
-        return results;
-    } catch (error) {
-        console.error('Erreur lors de la récupération des données d\'épisodes:', error);
-        return [];
+  let allEmbeds = [];
+
+  for (const [, , arrayString] of matches) {
+    try {
+      const links = eval(arrayString); 
+      allEmbeds.push(...links);
+    } catch (e) {
+      console.warn("Could not parse embed array:", e);
+    }
+  }
+  for (const host of hostPriority) {
+    const filtered = allEmbeds.filter((url) => url.includes(host));
+    if (filtered.length) {
+      const titles = await getEpisodeTitles(animeUrl);
+      return titles.slice(0, filtered.length).map((title, i) => ({
+        title,
+        url: filtered[i]
+      }));
     }
+  }
+  const titles = await getEpisodeTitles(animeUrl);
+  return titles.slice(0, allEmbeds.length).map((title, i) => ({
+    title,
+    url: allEmbeds[i]
+  }));
 }
 
+
 export async function getAnimeInfo(animeUrl) {
   const res = await axios.get(animeUrl, { headers: getHeaders(CATALOGUE_URL) });
   const $ = cheerio.load(res.data);

package/scrapers/scrapers.js

@@ -83,4 +83,13 @@ export class AnimeScraper {
       return null;
     }
   }
+
+  async getEpisodeTitles(animeUrl) {
+    try {
+      return await this.source.getEpisodeTitles(animeUrl);
+    } catch (error) {
+      console.error(`This scraper does not have the getRandomAnime function implemented or an error happened -> ${error}`);
+      return null;
+    }
+  }
 }