@dan-uni/dan-any 0.2.6 → 0.4.8

package/dist/src/ass-gen/ass/create.d.ts

@@ -1,4 +1,5 @@
 import type { UniPool } from '../..';
 import type { Context, SubtitleStyle } from '../types';
-declare const _default: (list: UniPool, rawList: UniPool, config: SubtitleStyle, context?: Context) => string;
+import type { RawConfig } from './raw';
+declare const _default: (list: UniPool, rawList: UniPool, config: SubtitleStyle, context?: Context, rawConfig?: RawConfig) => string;
 export default _default;

package/dist/src/ass-gen/ass/raw.d.ts

@@ -1,10 +1,14 @@
 import type { Context, Danmaku, SubtitleStyle } from '../types';
 type compressType = 'brotli' | 'gzip';
 type baseType = 'base64' | 'base18384';
-declare const _default: (list: Danmaku[], config: SubtitleStyle, context: Context, compressType?: compressType, baseType?: baseType) => string;
-export default _default;
+export interface RawConfig {
+    compressType: compressType;
+    baseType: baseType;
+}
+export declare function raw(list: Danmaku[], config: SubtitleStyle, context: Context, compressType?: compressType, baseType?: baseType): string;
 export declare function deRaw(ass: string): {
     list: Danmaku[];
     config: SubtitleStyle;
     context: Context;
 } | undefined;
+export {};

package/dist/src/ass-gen/index.d.ts

@@ -1,9 +1,11 @@
+import type { RawConfig } from './ass/raw';
 import type { SubtitleStyle } from './types';
 import { UniPool } from '..';
 export type Options = {
     filename?: string;
     title?: string;
     substyle?: Partial<SubtitleStyle>;
+    raw?: RawConfig;
 };
 /**
  * 使用bilibili弹幕(XMl)生成ASS字幕文件

package/dist/src/index.d.ts

@@ -1,9 +1,9 @@
 import type { Options as AssGenOptions } from './ass-gen';
 import type { CommandDm as DM_JSON_BiliCommandGrpc } from './proto/gen/bili/dm_pb';
-import type { platfrom } from './utils/id-gen';
 import { UniDM } from './utils/dm-gen';
 import * as UniDMTools from './utils/dm-gen';
 import * as UniIDTools from './utils/id-gen';
+import * as platform from './utils/platform';
 export interface DM_XML_Bili {
     i: {
         chatserver: string;
@@ -43,11 +43,67 @@ export interface DM_JSON_DDPlay {
     }[];
 }
 export type DM_format = 'danuni.json' | 'danuni.bin' | 'danuni.pb.zst' | 'bili.xml' | 'bili.bin' | 'bili.cmd.bin' | 'dplayer.json' | 'artplayer.json' | 'ddplay.json' | 'common.ass';
-type shareItems = Partial<Pick<UniDMTools.UniDMObj, 'FCID' | 'senderID' | 'platform' | 'SPMO' | 'pool' | 'mode'>>;
+type shareItems = Partial<Pick<UniDMTools.UniDMObj, 'SOID' | 'senderID' | 'platform' | 'SOID' | 'pool' | 'mode' | 'color'>>;
+type UniPoolPipe = (that: UniPool) => Promise<UniPool>;
+type UniPoolPipeSync = (that: UniPool) => UniPool;
+interface Options {
+    dedupe?: boolean;
+}
 export declare class UniPool {
     dans: UniDM[];
-    readonly shared: shareItems;
-    constructor(dans: UniDM[]);
+    options: Options;
+    constructor(dans: UniDM[], options?: Options);
+    pipe(fn: UniPoolPipe): Promise<UniPool>;
+    pipeSync(fn: UniPoolPipeSync): UniPool;
+    get shared(): shareItems;
+    get stat(): {
+        SOID: {
+            val: string;
+            count: number;
+        }[];
+        mode: {
+            val: UniDMTools.Modes;
+            count: number;
+        }[];
+        fontsize: {
+            val: number;
+            count: number;
+        }[];
+        color: {
+            val: number;
+            count: number;
+        }[];
+        senderID: {
+            val: string;
+            count: number;
+        }[];
+        content: {
+            val: string;
+            count: number;
+        }[];
+        weight: {
+            val: number;
+            count: number;
+        }[];
+        pool: {
+            val: UniDMTools.Pools;
+            count: number;
+        }[];
+        platform: {
+            val?: string;
+            count: number;
+        }[];
+    };
+    get most(): {
+        mode: UniDMTools.Modes;
+        fontsize: number;
+        color: number;
+        senderID: string;
+        content: string;
+        weight: number;
+        pool: UniDMTools.Pools;
+        platform: string | undefined;
+    };
     static create(): UniPool;
     /**
      * 合并弹幕/弹幕库
@@ -57,33 +113,36 @@ export declare class UniPool {
      * 按共通属性拆分弹幕库
      */
     split(key: keyof shareItems): UniPool[];
+    /**
+     * 基于DMID的基本去重功能，用于解决该class下dans为array而非Set的问题
+     */
+    private dedupe;
     /**
      * 合并一定时间段内的重复弹幕，防止同屏出现过多
-     * @param lifetime 查重时间区段，单位秒 (默认为0，表示不查重)
+     * @param lifetime 查重时间区段，单位秒 (默认为 0，表示不查重)
      */
     merge(lifetime?: number): UniPool;
-    minify(): (Partial<UniDMTools.UniDMObj> & Pick<UniDMTools.UniDMObj, "FCID">)[];
+    minify(): (Partial<UniDMTools.UniDMObj> & Pick<UniDMTools.UniDMObj, "SOID">)[];
     convert2(format: DM_format, continue_on_error?: boolean): string | Uint8Array<ArrayBufferLike> | UniDM[] | DM_JSON_Dplayer | DM_JSON_DDPlay | DM_JSON_Artplayer[];
     static fromPb(bin: Uint8Array | ArrayBuffer): UniPool;
     /**
      * 转为 protobuf 二进制
      */
     toPb(): Uint8Array<ArrayBufferLike>;
-    static fromBiliXML(xml: string, SPMO?: string): UniPool;
-    static fromBiliGrpc(bin: Uint8Array | ArrayBuffer, SPMO?: string): UniPool;
+    static fromBiliXML(xml: string): UniPool;
+    toBiliXML(): string;
+    static fromBiliGrpc(bin: Uint8Array | ArrayBuffer): UniPool;
     /**
-     *
      * @param bin 符合`DmWebViewReplySchema`(bili视频meta)的protobuf二进制
-     * @param SPMO
      */
-    static fromBiliCommandGrpc(bin: Uint8Array | ArrayBuffer, SPMO?: string): UniPool;
+    static fromBiliCommandGrpc(bin: Uint8Array | ArrayBuffer): UniPool;
     static fromDplayer(json: DM_JSON_Dplayer, playerID: string, domain?: string): UniPool;
     toDplayer(): DM_JSON_Dplayer;
     static fromArtplayer(json: DM_JSON_Artplayer[], playerID: string, domain?: string): UniPool;
     toArtplayer(): DM_JSON_Artplayer[];
-    static fromDDPlay(json: DM_JSON_DDPlay, episodeId: string, domain?: string): UniPool;
+    static fromDDPlay(json: DM_JSON_DDPlay, episodeId: string): UniPool;
     toDDplay(): DM_JSON_DDPlay;
     static fromASS(ass: string): UniPool;
     toASS(options?: AssGenOptions): string;
 }
-export { UniDM, UniDMTools, UniIDTools, type DM_JSON_BiliCommandGrpc, type platfrom, };
+export { platform, UniDM, UniDMTools, UniIDTools, type DM_JSON_BiliCommandGrpc, };

package/dist/src/proto/gen/bili/dm_pb.d.ts

@@ -1,4 +1,4 @@
-import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv1";
+import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";
 import type { Message } from "@bufbuild/protobuf";
 /**
  * Describes the file bili/dm.proto.

package/dist/src/proto/gen/danuni_pb.d.ts

@@ -1,18 +1,36 @@
-import type { GenEnum, GenFile, GenMessage } from "@bufbuild/protobuf/codegenv1";
+import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";
 import type { Timestamp } from "@bufbuild/protobuf/wkt";
 import type { Message } from "@bufbuild/protobuf";
 /**
  * Describes the file danuni.proto.
  */
 export declare const file_danuni: GenFile;
+/**
+ * @generated from message danuni.danmaku.v1.listDanReq
+ */
+export type listDanReq = Message<"danuni.danmaku.v1.listDanReq"> & {
+    /**
+     * @generated from field: string ID = 1;
+     */
+    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.
+ */
+export declare const listDanReqSchema: GenMessage<listDanReq>;
 /**
  * @generated from message danuni.danmaku.v1.Danmaku
  */
 export type Danmaku = Message<"danuni.danmaku.v1.Danmaku"> & {
     /**
-     * @generated from field: string FCID = 1;
+     * @generated from field: string SOID = 1;
      */
-    FCID: string;
+    SOID: string;
     /**
      * @generated from field: string DMID = 2;
      */
@@ -62,11 +80,7 @@ export type Danmaku = Message<"danuni.danmaku.v1.Danmaku"> & {
      */
     platform: string;
     /**
-     * @generated from field: optional string SPMO = 14;
-     */
-    SPMO?: string;
-    /**
-     * @generated from field: optional string extra = 15;
+     * @generated from field: optional string extra = 14;
      */
     extra?: string;
 };
@@ -143,3 +157,16 @@ export declare enum Pool {
  * Describes the enum danuni.danmaku.v1.Pool.
  */
 export declare const PoolSchema: GenEnum<Pool>;
+/**
+ * @generated from service danuni.danmaku.v1.DanmakuService
+ */
+export declare const DanmakuService: GenService<{
+    /**
+     * @generated from rpc danuni.danmaku.v1.DanmakuService.listDan
+     */
+    listDan: {
+        methodKind: "unary";
+        input: typeof listDanReqSchema;
+        output: typeof DanmakuReplySchema;
+    };
+}>;

package/dist/src/utils/dm-gen.d.ts

@@ -1,6 +1,7 @@
 import type { DM_JSON_BiliCommandGrpc } from '..';
-import type { platfrom } from './id-gen';
-export type DMAttr = 'Protect' | 'FromLive' | 'HighLike' | 'Compatible' | 'Reported' | 'Hide';
+import type { PlatformDanmakuSource } from './platform';
+import { PlatformDanmakuOnlySource } from './platform';
+export type DMAttr = 'Protect' | 'FromLive' | 'HighLike' | 'Compatible' | 'Reported' | 'Unchecked' | 'HasEvent' | 'Hide';
 interface DMBili {
     id: bigint;
     progress: number;
@@ -102,6 +103,8 @@ export interface ExtraDanUniMerge {
     duration: number;
     count: number;
     senders: string[];
+    taolu_count: number;
+    taolu_senders: string[];
 }
 export declare enum ExtraDanUniChapterType {
     Chapter = "ch",//其它片段(用于标记章节)
@@ -136,7 +139,7 @@ export declare enum Pools {
 }
 export type ctime = string | number | bigint | Date;
 export interface UniDMObj {
-    FCID: string;
+    SOID: string;
     progress: number;
     mode: Modes;
     fontsize: number;
@@ -147,8 +150,7 @@ export interface UniDMObj {
     weight: number;
     pool: Pools;
     attr: DMAttr[];
-    platform: platfrom | string;
-    SPMO: string;
+    platform: PlatformDanmakuSource | string;
     extra: string | Extra;
     extraStr: string;
     DMID: string;
@@ -158,9 +160,10 @@ export interface UniDMObj {
  */
 export declare class UniDM {
     /**
-     * FCID
+     * 资源ID
+     * @description 由某一danuni服务确定的某一剧集下不同资源(不同视频站/字幕组具有细节差异)的ID
      */
-    FCID: string;
+    SOID: string;
     /**
      * 弹幕出现位置(单位s;精度为ms,即保留三位小数)
      */
@@ -199,7 +202,7 @@ export declare class UniDM {
      * 权重 用于屏蔽等级 区间:[1,10]
      * @description 参考B站，源弹幕有该参数则直接利用，
      * 本实现默认取5，再经过ruleset匹配加减分数
-     * @description 特殊情况下接受值为0，即设置0需转换为默认权重(5)
+     * @description 为0时表示暂时未计算权重
      */
     weight: number;
     /**
@@ -215,18 +218,7 @@ export declare class UniDM {
      * 初始来源平台
      * `danuni`与任意空值(可隐式转换为false的值)等价
      */
-    platform?: (platfrom | string) | undefined;
-    /**
-     * Same Platform Multiple Origin
-     * @description 解决B站等同一番剧存在港澳台站、多语言配音(不同一CID)的问题，同时方便过滤
-     * @description 示例:
-     * - main: 主站
-     * - hm: 仅港澳
-     * - t: 仅台
-     * - hmt: 仅港澳台
-     * - lang:{ISO语言代号}: 多语言
-     */
-    SPMO?: string | undefined;
+    platform?: (PlatformDanmakuSource | string) | undefined;
     /**
      * 弹幕原始数据(不推荐使用)
      * @description 适用于无法解析的B站代码弹幕、Artplayer弹幕样式等
@@ -240,9 +232,10 @@ export declare class UniDM {
      */
     constructor(
     /**
-     * FCID
+     * 资源ID
+     * @description 由某一danuni服务确定的某一剧集下不同资源(不同视频站/字幕组具有细节差异)的ID
      */
-    FCID: string, 
+    SOID: string, 
     /**
      * 弹幕出现位置(单位s;精度为ms,即保留三位小数)
      */
@@ -281,7 +274,7 @@ export declare class UniDM {
      * 权重 用于屏蔽等级 区间:[1,10]
      * @description 参考B站，源弹幕有该参数则直接利用，
      * 本实现默认取5，再经过ruleset匹配加减分数
-     * @description 特殊情况下接受值为0，即设置0需转换为默认权重(5)
+     * @description 为0时表示暂时未计算权重
      */
     weight?: number, 
     /**
@@ -297,18 +290,7 @@ export declare class UniDM {
      * 初始来源平台
      * `danuni`与任意空值(可隐式转换为false的值)等价
      */
-    platform?: (platfrom | string) | undefined, 
-    /**
-     * Same Platform Multiple Origin
-     * @description 解决B站等同一番剧存在港澳台站、多语言配音(不同一CID)的问题，同时方便过滤
-     * @description 示例:
-     * - main: 主站
-     * - hm: 仅港澳
-     * - t: 仅台
-     * - hmt: 仅港澳台
-     * - lang:{ISO语言代号}: 多语言
-     */
-    SPMO?: string | undefined, 
+    platform?: (PlatformDanmakuSource | string) | undefined, 
     /**
      * 弹幕原始数据(不推荐使用)
      * @description 适用于无法解析的B站代码弹幕、Artplayer弹幕样式等
@@ -322,11 +304,11 @@ export declare class UniDM {
     /**
      * 弹幕id
      * @description sha3-256(content+senderID+ctime)截取前8位
-     * @description 同一FCID下唯一
+     * @description 同一SOID下唯一
      */
     toDMID(): string;
     isSameAs(dan: UniDM, _check2?: boolean): boolean;
-    minify(): Partial<UniDMObj> & Pick<UniDMObj, "FCID">;
+    minify(): Partial<UniDMObj> & Pick<UniDMObj, "SOID">;
     downgradeAdvcancedDan({ include, exclude, cleanExtra, }?: {
         include?: (keyof Extra)[];
         exclude?: (keyof Extra)[];
@@ -341,13 +323,17 @@ export declare class UniDM {
      */
     static transCtime(oriCtime: ctime, tsUnit?: 'ms' | 's'): Date;
     static transMode(oriMode: number, fmt: 'bili' | 'dplayer' | 'artplayer' | 'ddplay'): Modes;
-    static fromBili(args: DMBili, SPMO?: string, cid?: bigint): UniDM;
-    static fromBiliCommand(args: DMBiliCommand, SPMO?: string, cid?: bigint): UniDM;
+    static fromBili(args: DMBili, cid?: bigint): UniDM;
+    toBiliXML(): {
+        '#text': string;
+        '@_p': string;
+    };
+    static fromBiliCommand(args: DMBiliCommand, cid?: bigint): UniDM;
     static fromDplayer(args: DMDplayer, playerID: string, domain: string): UniDM;
     toDplayer(): DMDplayer;
     static fromArtplayer(args: DMArtplayer, playerID: string, domain: string): UniDM;
     toArtplayer(): DMArtplayer;
-    static fromDDplay(args: DMDDplay, episodeId: string, domain?: string): UniDM;
+    static fromDDplay(args: DMDDplay, episodeId: string, domain?: PlatformDanmakuOnlySource): UniDM;
     toDDplay(): DMDDplay;
 }
 export {};

package/dist/src/utils/id-gen.d.ts

@@ -1,15 +1,5 @@
 import type { ctime } from './dm-gen';
-export declare const domainPreset: {
-    acfun: string;
-    baha: string;
-    bgm: string;
-    bili: string;
-    bglobal: string;
-    ddplay: string;
-    tucao: string;
-};
-export type platfrom = 'acfun' | 'baha' | 'bili' | 'bglobal' | 'ddplay' | 'danuni' | 'tucao' | 'other';
-export declare const platforms: platfrom[];
+import type { PlatformSource } from './platform';
 export declare class UniID {
     /**
      * @description 每个domain下应为唯一值
@@ -23,16 +13,9 @@ export declare class UniID {
      * - `{any}.danuni` (若使用IP或无域名，请使用该domain，防止隐私泄露/无法解析)
      * #### 注意
      * - `any`值建议为UUID/ULID/NanoID以防同步错误
-     * ### 非DanUni弹幕服务预设(默认采用其最短服务域名)
-     * - `acfun.cn`
-     * - `ani.gamer.com.tw` (Baha)
-     * - `bgm.tv` (bangumi)
-     * - `b23.tv` (比bilibili.com短，省空间)
-     * - `biliintl.com` (即bilibili.tv)
-     * - `dandanplay.com`
-     * - `tucao` (由于其域名常变，故分配固定解析，运行时解析)
+     * ### 非DanUni弹幕服务建议使用预设，或自行填写域名
      */
-    domain: string;
+    domain: PlatformSource | string;
     constructor(
     /**
      * @description 每个domain下应为唯一值
@@ -46,18 +29,12 @@ export declare class UniID {
      * - `{any}.danuni` (若使用IP或无域名，请使用该domain，防止隐私泄露/无法解析)
      * #### 注意
      * - `any`值建议为UUID/ULID/NanoID以防同步错误
-     * ### 非DanUni弹幕服务预设(默认采用其最短服务域名)
-     * - `acfun.cn`
-     * - `ani.gamer.com.tw` (Baha)
-     * - `bgm.tv` (bangumi)
-     * - `b23.tv` (比bilibili.com短，省空间)
-     * - `biliintl.com` (即bilibili.tv)
-     * - `dandanplay.com`
-     * - `tucao` (由于其域名常变，故分配固定解析，运行时解析)
+     * ### 非DanUni弹幕服务建议使用预设，或自行填写域名
      */
-    domain: string);
+    domain: PlatformSource | string);
+    static fromString(str: string): UniID;
     toString(): string;
-    static fromNull(domain?: string): UniID;
+    static fromNull(domain?: PlatformSource | 'runtime' | string): UniID;
     static fromBili({ cid, mid, midHash, }: {
         cid?: number | bigint | string;
         mid?: number | bigint;
@@ -65,8 +42,8 @@ export declare class UniID {
     }): UniID;
     static fromUnknown(id: string, 
     /**
-     * 可使用预设`acfun` `baha` `bili` `bglobal` `ddplay` `tucao`代替其域名
+     * 可使用预设
      */
-    domain: platfrom | string): UniID;
+    domain: PlatformSource | string): UniID;
 }
 export declare function createDMID(content: string | undefined, senderID: string, ctime: ctime, slice?: number): string;

package/dist/src/utils/platform.d.ts

@@ -0,0 +1,24 @@
+export declare enum PlatformInfoSource {
+    Bangumi = "bgm",
+    TMDB = "tmdb"
+}
+export declare const PlatformInfoSources: PlatformInfoSource[];
+export declare enum PlatformVideoSource {
+    Acfun = "acfun",
+    Baha = "baha",
+    Bilibili = "bili",
+    BilibiliGlobal = "bglobal",
+    Iqiyi = "iqiyi",
+    Tencent = "tencent",
+    Youku = "youku"
+}
+export declare const PlatformVideoSources: PlatformVideoSource[];
+export declare enum PlatformDanmakuOnlySource {
+    DanDanPlay = "ddplay",
+    TuCao = "tucao"
+}
+export declare const PlatformDanmakuOnlySources: PlatformDanmakuOnlySource[];
+export type PlatformDanmakuSource = PlatformVideoSource | PlatformDanmakuOnlySource;
+export declare const PlatformDanmakuSources: (PlatformVideoSource | PlatformDanmakuOnlySource)[];
+export type PlatformSource = PlatformInfoSource | PlatformDanmakuSource;
+export declare const PlatformSources: (PlatformInfoSource | PlatformVideoSource | PlatformDanmakuOnlySource)[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dan-uni/dan-any",
-  "version": "0.2.6",
+  "version": "0.4.8",
   "description": "A danmaku transformer lib, supporting danmaku from different platforms.",
   "keywords": [
     "bangumi",
@@ -17,7 +17,7 @@
   },
   "author": "rinne",
   "main": "dist/index.js",
-  "module": "dist/index.js",
+  "module": "src/index.ts",
   "types": "dist/src/index.d.ts",
   "browser": "dist/index.umd.min.js",
   "scripts": {
@@ -32,17 +32,18 @@
   },
   "dependencies": {
     "base16384": "^1.0.0",
-    "canvas": "^3.1.0",
-    "fast-xml-parser": "^4.5.1",
+    "canvas": "^3.1.2",
+    "fast-xml-parser": "^5.2.5",
+    "fs-extra": "^11.3.0",
     "hh-mm-ss": "^1.2.0",
     "jssha": "^3.3.1"
   },
   "devDependencies": {
-    "@bufbuild/buf": "^1.50.0",
-    "@bufbuild/protobuf": "^2.2.3",
-    "@bufbuild/protoc-gen-es": "^2.2.3",
+    "@bufbuild/buf": "^1.55.1",
+    "@bufbuild/protobuf": "^2.6.0",
+    "@bufbuild/protoc-gen-es": "^2.6.0",
+    "@types/fs-extra": "^11.0.4",
     "@types/hh-mm-ss": "^1.2.3",
-    "@types/pako": "^2.0.3",
-    "protobufjs": "^7.4.0"
+    "protobufjs": "^7.5.3"
   }
 }