@dan-uni/dan-any 0.5.0 → 0.6.8

package/src/index.ts

@@ -1,4 +1,7 @@
+import 'reflect-metadata/lite'
+
 import { XMLBuilder, XMLParser } from 'fast-xml-parser'
+import JSONbig from 'json-bigint'
 import type { Options as AssGenOptions } from './ass-gen'
 import type { CommandDm as DM_JSON_BiliCommandGrpc } from './proto/gen/bili/dm_pb'
 
@@ -24,6 +27,10 @@ import { UniID as ID } from './utils/id-gen'
 import * as UniIDTools from './utils/id-gen'
 import * as platform from './utils/platform'
 
+const JSON = JSONbig({
+  useNativeBigInt: true,
+})
+
 export interface DM_XML_Bili {
   i: {
     chatserver: string
@@ -273,7 +280,7 @@ export class UniPool {
       ]
     >(
       ([result, cache, mergeObj], danmaku) => {
-        const key = ['SOID', 'content', 'mode', 'platform', 'pool']
+        const key = ['content', 'mode', 'platform', 'pool']
           .map((k) => danmaku[k as keyof UniDM])
           .join('|')
         const cached = cache[key]
@@ -281,7 +288,7 @@ export class UniPool {
         if (
           cached &&
           danmaku.progress - lastAppearTime <= lifetime &&
-          danmaku.isSameAs(cached)
+          danmaku.isSameAs(cached, { skipDanuniMerge: true })
         ) {
           const senders = mergeObj[key].senders
           senders.push(danmaku.senderID)
@@ -289,7 +296,9 @@ export class UniPool {
           extra.danuni = extra.danuni || {}
           extra.danuni.merge = {
             count: senders.length,
-            duration: danmaku.progress - cached.progress,
+            duration: Number.parseFloat(
+              (danmaku.progress - cached.progress).toFixed(3),
+            ),
             senders,
             taolu_count: senders.length,
             taolu_senders: senders,
@@ -321,7 +330,7 @@ export class UniPool {
     // 处理结果，删除senders<=1的merge字段
     const [result, _cache, mergeObj] = mergeContext
     result.forEach((danmaku, i) => {
-      const key = ['SOID', 'content', 'mode', 'platform', 'pool']
+      const key = ['content', 'mode', 'platform', 'pool']
         .map((k) => danmaku[k as keyof UniDM])
         .join('|')
       const extra = result[i].extra,
@@ -349,8 +358,8 @@ export class UniPool {
         } else {
           result[i].senderID = 'merge[bot]@dan-any'
           result[i].attr
-            ? result[i].attr.push('Protect')
-            : (result[i].attr = ['Protect'])
+            ? result[i].attr.push(UniDMTools.DMAttr.Protect)
+            : (result[i].attr = [UniDMTools.DMAttr.Protect])
         }
       }
     })
@@ -389,24 +398,14 @@ export class UniPool {
   static fromPb(bin: Uint8Array | ArrayBuffer) {
     const data = fromBinary(DanmakuReplySchema, new Uint8Array(bin))
     return new UniPool(
-      data.danmakus.map(
-        (d) =>
-          new UniDM(
-            d.SOID,
-            d.progress,
-            d.mode as number,
-            d.fontsize,
-            d.color,
-            d.senderID,
-            d.content,
-            timestampDate(d.ctime || timestampNow()),
-            d.weight,
-            d.pool as number,
-            d.attr as UniDMTools.DMAttr[],
-            d.platform,
-            d.extra,
-            d.DMID,
-          ),
+      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[],
+        }),
       ),
     )
   }
@@ -443,35 +442,41 @@ export class UniPool {
       oriData: DM_XML_Bili = parser.parse(xml),
       dans = oriData.i.d
     return new UniPool(
-      dans.map((d) => {
-        const p_str = d['@_p'],
-          p_arr = p_str.split(',')
-        return UniDM.fromBili(
-          {
-            content: d['#text'],
-            progress: Number.parseFloat(p_arr[0]),
-            mode: Number.parseInt(p_arr[1]),
-            fontsize: Number.parseInt(p_arr[2]),
-            color: Number.parseInt(p_arr[3]),
-            ctime: BigInt(p_arr[4]),
-            pool: Number.parseInt(p_arr[5]),
-            midHash: p_arr[6],
-            id: BigInt(p_arr[7]),
-            weight: Number.parseInt(p_arr[8]),
-          },
-          BigInt(oriData.i.chatid),
-        )
-      }),
+      dans
+        .map((d) => {
+          const p_str = d['@_p'],
+            p_arr = p_str.split(',')
+          return UniDM.fromBili(
+            {
+              content: d['#text'],
+              progress: Number.parseFloat(p_arr[0]),
+              mode: Number.parseInt(p_arr[1]),
+              fontsize: Number.parseInt(p_arr[2]),
+              color: Number.parseInt(p_arr[3]),
+              ctime: BigInt(p_arr[4]),
+              pool: Number.parseInt(p_arr[5]),
+              midHash: p_arr[6],
+              id: BigInt(p_arr[7]),
+              weight: Number.parseInt(p_arr[8]),
+            },
+            BigInt(oriData.i.chatid),
+          )
+        })
+        .filter((d) => d !== null),
     )
   }
   toBiliXML(): string {
     const genCID = (id: string) => {
       const UniID = ID.fromString(id)
       if (UniID.domain === platform.PlatformVideoSource.Bilibili) {
-        const cid = Number(UniID.id.replaceAll('def::', ''))
+        const cid = UniID.id.replaceAll(
+          `def_${platform.PlatformVideoSource.Bilibili}+`,
+          '',
+        )
+
         if (cid) return cid
       }
-      return Number.parseInt(Buffer.from(id).toString('hex'), 16)
+      return Number.parseInt(Buffer.from(id).toString('hex'), 16).toString()
     }
     const builder = new XMLBuilder({ ignoreAttributes: false })
     return builder.build({

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

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v2.6.0 with parameter "target=ts"
+// @generated by protoc-gen-es v2.6.2 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.6.0 with parameter "target=ts"
+// @generated by protoc-gen-es v2.6.2 with parameter "target=ts"
 // @generated from file danuni.proto (package danuni.danmaku.v1, syntax proto3)
 /* eslint-disable */
 

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

@@ -114,13 +114,16 @@ describe('其它', () => {
       UniDM.create({ ...commonSample }),
       UniDM.create({ ...commonSample, extra: { artplayer: { border: true } } }),
     ]
+    let counter = 0
     for (const pool of pool2) {
       console.info(pool.extraStr)
       console.info(pool2[0].isSameAs(pool))
+      if (counter <= 2) expect(pool2[0].extraStr).toBe(undefined)
+      counter++
     }
     expect(pool2[0].isSameAs(pool2[1])).toBe(true)
     expect(pool2[0].isSameAs(pool2[2])).toBe(true)
-    expect(pool2[0].isSameAs(pool2[3])).toBe(true)
+    expect(pool2[0].isSameAs(pool2[3])).toBe(false)
     expect(pool2[0].isSameAs(pool2[4])).toBe(false)
   })
 })