@dan-uni/dan-any 0.6.8 → 0.7.3

package/src/index.test.ts

@@ -75,4 +75,26 @@ describe('其它', () => {
   it('合并范围内重复', () => {
     console.info(pool.merge(10).minify())
   })
+  it('禁止DMID生成', () => {
+    console.info(
+      UniPool.fromBiliXML(xml, {
+        dmid: false,
+      }),
+    )
+  })
+  it('自定义DMID生成长度', () => {
+    console.info(
+      UniPool.fromBiliXML(xml, {
+        dmid: 64,
+      }),
+    )
+  })
+  it('自定义DMID生成器', () => {
+    console.info(
+      UniPool.fromBiliXML(xml, {
+        dmid: (_content, _senderID, ctime = new Date(), _extraStr) =>
+          ctime.toString() + Math.random(),
+      }),
+    )
+  })
 })

package/src/index.ts

@@ -94,6 +94,7 @@ type UniPoolPipeSync = (that: UniPool) => UniPool
 
 interface Options {
   dedupe?: boolean
+  dmid?: boolean | number | UniIDTools.DMIDGenerator
 }
 
 export class UniPool {
@@ -223,8 +224,8 @@ export class UniPool {
       platform: s.platform.sort((a, b) => b.count - a.count)[0].val,
     }
   }
-  static create() {
-    return new UniPool([])
+  static create(options?: Options) {
+    return new UniPool([], options)
   }
   /**
    * 合并弹幕/弹幕库
@@ -395,18 +396,22 @@ export class UniPool {
       }
     }
   }
-  static fromPb(bin: Uint8Array | ArrayBuffer) {
+  static fromPb(bin: Uint8Array | ArrayBuffer, options?: Options) {
     const data = fromBinary(DanmakuReplySchema, new Uint8Array(bin))
     return new UniPool(
       data.danmakus.map((d) =>
-        UniDM.create({
-          ...d,
-          mode: d.mode as number,
-          ctime: timestampDate(d.ctime || timestampNow()),
-          pool: d.pool as number,
-          attr: d.attr as UniDMTools.DMAttr[],
-        }),
+        UniDM.create(
+          {
+            ...d,
+            mode: d.mode as number,
+            ctime: timestampDate(d.ctime || timestampNow()),
+            pool: d.pool as number,
+            attr: d.attr as UniDMTools.DMAttr[],
+          },
+          options,
+        ),
       ),
+      options,
     )
   }
   /**
@@ -437,7 +442,7 @@ export class UniPool {
       }),
     )
   }
-  static fromBiliXML(xml: string) {
+  static fromBiliXML(xml: string, options?: Options) {
     const parser = new XMLParser({ ignoreAttributes: false }),
       oriData: DM_XML_Bili = parser.parse(xml),
       dans = oriData.i.d
@@ -460,9 +465,11 @@ export class UniPool {
               weight: Number.parseInt(p_arr[8]),
             },
             BigInt(oriData.i.chatid),
+            options,
           )
         })
         .filter((d) => d !== null),
+      options,
     )
   }
   toBiliXML(): string {
@@ -496,31 +503,38 @@ export class UniPool {
       },
     })
   }
-  static fromBiliGrpc(bin: Uint8Array | ArrayBuffer) {
+  static fromBiliGrpc(bin: Uint8Array | ArrayBuffer, options?: Options) {
     const data = fromBinary(DmSegMobileReplySchema, new Uint8Array(bin)),
       json = data.elems
     return new UniPool(
       json.map((d) => {
-        return UniDM.fromBili({ ...d, progress: d.progress / 1000 })
+        return UniDM.fromBili(
+          { ...d, progress: d.progress / 1000 },
+          d.oid,
+          options,
+        )
       }),
+      options,
     )
   }
   /**
    * @param bin 符合`DmWebViewReplySchema`(bili视频meta)的protobuf二进制
    */
-  static fromBiliCommandGrpc(bin: Uint8Array | ArrayBuffer) {
+  static fromBiliCommandGrpc(bin: Uint8Array | ArrayBuffer, options?: Options) {
     const data = fromBinary(DmWebViewReplySchema, new Uint8Array(bin)),
       json = data.commandDms
     return new UniPool(
       json.map((d) => {
-        return UniDM.fromBiliCommand(d)
+        return UniDM.fromBiliCommand(d, d.oid, options)
       }),
+      options,
     )
   }
   static fromDplayer(
     json: DM_JSON_Dplayer,
     playerID: string,
     domain = 'other',
+    options?: Options,
   ) {
     return new UniPool(
       json.data.map((d) => {
@@ -537,8 +551,10 @@ export class UniPool {
           },
           playerID,
           domain,
+          options,
         )
       }),
+      options,
     )
   }
   toDplayer(): DM_JSON_Dplayer {
@@ -554,6 +570,7 @@ export class UniPool {
     json: DM_JSON_Artplayer[],
     playerID: string,
     domain = 'other',
+    options?: Options,
   ) {
     return new UniPool(
       json.map((d) => {
@@ -570,8 +587,10 @@ export class UniPool {
           },
           playerID,
           domain,
+          options,
         )
       }),
+      options,
     )
   }
   toArtplayer(): DM_JSON_Artplayer[] {
@@ -587,7 +606,11 @@ export class UniPool {
       }
     })
   }
-  static fromDDPlay(json: DM_JSON_DDPlay, episodeId: string) {
+  static fromDDPlay(
+    json: DM_JSON_DDPlay,
+    episodeId: string,
+    options?: Options,
+  ) {
     return new UniPool(
       json.comments.map((d) => {
         const p_arr = d.p.split(',')
@@ -601,8 +624,11 @@ export class UniPool {
             uid: p_arr[3],
           },
           episodeId,
+          undefined, //使用默认
+          options,
         )
       }),
+      options,
     )
   }
   toDDplay(): DM_JSON_DDPlay {

package/src/utils/dm-gen.ts

@@ -17,7 +17,7 @@ import JSONbig from 'json-bigint'
 import type { DM_JSON_BiliCommandGrpc } from '..'
 import type { PlatformDanmakuSource } from './platform'
 
-import { createDMID, UniID as ID } from './id-gen'
+import { createDMID, DMIDGenerator, UniID as ID } from './id-gen'
 import {
   PlatformDanmakuOnlySource,
   PlatformDanmakuSources,
@@ -71,7 +71,7 @@ const toBits = (number: number) => {
     // bits.unshift(number & 1) // (0|1)[]
     number >>= 1
   } while (number)
-  return bits.reverse()
+  return bits.toReversed()
 }
 
 export enum DMAttr {
@@ -334,6 +334,10 @@ export interface UniDMObj {
   DMID: string
 }
 
+interface Options {
+  dmid?: boolean | number | DMIDGenerator
+}
+
 export class UniDM {
   /**
    * 资源ID
@@ -456,9 +460,15 @@ export class UniDM {
   @IsOptional()
   @Expose()
   public DMID?: string
+  private options: Options = { dmid: createDMID }
   @Expose()
-  init() {
+  init(options?: Options) {
+    this.options = options || this.options
     const def = new UniDM()
+
+    if (this.options.dmid === undefined || this.options.dmid === true)
+      this.options.dmid = createDMID
+
     if (!this.SOID) this.SOID = def.SOID
     if (!this.progress) this.progress = def.progress
     if (!this.mode) this.mode = def.mode
@@ -471,7 +481,7 @@ export class UniDM {
     if (!this.pool) this.pool = def.pool
     if (!this.attr) this.attr = def.attr
 
-    if (!this.DMID) this.DMID = this.toDMID()
+    if (!this.DMID && this.options.dmid !== false) this.DMID = this.toDMID()
     this.progress = Number.parseFloat(this.progress.toFixed(3))
     if (this.extraStr)
       this.extraStr = JSON.stringify(
@@ -498,7 +508,7 @@ export class UniDM {
   async validate() {
     return validateOrReject(this)
   }
-  static create(pjson?: Partial<UniDMObj>) {
+  static create(pjson?: Partial<UniDMObj>, options?: Options) {
     return pjson
       ? plainToInstance(
           UniDM,
@@ -511,7 +521,7 @@ export class UniDM {
               }
             : pjson,
           { excludeExtraneousValues: true },
-        ).init()
+        ).init(options)
       : new UniDM()
   }
   @Expose()
@@ -537,7 +547,23 @@ export class UniDM {
    */
   @Expose()
   toDMID() {
-    return createDMID(this.content, this.senderID, this.ctime, this.extraStr)
+    if (this.options.dmid === false) return
+    else if (this.options.dmid === true)
+      return createDMID(this.content, this.senderID, this.ctime, this.extraStr)
+    else if (typeof this.options.dmid === 'number')
+      return createDMID(
+        this.content,
+        this.senderID,
+        this.ctime,
+        this.extraStr,
+        this.options.dmid,
+      )
+    return this.options.dmid!(
+      this.content,
+      this.senderID,
+      this.ctime,
+      this.extraStr,
+    )
   }
   @Expose()
   isSameAs(dan: UniDM, options?: { skipDanuniMerge?: boolean }): boolean {
@@ -717,7 +743,7 @@ export class UniDM {
     }
     return mode
   }
-  static fromBili(args: DMBili, cid?: bigint) {
+  static fromBili(args: DMBili, cid?: bigint, options?: Options) {
     interface TExtra extends Extra {
       bili: ExtraBili
     }
@@ -757,25 +783,28 @@ export class UniDM {
         mode = Modes.Normal
         break
     }
-    return this.create({
-      ...args,
-      SOID: SOID.toString(),
-      // progress: args.progress,
-      mode,
-      // fontsize: args.fontsize,
-      // color: args.color,
-      senderID: senderID.toString(),
-      // content: args.content,
-      ctime: this.transCtime(args.ctime, 's'),
-      weight: args.weight ? args.weight : pool === Pools.Ix ? 1 : 0,
-      pool,
-      attr: DMAttrUtils.fromBin(args.attr, PlatformVideoSource.Bilibili),
-      platform: PlatformVideoSource.Bilibili,
-      // 需改进，7=>advanced 8=>code 9=>bas 互动=>command
-      // 同时塞进无法/无需直接解析的数据
-      // 另开一个解析器，为大部分播放器（无法解析该类dm）做文本类型降级处理
-      extra,
-    })
+    return this.create(
+      {
+        ...args,
+        SOID,
+        // progress: args.progress,
+        mode,
+        // fontsize: args.fontsize,
+        // color: args.color,
+        senderID: senderID.toString(),
+        // content: args.content,
+        ctime: this.transCtime(args.ctime, 's'),
+        weight: args.weight ? args.weight : pool === Pools.Ix ? 1 : 0,
+        pool,
+        attr: DMAttrUtils.fromBin(args.attr, PlatformVideoSource.Bilibili),
+        platform: PlatformVideoSource.Bilibili,
+        // 需改进，7=>advanced 8=>code 9=>bas 互动=>command
+        // 同时塞进无法/无需直接解析的数据
+        // 另开一个解析器，为大部分播放器（无法解析该类dm）做文本类型降级处理
+        extra,
+      },
+      options,
+    )
   }
   @Expose()
   toBiliXML(options?: { skipBiliCommand: boolean }) {
@@ -833,45 +862,56 @@ export class UniDM {
       ].join(','),
     }
   }
-  static fromBiliCommand(args: DMBiliCommand, cid?: bigint) {
+  static fromBiliCommand(args: DMBiliCommand, cid?: bigint, options?: Options) {
     if (args.oid && !cid) cid = args.oid
-    const SOID = ID.fromBili({ cid }),
+    const SOID = `def_${PlatformVideoSource.Bilibili}+${ID.fromBili({ cid })}`,
       senderID = ID.fromBili({ mid: args.mid })
-    return this.create({
-      ...args,
-      SOID: SOID.toString(),
-      // progress: args.progress,
-      mode: Modes.Ext,
-      // fontsize: args.fontsize,
-      // color: args.color,
-      senderID: senderID.toString(),
-      // content: args.content,
-      ctime: new Date(`${args.ctime} GMT+0800`), // 无视本地时区，按照B站的东8区计算时间
-      weight: 10,
-      pool: Pools.Adv,
-      attr: [DMAttr.Protect],
-      platform: PlatformVideoSource.Bilibili,
-      extra: {
-        bili: {
-          command: args,
+    return this.create(
+      {
+        ...args,
+        SOID,
+        // progress: args.progress,
+        mode: Modes.Ext,
+        // fontsize: args.fontsize,
+        // color: args.color,
+        senderID: senderID.toString(),
+        // content: args.content,
+        ctime: new Date(`${args.ctime} GMT+0800`), // 无视本地时区，按照B站的东8区计算时间
+        weight: 10,
+        pool: Pools.Adv,
+        attr: [DMAttr.Protect],
+        platform: PlatformVideoSource.Bilibili,
+        extra: {
+          bili: {
+            command: args,
+          },
         },
       },
-    })
+      options,
+    )
   }
-  static fromDplayer(args: DMDplayer, playerID: string, domain: string) {
+  static fromDplayer(
+    args: DMDplayer,
+    playerID: string,
+    domain: string,
+    options?: Options,
+  ) {
     const SOID = ID.fromUnknown(playerID, domain),
       senderID = ID.fromUnknown(args.midHash, domain)
-    return this.create({
-      ...args,
-      SOID: SOID.toString(),
-      // progress: args.progress,
-      mode: this.transMode(args.mode, 'dplayer'),
-      // fontsize: 25,
-      // color: args.color,
-      senderID: senderID.toString(),
-      // content: args.content,
-      platform: domain,
-    })
+    return this.create(
+      {
+        ...args,
+        SOID: SOID.toString(),
+        // progress: args.progress,
+        mode: this.transMode(args.mode, 'dplayer'),
+        // fontsize: 25,
+        // color: args.color,
+        senderID: senderID.toString(),
+        // content: args.content,
+        platform: domain,
+      },
+      options,
+    )
   }
   @Expose()
   toDplayer(): DMDplayer {
@@ -886,7 +926,12 @@ export class UniDM {
       content: this.content,
     }
   }
-  static fromArtplayer(args: DMArtplayer, playerID: string, domain: string) {
+  static fromArtplayer(
+    args: DMArtplayer,
+    playerID: string,
+    domain: string,
+    options?: Options,
+  ) {
     const SOID = ID.fromUnknown(playerID, domain),
       senderID = ID.fromUnknown('', domain)
     let extra = args.border
@@ -900,18 +945,21 @@ export class UniDM {
         }
       else extra = { artplayer: { style: args.style } }
     }
-    return this.create({
-      ...args,
-      SOID: SOID.toString(),
-      // progress: args.progress,
-      mode: this.transMode(args.mode, 'artplayer'),
-      // fontsize: 25,
-      // color: args.color,
-      senderID: senderID.toString(),
-      // content: args.content,
-      platform: domain,
-      extra, //optional BigINt parser
-    })
+    return this.create(
+      {
+        ...args,
+        SOID: SOID.toString(),
+        // progress: args.progress,
+        mode: this.transMode(args.mode, 'artplayer'),
+        // fontsize: 25,
+        // color: args.color,
+        senderID: senderID.toString(),
+        // content: args.content,
+        platform: domain,
+        extra, //optional BigINt parser
+      },
+      options,
+    )
   }
   @Expose()
   toArtplayer(): DMArtplayer {
@@ -930,20 +978,27 @@ export class UniDM {
     args: DMDDplay,
     episodeId: string,
     domain = PlatformDanmakuOnlySource.DanDanPlay,
+    options?: Options,
   ) {
-    const SOID = ID.fromUnknown(`def::${episodeId}`, domain)
-    return this.create({
-      ...args,
-      SOID: SOID.toString(),
-      // progress: args.progress,
-      mode: this.transMode(args.mode, 'ddplay'),
-      // fontsize: 25,
-      // color: args.color,
-      senderID: args.uid,
-      content: args.m,
-      platform: domain,
-      DMID: args.cid.toString(), //无需 new ID() 获取带suffix的ID
-    })
+    const SOID = ID.fromUnknown(
+      `def_${PlatformDanmakuOnlySource.DanDanPlay}+${episodeId}`,
+      domain,
+    )
+    return this.create(
+      {
+        ...args,
+        SOID: SOID.toString(),
+        // progress: args.progress,
+        mode: this.transMode(args.mode, 'ddplay'),
+        // fontsize: 25,
+        // color: args.color,
+        senderID: args.uid,
+        content: args.m,
+        platform: domain,
+        DMID: args.cid.toString(), //无需 new ID() 获取带suffix的ID
+      },
+      options,
+    )
   }
   @Expose()
   toDDplay(): DMDDplay {

package/src/utils/id-gen.ts

@@ -62,10 +62,18 @@ export class UniID {
   }
 }
 
+export type DMIDGenerator = (
+  content?: string,
+  senderID?: string,
+  ctime?: ctime,
+  extraStr?: string,
+  slice?: number,
+) => string
+
 export function createDMID(
   content: string = '',
-  senderID: string,
-  ctime: ctime,
+  senderID: string = UniID.fromNull().toString(),
+  ctime: ctime = new Date().toISOString(),
   extraStr?: string,
   slice = 8,
 ) {

package/tsconfig.json

@@ -9,7 +9,7 @@
     // "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
     /* Language and Environment */
-    "target": "ES2021" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
+    "target": "ES2023" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
     "emitDecoratorMetadata": true /* Emit design-type metadata for decorated declarations in source files. */,
     // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */

package/types/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"version":"5.8.3"}
+{"version":"5.9.2"}