@forward-widget/danmu-universe 0.0.4 → 0.0.5

package/README.md

@@ -19,7 +19,7 @@
 
 ### 一键安装
 
-[![Forward Widget](https://img.shields.io/badge/dynamic/json?url=http%3A%2F%2Funpkg.com%2F%40forward-widget%2Fdanmu-universe%2Fpackage.json&query=%24.version&prefix=%E9%80%9A%E7%94%A8%E5%BC%B9%E5%B9%95%20v&style=flat-square&label=Forward%20Widget&labelColor=black)](forward://widget?url=https%3A%2F%2Funpkg.com%2F%40forward-widget%2Fdanmu-universe)
+[![Forward Widget](https://img.shields.io/badge/dynamic/json?url=http%3A%2F%2Funpkg.com%2F%40forward-widget%2Fdanmu-universe%2Fpackage.json&query=%24.version&prefix=%E9%80%9A%E7%94%A8%E5%BC%B9%E5%B9%95%20v&style=flat-square&label=Forward%20Widget&labelColor=black)](https://gocy.pages.dev/#forward://widget?url=https%3A%2F%2Funpkg.com%2F%40forward-widget%2Fdanmu-universe)
 
 ### 手动安装
 
@@ -32,7 +32,9 @@ https://unpkg.com/@forward-widget/danmu-universe
 
 ## 开发
 
-欢迎社区贡献，如果你想为项目做出贡献
+项目自豪的使用 [forward-widget-libs](https://github.com/baranwang/forward-widget-libs) 开发工具链
+
+欢迎社区贡献，如果你想为项目做出贡献可按照以下流程：
 
 ### 环境要求
 
@@ -41,12 +43,16 @@ https://unpkg.com/@forward-widget/danmu-universe
 
 ### 安装依赖
 
+仓库根目录
+
 ```bash
 pnpm install
 ```
 
 ### 开发模式
 
+项目目录
+
 ```bash
 pnpm dev
 ```
@@ -63,6 +69,10 @@ pnpm build
 pnpm test
 ```
 
+### 提交
+
+在仓库根目录执行 `pnpm changeset` 创建 changeset 文件，同时使用标准的 Conventional Commits 提交代码
+
 ## 鸣谢
 
 - [misaka_danmu_server](https://github.com/l429609201/misaka_danmu_server)

package/dist/danmu-universe.js

@@ -4047,13 +4047,16 @@ class Fetch {
             }, s), r = storage.getJson(n);
             if (r) return console.debug("fetch cache hit", n), Promise.resolve(r);
         }
-        let a = o ? void 0 : n, { timeout: u, schema: l, ...c } = s;
-        console.debug("fetch", t, a, c);
-        let d = o ? Widget.http.get(t, c) : Widget.http.post(t, a, c);
+        let a = o ? void 0 : n, { timeout: u, schema: l, params: c, ...d } = s, p = t;
+        c && (p = `${t}?${url_parse.qs.stringify(c)}`), console.debug("\u2B06\uFE0F fetch", t, null != a ? a : "", {
+            ...d,
+            params: c
+        });
+        let f = o ? Widget.http.get(p, d) : Widget.http.post(p, a, d);
         return u && u > 0 ? Promise.race([
-            d,
+            f,
             this.createTimeoutPromise(u)
-        ]) : d;
+        ]) : f;
     }
     getCacheKey(e, t) {
         var n;
@@ -4255,29 +4258,6 @@ class BaseScraper {
     sleep(e) {
         return new Promise((t)=>setTimeout(t, e));
     }
-    formatComments(e, t) {
-        let n = new Set(), r = new Map();
-        for (let i of e){
-            if (!i) continue;
-            let e = t(i);
-            if (!e || n.has(e.id)) continue;
-            n.add(e.id);
-            let o = e.content, s = r.get(o);
-            s ? (e.timestamp < s.item.timestamp && (s.item = e), s.count += 1) : r.set(o, {
-                item: e,
-                count: 1
-            });
-        }
-        let i = [];
-        return r.forEach((e)=>{
-            let { item: t, count: n } = e, r = n > 1 ? `${t.content} \xd7 ${n}` : t.content;
-            i.push({
-                cid: t.id,
-                p: `${t.timestamp.toFixed(2)},${t.mode},${t.color},[${this.providerName}]`,
-                m: r
-            });
-        }), i;
-    }
     getEpisodeIndexFromTitle(e) {
         if (!e) return null;
         let t = /(?:第)?(\d+)(?:集|话)?$/.exec(e.trim());
@@ -4361,22 +4341,22 @@ class BilibiliScraper extends BaseScraper {
     async getComments(e, t) {
         var n;
         let { aid: r, cid: i, seasonId: o } = null != (n = this.parseIdString(e)) ? n : {};
-        if (!r || !i || !o) return [];
+        if (!r || !i || !o) return null;
         let s = await this.getPgcEpisodes(o);
-        if (!(null == s ? void 0 : s.find((e)=>e.aid === parseInt(r) && e.cid === parseInt(i)))) return [];
+        if (!(null == s ? void 0 : s.find((e)=>e.aid === parseInt(r) && e.cid === parseInt(i)))) return null;
         let a = await this.fetchCommentsForCid(r, i, t);
-        return this.formatComments(a, (e)=>{
+        return a ? a.map((e)=>{
             var t, n, r;
             if (!e.progress) return null;
             let i = (null == (t = e.content) ? void 0 : t.toString().replace(/\0/g, "")) || "";
             return i ? {
-                id: e.id,
+                id: e.id.toString(),
                 timestamp: e.progress / 1000.0,
                 mode: null != (n = e.mode) ? n : 1,
                 color: null != (r = e.color) ? r : 16777215,
                 content: i
             } : null;
-        });
+        }) : null;
     }
     async getPgcEpisodes(e) {
         var t;
@@ -4391,18 +4371,17 @@ class BilibiliScraper extends BaseScraper {
         })).data) ? void 0 : t.result.episodes;
     }
     async fetchCommentsForCid(e, t, n) {
-        let r = [];
         try {
-            let i = await this.fetch.get(`https://api.bilibili.com/x/v2/dm/web/seg.so?type=1&oid=${t}&pid=${e}&segment_index=${n}`, {
+            let r = await this.fetch.get(`https://api.bilibili.com/x/v2/dm/web/seg.so?type=1&oid=${t}&pid=${e}&segment_index=${n}`, {
                 base64Data: !0
             });
-            if (404 === i.statusCode || 304 === i.statusCode) return r;
-            let o = this.DmSegMobileReply.decode(base64ToUint8Array(i.data));
-            r.push(...o.elems);
+            if (404 === r.statusCode || 304 === r.statusCode) return null;
+            let i = this.DmSegMobileReply.decode(base64ToUint8Array(r.data));
+            return console.log(i), i.elems;
         } catch (r) {
             console.error(`\u{83B7}\u{53D6}\u{5206}\u{6BB5} ${n} \u{5931}\u{8D25} (aid=${e}, cid=${t}): ${r}`);
         }
-        return r;
+        return null;
     }
     constructor(){
         super(), bilibili_define_property(this, "providerName", "bilibili"), bilibili_define_property(this, "idSchema", bilibiliIdSchema), bilibili_define_property(this, "DmSegMobileReply", dm_proto.biliproto.community.service.dm.v1.DmSegMobileReply), this.fetch.setHeaders({
@@ -5319,13 +5298,13 @@ class IqiyiScraper extends BaseScraper {
         let a = await this.fetch.get(s, {
             zlibMode: !0
         }), u = this.xmlParser.parse(a.data), { success: l, data: c, error: d } = iqiyiCommentsResponseSchema.safeParse(u);
-        return l ? this.formatComments(c, (e)=>{
+        return l ? c.map((e)=>{
             let t = 16777215;
             try {
                 t = parseInt(e.color, 16);
             } catch (e) {}
             return {
-                id: e.contentId,
+                id: e.contentId.toString(),
                 timestamp: e.showTime,
                 mode: 1,
                 color: t,
@@ -5378,8 +5357,7 @@ class IqiyiScraper extends BaseScraper {
                             entityId: t
                         }),
                         episodeTitle: e.title,
-                        episodeNumber: null != (p = this.getEpisodeIndexFromTitle(e.short_display_name)) ? p : h,
-                        url: e.page_url
+                        episodeNumber: null != (p = this.getEpisodeIndexFromTitle(e.short_display_name)) ? p : h
                     }), h += 1));
                 }
             }
@@ -5507,8 +5485,7 @@ class TencentScraper extends BaseScraper {
                     vid: e.vid
                 }),
                 episodeTitle: e.union_title && e.union_title !== e.title ? e.union_title : e.title,
-                episodeNumber: r,
-                url: `https://v.qq.com/x/cover/${n.cid}/${e.vid}.html`
+                episodeNumber: r
             };
         });
         if (void 0 !== t) {
@@ -5552,13 +5529,13 @@ class TencentScraper extends BaseScraper {
         let n = this.parseIdString(e);
         if (!(null == n ? void 0 : n.vid)) return [];
         let r = await this.internalGetComments(n.vid, t);
-        return r && 0 !== r.length ? this.formatComments(r, (e)=>{
+        return r && 0 !== r.length ? r.map((e)=>{
             let t = 1, n = 16777215;
             if (e.content_style && (2 === e.content_style.position ? t = 5 : 3 === e.content_style.position && (t = 4), e.content_style.color)) try {
                 n = parseInt(e.content_style.color, 10);
             } catch (e) {}
             return {
-                id: e.id,
+                id: e.id.toString(),
                 timestamp: parseInt(e.time_offset, 10) / 1000.0,
                 mode: t,
                 color: n,
@@ -5707,8 +5684,7 @@ class YoukuScraper extends BaseScraper {
                     vid: e.id
                 }),
                 episodeTitle: e.title,
-                episodeNumber: t + 1,
-                url: e.link
+                episodeNumber: t + 1
             }));
         if (void 0 !== t) {
             let e = a.find((e)=>e.episodeNumber === t);
@@ -5822,7 +5798,7 @@ class YoukuScraper extends BaseScraper {
                 })
             })).data) || null == (u = l.data.result) ? void 0 : u.data.result) ? c : [];
             if (console.log(`Youku: \u{83B7}\u{53D6}\u{5230}\u{5206}\u{6BB5} ${t} \u{7684}\u{5F39}\u{5E55} ${e.length} \u{6761}`), !e || 0 === e.length) return [];
-            return this.formatComments(e, (e)=>{
+            return e.map((e)=>{
                 let t = 1, n = 16777215;
                 try {
                     let r = e.propertis;
@@ -5853,26 +5829,34 @@ class YoukuScraper extends BaseScraper {
         ].join("&")).toString().toLowerCase();
     }
     async ensureTokenCookie() {
-        if (!this.cna) try {
-            console.debug("Youku: 'cna' cookie \u672A\u627E\u5230, \u6B63\u5728\u8BBF\u95EE youku.com \u4EE5\u83B7\u53D6..."), await this.fetch.get("https://log.mmstat.com/eg.js");
+        this.fetch.cookie = {};
+        try {
+            await this.fetch.get("https://log.mmstat.com/eg.js", {
+                headers: {
+                    Cookie: "",
+                    "If-None-Match": ""
+                }
+            });
         } catch (e) {
             console.warn(`Youku: \u{65E0}\u{6CD5}\u{8FDE}\u{63A5}\u{5230} youku.com \u{83B7}\u{53D6} 'cna' cookie\u{3002}\u{9519}\u{8BEF}: ${e}`);
         }
-        if (!this.token) try {
-            console.debug("Youku: '_m_h5_tk' cookie \u672A\u627E\u5230, \u6B63\u5728\u4ECE acs.youku.com \u8BF7\u6C42..."), await this.fetch.get("https://acs.youku.com/h5/mtop.com.youku.aplatform.weakget/1.0/?jsv=2.5.1&appKey=24679788");
+        try {
+            await this.fetch.get("https://acs.youku.com/h5/mtop.com.youku.aplatform.weakget/1.0/?jsv=2.5.1&appKey=24679788");
         } catch (e) {
             console.error(`Youku: \u{65E0}\u{6CD5}\u{8FDE}\u{63A5}\u{5230} acs.youku.com \u{83B7}\u{53D6}\u{4EE4}\u{724C} cookie\u{3002}\u{5F39}\u{5E55}\u{83B7}\u{53D6}\u{5F88}\u{53EF}\u{80FD}\u{4F1A}\u{5931}\u{8D25}\u{3002}\u{9519}\u{8BEF}: ${e}`);
         }
         this.cna && this.token || console.warn(`Youku: \u{672A}\u{80FD}\u{83B7}\u{53D6}\u{5230}\u{5F39}\u{5E55}\u{7B7E}\u{540D}\u{6240}\u{9700}\u{7684}\u{5168}\u{90E8} cookie\u{3002} cna: '${this.cna}', token: '${this.token}'`);
     }
-    constructor(...e){
-        super(...e), youku_define_property(this, "providerName", "youku"), youku_define_property(this, "idSchema", youkuIdSchema), youku_define_property(this, "EPISODE_BLACKLIST_KEYWORDS", [
+    constructor(){
+        super(), youku_define_property(this, "providerName", "youku"), youku_define_property(this, "idSchema", youkuIdSchema), youku_define_property(this, "EPISODE_BLACKLIST_KEYWORDS", [
             "\u5F69\u86CB",
             "\u52A0\u66F4",
             "\u8D70\u5FC3",
             "\u89E3\u5FE7",
             "\u7EAF\u4EAB"
-        ]);
+        ]), this.fetch.setHeaders({
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36"
+        });
     }
 }
 function scrapers_define_property(e, t, n) {
@@ -5914,16 +5898,41 @@ class scrapers_Scraper {
     }
     async getSegmentWithTime() {
         let e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : 0;
-        for(var t = arguments.length, n = Array(t > 1 ? t - 1 : 0), r = 1; r < t; r++)n[r - 1] = arguments[r];
-        let i = [];
-        for (let { provider: t, idString: r } of n)i.push((async ()=>{
-            var n;
-            let i = await this.getSegmentsByProvider(t, r);
-            if (!i.length) return [];
-            let o = this.findSegmentAtTime(i, e);
-            return o ? null == (n = this.scraperMap[t]) ? void 0 : n.getComments(r, o.segmentId) : [];
+        for(var t, n = arguments.length, r = Array(n > 1 ? n - 1 : 0), i = 1; i < n; i++)r[i - 1] = arguments[i];
+        let o = [];
+        for (let { provider: t, idString: n } of r)o.push((async ()=>{
+            let r = await this.getSegmentsByProvider(t, n);
+            if (!r.length) return null;
+            let i = this.findSegmentAtTime(r, e);
+            if (!i) return null;
+            let o = this.scraperMap[t];
+            return o ? {
+                comments: await o.getComments(n, i.segmentId),
+                provider: t
+            } : null;
         })());
-        return (await Promise.all(i)).flat();
+        let s = await Promise.all(o), a = new Map();
+        for (let e of s)if (null == e || null == (t = e.comments) ? void 0 : t.length) for (let t of e.comments){
+            if (!t) continue;
+            let n = [
+                t.mode,
+                t.color,
+                t.content
+            ].join("___"), r = a.get(n);
+            r ? (t.timestamp < r.item.timestamp && (r.item = t), r.count += 1) : a.set(n, {
+                item: t,
+                count: 1,
+                provider: e.provider
+            });
+        }
+        let u = [];
+        return a.forEach((e)=>{
+            let { item: t, count: n, provider: r } = e, i = n > 1 ? `${t.content} \xd7 ${n}` : t.content;
+            u.push({
+                p: `${t.timestamp.toFixed(2)},${t.mode},${t.color},[${r}]`,
+                m: i
+            });
+        }), u;
     }
     getDanmuWithSegmentTimeByVideoId(e, t) {
         let n = e.split(",").map((e)=>{
@@ -5982,7 +5991,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.4",
+    version: "0.0.5",
     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.4",
+  "version": "0.0.5",
   "type": "module",
   "main": "./dist/danmu-universe.js",
   "exports": {
@@ -19,8 +19,8 @@
     "zod": "^4.0.17"
   },
   "devDependencies": {
-    "@forward-widget/libs": "^1.8.3",
-    "@forward-widget/rslib-plugin": "^1.8.3",
+    "@forward-widget/libs": "^1.8.4",
+    "@forward-widget/rslib-plugin": "^1.8.4",
     "@rslib/core": "^0.12.4",
     "@rstest/core": "^0.3.1",
     "@types/crypto-js": "^4.2.2",