@dan-uni/dan-any 0.2.6 → 0.4.8

package/src/index.ts

@@ -1,8 +1,6 @@
-import { XMLParser } from 'fast-xml-parser'
+import { XMLBuilder, XMLParser } from 'fast-xml-parser'
 import type { Options as AssGenOptions } from './ass-gen'
 import type { CommandDm as DM_JSON_BiliCommandGrpc } from './proto/gen/bili/dm_pb'
-// import type * as UniDMType from './utils/dm-gen'
-import type { platfrom } from './utils/id-gen'
 
 import { create, fromBinary, toBinary } from '@bufbuild/protobuf'
 import {
@@ -22,7 +20,9 @@ import { DanmakuReplySchema } from './proto/gen/danuni_pb'
 
 import { UniDM } from './utils/dm-gen'
 import * as UniDMTools from './utils/dm-gen'
+import { UniID as ID } from './utils/id-gen'
 import * as UniIDTools from './utils/id-gen'
+import * as platform from './utils/platform'
 
 export interface DM_XML_Bili {
   i: {
@@ -48,11 +48,11 @@ export interface DM_JSON_Dplayer {
 }
 export interface DM_JSON_Artplayer {
   text: string // 弹幕文本
-  time?: number // 弹幕时间, 默认为当前播放器时间
-  mode?: number // 弹幕模式: 0: 滚动(默认)，1: 顶部，2: 底部
+  time?: number // 弹幕时间，默认为当前播放器时间
+  mode?: number // 弹幕模式：0: 滚动 (默认)，1: 顶部，2: 底部
   color?: string // 弹幕颜色，默认为白色
-  border?: boolean // 弹幕是否有描边, 默认为 false
-  style?: {} // 弹幕自定义样式, 默认为空对象
+  border?: boolean // 弹幕是否有描边，默认为 false
+  style?: {} // 弹幕自定义样式，默认为空对象
 }
 export interface DM_JSON_DDPlay {
   count: number | string
@@ -78,22 +78,143 @@ export type DM_format =
 type shareItems = Partial<
   Pick<
     UniDMTools.UniDMObj,
-    'FCID' | 'senderID' | 'platform' | 'SPMO' | 'pool' | 'mode'
+    'SOID' | 'senderID' | 'platform' | 'SOID' | 'pool' | 'mode' | 'color'
   >
 >
 
+type UniPoolPipe = (that: UniPool) => Promise<UniPool>
+type UniPoolPipeSync = (that: UniPool) => UniPool
+
+interface Options {
+  dedupe?: boolean
+}
+
 export class UniPool {
-  readonly shared: shareItems = {}
-  constructor(public dans: UniDM[]) {
-    function isShared(key: keyof UniDMTools.UniDMObj) {
-      return new Set(dans.map((d) => d[key])).size === 1
+  constructor(
+    public dans: UniDM[],
+    public options: Options = {},
+  ) {
+    if (options.dedupe !== false) options.dedupe = true
+    if (this.options.dedupe) this.dedupe()
+  }
+  async pipe(fn: UniPoolPipe): Promise<UniPool> {
+    return fn(this)
+  }
+  pipeSync(fn: UniPoolPipeSync): UniPool {
+    return fn(this)
+  }
+  get shared(): shareItems {
+    const isShared = (key: keyof UniDMTools.UniDMObj) => {
+      return this.dans.every((d) => d[key])
+    }
+    return {
+      SOID: isShared('SOID') ? this.dans[0].SOID : undefined,
+      senderID: isShared('senderID') ? this.dans[0].senderID : undefined,
+      platform: isShared('platform') ? this.dans[0].platform : undefined,
+      pool: isShared('pool') ? this.dans[0].pool : undefined,
+      mode: isShared('mode') ? this.dans[0].mode : undefined,
+      color: isShared('color') ? this.dans[0].color : undefined,
+    }
+  }
+  get stat() {
+    const default_stat = {
+      SOID: [] as { val: string; count: number }[],
+      mode: [
+        { val: UniDMTools.Modes.Normal, count: 0 },
+        { val: UniDMTools.Modes.Bottom, count: 0 },
+        { val: UniDMTools.Modes.Top, count: 0 },
+        { val: UniDMTools.Modes.Reverse, count: 0 },
+        { val: UniDMTools.Modes.Ext, count: 0 },
+      ],
+      fontsize: [
+        // { val: 18, count: 0 },
+        // { val: 25, count: 0 },
+        // { val: 36, count: 0 },
+      ] as { val: number; count: number }[],
+      color: [] as { val: number; count: number }[],
+      senderID: [] as { val: string; count: number }[],
+      content: [] as { val: string; count: number }[],
+      weight: [] as { val: number; count: number }[],
+      pool: [
+        { val: UniDMTools.Pools.Def, count: 0 },
+        { val: UniDMTools.Pools.Sub, count: 0 },
+        { val: UniDMTools.Pools.Adv, count: 0 },
+        { val: UniDMTools.Pools.Ix, count: 0 },
+      ],
+      platform: [] as { val?: string; count: number }[],
+    }
+    type Stat = typeof default_stat
+    const stat = this.dans.reduce((s, d): Stat => {
+      const SOID = s.SOID.find((i) => i.val === d.SOID)
+      if (!SOID) {
+        s.SOID.push({ val: d.SOID, count: 1 })
+      } else {
+        SOID.count++
+      }
+      const mode = s.mode.find((i) => i.val === d.mode)
+      if (!mode) {
+        s.mode.push({ val: d.mode, count: 1 })
+      } else {
+        mode.count++
+      }
+      const fontsize = s.fontsize.find((i) => i.val === d.fontsize)
+      if (!fontsize) {
+        s.fontsize.push({ val: d.fontsize, count: 1 })
+      } else {
+        fontsize.count++
+      }
+      const color = s.color.find((i) => i.val === d.color)
+      if (!color) {
+        s.color.push({ val: d.color, count: 1 })
+      } else {
+        color.count++
+      }
+      const senderID = s.senderID.find((i) => i.val === d.senderID)
+      if (!senderID) {
+        s.senderID.push({ val: d.senderID, count: 1 })
+      } else {
+        senderID.count++
+      }
+      const content = s.content.find((i) => i.val === d.content)
+      if (!content) {
+        s.content.push({ val: d.content, count: 1 })
+      } else {
+        content.count++
+      }
+      const weight = s.weight.find((i) => i.val === d.weight)
+      if (!weight) {
+        s.weight.push({ val: d.weight, count: 1 })
+      } else {
+        weight.count++
+      }
+      const pool = s.pool.find((i) => i.val === d.pool)
+      if (!pool) {
+        s.pool.push({ val: d.pool, count: 1 })
+      } else {
+        pool.count++
+      }
+      const platform = s.platform.find((i) => i.val === d.platform)
+      if (!platform) {
+        s.platform.push({ val: d.platform, count: 1 })
+      } else {
+        platform.count++
+      }
+      return s
+    }, default_stat)
+    return stat
+  }
+  get most() {
+    const s = this.stat
+    return {
+      mode: s.mode.sort((a, b) => b.count - a.count)[0].val,
+      fontsize: s.fontsize.sort((a, b) => b.count - a.count)[0].val,
+      color: s.color.sort((a, b) => b.count - a.count)[0].val,
+      senderID: s.senderID.sort((a, b) => b.count - a.count)[0].val,
+      content: s.content.sort((a, b) => b.count - a.count)[0].val,
+      weight: s.weight.sort((a, b) => b.count - a.count)[0].val,
+      pool: s.pool.sort((a, b) => b.count - a.count)[0].val,
+      platform: s.platform.sort((a, b) => b.count - a.count)[0].val,
     }
-    if (isShared('FCID')) this.shared.FCID = dans[0].FCID
-    if (isShared('senderID')) this.shared.senderID = dans[0].senderID
-    if (isShared('platform')) this.shared.platform = dans[0].platform
-    if (isShared('SPMO')) this.shared.SPMO = dans[0].SPMO
-    if (isShared('pool')) this.shared.pool = dans[0].pool
-    if (isShared('mode')) this.shared.mode = dans[0].mode
   }
   static create() {
     return new UniPool([])
@@ -117,17 +238,29 @@ export class UniPool {
     if (this.shared[key]) return [this]
     const set = new Set(this.dans.map((d) => d[key]))
     return [...set].map((v) => {
-      return new UniPool(this.dans.filter((d) => d[key] === v))
+      return new UniPool(
+        this.dans.filter((d) => d[key] === v),
+        { dedupe: false },
+      )
     })
   }
+  /**
+   * 基于DMID的基本去重功能，用于解决该class下dans为array而非Set的问题
+   */
+  private dedupe() {
+    const map = new Map()
+    this.dans.forEach((d) => map.set(d.DMID || d.toDMID(), d))
+    this.dans = [...map.values()]
+    this.options.dedupe = false
+  }
   /**
    * 合并一定时间段内的重复弹幕，防止同屏出现过多
-   * @param lifetime 查重时间区段，单位秒 (默认为0，表示不查重)
+   * @param lifetime 查重时间区段，单位秒 (默认为 0，表示不查重)
    */
   merge(lifetime = 0) {
-    if (!this.shared.FCID) {
+    if (!this.shared.SOID) {
       console.error(
-        "本功能仅支持同弹幕库内使用，可先 .split('FCID') 在分别使用",
+        "本功能仅支持同弹幕库内使用，可先 .split('SOID') 在分别使用",
       )
       return this
     }
@@ -140,7 +273,7 @@ export class UniPool {
       ]
     >(
       ([result, cache, mergeObj], danmaku) => {
-        const key = ['content', 'mode', 'platform', 'pool', 'SPMO']
+        const key = ['SOID', 'content', 'mode', 'platform', 'pool']
           .map((k) => danmaku[k as keyof UniDM])
           .join('|')
         const cached = cache[key]
@@ -158,6 +291,8 @@ export class UniPool {
             count: senders.length,
             duration: danmaku.progress - cached.progress,
             senders,
+            taolu_count: senders.length,
+            taolu_senders: senders,
           }
           danmaku.extraStr = JSON.stringify(extra)
           cache[key] = danmaku
@@ -168,6 +303,8 @@ export class UniPool {
             count: 1,
             duration: 0,
             senders: [danmaku.senderID],
+            taolu_count: 1,
+            taolu_senders: [danmaku.senderID],
           }
           cache[key] = danmaku
           // 初始化merge信息，包含第一个sender
@@ -184,7 +321,7 @@ export class UniPool {
     // 处理结果，删除senders<=1的merge字段
     const [result, _cache, mergeObj] = mergeContext
     result.forEach((danmaku, i) => {
-      const key = ['content', 'mode', 'platform', 'pool', 'SPMO']
+      const key = ['SOID', 'content', 'mode', 'platform', 'pool']
         .map((k) => danmaku[k as keyof UniDM])
         .join('|')
       const extra = result[i].extra,
@@ -210,7 +347,10 @@ export class UniPool {
               ? JSON.stringify(updatedExtra)
               : undefined
         } else {
-          result[i].senderID = 'merge@bot'
+          result[i].senderID = 'merge[bot]@dan-any'
+          result[i].attr
+            ? result[i].attr.push('Protect')
+            : (result[i].attr = ['Protect'])
         }
       }
     })
@@ -252,7 +392,7 @@ export class UniPool {
       data.danmakus.map(
         (d) =>
           new UniDM(
-            d.FCID,
+            d.SOID,
             d.progress,
             d.mode as number,
             d.fontsize,
@@ -264,7 +404,6 @@ export class UniPool {
             d.pool as number,
             d.attr as UniDMTools.DMAttr[],
             d.platform,
-            d.SPMO,
             d.extra,
             d.DMID,
           ),
@@ -280,7 +419,7 @@ export class UniPool {
       create(DanmakuReplySchema, {
         danmakus: this.dans.map((d) => {
           return {
-            FCID: d.FCID,
+            SOID: d.SOID,
             DMID: d.DMID,
             progress: d.progress,
             mode: d.mode as number,
@@ -293,14 +432,13 @@ export class UniPool {
             pool: d.pool as number,
             attr: d.attr,
             platform: d.platform,
-            SPMO: d.SPMO,
             extra: d.extraStr,
           }
         }),
       }),
     )
   }
-  static fromBiliXML(xml: string, SPMO?: string) {
+  static fromBiliXML(xml: string) {
     const parser = new XMLParser({ ignoreAttributes: false }),
       oriData: DM_XML_Bili = parser.parse(xml),
       dans = oriData.i.d
@@ -321,32 +459,56 @@ export class UniPool {
             id: BigInt(p_arr[7]),
             weight: Number.parseInt(p_arr[8]),
           },
-          SPMO,
           BigInt(oriData.i.chatid),
         )
       }),
     )
   }
-  static fromBiliGrpc(bin: Uint8Array | ArrayBuffer, SPMO?: string) {
+  toBiliXML(): string {
+    const genCID = (id: string) => {
+      const UniID = ID.fromString(id)
+      if (UniID.domain === platform.PlatformVideoSource.Bilibili) {
+        const cid = Number(UniID.id.replaceAll('def::', ''))
+        if (cid) return cid
+      }
+      return Number.parseInt(Buffer.from(id).toString('hex'), 16)
+    }
+    const builder = new XMLBuilder({ ignoreAttributes: false })
+    return builder.build({
+      '?xml': {
+        '@_version': '1.0',
+        '@_encoding': 'UTF-8',
+      },
+      i: {
+        chatserver: 'chat.bilibili.com',
+        chatid: genCID(this.dans[0].SOID),
+        mission: 0,
+        maxlimit: this.dans.length,
+        state: 0,
+        real_name: 0,
+        source: 'k-v',
+        d: this.dans.map((dan) => dan.toBiliXML()),
+      },
+    })
+  }
+  static fromBiliGrpc(bin: Uint8Array | ArrayBuffer) {
     const data = fromBinary(DmSegMobileReplySchema, new Uint8Array(bin)),
       json = data.elems
     return new UniPool(
       json.map((d) => {
-        return UniDM.fromBili(d, SPMO)
+        return UniDM.fromBili({ ...d, progress: d.progress / 1000 })
       }),
     )
   }
   /**
-   *
    * @param bin 符合`DmWebViewReplySchema`(bili视频meta)的protobuf二进制
-   * @param SPMO
    */
-  static fromBiliCommandGrpc(bin: Uint8Array | ArrayBuffer, SPMO?: string) {
+  static fromBiliCommandGrpc(bin: Uint8Array | ArrayBuffer) {
     const data = fromBinary(DmWebViewReplySchema, new Uint8Array(bin)),
       json = data.commandDms
     return new UniPool(
       json.map((d) => {
-        return UniDM.fromBiliCommand(d, SPMO)
+        return UniDM.fromBiliCommand(d)
       }),
     )
   }
@@ -420,7 +582,7 @@ export class UniPool {
       }
     })
   }
-  static fromDDPlay(json: DM_JSON_DDPlay, episodeId: string, domain?: string) {
+  static fromDDPlay(json: DM_JSON_DDPlay, episodeId: string) {
     return new UniPool(
       json.comments.map((d) => {
         const p_arr = d.p.split(',')
@@ -434,7 +596,6 @@ export class UniPool {
             uid: p_arr[3],
           },
           episodeId,
-          domain,
         )
       }),
     )
@@ -456,18 +617,18 @@ export class UniPool {
     return parseAssRawField(ass)
   }
   toASS(options: AssGenOptions = { substyle: {} }): string {
-    const fn = this.shared.FCID
+    const fn = this.shared.SOID
     return generateASS(this, { filename: fn, title: fn, ...options })
   }
 }
 
 export {
+  platform,
   // UniPool,
   UniDM,
   UniDMTools,
   UniIDTools,
   type DM_JSON_BiliCommandGrpc,
-  type platfrom,
   // type UniDMType,
   // type UniIDType,
 }

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

@@ -1,9 +1,9 @@
-// @generated by protoc-gen-es v2.2.3 with parameter "target=ts"
+// @generated by protoc-gen-es v2.6.0 with parameter "target=ts"
 // @generated from file bili/dm.proto (package bilibili.community.service.dm.v1, syntax proto3)
 /* eslint-disable */
 
-import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv1";
-import { enumDesc, fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv1";
+import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";
+import { enumDesc, fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2";
 import type { Message } from "@bufbuild/protobuf";
 
 /**

package/src/proto/gen/danuni_pb.ts

@@ -1,9 +1,9 @@
-// @generated by protoc-gen-es v2.2.3 with parameter "target=ts"
+// @generated by protoc-gen-es v2.6.0 with parameter "target=ts"
 // @generated from file danuni.proto (package danuni.danmaku.v1, syntax proto3)
 /* eslint-disable */
 
-import type { GenEnum, GenFile, GenMessage } from "@bufbuild/protobuf/codegenv1";
-import { enumDesc, fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv1";
+import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";
+import { enumDesc, fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2";
 import type { Timestamp } from "@bufbuild/protobuf/wkt";
 import { file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";
 import type { Message } from "@bufbuild/protobuf";
@@ -12,16 +12,38 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file danuni.proto.
  */
 export const file_danuni: GenFile = /*@__PURE__*/
-  fileDesc("CgxkYW51bmkucHJvdG8SEWRhbnVuaS5kYW5tYWt1LnYxIt4CCgdEYW5tYWt1EgwKBEZDSUQYASABKAkSDAoERE1JRBgCIAEoCRIQCghwcm9ncmVzcxgDIAEoBRIlCgRtb2RlGAQgASgOMhcuZGFudW5pLmRhbm1ha3UudjEuTW9kZRIQCghmb250c2l6ZRgFIAEoBRINCgVjb2xvchgGIAEoBRIQCghzZW5kZXJJRBgHIAEoCRIPCgdjb250ZW50GAggASgJEikKBWN0aW1lGAkgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIOCgZ3ZWlnaHQYCiABKAUSJQoEcG9vbBgLIAEoDjIXLmRhbnVuaS5kYW5tYWt1LnYxLlBvb2wSDAoEYXR0chgMIAMoCRIQCghwbGF0Zm9ybRgNIAEoCRIRCgRTUE1PGA4gASgJSACIAQESEgoFZXh0cmEYDyABKAlIAYgBAUIHCgVfU1BNT0IICgZfZXh0cmEiPAoMRGFubWFrdVJlcGx5EiwKCGRhbm1ha3VzGAEgAygLMhouZGFudW5pLmRhbm1ha3UudjEuRGFubWFrdSo9CgRNb2RlEgoKBk5vcm1hbBAAEgoKBkJvdHRvbRABEgcKA1RvcBACEgsKB1JldmVyc2UQAxIHCgNFeHQQBCopCgRQb29sEgcKA0RlZhAAEgcKA1N1YhABEgcKA0FkdhACEgYKAkl4EANQAGIGcHJvdG8z", [file_google_protobuf_timestamp]);
+  fileDesc("CgxkYW51bmkucHJvdG8SEWRhbnVuaS5kYW5tYWt1LnYxIjIKCmxpc3REYW5SZXESCgoCSUQYASABKAkSEAoDc2VnGAIgASgFSACIAQFCBgoEX3NlZyLCAgoHRGFubWFrdRIMCgRTT0lEGAEgASgJEgwKBERNSUQYAiABKAkSEAoIcHJvZ3Jlc3MYAyABKAUSJQoEbW9kZRgEIAEoDjIXLmRhbnVuaS5kYW5tYWt1LnYxLk1vZGUSEAoIZm9udHNpemUYBSABKAUSDQoFY29sb3IYBiABKAUSEAoIc2VuZGVySUQYByABKAkSDwoHY29udGVudBgIIAEoCRIpCgVjdGltZRgJIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASDgoGd2VpZ2h0GAogASgFEiUKBHBvb2wYCyABKA4yFy5kYW51bmkuZGFubWFrdS52MS5Qb29sEgwKBGF0dHIYDCADKAkSEAoIcGxhdGZvcm0YDSABKAkSEgoFZXh0cmEYDiABKAlIAIgBAUIICgZfZXh0cmEiPAoMRGFubWFrdVJlcGx5EiwKCGRhbm1ha3VzGAEgAygLMhouZGFudW5pLmRhbm1ha3UudjEuRGFubWFrdSo9CgRNb2RlEgoKBk5vcm1hbBAAEgoKBkJvdHRvbRABEgcKA1RvcBACEgsKB1JldmVyc2UQAxIHCgNFeHQQBCopCgRQb29sEgcKA0RlZhAAEgcKA1N1YhABEgcKA0FkdhACEgYKAkl4EAMyXQoORGFubWFrdVNlcnZpY2USSwoHbGlzdERhbhIdLmRhbnVuaS5kYW5tYWt1LnYxLmxpc3REYW5SZXEaHy5kYW51bmkuZGFubWFrdS52MS5EYW5tYWt1UmVwbHkiAFAAYgZwcm90bzM", [file_google_protobuf_timestamp]);
+
+/**
+ * @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 const listDanReqSchema: GenMessage<listDanReq> = /*@__PURE__*/
+  messageDesc(file_danuni, 0);
 
 /**
  * @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;
@@ -84,12 +106,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;
 };
@@ -99,7 +116,7 @@ export type Danmaku = Message<"danuni.danmaku.v1.Danmaku"> & {
  * Use `create(DanmakuSchema)` to create a new message.
  */
 export const DanmakuSchema: GenMessage<Danmaku> = /*@__PURE__*/
-  messageDesc(file_danuni, 0);
+  messageDesc(file_danuni, 1);
 
 /**
  * @generated from message danuni.danmaku.v1.DanmakuReply
@@ -116,7 +133,7 @@ export type DanmakuReply = Message<"danuni.danmaku.v1.DanmakuReply"> & {
  * Use `create(DanmakuReplySchema)` to create a new message.
  */
 export const DanmakuReplySchema: GenMessage<DanmakuReply> = /*@__PURE__*/
-  messageDesc(file_danuni, 1);
+  messageDesc(file_danuni, 2);
 
 /**
  * @generated from enum danuni.danmaku.v1.Mode
@@ -185,3 +202,18 @@ export enum Pool {
 export const PoolSchema: GenEnum<Pool> = /*@__PURE__*/
   enumDesc(file_danuni, 1);
 
+/**
+ * @generated from service danuni.danmaku.v1.DanmakuService
+ */
+export const DanmakuService: GenService<{
+  /**
+   * @generated from rpc danuni.danmaku.v1.DanmakuService.listDan
+   */
+  listDan: {
+    methodKind: "unary";
+    input: typeof listDanReqSchema;
+    output: typeof DanmakuReplySchema;
+  },
+}> = /*@__PURE__*/
+  serviceDesc(file_danuni, 0);
+

package/src/proto/src/danuni.proto

@@ -4,6 +4,15 @@ package danuni.danmaku.v1;
 
 import public "google/protobuf/timestamp.proto";
 
+service DanmakuService {
+  rpc listDan (listDanReq) returns (DanmakuReply) {}
+}
+
+message listDanReq {
+  string ID = 1;
+  optional int32 seg = 2;
+}
+
 enum Mode {
   Normal = 0;
   Bottom = 1;
@@ -20,7 +29,7 @@ enum Pool {
 }
 
 message Danmaku {
-  string FCID = 1;
+  string SOID = 1;
   string DMID = 2;
   int32 progress = 3;
   Mode mode = 4;
@@ -33,8 +42,7 @@ message Danmaku {
   Pool pool = 11;
   repeated string attr = 12;
   string platform = 13;
-  optional string SPMO = 14;
-  optional string extra = 15;
+  optional string extra = 14;
 }
 
 message DanmakuReply {

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

@@ -1,4 +1,3 @@
-//基于以下注释，根据vitest生成测试用例
 import { describe, expect, it } from 'vitest'
 import type { UniDMObj } from './dm-gen'
 
@@ -24,7 +23,15 @@ describe('弹幕降级', () => {
     UniDM.create({
       content: 'test',
       extra: {
-        danuni: { merge: { count: 100, duration: 10, senders: [] } },
+        danuni: {
+          merge: {
+            count: 100,
+            duration: 10,
+            senders: [],
+            taolu_count: 100,
+            taolu_senders: [],
+          },
+        },
       },
     }),
     UniDM.create({
@@ -86,7 +93,7 @@ describe('其它', () => {
   })
   it('比较(extra)', () => {
     const commonSample = {
-      FCID: 'test@du',
+      SOID: 'test@du',
       content: 'T Sample',
       extra: {
         danuni: {
@@ -94,6 +101,8 @@ describe('其它', () => {
             count: 1,
             duration: 0,
             senders: ['test@du'],
+            taolu_count: 1,
+            taolu_senders: ['test@du'],
           },
         },
       },