@dan-uni/dan-any 1.2.2 → 1.2.5

package/README.md

@@ -29,6 +29,7 @@
 插件的使用方法参见对应路径下README.md  
 
 - [dan-any-plugin-detaolu](https://github.com/ani-uni/danuni/tree/master/packages/dan-any-plugin-detaolu): 基于pakku.js的弹幕过滤器
+- `src/plugins`下的插件 `bili`(B站弹幕相关) `stats`(统计相关)，内部附有使用文档
 
 ## 特殊字段提示
 

package/dist/browser/17.min.js

@@ -11461,7 +11461,7 @@ __webpack_require__.d(platform_namespaceObject, {
     PlatformVideoSource: ()=>platform_PlatformVideoSource,
     PlatformVideoSources: ()=>PlatformVideoSources
 });
-var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.2.2","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
+var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.2.5","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
 const color_pad = (s)=>s.length < 2 ? `0${s}` : s;
 const decimalToHex = (n)=>color_pad(n.toString(16));
 const isDarkColor = ({ r, g, b })=>0.299 * r + 0.587 * g + 0.114 * b < 0x30;
@@ -12739,10 +12739,7 @@ class UniPool {
         if (false !== options.dedupe) options.dedupe = true;
         if (this.options.dedupe) this.dedupe();
     }
-    async pipe(fn) {
-        return fn(this);
-    }
-    pipeSync(fn) {
+    pipe(fn) {
         return fn(this);
     }
     get shared() {

package/dist/browser/705.min.js

@@ -0,0 +1,77 @@
+import { __webpack_require__ } from "./rslib-runtime.min.js";
+import { DateTime } from "luxon";
+import { UniPool, platform_PlatformVideoSource } from "./17.min.js";
+var dedupe_namespaceObject = {};
+__webpack_require__.r(dedupe_namespaceObject);
+__webpack_require__.d(dedupe_namespaceObject, {
+    bili_dedupe: ()=>bili_dedupe,
+    to_bili_deduped: ()=>to_bili_deduped
+});
+var bili_namespaceObject = {};
+__webpack_require__.r(bili_namespaceObject);
+__webpack_require__.d(bili_namespaceObject, {
+    bili_dedupe: ()=>dedupe_namespaceObject,
+    bili_history_fast_forward: ()=>bili_history_fast_forward
+});
+function main(that) {
+    that.dans.forEach((d)=>{
+        if (d.platform !== platform_PlatformVideoSource.Bilibili) throw new Error('bili-dedupe: 仅支持B站(主站)的弹幕');
+        if (!d.extra.bili?.dmid) throw new Error('bili-dedupe: 弹幕缺少bili extra dmid字段');
+    });
+    const map = new Map();
+    that.dans.forEach((d)=>map.set(d.extra.bili.dmid, d));
+    return map;
+}
+function to_bili_deduped(that) {
+    const map = main(that);
+    return new UniPool([
+        ...map.values()
+    ], that.options, that.info);
+}
+function bili_dedupe(that) {
+    const map = main(that);
+    that.dans = [
+        ...map.values()
+    ];
+}
+function history_danmaku_fast_forward_main(that, query_history_date) {
+    const qhd = DateTime.fromFormat(query_history_date, 'yyyy-MM-dd', {
+        zone: 'Asia/Shanghai'
+    }).setZone('Asia/Shanghai');
+    if (!qhd.isValid) throw new Error('Invalid query_history_date');
+    const s = qhd.startOf('day');
+    const before = that.dans.filter((d)=>d.ctime < s.toJSDate());
+    if (0 === before.length) return {
+        earliest: null,
+        FastForward: [],
+        skip: [],
+        SpecificDate: qhd.toFormat('yyyy-MM-dd')
+    };
+    const earliestCtime = before.toSorted((a, b)=>a.ctime.getTime() - b.ctime.getTime())[0].ctime;
+    const earliestDate = DateTime.fromJSDate(earliestCtime).setZone('Asia/Shanghai').startOf('day');
+    const datesWithDanmaku = new Set();
+    for (const dan of before){
+        const dateStr = DateTime.fromJSDate(dan.ctime).setZone('Asia/Shanghai').toFormat('yyyy-MM-dd');
+        datesWithDanmaku.add(dateStr);
+    }
+    let current = earliestDate;
+    const allDates = [];
+    while(current < s){
+        allDates.push(current.toFormat('yyyy-MM-dd'));
+        current = current.plus({
+            days: 1
+        });
+    }
+    const FastForward = allDates.filter((d)=>datesWithDanmaku.has(d));
+    const skip = allDates.filter((d)=>!datesWithDanmaku.has(d));
+    return {
+        earliest: earliestDate.toFormat('yyyy-MM-dd'),
+        FastForward,
+        skip,
+        SpecificDate: qhd.toFormat('yyyy-MM-dd')
+    };
+}
+function bili_history_fast_forward(query_history_date) {
+    return (that)=>history_danmaku_fast_forward_main(that, query_history_date);
+}
+export { bili_history_fast_forward, bili_namespaceObject as bili, dedupe_namespaceObject as bili_dedupe };

package/dist/browser/plugins/bili.min.js

@@ -0,0 +1 @@
+export { bili_dedupe, bili_history_fast_forward } from "../705.min.js";

package/dist/browser/plugins/index.min.js

@@ -1,2 +1,2 @@
-export { bili_dedupe } from "../157.min.js";
+export { bili } from "../705.min.js";
 export { stats } from "../898.min.js";

package/dist/browser/src/index.d.ts

@@ -120,8 +120,6 @@ export type DM_format = 'danuni.json' | 'danuni.pb.bin' | 'bili.xml' | 'bili.pb.
 type shareItems = Partial<Pick<UniDMTools.UniDMObj, 'SOID' | 'senderID' | 'platform' | 'SOID' | 'pool' | 'mode' | 'color'>>;
 type statItems = Partial<Pick<UniDMTools.UniDMObj, 'SOID' | 'mode' | 'fontsize' | 'color' | 'senderID' | 'content' | 'weight' | 'pool' | 'platform'>>;
 type Stats<T extends keyof statItems> = Map<statItems[T], number>;
-type UniPoolPipe = (that: UniPool) => Promise<any>;
-type UniPoolPipeSync = (that: UniPool) => any;
 export interface Options {
     dedupe?: boolean;
     /**
@@ -145,8 +143,7 @@ export declare class UniPool {
          */
         fromConverted: boolean;
     });
-    pipe<T extends (...args: any) => any = UniPoolPipe>(fn: T): Promise<ReturnType<T>>;
-    pipeSync<T extends (...args: any) => any = UniPoolPipeSync>(fn: T): ReturnType<T>;
+    pipe<T extends (...args: any) => any>(fn: T): ReturnType<T>;
     /**
      * @deprecated 使用 `getShared` 代替
      */

package/dist/browser/src/plugins/bili/history-danmaku-fast-forward.d.ts

@@ -0,0 +1,18 @@
+/**
+ * 注：该方法受BiliPlus全弹幕下载器启发
+ * 详情参考以下链接
+ * @see https://github.com/HengXin666/BiLiBiLi_DanMu_Crawling/issues/14
+ */
+import type { UniPool } from '../..';
+interface BiliHistoryDanmakuFastForwardResult {
+    earliest: string | null;
+    FastForward: string[];
+    skip: string[];
+    SpecificDate: string;
+}
+export declare function bili_history_fast_forward(
+/**
+ * 请求api时使用的日期(UTC+8, yyyy-MM-dd)
+ */
+query_history_date: string): (that: UniPool) => BiliHistoryDanmakuFastForwardResult;
+export {};

package/dist/browser/src/plugins/bili/index.d.ts

@@ -0,0 +1,2 @@
+export * as bili_dedupe from './dedupe';
+export { bili_history_fast_forward } from './history-danmaku-fast-forward';

package/dist/browser/src/plugins/index.d.ts

@@ -1,2 +1,2 @@
-export * as bili_dedupe from './bili-dedupe';
+export * as bili from './bili';
 export * as stats from './stats';

package/dist/node/17.js

@@ -39,7 +39,7 @@ __webpack_require__.d(platform_namespaceObject, {
     PlatformVideoSource: ()=>platform_PlatformVideoSource,
     PlatformVideoSources: ()=>PlatformVideoSources
 });
-var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.2.2","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
+var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.2.5","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
 const color_pad = (s)=>s.length < 2 ? `0${s}` : s;
 const decimalToHex = (n)=>color_pad(n.toString(16));
 const isDarkColor = ({ r, g, b })=>0.299 * r + 0.587 * g + 0.114 * b < 0x30;
@@ -1314,10 +1314,7 @@ class UniPool {
         if (false !== options.dedupe) options.dedupe = true;
         if (this.options.dedupe) this.dedupe();
     }
-    async pipe(fn) {
-        return fn(this);
-    }
-    pipeSync(fn) {
+    pipe(fn) {
         return fn(this);
     }
     get shared() {

package/dist/node/705.js

@@ -0,0 +1,77 @@
+import { __webpack_require__ } from "./rslib-runtime.js";
+import { DateTime } from "luxon";
+import { UniPool, platform_PlatformVideoSource } from "./17.js";
+var dedupe_namespaceObject = {};
+__webpack_require__.r(dedupe_namespaceObject);
+__webpack_require__.d(dedupe_namespaceObject, {
+    bili_dedupe: ()=>bili_dedupe,
+    to_bili_deduped: ()=>to_bili_deduped
+});
+var bili_namespaceObject = {};
+__webpack_require__.r(bili_namespaceObject);
+__webpack_require__.d(bili_namespaceObject, {
+    bili_dedupe: ()=>dedupe_namespaceObject,
+    bili_history_fast_forward: ()=>bili_history_fast_forward
+});
+function main(that) {
+    that.dans.forEach((d)=>{
+        if (d.platform !== platform_PlatformVideoSource.Bilibili) throw new Error('bili-dedupe: 仅支持B站(主站)的弹幕');
+        if (!d.extra.bili?.dmid) throw new Error('bili-dedupe: 弹幕缺少bili extra dmid字段');
+    });
+    const map = new Map();
+    that.dans.forEach((d)=>map.set(d.extra.bili.dmid, d));
+    return map;
+}
+function to_bili_deduped(that) {
+    const map = main(that);
+    return new UniPool([
+        ...map.values()
+    ], that.options, that.info);
+}
+function bili_dedupe(that) {
+    const map = main(that);
+    that.dans = [
+        ...map.values()
+    ];
+}
+function history_danmaku_fast_forward_main(that, query_history_date) {
+    const qhd = DateTime.fromFormat(query_history_date, 'yyyy-MM-dd', {
+        zone: 'Asia/Shanghai'
+    }).setZone('Asia/Shanghai');
+    if (!qhd.isValid) throw new Error('Invalid query_history_date');
+    const s = qhd.startOf('day');
+    const before = that.dans.filter((d)=>d.ctime < s.toJSDate());
+    if (0 === before.length) return {
+        earliest: null,
+        FastForward: [],
+        skip: [],
+        SpecificDate: qhd.toFormat('yyyy-MM-dd')
+    };
+    const earliestCtime = before.toSorted((a, b)=>a.ctime.getTime() - b.ctime.getTime())[0].ctime;
+    const earliestDate = DateTime.fromJSDate(earliestCtime).setZone('Asia/Shanghai').startOf('day');
+    const datesWithDanmaku = new Set();
+    for (const dan of before){
+        const dateStr = DateTime.fromJSDate(dan.ctime).setZone('Asia/Shanghai').toFormat('yyyy-MM-dd');
+        datesWithDanmaku.add(dateStr);
+    }
+    let current = earliestDate;
+    const allDates = [];
+    while(current < s){
+        allDates.push(current.toFormat('yyyy-MM-dd'));
+        current = current.plus({
+            days: 1
+        });
+    }
+    const FastForward = allDates.filter((d)=>datesWithDanmaku.has(d));
+    const skip = allDates.filter((d)=>!datesWithDanmaku.has(d));
+    return {
+        earliest: earliestDate.toFormat('yyyy-MM-dd'),
+        FastForward,
+        skip,
+        SpecificDate: qhd.toFormat('yyyy-MM-dd')
+    };
+}
+function bili_history_fast_forward(query_history_date) {
+    return (that)=>history_danmaku_fast_forward_main(that, query_history_date);
+}
+export { bili_history_fast_forward, bili_namespaceObject as bili, dedupe_namespaceObject as bili_dedupe };

package/dist/node/plugins/bili.js

@@ -0,0 +1 @@
+export { bili_dedupe, bili_history_fast_forward } from "../705.js";

package/dist/node/plugins/index.js

@@ -1,2 +1,2 @@
-export { bili_dedupe } from "../157.js";
+export { bili } from "../705.js";
 export { stats } from "../898.js";

package/dist/node/src/index.d.ts

@@ -120,8 +120,6 @@ export type DM_format = 'danuni.json' | 'danuni.pb.bin' | 'bili.xml' | 'bili.pb.
 type shareItems = Partial<Pick<UniDMTools.UniDMObj, 'SOID' | 'senderID' | 'platform' | 'SOID' | 'pool' | 'mode' | 'color'>>;
 type statItems = Partial<Pick<UniDMTools.UniDMObj, 'SOID' | 'mode' | 'fontsize' | 'color' | 'senderID' | 'content' | 'weight' | 'pool' | 'platform'>>;
 type Stats<T extends keyof statItems> = Map<statItems[T], number>;
-type UniPoolPipe = (that: UniPool) => Promise<any>;
-type UniPoolPipeSync = (that: UniPool) => any;
 export interface Options {
     dedupe?: boolean;
     /**
@@ -145,8 +143,7 @@ export declare class UniPool {
          */
         fromConverted: boolean;
     });
-    pipe<T extends (...args: any) => any = UniPoolPipe>(fn: T): Promise<ReturnType<T>>;
-    pipeSync<T extends (...args: any) => any = UniPoolPipeSync>(fn: T): ReturnType<T>;
+    pipe<T extends (...args: any) => any>(fn: T): ReturnType<T>;
     /**
      * @deprecated 使用 `getShared` 代替
      */

package/dist/node/src/plugins/bili/history-danmaku-fast-forward.d.ts

@@ -0,0 +1,18 @@
+/**
+ * 注：该方法受BiliPlus全弹幕下载器启发
+ * 详情参考以下链接
+ * @see https://github.com/HengXin666/BiLiBiLi_DanMu_Crawling/issues/14
+ */
+import type { UniPool } from '../..';
+interface BiliHistoryDanmakuFastForwardResult {
+    earliest: string | null;
+    FastForward: string[];
+    skip: string[];
+    SpecificDate: string;
+}
+export declare function bili_history_fast_forward(
+/**
+ * 请求api时使用的日期(UTC+8, yyyy-MM-dd)
+ */
+query_history_date: string): (that: UniPool) => BiliHistoryDanmakuFastForwardResult;
+export {};

package/dist/node/src/plugins/bili/index.d.ts

@@ -0,0 +1,2 @@
+export * as bili_dedupe from './dedupe';
+export { bili_history_fast_forward } from './history-danmaku-fast-forward';

package/dist/node/src/plugins/index.d.ts

@@ -1,2 +1,2 @@
-export * as bili_dedupe from './bili-dedupe';
+export * as bili from './bili';
 export * as stats from './stats';

package/dist/umd/index.umd.min.js

@@ -15107,11 +15107,11 @@ and limitations under the License.
                         },
                         num_dec: {
                             regex: /&#([0-9]{1,7});/g,
-                            val: (_, str)=>String.fromCodePoint(Number.parseInt(str, 10))
+                            val: (_, str)=>fromCodePoint(str, 10, "&#")
                         },
                         num_hex: {
                             regex: /&#x([0-9a-fA-F]{1,6});/g,
-                            val: (_, str)=>String.fromCodePoint(Number.parseInt(str, 16))
+                            val: (_, str)=>fromCodePoint(str, 16, "&#x")
                         }
                     };
                     this.addExternalEntities = addExternalEntities;
@@ -15487,6 +15487,11 @@ and limitations under the License.
                 if (isExist(val)) return val;
                 return '';
             }
+            function fromCodePoint(str, base, prefix) {
+                const codePoint = Number.parseInt(str, base);
+                if (codePoint >= 0 && codePoint <= 0x10FFFF) return String.fromCodePoint(codePoint);
+                return prefix + str + ";";
+            }
             const node2json_METADATA_SYMBOL = XmlNode.getMetaDataSymbol();
             function prettify(node, options) {
                 return node2json_compress(node, options);
@@ -21043,7 +21048,7 @@ and limitations under the License.
             function timestamp_timestampMs(timestamp) {
                 return 1000 * Number(timestamp.seconds) + Math.round(timestamp.nanos / 1000000);
             }
-            var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.2.2","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
+            var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.2.5","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
             const color_pad = (s)=>s.length < 2 ? `0${s}` : s;
             const decimalToHex = (n)=>color_pad(n.toString(16));
             const isDarkColor = ({ r, g, b })=>0.299 * r + 0.587 * g + 0.114 * b < 0x30;
@@ -24492,10 +24497,7 @@ and limitations under the License.
                     if (false !== options.dedupe) options.dedupe = true;
                     if (this.options.dedupe) this.dedupe();
                 }
-                async pipe(fn) {
-                    return fn(this);
-                }
-                pipeSync(fn) {
+                pipe(fn) {
                     return fn(this);
                 }
                 get shared() {