@forward-widget/danmu-universe 0.0.5 → 0.0.7

package/dist/danmu-universe.js

@@ -695,8 +695,8 @@ var __webpack_modules__ = {
                             var r = t + n, i = e[r];
                             e[r] = (i << 8 | i >>> 24) & 0x00ff00ff | (i << 24 | i >>> 8) & 0xff00ff00;
                         }
-                        var o = this._hash.words, s = e[t + 0], u = e[t + 1], f = e[t + 2], h = e[t + 3], m = e[t + 4], g = e[t + 5], v = e[t + 6], y = e[t + 7], b = e[t + 8], _ = e[t + 9], w = e[t + 10], x = e[t + 11], k = e[t + 12], j = e[t + 13], S = e[t + 14], E = e[t + 15], z = o[0], O = o[1], I = o[2], $ = o[3];
-                        z = l(z, O, I, $, s, 7, a[0]), $ = l($, z, O, I, u, 12, a[1]), I = l(I, $, z, O, f, 17, a[2]), O = l(O, I, $, z, h, 22, a[3]), z = l(z, O, I, $, m, 7, a[4]), $ = l($, z, O, I, g, 12, a[5]), I = l(I, $, z, O, v, 17, a[6]), O = l(O, I, $, z, y, 22, a[7]), z = l(z, O, I, $, b, 7, a[8]), $ = l($, z, O, I, _, 12, a[9]), I = l(I, $, z, O, w, 17, a[10]), O = l(O, I, $, z, x, 22, a[11]), z = l(z, O, I, $, k, 7, a[12]), $ = l($, z, O, I, j, 12, a[13]), I = l(I, $, z, O, S, 17, a[14]), O = l(O, I, $, z, E, 22, a[15]), z = c(z, O, I, $, u, 5, a[16]), $ = c($, z, O, I, v, 9, a[17]), I = c(I, $, z, O, x, 14, a[18]), O = c(O, I, $, z, s, 20, a[19]), z = c(z, O, I, $, g, 5, a[20]), $ = c($, z, O, I, w, 9, a[21]), I = c(I, $, z, O, E, 14, a[22]), O = c(O, I, $, z, m, 20, a[23]), z = c(z, O, I, $, _, 5, a[24]), $ = c($, z, O, I, S, 9, a[25]), I = c(I, $, z, O, h, 14, a[26]), O = c(O, I, $, z, b, 20, a[27]), z = c(z, O, I, $, j, 5, a[28]), $ = c($, z, O, I, f, 9, a[29]), I = c(I, $, z, O, y, 14, a[30]), O = c(O, I, $, z, k, 20, a[31]), z = d(z, O, I, $, g, 4, a[32]), $ = d($, z, O, I, b, 11, a[33]), I = d(I, $, z, O, x, 16, a[34]), O = d(O, I, $, z, S, 23, a[35]), z = d(z, O, I, $, u, 4, a[36]), $ = d($, z, O, I, m, 11, a[37]), I = d(I, $, z, O, y, 16, a[38]), O = d(O, I, $, z, w, 23, a[39]), z = d(z, O, I, $, j, 4, a[40]), $ = d($, z, O, I, s, 11, a[41]), I = d(I, $, z, O, h, 16, a[42]), O = d(O, I, $, z, v, 23, a[43]), z = d(z, O, I, $, _, 4, a[44]), $ = d($, z, O, I, k, 11, a[45]), I = d(I, $, z, O, E, 16, a[46]), O = d(O, I, $, z, f, 23, a[47]), z = p(z, O, I, $, s, 6, a[48]), $ = p($, z, O, I, y, 10, a[49]), I = p(I, $, z, O, S, 15, a[50]), O = p(O, I, $, z, g, 21, a[51]), z = p(z, O, I, $, k, 6, a[52]), $ = p($, z, O, I, h, 10, a[53]), I = p(I, $, z, O, w, 15, a[54]), O = p(O, I, $, z, u, 21, a[55]), z = p(z, O, I, $, b, 6, a[56]), $ = p($, z, O, I, E, 10, a[57]), I = p(I, $, z, O, v, 15, a[58]), O = p(O, I, $, z, j, 21, a[59]), z = p(z, O, I, $, m, 6, a[60]), $ = p($, z, O, I, x, 10, a[61]), I = p(I, $, z, O, f, 15, a[62]), O = p(O, I, $, z, _, 21, a[63]), o[0] = o[0] + z | 0, o[1] = o[1] + O | 0, o[2] = o[2] + I | 0, o[3] = o[3] + $ | 0;
+                        var o = this._hash.words, s = e[t + 0], u = e[t + 1], f = e[t + 2], h = e[t + 3], m = e[t + 4], g = e[t + 5], v = e[t + 6], y = e[t + 7], b = e[t + 8], _ = e[t + 9], w = e[t + 10], x = e[t + 11], k = e[t + 12], j = e[t + 13], E = e[t + 14], S = e[t + 15], z = o[0], O = o[1], I = o[2], $ = o[3];
+                        z = l(z, O, I, $, s, 7, a[0]), $ = l($, z, O, I, u, 12, a[1]), I = l(I, $, z, O, f, 17, a[2]), O = l(O, I, $, z, h, 22, a[3]), z = l(z, O, I, $, m, 7, a[4]), $ = l($, z, O, I, g, 12, a[5]), I = l(I, $, z, O, v, 17, a[6]), O = l(O, I, $, z, y, 22, a[7]), z = l(z, O, I, $, b, 7, a[8]), $ = l($, z, O, I, _, 12, a[9]), I = l(I, $, z, O, w, 17, a[10]), O = l(O, I, $, z, x, 22, a[11]), z = l(z, O, I, $, k, 7, a[12]), $ = l($, z, O, I, j, 12, a[13]), I = l(I, $, z, O, E, 17, a[14]), O = l(O, I, $, z, S, 22, a[15]), z = c(z, O, I, $, u, 5, a[16]), $ = c($, z, O, I, v, 9, a[17]), I = c(I, $, z, O, x, 14, a[18]), O = c(O, I, $, z, s, 20, a[19]), z = c(z, O, I, $, g, 5, a[20]), $ = c($, z, O, I, w, 9, a[21]), I = c(I, $, z, O, S, 14, a[22]), O = c(O, I, $, z, m, 20, a[23]), z = c(z, O, I, $, _, 5, a[24]), $ = c($, z, O, I, E, 9, a[25]), I = c(I, $, z, O, h, 14, a[26]), O = c(O, I, $, z, b, 20, a[27]), z = c(z, O, I, $, j, 5, a[28]), $ = c($, z, O, I, f, 9, a[29]), I = c(I, $, z, O, y, 14, a[30]), O = c(O, I, $, z, k, 20, a[31]), z = d(z, O, I, $, g, 4, a[32]), $ = d($, z, O, I, b, 11, a[33]), I = d(I, $, z, O, x, 16, a[34]), O = d(O, I, $, z, E, 23, a[35]), z = d(z, O, I, $, u, 4, a[36]), $ = d($, z, O, I, m, 11, a[37]), I = d(I, $, z, O, y, 16, a[38]), O = d(O, I, $, z, w, 23, a[39]), z = d(z, O, I, $, j, 4, a[40]), $ = d($, z, O, I, s, 11, a[41]), I = d(I, $, z, O, h, 16, a[42]), O = d(O, I, $, z, v, 23, a[43]), z = d(z, O, I, $, _, 4, a[44]), $ = d($, z, O, I, k, 11, a[45]), I = d(I, $, z, O, S, 16, a[46]), O = d(O, I, $, z, f, 23, a[47]), z = p(z, O, I, $, s, 6, a[48]), $ = p($, z, O, I, y, 10, a[49]), I = p(I, $, z, O, E, 15, a[50]), O = p(O, I, $, z, g, 21, a[51]), z = p(z, O, I, $, k, 6, a[52]), $ = p($, z, O, I, h, 10, a[53]), I = p(I, $, z, O, w, 15, a[54]), O = p(O, I, $, z, u, 21, a[55]), z = p(z, O, I, $, b, 6, a[56]), $ = p($, z, O, I, S, 10, a[57]), I = p(I, $, z, O, v, 15, a[58]), O = p(O, I, $, z, j, 21, a[59]), z = p(z, O, I, $, m, 6, a[60]), $ = p($, z, O, I, x, 10, a[61]), I = p(I, $, z, O, f, 15, a[62]), O = p(O, I, $, z, _, 21, a[63]), o[0] = o[0] + z | 0, o[1] = o[1] + O | 0, o[2] = o[2] + I | 0, o[3] = o[3] + $ | 0;
                     },
                     _doFinalize: function() {
                         var e = this._data, n = e.words, r = 8 * this._nDataBytes, i = 8 * e.sigBytes;
@@ -4187,9 +4187,10 @@ const getExternalIdsByTmdbId = async (e, t)=>{
                 }
             case "youku":
                 {
-                    let { showid: e } = t.query;
-                    e && (o.providers.youku = {
-                        showId: e
+                    let { showid: e, vid: n } = t.query;
+                    (e || n) && (o.providers.youku = {
+                        showId: e,
+                        vid: n
                     });
                     break;
                 }
@@ -5617,11 +5618,13 @@ function youku_define_property(e, t, n) {
     }) : e[t] = n, e;
 }
 const youkuIdSchema = schemas_object({
-    showId: schemas_string(),
+    showId: schemas_string().optional(),
     vid: schemas_string().optional()
 }), youkuEpisodeInfoSchema = schemas_object({
     id: schemas_string(),
+    show_id: schemas_string().optional(),
     title: schemas_string(),
+    seq: schemas_string().transform((e)=>parseInt(e)).optional(),
     duration: schemas_string(),
     category: schemas_string(),
     link: schemas_string()
@@ -5663,36 +5666,57 @@ class YoukuScraper extends BaseScraper {
         return null != (e = this.fetch.getCookie("cna")) ? e : "";
     }
     async getEpisodes(e, t) {
-        let n = this.parseIdString(e);
-        if (!n) return [];
-        let r = [], i = 1, o = 20, s = 0;
-        for(;;)try {
-            let e = await this.getEpisodesPage(n.showId, i, o);
-            if (!e || !e.videos || 0 === e.videos.length) break;
-            1 === i && e.total && (s = e.total);
-            let a = e.videos.filter((e)=>!this.EPISODE_BLACKLIST_KEYWORDS.some((t)=>e.title.includes(t)));
-            if (r.push(...a), r.length >= s || e.videos.length < o || t && r.length >= t) break;
-            i++, await this.sleep(300);
-        } catch (e) {
-            console.error(`Youku: Failed to get episodes page ${i} for media_id ${n.showId}:`, e);
-            break;
+        var n, r, i;
+        let o = this.parseIdString(e);
+        if (!o) return [];
+        let s = o.showId;
+        if (!s && o.vid) {
+            let e = await this.getVideoInfo(o.vid);
+            s = null != (n = null == e ? void 0 : e.show_id) ? n : "";
         }
-        let a = r.map((e, t)=>({
-                provider: this.providerName,
-                episodeId: this.generateIdString({
-                    showId: n.showId,
-                    vid: e.id
-                }),
-                episodeTitle: e.title,
-                episodeNumber: t + 1
-            }));
-        if (void 0 !== t) {
-            let e = a.find((e)=>e.episodeNumber === t);
-            return e ? [
-                e
-            ] : [];
+        if (!s) return [];
+        let a = 20, u = null != t ? t : 1, l = Math.max(1, Math.ceil(u / 20));
+        try {
+            let e = (e)=>e.filter((e)=>!this.EPISODE_BLACKLIST_KEYWORDS.some((t)=>e.title.includes(t))), n = (e, t)=>({
+                    provider: this.providerName,
+                    episodeId: this.generateIdString({
+                        showId: s,
+                        vid: e.id
+                    }),
+                    episodeTitle: e.title,
+                    episodeNumber: t
+                }), o = await this.getEpisodesPage(s, l, a), c = e(null != (r = null == o ? void 0 : o.videos) ? r : []), d = c.find((e)=>e.seq === u);
+            if (d) return [
+                n(d, u)
+            ];
+            let p = Number(null != (i = null == o ? void 0 : o.total) ? i : 0), f = Math.max(1, Math.ceil(p / a)), h = Array.from({
+                length: f
+            }, (e, t)=>t + 1).filter((e)=>e !== l), m = [];
+            for (let e of h){
+                await this.sleep(500);
+                let t = await this.getEpisodesPage(s, e, a);
+                m.push(t);
+            }
+            let g = e(m.flatMap((e)=>{
+                var t;
+                return null != (t = null == e ? void 0 : e.videos) ? t : [];
+            })), v = [
+                ...c,
+                ...g
+            ];
+            if (void 0 !== t) {
+                let e = v.find((e)=>e.seq === u);
+                return e ? [
+                    n(e, u)
+                ] : [];
+            }
+            return v.sort((e, t)=>{
+                var n, r;
+                return (null != (n = e.seq) ? n : Number.MAX_SAFE_INTEGER) - (null != (r = t.seq) ? r : Number.MAX_SAFE_INTEGER);
+            }).map((e, t)=>n(e, t + 1));
+        } catch (e) {
+            return console.error(`Youku: \u{83B7}\u{53D6}\u{5206}\u{96C6}\u{5931}\u{8D25} showId=${s}:`, e), [];
         }
-        return a;
     }
     async getSegments(e) {
         var t;
@@ -5700,17 +5724,7 @@ class YoukuScraper extends BaseScraper {
         if (!n) return [];
         try {
             await this.ensureTokenCookie();
-            let e = (await this.fetch.get("https://openapi.youku.com/v2/videos/show_basic.json", {
-                params: {
-                    client_id: "53e6cc67237fc59a",
-                    package: "com.huawei.hwvplayer.youku",
-                    video_id: n
-                },
-                schema: youkuEpisodeInfoSchema,
-                cache: {
-                    cacheKey: `youku:segments:${n}`
-                }
-            })).data;
+            let e = await this.getVideoInfo(n);
             if (!e) return console.warn(`Youku: Failed to get episode info for vid ${n}`), [];
             let t = e.totalMat;
             if (0 === t) return console.warn(`Youku: Video ${n} has duration 0, no danmaku to fetch.`), [];
@@ -5735,6 +5749,19 @@ class YoukuScraper extends BaseScraper {
             return console.error(`Youku: Failed to get danmaku for vid ${r}:`, e), [];
         }
     }
+    async getVideoInfo(e) {
+        return (await this.fetch.get("https://openapi.youku.com/v2/videos/show_basic.json", {
+            params: {
+                client_id: "53e6cc67237fc59a",
+                package: "com.huawei.hwvplayer.youku",
+                video_id: e
+            },
+            schema: youkuEpisodeInfoSchema,
+            cache: {
+                cacheKey: `youku:segments:${e}`
+            }
+        })).data;
+    }
     async getEpisodesPage(e, t, n) {
         return (await this.fetch.get("https://openapi.youku.com/v2/shows/videos.json", {
             params: {
@@ -5906,8 +5933,10 @@ class scrapers_Scraper {
             let i = this.findSegmentAtTime(r, e);
             if (!i) return null;
             let o = this.scraperMap[t];
-            return o ? {
-                comments: await o.getComments(n, i.segmentId),
+            if (!o) return null;
+            let s = await o.getComments(n, i.segmentId);
+            return s ? {
+                comments: s,
                 provider: t
             } : null;
         })());
@@ -5947,38 +5976,37 @@ class scrapers_Scraper {
     async getEpisodes() {
         for(var e = arguments.length, t = Array(e), n = 0; n < e; n++)t[n] = arguments[n];
         let r = [];
-        for (let { provider: e, idString: n } of t){
+        for (let { provider: e, idString: n, episodeNumber: i } of t){
             let t = this.scraperMap[e];
-            t && r.push(t.getEpisodes(n).catch((e)=>(console.error(e), [])));
+            t && r.push(t.getEpisodes(n, i).catch((e)=>(console.error(e), [])));
         }
         return (await Promise.all(r).catch((e)=>(console.error(e), []))).flat().map((e)=>({
                 ...e,
                 episodeId: `${e.provider}:${e.episodeId}`
             }));
     }
-    formatEpisodeResult(e, t, n) {
-        let r = n ? parseInt(null != n ? n : "") : void 0;
-        return "tv" === t && r ? e.filter((e)=>e.episodeNumber === r) : e;
+    getEpisodeNumber(e, t) {
+        if ("tv" === e && t) return parseInt(t);
     }
     async getDetailWithAnimeId(e, t, n) {
-        let [r, i] = e.split(":"), o = await this.getEpisodes({
+        let [r, i] = e.split(":");
+        return await this.getEpisodes({
             provider: r,
-            idString: i
+            idString: i,
+            episodeNumber: this.getEpisodeNumber(t, n)
         });
-        return this.formatEpisodeResult(o, t, n);
     }
     async getDetailWithDoubanId(e, t, n) {
-        let r = await getVideoPlatformInfoByDoubanId(e.toString()), i = [];
-        Object.entries(r.providers).forEach((e)=>{
+        let r = await getVideoPlatformInfoByDoubanId(e.toString()), i = this.getEpisodeNumber(t, n), o = [];
+        return Object.entries(r.providers).forEach((e)=>{
             var t, n;
-            let [r, o] = e;
-            i.push({
+            let [r, s] = e;
+            o.push({
                 provider: r,
-                idString: null != (n = null == (t = this.scraperMap[r]) ? void 0 : t.generateIdString(o)) ? n : ""
+                idString: null != (n = null == (t = this.scraperMap[r]) ? void 0 : t.generateIdString(s)) ? n : "",
+                episodeNumber: i
             });
-        });
-        let o = await this.getEpisodes(...i);
-        return this.formatEpisodeResult(o, t, n);
+        }), this.getEpisodes(...o);
     }
     constructor(){
         scrapers_define_property(this, "scrapers", []), scrapers.forEach((e)=>{
@@ -5991,7 +6019,7 @@ WidgetMetadata = {
     title: "\u901A\u7528\u5F39\u5E55",
     description: "\u901A\u7528\u5F39\u5E55\u63D2\u4EF6\uFF0C\u652F\u6301\u817E\u8BAF\u3001\u4F18\u9177\u3001\u7231\u5947\u827A\u3001\u54D4\u54E9\u54D4\u54E9\u7B49\u5E73\u53F0",
     author: "Baran",
-    version: "0.0.5",
+    version: "0.0.7",
     site: "https://github.com/baranwang/forward-widgets/tree/main/packages/danmu-universe",
     requiredVersion: "0.0.2",
     modules: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forward-widget/danmu-universe",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "type": "module",
   "main": "./dist/danmu-universe.js",
   "exports": {