Merge branch 'main' into feature/light-novel

javascript/anime/src/all/autoembed.js

@@ -1,12 +1,12 @@
 const mangayomiSources = [{
     "name": "Autoembed",
     "lang": "all",
-    "baseUrl": "https://autoembed.cc",
+    "baseUrl": "https://watch.autoembed.cc",
     "apiUrl": "https://tom.autoembed.cc",
     "iconUrl": "https://www.google.com/s2/favicons?sz=64&domain=https://autoembed.cc/",
     "typeSource": "multi",
     "isManga": false,
-    "version": "1.0.1",
+    "version": "1.1.4",
     "dateFormat": "",
     "dateFormatLocale": "",
     "pkgPath": "anime/src/all/autoembed.js"
@@ -14,7 +14,7 @@ const mangayomiSources = [{
 
 class DefaultExtension extends MProvider {
 
-    getHeaders(url) {
+    getHeaders() {
         return {
             Referer: this.source.apiUrl
         }
@@ -59,9 +59,17 @@ class DefaultExtension extends MProvider {
         body = await this.tmdbRequest(`catalog/series/${slug}`);
         var popSeries = await this.getSearchItems(body);
 
+        var fullList = [];
+
+        var priority = await this.getPreference("pref_content_priority");
+        if (priority === "series") {
+            fullList = [...popSeries, ...popMovie];
+        } else {
+            fullList = [...popMovie, ...popSeries]
+        }
         var hasNextPage = slug.indexOf("search=") > -1 ? false : true;
         return {
-            list: [...popMovie, ...popSeries],
+            list: fullList,
             hasNextPage
         };
 
@@ -90,8 +98,9 @@ class DefaultExtension extends MProvider {
         var body = await this.tmdbRequest(`meta/${media_type}/${id}.json`)
         var result = body.meta;
 
-        var tmdb_id = id.substring(5, )
-        var imdb_id = result.imdb_id
+        var tmdb_id = id.substring(5,)
+        media_type = media_type == "series" ? "tv" : media_type;
+
         var dateNow = Date.now().valueOf();
         var release = result.released ? new Date(result.released).valueOf() : dateNow
         var chaps = [];
@@ -99,12 +108,14 @@ class DefaultExtension extends MProvider {
         var item = {
             name: result.name,
             imageUrl: result.poster,
-            link: `https://imdb.com/title/${imdb_id}`,
+            link: `${this.source.baseUrl}/${media_type}/${tmdb_id}`,
             description: result.description,
             genre: result.genre,
         };
 
-        if (media_type == "series") {
+        var link = `${media_type}||${tmdb_id}`
+
+        if (media_type == "tv") {
 
             var videos = result.videos
             for (var i in videos) {
@@ -118,7 +129,7 @@ class DefaultExtension extends MProvider {
                 if (release < dateNow) {
                     var episodeNum = video.episode
                     var name = `S${seasonNum}:E${episodeNum} - ${video.name}`
-                    var eplink = `tv||${tmdb_id}/${seasonNum}/${episodeNum}`
+                    var eplink = `${link}||${seasonNum}||${episodeNum}`
 
                     chaps.push({
                         name: name,
@@ -131,7 +142,7 @@ class DefaultExtension extends MProvider {
             if (release < dateNow) {
                 chaps.push({
                     name: "Movie",
-                    url: `${media_type}||${tmdb_id}`,
+                    url: link,
                     dateUpload: release.toString(),
                 })
             }
@@ -141,27 +152,57 @@ class DefaultExtension extends MProvider {
         chaps.reverse();
         return item;
     }
-    async extractStreams(url) {
+
+    // Extracts the streams url for different resolutions from a hls stream.
+    async extractStreams(url, lang = "", hdr = {}) {
         const response = await new Client().get(url);
         const body = response.body;
         const lines = body.split('\n');
-        var streams = [];
+        var streams = [{
+            url: url,
+            originalUrl: url,
+            quality: "auto",
+        }];
 
         for (let i = 0; i < lines.length; i++) {
             if (lines[i].startsWith('#EXT-X-STREAM-INF:')) {
-                const resolution = lines[i].match(/RESOLUTION=(\d+x\d+)/)[1];
-                const m3u8Url = lines[i + 1].trim();
-
+                var resolution = lines[i].match(/RESOLUTION=(\d+x\d+)/)[1];
+                resolution = `${lang} ${resolution}`
+                var m3u8Url = lines[i + 1].trim();
+                m3u8Url = m3u8Url.replace("./", `${url}/`)
                 streams.push({
                     url: m3u8Url,
                     originalUrl: m3u8Url,
                     quality: resolution,
+                    headers: hdr
                 });
             }
         }
+        return streams
+
+    }
+
+    // For some streams, we can form stream url using a default template.
+    async splitStreams(url, lang = "", hdr = {}) {
+        var streams = [];
+        var quality = ["auto", "360", "480", "720", "1080"]
+        for (var q of quality) {
+            var link = url
+            if (q != "auto") {
+                link = link.replace("index.m3u8", `${q}/index.m3u8`)
+                q = `${q}p`
+            }
+            streams.push({
+                url: link,
+                originalUrl: link,
+                quality: `${lang} - ${q}`,
+                headers: hdr
+            });
+        }
         return streams;
     }
 
+    // Sorts streams based on user preference.
     async sortStreams(streams) {
         var sortedStreams = [];
 
@@ -181,31 +222,177 @@ class DefaultExtension extends MProvider {
         return [...sortedStreams, ...copyStreams]
     }
 
+    // Gets subtitles based on TMDB id.
+    async getSubtitleList(id, s, e) {
+        var api = `https://sub.wyzie.ru/search?id=${id}`
+        if (s != "0") api = `${api}&season=${s}&episode=${e}`
+        var response = await new Client().get(api);
+        var body = JSON.parse(response.body);
+
+        var subs = []
+        for (var sub of body) {
+            subs.push({
+                file: sub.url,
+                label: sub.display
+            })
+        }
+
+        return subs
+    }
+
     // For anime episode video list
     async getVideoList(url) {
+        var streamAPI = parseInt(await this.getPreference("pref_stream_source"))
+
         var parts = url.split("||");
         var media_type = parts[0];
         var id = parts[1];
-        var api = `${this.source.apiUrl}/api/getVideoSource?type=${media_type}&id=${id}`
-        const response = await new Client().get(api, this.getHeaders());
-        const body = JSON.parse(response.body);
+        var tmdb = id
+        var streams = []
+        var subtitles = []
+        switch (streamAPI) {
+            case 2: {
+                var s = "0"
+                var e = "0"
+                if (media_type == "tv") {
+                    s = parts[2]
+                    e = parts[3]
+                    id = `${id}/${s}/${e}`
+                }
+                var api = `https://play2.123embed.net/server/3?path=/${media_type}/${id}`
+                var response = await new Client().get(api);
 
-        if (response.statusCode == 404) {
-            throw new Error("Video unavailable");
+                if (response.statusCode != 200) {
+                    throw new Error("Video unavailable");
+                }
+
+                var body = JSON.parse(response.body);
+                var link = body.playlist[0].file
+                streams.push({
+                    url: link,
+                    originalUrl: link,
+                    quality: "auto",
+                    headers: { "Origin": "https://play2.123embed.net" },
+                });
+                break;
+            }
+            case 3: {
+                var s = "0"
+                var e = "0"
+                if (media_type == "tv") {
+                    s = parts[2]
+                    e = parts[3]
+                    id = `${id}&s=${s}&e=${e}`
+                }
+                var api = `https://autoembed.cc/embed/player.php?id=${id}`
+
+                var response = await new Client().get(api);
+
+                if (response.statusCode != 200) {
+                    throw new Error("Video unavailable");
+                }
+                var body = response.body
+                var sKey = '"file": '
+                var eKey = "]});"
+                var start = body.indexOf(sKey)
+                if (start < 0) {
+                    throw new Error("Video unavailable");
+                }
+                start += sKey.length
+
+                var end = body.substring(start,).indexOf(eKey) + start - 1
+                var strms = JSON.parse(body.substring(start, end) + "]")
+                for (var strm of strms) {
+                    var link = strm.file
+                    var lang = strm.title
+                    var streamSplit = await this.splitStreams(link, lang);
+                    streams = [...streams, ...streamSplit]
+                }
+
+                break;
+            }
+            case 4: {
+                var s = "0"
+                var e = "0"
+                if (media_type == "tv") {
+                    s = parts[2]
+                    e = parts[3]
+                    id = `${id}&season=${s}&episode=${e}`
+                }
+                var api = `https://player.flicky.host/Server-main.php?id=${id}`
+                var response = await new Client().get(api, { "Referer": "https://flicky.host/" });
+
+                if (response.statusCode != 200) {
+                    throw new Error("Video unavailable");
+                }
+                var body = response.body
+                var sKey = 'streams = '
+                var eKey = "];"
+                var start = body.indexOf(sKey)
+                if (start < 0) {
+                    throw new Error("Video unavailable");
+                }
+                start += sKey.length
+
+                var end = body.substring(start,).indexOf(eKey) + start + 1
+                var strms = JSON.parse(body.substring(start, end))
+
+                for (var strm of strms) {
+                    var link = strm.url
+                    var lang = strm.language
+                    var streamSplit = await this.splitStreams(link, lang);
+                    streams = [...streams, ...streamSplit]
+                }
+
+                break;
+            }
+            case 5: {
+                if (media_type == "tv") {
+                    id = `${id}/${parts[2]}/${parts[3]}`
+                }
+                var api = `https://vidapi.click/api/video/${media_type}/${id}`
+                var response = await new Client().get(api);
+
+                if (response.statusCode != 200) {
+                    throw new Error("Video unavailable");
+                }
+
+                var body = JSON.parse(response.body);
+                var link = body.sources[0].file
+                subtitles = body.tracks
+                streams = await this.extractStreams(link);
+                break;
+            }
+
+            default: {
+                if (media_type == "tv") {
+                    id = `${id}/${parts[2]}/${parts[3]}`
+                }
+                var api = `${this.source.apiUrl}/api/getVideoSource?type=${media_type}&id=${id}`
+                var response = await new Client().get(api, this.getHeaders());
+
+                if (response.statusCode != 200) {
+                    throw new Error("Video unavailable");
+                }
+
+                var body = JSON.parse(response.body);
+                var link = body.videoSource
+                subtitles = body.subtitles
+                streams = await this.extractStreams(link);
+                break;
+            }
 
         }
-        var link = body.videoSource
+        if (streams.length < 1) {
+            throw new Error("Video unavailable");
+        }
 
-        var subtitles = body.subtitles
-        var streams = await this.extractStreams(link);
-        streams.push({
-            url: link,
-            originalUrl: link,
-            quality: "auto",
-            subtitles: subtitles,
-        });
+        if (subtitles.length < 1) {
+            subtitles = await this.getSubtitleList(tmdb, s, e)
+        }
+        streams[0].subtitles = subtitles
 
-        return await this.sortStreams(streams);
+        return await this.sortStreams(streams)
     }
     // For manga chapter pages
     async getPageList() {
@@ -217,27 +404,44 @@ class DefaultExtension extends MProvider {
 
     getSourcePreferences() {
         return [{
-                key: 'pref_latest_time_window',
-                listPreference: {
-                    title: 'Preferred latest trend time window',
-                    summary: '',
-                    valueIndex: 0,
-                    entries: ["Day", "Week"],
-                    entryValues: ["day", "week"]
-                }
-            }, {
-                key: 'pref_video_resolution',
-                listPreference: {
-                    title: 'Preferred video resolution',
-                    summary: '',
-                    valueIndex: 0,
-                    entries: ["Auto", "1080p", "720p", "360p"],
-                    entryValues: ["auto", "1080", "720", "360"]
-                }
-            },
-
-
+            key: 'pref_latest_time_window',
+            listPreference: {
+                title: 'Preferred latest trend time window',
+                summary: '',
+                valueIndex: 0,
+                entries: ["Day", "Week"],
+                entryValues: ["day", "week"]
+            }
+        }, {
+            key: 'pref_video_resolution',
+            listPreference: {
+                title: 'Preferred video resolution',
+                summary: '',
+                valueIndex: 0,
+                entries: ["Auto", "1080p", "720p", "360p"],
+                entryValues: ["auto", "1080", "720", "360"]
+            }
+        }, {
+            key: 'pref_content_priority',
+            listPreference: {
+                title: 'Preferred content priority',
+                summary: 'Choose which type of content to show first',
+                valueIndex: 0,
+                entries: ["Movies", "Series"],
+                entryValues: ["movies", "series"]
+            }
+        },
+        {
+            key: 'pref_stream_source',
+            listPreference: {
+                title: 'Preferred stream source',
+                summary: '',
+                valueIndex: 0,
+                entries: ["tom.autoembed.cc", "123embed.net", "autoembed.cc - Indian languages", "flicky.host - Indian languages", "vidapi.click"],
+                entryValues: ["1", "2", "3", "4", "5"]
+            }
+        },
         ];
 
     }
-}
+}

javascript/anime/src/all/netflixmirror.js

@@ -5,8 +5,8 @@ const mangayomiSources = [{
     "apiUrl": "",
     "iconUrl": "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/main/javascript/icon/all.netflixmirror.png",
     "typeSource": "single",
-    "itemType": 1,
-    "version": "0.0.55",
+    "isManga": false,
+    "version": "0.0.6",
     "dateFormat": "",
     "dateFormatLocale": "",
     "pkgPath": "anime/src/all/netflixmirror.js"
@@ -22,8 +22,10 @@ class DefaultExtension extends MProvider {
         if (elements && elements.length > 0) {
             return cookie;
         }
-        const addhash = new Document((await new Client().get(`${this.source.baseUrl}/home`, { "cookie": "" })).body).selectFirst("body").attr("data-addhash");
-        await new Client().get(`https://userverify.netmirror.app/verify?vhfd=${addhash}&a=y`);
+        const hDoc = new Document((await new Client().get(`${this.source.baseUrl}/home`, { "cookie": "" })).body);
+        const addhash = hDoc.selectFirst("body").attr("data-addhash");
+        const time = hDoc.selectFirst("body").attr("data-time");
+        await new Client().get(`https://userverify.netmirror.app/?fr3=${addhash}&a=y&t=${time}`);
         let body;
         let res;
         do {
@@ -209,4 +211,4 @@ class DefaultExtension extends MProvider {
         return videoList;
     }
 
-}
+}