@dan-uni/dan-any 1.0.0 → 1.1.1

package/src/index.ts

@@ -47,7 +47,7 @@ interface DanUniConvertTip {
 export interface DM_XML_Bili {
   i: {
     chatserver: string
-    chatid: number
+    chatid: bigint
     mission: number
     maxlimit: number
     state: number
@@ -78,15 +78,15 @@ export interface DM_JSON_BiliUp {
     }
     result: {
       /** 弹幕 ID，int64 */
-      id: number
+      id: bigint
       /** 弹幕 ID 字符串形式 */
       id_str: string
       /** 弹幕类型：1 表示视频弹幕（当前接口恒为 1） */
       type: number
-      aid: number
+      aid: bigint
       bvid: string
-      oid: number
-      mid: number
+      oid: bigint
+      mid: bigint
       /** 发送者 mid 的 CRC 哈希（正常接口里用的是这个，保护隐私） */
       mid_hash: string
       /** 弹幕池 */
@@ -145,7 +145,7 @@ export interface DM_JSON_Artplayer {
 export interface DM_JSON_DDPlay {
   count: number | string
   comments: {
-    cid: number
+    cid: bigint
     p: string
     m: string
   }[]

package/src/plugins/bili-dedupe/index.test.ts

@@ -0,0 +1,40 @@
+//基于以下注释，根据vitest生成测试用例
+import { describe, expect, it } from 'vitest'
+
+import bili_dedupe from '.'
+import { UniPool } from '../..'
+
+const xml = `<i>
+<chatserver>chat.bilibili.com</chatserver>
+<chatid>1156756312</chatid>
+<mission>0</mission>
+<maxlimit>2947</maxlimit>
+<state>0</state>
+<real_name>0</real_name>
+<source>k-v</source>
+<d p="13.213,1,25,16777215,1686314041,3,ff41173d,1335658005672492032">喜欢</d>
+<d p="13.213,1,25,16777215,1686590010,0,296b35b5,1337972999512832512">来了 哈哈~~</d>
+<d p="13.246,1,25,16777215,1686276875,0,5664cfc4,1335346233459549696">就是</d>
+<d p="13.266,1,25,16777215,1686283375,0,c7e6646f,1335400761013670912">什么鬼？</d>
+<d p="13.284,1,25,16777215,1686291338,0,38662881,1335517923728804864">哇哦</d>
+<d p="13.306,1,25,16777215,1686268410,0,4c01de10,1335275224983600896">试试</d>
+<d p="13.331,1,25,16777215,1686948453,3,56a3c5d5,1340979831550069760">不喜欢</d>
+<d p="13.374,1,25,16777215,1686300770,3,647fe355,1335546672880933888">不喜欢</d>
+<d p="13.376,1,25,16777215,1686297921,0,469d94b8,1335522778300134400">哦豁</d>
+<d p="13.419,1,25,8700107,1686268005,0,be402447,1335271828100244224">太酷啦</d>
+<d p="13.419,1,25,16777215,1686316828,3,7ffb6619,1335681385016736768">喜欢</d>
+<d p="13.459,1,25,16777215,1686299729,0,45834405,1335537942797634048">一般，不好看</d>
+<d p="13.462,1,25,16777215,1686302133,0,3cab672c,1335558106620590080">哈哈哈</d>
+<d p="13.481,1,25,16777215,1686297342,0,ce67fafd,1335517923728804864">？</d>
+<d p="13.499,1,25,16777215,1686301548,3,2848bf1c,1335517923728804864">不喜欢</d>
+</i>`
+
+describe('其它', () => {
+  const pool = UniPool.fromBiliXML(xml)
+  it('B站dmid去重(仅限主站直接获取的弹幕)', () => {
+    const ori = pool.dans.length
+    expect(ori).toBe(15)
+    const n = pool.pipeSync(bili_dedupe)
+    expect(n.dans.length).toBe(13)
+  })
+})

package/src/plugins/bili-dedupe/index.ts

@@ -0,0 +1,19 @@
+import type { UniDM, UniPool } from '../..'
+
+import { PlatformVideoSource } from '../../utils/platform'
+
+/**
+ * 用于过滤直接从B站api获取到的弹幕中去除dmid重复的弹幕
+ */
+export default function bili_dedupe(that: UniPool): UniPool {
+  that.dans.forEach((d) => {
+    if (d.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<bigint, UniDM>()
+  that.dans.forEach((d) => map.set(d.extra.bili!.dmid!, d)) // 已由上方的检查保证存在
+  that.dans = [...map.values()]
+  return that
+}

package/src/plugins/index.ts

@@ -0,0 +1,3 @@
+import bili_dedupe from './bili-dedupe'
+
+export { bili_dedupe }

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

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v2.10.1 with parameter "target=ts"
+// @generated by protoc-gen-es v2.11.0 with parameter "target=ts"
 // @generated from file bili/dm.proto (package bilibili.community.service.dm.v1, syntax proto3)
 /* eslint-disable */
 

package/src/proto/gen/danuni_pb.ts

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v2.10.1 with parameter "target=ts"
+// @generated by protoc-gen-es v2.11.0 with parameter "target=ts"
 // @generated from file danuni.proto (package danuni.danmaku.v1, syntax proto3)
 /* eslint-disable */
 

package/src/utils/dm-gen.test.ts

@@ -88,8 +88,8 @@ describe('其它', () => {
     const c = pool.dans[1].isSameAs(pool.dans[3])
     console.info(a, b, c)
     expect(a).toBe(false)
-    expect(b).toBe(true)
-    expect(c).toBe(true)
+    expect(b).toBe(false)
+    expect(c).toBe(false)
   })
   it('比较(extra)', () => {
     const commonSample = {

package/src/utils/dm-gen.ts

@@ -160,7 +160,7 @@ interface DMBili {
   mode: number // xml 1
   fontsize: number // xml 2
   color: number // xml 3
-  mid?: number // 仅创作中心源
+  mid?: bigint // 仅创作中心源
   midHash: string // xml 6
   /**
    * 特殊类型解析：
@@ -204,7 +204,7 @@ interface DMArtplayer {
   style?: object
 }
 interface DMDDplay {
-  cid: number
+  cid: bigint
   /**
    * content
    */
@@ -241,7 +241,7 @@ interface ExtraBili {
   pool?: number //原弹幕池
   dmid?: bigint //原弹幕ID
   attr?: number //原弹幕属性
-  mid?: number //发送者mid(仅创作中心源)
+  mid?: bigint //发送者mid(仅创作中心源)
   adv?: string
   code?: string
   bas?: string
@@ -572,6 +572,31 @@ export class UniDM {
       (this.extra.danuni?.merge || dan.extra.danuni?.merge)
     )
       return false
+    // 如果是bili弹幕，则以dmid判断是否相同
+    if (this.extra.bili?.dmid && dan.extra.bili?.dmid) {
+      // 当来源不同(标准源/创作中心源)时，视为不同弹幕
+      if (
+        (this.extra.bili.dmid && !dan.extra.bili.dmid) ||
+        (!this.extra.bili.dmid && dan.extra.bili.dmid)
+      )
+        return false
+      if (this.extra.bili.dmid === dan.extra.bili.dmid) return true
+      else return false
+    }
+    // 如果是artplayer弹幕，需额外比较extra项目
+    if (
+      (this.extra.artplayer && !dan.extra.artplayer) ||
+      (!this.extra.artplayer && dan.extra.artplayer)
+    )
+      return false
+    else if (
+      this.extra.artplayer &&
+      dan.extra.artplayer &&
+      (this.extra.artplayer.border !== dan.extra.artplayer.border ||
+        JSON.stringify(this.extra.artplayer.style) !==
+          JSON.stringify(dan.extra.artplayer.style))
+    )
+      return false
     const isSame = (k: keyof UniDMObj) => this[k] === dan[k]
     const checks = (
       [
@@ -1042,8 +1067,8 @@ export class UniDM {
       uid: this.senderID,
       m: this.content,
       cid: this.DMID
-        ? Number.parseInt(Buffer.from(this.DMID).toString('hex'), 16)
-        : 0,
+        ? BigInt(`0x${Buffer.from(this.DMID).toString('hex')}`)
+        : 0n,
     }
   }
 }

package/dist/{src → browser/src}/ass-gen/util/index.d.ts

@@ -1,4 +1,4 @@
 export { decimalColorToRGB, formatColor, getDecoratingColor, hexColorToRGB, isWhite, } from './color';
-export { layoutDanmaku } from './layout';
-export { arrayOfLength, assign, uniqueArray } from './lang';
 export { DanmakuList2UniPool, UniPool2DanmakuLists } from './danconvert';
+export { arrayOfLength, assign, uniqueArray } from './lang';
+export { layoutDanmaku } from './layout';