@dan-uni/dan-any 1.2.7 → 1.3.3

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

@@ -1 +1,77 @@
-export { bili_dedupe, bili_history_fast_forward } from "../705.min.js";
+import { __webpack_require__ } from "../rslib-runtime.min.js";
+import { DateTime } from "luxon";
+import { UniPool, platform_PlatformVideoSource } from "../index.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/index.min.js

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

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

@@ -1 +1,10 @@
-export { getLatestDan } from "../898.min.js";
+import { __webpack_require__ } from "../rslib-runtime.min.js";
+var stats_namespaceObject = {};
+__webpack_require__.r(stats_namespaceObject);
+__webpack_require__.d(stats_namespaceObject, {
+    getLatestDan: ()=>getLatestDan
+});
+function getLatestDan(that) {
+    return 0 === that.dans.length ? null : that.dans.reduce((latest, current)=>current.ctime > latest.ctime ? current : latest);
+}
+export { getLatestDan, stats_namespaceObject as stats };

package/dist/browser/rslib-runtime.min.js

@@ -10,11 +10,6 @@ function __webpack_require__(moduleId) {
     return module.exports;
 }
 __webpack_require__.m = __webpack_modules__;
-(()=>{
-    __webpack_require__.add = function(modules) {
-        Object.assign(__webpack_require__.m, modules);
-    };
-})();
 (()=>{
     __webpack_require__.d = (exports, definition)=>{
         for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) Object.defineProperty(exports, key, {
@@ -23,6 +18,11 @@ __webpack_require__.m = __webpack_modules__;
         });
     };
 })();
+(()=>{
+    __webpack_require__.add = function(modules) {
+        Object.assign(__webpack_require__.m, modules);
+    };
+})();
 (()=>{
     __webpack_require__.g = (()=>{
         if ('object' == typeof globalThis) return globalThis;

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

@@ -1,6 +1,6 @@
 import 'reflect-metadata/lite';
 import type { Options as AssGenOptions, CanvasCtx } from './ass-gen';
-import type { CommandDm as DM_JSON_BiliCommandGrpc } from './proto/gen/bili/dm_pb';
+import type { CommandDm as DM_JSON_BiliCommandGrpc } from './proto/gen/bilibili/community/service/dm/v1/dm_pb';
 import { UniDM } from './utils/dm-gen';
 import * as UniDMTools from './utils/dm-gen';
 import * as UniIDTools from './utils/id-gen';
@@ -10,6 +10,7 @@ interface DanUniConvertTip {
     version: string;
     data?: string;
 }
+export type DM_JSON_DanuniMin = Partial<UniDMTools.UniDMObj>[];
 export interface DM_XML_Bili {
     i: {
         chatserver: string;
@@ -118,10 +119,11 @@ export interface DM_JSON_DDPlay {
 }
 export declare enum DM_format {
     DanuniJson = "danuni.json",
-    DanuniPbBin = "danuni.pb.bin",
+    DanuniMinJson = "danuni.min.json",
+    DanuniPbBin = "danuni.binpb",
     BiliXml = "bili.xml",
-    BiliPbBin = "bili.pb.bin",
-    BiliCmdPbBin = "bili.cmd.pb.bin",
+    BiliPbBin = "bili.binpb",
+    BiliCmdPbBin = "bili.cmd.binpb",
     BiliUpJson = "bili.up.json",
     DplayerJson = "dplayer.json",
     ArtplayerJson = "artplayer.json",
@@ -199,19 +201,20 @@ export declare class UniPool {
     minify(): (Partial<UniDMTools.UniDMObj> & Pick<UniDMTools.UniDMObj, "SOID">)[];
     static import(file: unknown, options?: Options, 
     /**
-     * 加载指定解析模块，为空则全选
+     * 加载指定解析模块，为空则全选，为字符串则视为文件名解析加载模块
      */
-    mod?: ('json' | 'str' | 'bin')[]): {
+    mod?: string | ('json' | 'str' | 'bin')[]): {
         pool: UniPool;
         fmt: DM_format;
     };
-    convert2(format: DM_format, continue_on_error?: boolean): string | Uint8Array<ArrayBuffer> | UniDM[] | (DM_JSON_Dplayer & {
+    convert2(format: DM_format, continue_on_error?: boolean): string | Uint8Array<ArrayBuffer> | UniDM[] | (Partial<UniDMTools.UniDMObj> & Pick<UniDMTools.UniDMObj, "SOID">)[] | (DM_JSON_Dplayer & {
         danuni?: DanUniConvertTip;
     }) | (DM_JSON_Artplayer & {
         danuni?: DanUniConvertTip;
     }) | (DM_JSON_DDPlay & {
         danuni?: DanUniConvertTip;
     });
+    static fromMin(json: DM_JSON_DanuniMin, options?: Options): UniPool;
     static fromPb(bin: Uint8Array | ArrayBuffer, options?: Options): UniPool;
     /**
      * 转为 protobuf 二进制

package/dist/browser/src/proto/gen/{bili → bilibili/community/service/dm/v1}/dm_pb.d.ts

@@ -1,9 +1,9 @@
 import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";
 import type { Message } from "@bufbuild/protobuf";
 /**
- * Describes the file bili/dm.proto.
+ * Describes the file bilibili/community/service/dm/v1/dm.proto.
  */
-export declare const file_bili_dm: GenFile;
+export declare const file_bilibili_community_service_dm_v1_dm: GenFile;
 /**
  * @generated from message bilibili.community.service.dm.v1.Avatar
  */

package/dist/browser/src/proto/gen/{danuni_pb.d.ts → danuni/danmaku/v1/danmaku_pb.d.ts}

@@ -2,39 +2,39 @@ import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobu
 import type { Timestamp } from "@bufbuild/protobuf/wkt";
 import type { Message } from "@bufbuild/protobuf";
 /**
- * Describes the file danuni.proto.
+ * Describes the file danuni/danmaku/v1/danmaku.proto.
  */
-export declare const file_danuni: GenFile;
+export declare const file_danuni_danmaku_v1_danmaku: GenFile;
 /**
- * @generated from message danuni.danmaku.v1.listDanReq
+ * @generated from message danuni.danmaku.v1.ListDanRequest
  */
-export type listDanReq = Message<"danuni.danmaku.v1.listDanReq"> & {
+export type ListDanRequest = Message<"danuni.danmaku.v1.ListDanRequest"> & {
     /**
-     * @generated from field: string ID = 1;
+     * @generated from field: string id = 1;
      */
-    ID: string;
+    id: string;
     /**
      * @generated from field: optional int32 seg = 2;
      */
     seg?: number;
 };
 /**
- * Describes the message danuni.danmaku.v1.listDanReq.
- * Use `create(listDanReqSchema)` to create a new message.
+ * Describes the message danuni.danmaku.v1.ListDanRequest.
+ * Use `create(ListDanRequestSchema)` to create a new message.
  */
-export declare const listDanReqSchema: GenMessage<listDanReq>;
+export declare const ListDanRequestSchema: GenMessage<ListDanRequest>;
 /**
  * @generated from message danuni.danmaku.v1.Danmaku
  */
 export type Danmaku = Message<"danuni.danmaku.v1.Danmaku"> & {
     /**
-     * @generated from field: string SOID = 1;
+     * @generated from field: string soid = 1 [json_name = "SOID"];
      */
-    SOID: string;
+    soid: string;
     /**
-     * @generated from field: string DMID = 2;
+     * @generated from field: string dmid = 2 [json_name = "DMID"];
      */
-    DMID: string;
+    dmid: string;
     /**
      * @generated from field: int32 progress = 3;
      */
@@ -52,9 +52,9 @@ export type Danmaku = Message<"danuni.danmaku.v1.Danmaku"> & {
      */
     color: number;
     /**
-     * @generated from field: string senderID = 7;
+     * @generated from field: string sender_id = 7 [json_name = "senderID"];
      */
-    senderID: string;
+    senderId: string;
     /**
      * @generated from field: string content = 8;
      */
@@ -90,68 +90,72 @@ export type Danmaku = Message<"danuni.danmaku.v1.Danmaku"> & {
  */
 export declare const DanmakuSchema: GenMessage<Danmaku>;
 /**
- * @generated from message danuni.danmaku.v1.DanmakuReply
+ * @generated from message danuni.danmaku.v1.ListDanResponse
  */
-export type DanmakuReply = Message<"danuni.danmaku.v1.DanmakuReply"> & {
+export type ListDanResponse = Message<"danuni.danmaku.v1.ListDanResponse"> & {
     /**
      * @generated from field: repeated danuni.danmaku.v1.Danmaku danmakus = 1;
      */
     danmakus: Danmaku[];
 };
 /**
- * Describes the message danuni.danmaku.v1.DanmakuReply.
- * Use `create(DanmakuReplySchema)` to create a new message.
+ * Describes the message danuni.danmaku.v1.ListDanResponse.
+ * Use `create(ListDanResponseSchema)` to create a new message.
  */
-export declare const DanmakuReplySchema: GenMessage<DanmakuReply>;
+export declare const ListDanResponseSchema: GenMessage<ListDanResponse>;
 /**
+ * 此处作为数字应与danuni库相应类型一一对应
+ *
  * @generated from enum danuni.danmaku.v1.Mode
  */
 export declare enum Mode {
     /**
-     * @generated from enum value: Normal = 0;
+     * @generated from enum value: MODE_NORMAL_UNSPECIFIED = 0;
      */
-    Normal = 0,
+    NORMAL_UNSPECIFIED = 0,
     /**
-     * @generated from enum value: Bottom = 1;
+     * @generated from enum value: MODE_BOTTOM = 1;
      */
-    Bottom = 1,
+    BOTTOM = 1,
     /**
-     * @generated from enum value: Top = 2;
+     * @generated from enum value: MODE_TOP = 2;
      */
-    Top = 2,
+    TOP = 2,
     /**
-     * @generated from enum value: Reverse = 3;
+     * @generated from enum value: MODE_REVERSE = 3;
      */
-    Reverse = 3,
+    REVERSE = 3,
     /**
-     * @generated from enum value: Ext = 4;
+     * @generated from enum value: MODE_EXT = 4;
      */
-    Ext = 4
+    EXT = 4
 }
 /**
  * Describes the enum danuni.danmaku.v1.Mode.
  */
 export declare const ModeSchema: GenEnum<Mode>;
 /**
+ * 此处作为数字应与danuni库相应类型一一对应
+ *
  * @generated from enum danuni.danmaku.v1.Pool
  */
 export declare enum Pool {
     /**
-     * @generated from enum value: Def = 0;
+     * @generated from enum value: POOL_DEF_UNSPECIFIED = 0;
      */
-    Def = 0,
+    DEF_UNSPECIFIED = 0,
     /**
-     * @generated from enum value: Sub = 1;
+     * @generated from enum value: POOL_SUB = 1;
      */
-    Sub = 1,
+    SUB = 1,
     /**
-     * @generated from enum value: Adv = 2;
+     * @generated from enum value: POOL_ADV = 2;
      */
-    Adv = 2,
+    ADV = 2,
     /**
-     * @generated from enum value: Ix = 3;
+     * @generated from enum value: POOL_IX = 3;
      */
-    Ix = 3
+    IX = 3
 }
 /**
  * Describes the enum danuni.danmaku.v1.Pool.
@@ -162,11 +166,11 @@ export declare const PoolSchema: GenEnum<Pool>;
  */
 export declare const DanmakuService: GenService<{
     /**
-     * @generated from rpc danuni.danmaku.v1.DanmakuService.listDan
+     * @generated from rpc danuni.danmaku.v1.DanmakuService.ListDan
      */
     listDan: {
         methodKind: "unary";
-        input: typeof listDanReqSchema;
-        output: typeof DanmakuReplySchema;
+        input: typeof ListDanRequestSchema;
+        output: typeof ListDanResponseSchema;
     };
 }>;

package/dist/browser/src/utils/fileParser.d.ts

@@ -0,0 +1,3 @@
+export declare function fileParser(file: unknown, mod: 'bin'): ArrayBuffer | Uint8Array;
+export declare function fileParser(file: unknown, mod: 'string'): string;
+export declare function fileParser<T extends object>(file: unknown, mod: 'json'): T;