@dan-uni/dan-any 0.9.8 → 1.0.0

package/dist/src/index.d.ts

@@ -116,17 +116,18 @@ export interface DM_JSON_DDPlay {
         m: string;
     }[];
 }
-export type DM_format = 'danuni.json' | 'danuni.pb.bin' | 'bili.xml' | 'bili.pb.bin' | 'bili.cmd.pb.bin' | 'dplayer.json' | 'artplayer.json' | 'ddplay.json' | 'common.ass';
+export type DM_format = 'danuni.json' | 'danuni.pb.bin' | 'bili.xml' | 'bili.pb.bin' | 'bili.cmd.pb.bin' | 'bili.up.json' | 'dplayer.json' | 'artplayer.json' | 'ddplay.json' | 'common.ass';
 type shareItems = Partial<Pick<UniDMTools.UniDMObj, 'SOID' | 'senderID' | 'platform' | 'SOID' | 'pool' | 'mode' | 'color'>>;
 type statItems = Partial<Pick<UniDMTools.UniDMObj, 'SOID' | 'mode' | 'fontsize' | 'color' | 'senderID' | 'content' | 'weight' | 'pool' | 'platform'>>;
-interface Stat {
-    val: statItems[keyof statItems];
-    count: number;
-}
+type Stats<T extends keyof statItems> = Map<statItems[T], number>;
 type UniPoolPipe = (that: UniPool) => Promise<UniPool>;
 type UniPoolPipeSync = (that: UniPool) => UniPool;
 export interface Options {
     dedupe?: boolean;
+    /**
+     * @description
+     * 当为`false`时，关闭DMID生成; 当为正整数时，表示生成DMID的截取位数; 或可传入一个DMID生成器实例
+     */
     dmid?: boolean | number | UniIDTools.DMIDGenerator;
 }
 export declare class UniPool {
@@ -146,10 +147,19 @@ export declare class UniPool {
     });
     pipe(fn: UniPoolPipe): Promise<UniPool>;
     pipeSync(fn: UniPoolPipeSync): UniPool;
+    /**
+     * @deprecated 使用 `getShared` 代替
+     */
     get shared(): shareItems;
-    getShared(key: keyof shareItems): shareItems[keyof shareItems];
-    getStat(key: keyof statItems): Stat[];
-    getMost(key: keyof statItems): Stat;
+    getShared<K extends keyof shareItems>(key: K): shareItems[K];
+    getStat<K extends keyof statItems>(key: K): Stats<K>;
+    getMost<K extends keyof statItems>(key: K): {
+        val: Partial<Pick<UniDMTools.UniDMObj, "SOID" | "mode" | "fontsize" | "color" | "senderID" | "content" | "weight" | "pool" | "platform">>[K] | undefined;
+        count: number;
+    };
+    /**
+     * @deprecated 使用 `getMost` 代替
+     */
     get most(): {
         mode: UniDMTools.Modes;
         fontsize: number;

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

@@ -76,9 +76,9 @@ export type Danmaku = Message<"danuni.danmaku.v1.Danmaku"> & {
      */
     attr: string[];
     /**
-     * @generated from field: string platform = 13;
+     * @generated from field: optional string platform = 13;
      */
-    platform: string;
+    platform?: string;
     /**
      * @generated from field: optional string extra = 14;
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dan-uni/dan-any",
-  "version": "0.9.8",
+  "version": "1.0.0",
   "description": "A danmaku transformer lib, supporting danmaku from different platforms.",
   "type": "module",
   "keywords": [
@@ -32,11 +32,11 @@
     "buf": "buf generate"
   },
   "dependencies": {
-    "@bufbuild/protobuf": "^2.9.0",
+    "@bufbuild/protobuf": "^2.10.1",
     "base16384": "^1.0.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.2",
-    "fast-xml-parser": "^5.3.0",
+    "fast-xml-parser": "^5.3.2",
     "fs-extra": "^11.3.2",
     "hh-mm-ss": "^1.2.0",
     "json-bigint": "^1.0.0",
@@ -44,8 +44,8 @@
     "reflect-metadata": "^0.2.2"
   },
   "devDependencies": {
-    "@bufbuild/buf": "^1.58.0",
-    "@bufbuild/protoc-gen-es": "^2.9.0",
+    "@bufbuild/buf": "^1.60.0",
+    "@bufbuild/protoc-gen-es": "^2.10.1",
     "@types/fs-extra": "^11.0.4",
     "@types/hh-mm-ss": "^1.2.3",
     "@types/json-bigint": "^1.0.4",

package/src/ass-gen/ass/dialogue.ts

@@ -34,11 +34,11 @@ const scrollCommand = ({
   start: number
   end: number
   top: number
-}) => `\\move(${start},${top},${end},${top})`
+}) => String.raw`\move(${start},${top},${end},${top})`
 const fixCommand = ({ top, left }: { top: number; left: number }) =>
-  `\\an8\\pos(${left},${top})`
-const colorCommand = (color: RGB) => `\\c${formatColor(color)}`
-const borderColorCommand = (color: RGB) => `\\3c${formatColor(color)}`
+  String.raw`\an8\pos(${left},${top})`
+const colorCommand = (color: RGB) => String.raw`\c${formatColor(color)}`
+const borderColorCommand = (color: RGB) => String.raw`\3c${formatColor(color)}`
 
 export const dialogue = (
   danmaku: {

package/src/index.ts

@@ -157,6 +157,7 @@ export type DM_format =
   | 'bili.xml'
   | 'bili.pb.bin'
   | 'bili.cmd.pb.bin'
+  | 'bili.up.json'
   | 'dplayer.json'
   | 'artplayer.json'
   | 'ddplay.json'
@@ -182,16 +183,17 @@ type statItems = Partial<
     | 'platform'
   >
 >
-interface Stat {
-  val: statItems[keyof statItems]
-  count: number
-}
+type Stats<T extends keyof statItems> = Map<statItems[T], number>
 
 type UniPoolPipe = (that: UniPool) => Promise<UniPool>
 type UniPoolPipeSync = (that: UniPool) => UniPool
 
 export interface Options {
   dedupe?: boolean
+  /**
+   * @description
+   * 当为`false`时，关闭DMID生成; 当为正整数时，表示生成DMID的截取位数; 或可传入一个DMID生成器实例
+   */
   dmid?: boolean | number | UniIDTools.DMIDGenerator
 }
 
@@ -215,51 +217,109 @@ export class UniPool {
   pipeSync(fn: UniPoolPipeSync): UniPool {
     return fn(this)
   }
+  /**
+   * @deprecated 使用 `getShared` 代替
+   */
   get shared(): shareItems {
-    const isShared = (key: keyof UniDMTools.UniDMObj) => {
-      return this.dans.every((d) => d[key])
+    if (this.dans.length === 0) return {}
+    const keys: (keyof shareItems)[] = [
+      'SOID',
+      'senderID',
+      'platform',
+      'pool',
+      'mode',
+      'color',
+    ]
+    const result: shareItems = {} as shareItems
+    for (const key of keys) {
+      const sharedVal = this.getShared(key)
+      if (sharedVal !== undefined) {
+        result[key] = sharedVal as any
+      }
     }
-    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,
+    return result
+  }
+  getShared<K extends keyof shareItems>(key: K): shareItems[K] {
+    if (this.dans.length === 0) return undefined
+    const firstVal = this.dans[0][key]
+    for (let i = 1; i < this.dans.length; i++) {
+      if (this.dans[i][key] !== firstVal) {
+        return undefined
+      }
     }
+    return firstVal
   }
-  getShared(key: keyof shareItems): shareItems[keyof shareItems] {
-    const isShared = (key: keyof UniDMTools.UniDMObj) => {
-      return this.dans.every((d) => d[key])
+  getStat<K extends keyof statItems>(key: K): Stats<K> {
+    const statMap = new Map<statItems[K], number>()
+    for (const dan of this.dans) {
+      const val = dan[key]
+      statMap.set(val, (statMap.get(val) || 0) + 1)
     }
-    return isShared(key) ? this.dans[0][key] : undefined
-  }
-  getStat(key: keyof statItems): Stat[] {
-    const default_stat: Stat[] = []
-    const stats = this.dans.reduce((stat, dan) => {
-      const valWithCount = stat.find((i) => i.val === dan[key])
-      if (valWithCount) {
-        valWithCount.count++
-      } else {
-        stat.push({ val: dan[key], count: 1 })
+    return statMap
+  }
+  getMost<K extends keyof statItems>(key: K) {
+    const stats = this.getStat(key)
+    if (stats.size === 0) return { val: undefined, count: 0 }
+    let mostVal: statItems[K] | undefined
+    let maxCount = 0
+    for (const [val, count] of stats.entries()) {
+      if (count > maxCount) {
+        maxCount = count
+        mostVal = val
       }
-      return stat
-    }, default_stat)
-    return stats
-  }
-  getMost(key: keyof statItems) {
-    return this.getStat(key).toSorted((a, b) => b.count - a.count)[0]
+    }
+    return { val: mostVal, count: maxCount }
   }
+  /**
+   * @deprecated 使用 `getMost` 代替
+   */
   get most() {
+    const keys: (keyof statItems)[] = [
+      'mode',
+      'fontsize',
+      'color',
+      'senderID',
+      'content',
+      'weight',
+      'pool',
+      'platform',
+    ]
+    const statMaps = new Map<
+      keyof statItems,
+      Map<statItems[keyof statItems], number>
+    >()
+    for (const dan of this.dans) {
+      for (const key of keys) {
+        if (!statMaps.has(key)) {
+          statMaps.set(key, new Map())
+        }
+        const statMap = statMaps.get(key)!
+        const val = dan[key]
+        statMap.set(val, (statMap.get(val) || 0) + 1)
+      }
+    }
+    const result: Record<string, any> = {}
+    for (const key of keys) {
+      const statMap = statMaps.get(key)!
+      let mostVal: statItems[keyof statItems] | undefined
+      let maxCount = 0
+      for (const [val, count] of statMap.entries()) {
+        if (count > maxCount) {
+          maxCount = count
+          mostVal = val
+        }
+      }
+      result[key] = mostVal
+    }
     return {
-      mode: this.getMost('mode').val as UniDMTools.Modes,
-      fontsize: this.getMost('fontsize').val as number,
-      color: this.getMost('color').val as number,
-      senderID: this.getMost('senderID').val as string,
-      content: this.getMost('content').val as string,
-      weight: this.getMost('weight').val as number,
-      pool: this.getMost('pool').val as UniDMTools.Pools,
-      platform: this.getMost('platform').val as string | undefined,
+      mode: result.mode as UniDMTools.Modes,
+      fontsize: result.fontsize as number,
+      color: result.color as number,
+      senderID: result.senderID as string,
+      content: result.content as string,
+      weight: result.weight as number,
+      pool: result.pool as UniDMTools.Pools,
+      platform: result.platform as string | undefined,
     }
   }
   static create(options?: Options) {
@@ -285,7 +345,7 @@ export class UniPool {
    * 按共通属性拆分弹幕库
    */
   split(key: keyof shareItems) {
-    if (this.shared[key]) return [this]
+    if (this.getShared(key)) return [this]
     const set = new Set(this.dans.map((d) => d[key]))
     return [...set].map((v) => {
       return new UniPool(
@@ -299,6 +359,7 @@ export class UniPool {
    * 基于DMID的基本去重功能，用于解决该class下dans为array而非Set的问题
    */
   private dedupe() {
+    // 这里基本上没有性能瓶颈(大文件测试与AI优化下无明显区别)
     if (this.options.dmid !== false) {
       const map = new Map()
       this.dans.forEach((d) => map.set(d.DMID || d.toDMID(), d))
@@ -311,104 +372,77 @@ export class UniPool {
    * @param lifetime 查重时间区段，单位秒 (默认为 0，表示不查重)
    */
   merge(lifetime = 0) {
-    if (!this.shared.SOID) {
+    if (!this.getShared('SOID')) {
       console.error(
         "本功能仅支持同弹幕库内使用，可先 .split('SOID') 在分别使用",
       )
       return this
     }
     if (lifetime <= 0) return this
-    const mergeContext = this.dans.reduce<
-      [
-        UniDM[],
-        Record<string, UniDM>,
-        Record<string, UniDMTools.ExtraDanUniMerge>,
-      ]
-    >(
-      ([result, cache, mergeObj], danmaku) => {
-        const key = ['content', 'mode', 'pool', 'platform']
-          .map((k) => danmaku[k as keyof UniDM])
-          .join('|')
-        const cached = cache[key]
-        const lastAppearTime = cached?.progress || 0
-        if (
-          cached &&
-          danmaku.progress - lastAppearTime <= lifetime &&
-          danmaku.isSameAs(cached, { skipDanuniMerge: true })
-        ) {
-          const senders = mergeObj[key].senders
-          senders.push(danmaku.senderID)
-          const extra = danmaku.extra
-          extra.danuni = extra.danuni || {}
-          extra.danuni.merge = {
-            count: senders.length,
-            duration: Number.parseFloat(
-              (danmaku.progress - cached.progress).toFixed(3),
-            ),
-            senders,
-            taolu_count: senders.length,
-            taolu_senders: senders,
-          }
-          danmaku.extraStr = JSON.stringify(extra)
-          cache[key] = danmaku
-          mergeObj[key] = extra.danuni.merge
-          return [result, cache, mergeObj]
-        } else {
-          mergeObj[key] = {
-            count: 1,
-            duration: 0,
-            senders: [danmaku.senderID],
-            taolu_count: 1,
-            taolu_senders: [danmaku.senderID],
-          }
-          cache[key] = danmaku
-          // 初始化merge信息，包含第一个sender
-          const extra = danmaku.extra
-          extra.danuni = extra.danuni || {}
-          extra.danuni.merge = mergeObj[key]
-          danmaku.extraStr = JSON.stringify(extra)
-          result.push(danmaku)
-          return [result, cache, mergeObj]
+    const result: UniDM[] = []
+    const cache: Record<string, UniDM> = {}
+    const mergeObj: Record<string, UniDMTools.ExtraDanUniMerge> = {}
+    // 第一遍：合并弹幕
+    for (const danmaku of this.dans) {
+      const key = `${danmaku.content}|${danmaku.mode}|${danmaku.pool}|${danmaku.platform}`
+      const cached = cache[key]
+
+      if (
+        cached &&
+        danmaku.progress - cached.progress <= lifetime &&
+        danmaku.isSameAs(cached, { skipDanuniMerge: true })
+      ) {
+        // 更新已存在的弹幕
+        mergeObj[key].senders.push(danmaku.senderID)
+        mergeObj[key].count = mergeObj[key].senders.length
+        mergeObj[key].taolu_count = mergeObj[key].count
+        mergeObj[key].taolu_senders = mergeObj[key].senders
+        mergeObj[key].duration = Number.parseFloat(
+          (danmaku.progress - cached.progress).toFixed(3),
+        )
+        cache[key] = danmaku
+      } else {
+        // 新弹幕
+        mergeObj[key] = {
+          count: 1,
+          duration: 0,
+          senders: [danmaku.senderID],
+          taolu_count: 1,
+          taolu_senders: [danmaku.senderID],
         }
-      },
-      [[], {}, {}],
-    )
-    // 处理结果，删除senders<=1的merge字段
-    const [result, _cache, mergeObj] = mergeContext
-    result.forEach((danmaku, i) => {
-      const key = ['content', 'mode', 'platform', 'pool']
-        .map((k) => danmaku[k as keyof UniDM])
-        .join('|')
-      const extra = result[i].extra
+        cache[key] = danmaku
+        result.push(danmaku)
+      }
+    }
+    // 第二遍：更新 extraStr
+    for (const danmaku of result) {
+      const key = `${danmaku.content}|${danmaku.mode}|${danmaku.pool}|${danmaku.platform}`
       const mergeData = mergeObj[key]
-      result[i].extraStr = JSON.stringify({
-        ...extra,
-        danuni: {
-          ...extra.danuni,
-          merge: mergeData,
-        },
-      } satisfies UniDMTools.Extra)
-      if (mergeData?.count) {
-        if (mergeData.count <= 1) {
-          const updatedExtra = { ...extra }
-          if (updatedExtra.danuni) {
-            delete updatedExtra.danuni.merge
-            if (Object.keys(updatedExtra.danuni).length === 0) {
-              delete updatedExtra.danuni
-            }
+      const extra = danmaku.extra
+      if (mergeData.count > 1) {
+        // 多个发送者：设置为机器人并添加保护标记
+        danmaku.senderID = 'merge[bot]@dan-any'
+        if (!danmaku.attr) {
+          danmaku.attr = [UniDMTools.DMAttr.Protect]
+        } else if (!danmaku.attr.includes(UniDMTools.DMAttr.Protect)) {
+          danmaku.attr.push(UniDMTools.DMAttr.Protect)
+        }
+
+        extra.danuni = extra.danuni || {}
+        extra.danuni.merge = mergeData
+        danmaku.extraStr = JSON.stringify(extra)
+      } else {
+        // 单个发送者：清理 merge 字段
+        if (extra.danuni?.merge) {
+          delete extra.danuni.merge
+          if (Object.keys(extra.danuni).length === 0) {
+            delete extra.danuni
           }
-          result[i].extraStr =
-            Object.keys(updatedExtra).length > 0
-              ? JSON.stringify(updatedExtra)
-              : undefined
-        } else {
-          result[i].senderID = 'merge[bot]@dan-any'
-          result[i].attr
-            ? result[i].attr.push(UniDMTools.DMAttr.Protect)
-            : (result[i].attr = [UniDMTools.DMAttr.Protect])
         }
+        danmaku.extraStr =
+          Object.keys(extra).length > 0 ? JSON.stringify(extra) : undefined
       }
-    })
+    }
     return new UniPool(result, this.options, this.info)
   }
   minify() {
@@ -427,7 +461,8 @@ export class UniPool {
     const parseJSON = (
       json: DM_JSON_Artplayer &
         DM_JSON_DDPlay &
-        DM_JSON_Dplayer & { danuni?: DanUniConvertTip },
+        DM_JSON_Dplayer &
+        DM_JSON_BiliUp & { danuni?: DanUniConvertTip },
     ): { pool: UniPool; fmt: DM_format } | undefined => {
       try {
         if (Array.isArray(json) && json.every((d) => d.SOID)) {
@@ -445,6 +480,7 @@ export class UniPool {
         } else if (
           json.count &&
           json.comments &&
+          Array.isArray(json.comments) &&
           json.comments.every((d) => d.m)
         ) {
           return {
@@ -452,8 +488,9 @@ export class UniPool {
             fmt: 'ddplay.json',
           }
         } else if (
-          json?.code == 0 &&
+          json.code == 0 &&
           json.data &&
+          Array.isArray(json.data) &&
           json.data.every((d) => Array.isArray(d))
         ) {
           return {
@@ -465,6 +502,19 @@ export class UniPool {
             ),
             fmt: 'dplayer.json',
           }
+        } else if (
+          json.code == 0 &&
+          json.message == '0' &&
+          json.data &&
+          json.data.page &&
+          json.data.result &&
+          Array.isArray(json.data.result) &&
+          json.data.result.every((d) => d.id && d.oid)
+        ) {
+          return {
+            pool: this.fromBiliUp(json, options),
+            fmt: 'bili.up.json',
+          }
         }
       } catch {}
     }
@@ -678,7 +728,7 @@ export class UniPool {
         state: 0,
         real_name: 0,
         source: 'k-v',
-        danuni: { ...DanUniConvertTipTemplate, data: this.shared.SOID },
+        danuni: { ...DanUniConvertTipTemplate, data: this.getShared('SOID') },
         d: this.dans.map((dan) => dan.toBiliXML(options)),
       },
     })
@@ -880,7 +930,7 @@ export class UniPool {
   toASS(canvasCtx: CanvasCtx, options?: AssGenOptions): string {
     const defaultOptions: AssGenOptions = { substyle: {} }
     const finalOptions = options ?? defaultOptions
-    const fn = this.shared.SOID
+    const fn = this.getShared('SOID')
     return generateASS(
       this,
       { filename: fn, title: fn, ...finalOptions },

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

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v2.9.0 with parameter "target=ts"
+// @generated by protoc-gen-es v2.10.1 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.9.0 with parameter "target=ts"
+// @generated by protoc-gen-es v2.10.1 with parameter "target=ts"
 // @generated from file danuni.proto (package danuni.danmaku.v1, syntax proto3)
 /* eslint-disable */
 
@@ -12,7 +12,7 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file danuni.proto.
  */
 export const file_danuni: GenFile = /*@__PURE__*/
-  fileDesc("CgxkYW51bmkucHJvdG8SEWRhbnVuaS5kYW5tYWt1LnYxIjIKCmxpc3REYW5SZXESCgoCSUQYASABKAkSEAoDc2VnGAIgASgFSACIAQFCBgoEX3NlZyLCAgoHRGFubWFrdRIMCgRTT0lEGAEgASgJEgwKBERNSUQYAiABKAkSEAoIcHJvZ3Jlc3MYAyABKAUSJQoEbW9kZRgEIAEoDjIXLmRhbnVuaS5kYW5tYWt1LnYxLk1vZGUSEAoIZm9udHNpemUYBSABKAUSDQoFY29sb3IYBiABKAUSEAoIc2VuZGVySUQYByABKAkSDwoHY29udGVudBgIIAEoCRIpCgVjdGltZRgJIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASDgoGd2VpZ2h0GAogASgFEiUKBHBvb2wYCyABKA4yFy5kYW51bmkuZGFubWFrdS52MS5Qb29sEgwKBGF0dHIYDCADKAkSEAoIcGxhdGZvcm0YDSABKAkSEgoFZXh0cmEYDiABKAlIAIgBAUIICgZfZXh0cmEiPAoMRGFubWFrdVJlcGx5EiwKCGRhbm1ha3VzGAEgAygLMhouZGFudW5pLmRhbm1ha3UudjEuRGFubWFrdSo9CgRNb2RlEgoKBk5vcm1hbBAAEgoKBkJvdHRvbRABEgcKA1RvcBACEgsKB1JldmVyc2UQAxIHCgNFeHQQBCopCgRQb29sEgcKA0RlZhAAEgcKA1N1YhABEgcKA0FkdhACEgYKAkl4EAMyXQoORGFubWFrdVNlcnZpY2USSwoHbGlzdERhbhIdLmRhbnVuaS5kYW5tYWt1LnYxLmxpc3REYW5SZXEaHy5kYW51bmkuZGFubWFrdS52MS5EYW5tYWt1UmVwbHkiAFAAYgZwcm90bzM", [file_google_protobuf_timestamp]);
+  fileDesc("CgxkYW51bmkucHJvdG8SEWRhbnVuaS5kYW5tYWt1LnYxIjIKCmxpc3REYW5SZXESCgoCSUQYASABKAkSEAoDc2VnGAIgASgFSACIAQFCBgoEX3NlZyLUAgoHRGFubWFrdRIMCgRTT0lEGAEgASgJEgwKBERNSUQYAiABKAkSEAoIcHJvZ3Jlc3MYAyABKAUSJQoEbW9kZRgEIAEoDjIXLmRhbnVuaS5kYW5tYWt1LnYxLk1vZGUSEAoIZm9udHNpemUYBSABKAUSDQoFY29sb3IYBiABKAUSEAoIc2VuZGVySUQYByABKAkSDwoHY29udGVudBgIIAEoCRIpCgVjdGltZRgJIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASDgoGd2VpZ2h0GAogASgFEiUKBHBvb2wYCyABKA4yFy5kYW51bmkuZGFubWFrdS52MS5Qb29sEgwKBGF0dHIYDCADKAkSFQoIcGxhdGZvcm0YDSABKAlIAIgBARISCgVleHRyYRgOIAEoCUgBiAEBQgsKCV9wbGF0Zm9ybUIICgZfZXh0cmEiPAoMRGFubWFrdVJlcGx5EiwKCGRhbm1ha3VzGAEgAygLMhouZGFudW5pLmRhbm1ha3UudjEuRGFubWFrdSo9CgRNb2RlEgoKBk5vcm1hbBAAEgoKBkJvdHRvbRABEgcKA1RvcBACEgsKB1JldmVyc2UQAxIHCgNFeHQQBCopCgRQb29sEgcKA0RlZhAAEgcKA1N1YhABEgcKA0FkdhACEgYKAkl4EAMyXQoORGFubWFrdVNlcnZpY2USSwoHbGlzdERhbhIdLmRhbnVuaS5kYW5tYWt1LnYxLmxpc3REYW5SZXEaHy5kYW51bmkuZGFubWFrdS52MS5EYW5tYWt1UmVwbHkiAFAAYgZwcm90bzM", [file_google_protobuf_timestamp]);
 
 /**
  * @generated from message danuni.danmaku.v1.listDanReq
@@ -101,9 +101,9 @@ export type Danmaku = Message<"danuni.danmaku.v1.Danmaku"> & {
   attr: string[];
 
   /**
-   * @generated from field: string platform = 13;
+   * @generated from field: optional string platform = 13;
    */
-  platform: string;
+  platform?: string;
 
   /**
    * @generated from field: optional string extra = 14;

package/src/proto/src/danuni.proto

@@ -41,7 +41,7 @@ message Danmaku {
   int32 weight = 10;
   Pool pool = 11;
   repeated string attr = 12;
-  string platform = 13;
+  optional string platform = 13;
   optional string extra = 14;
 }
 

package/src/utils/dm-gen.ts

@@ -562,6 +562,8 @@ export class UniDM {
   }
   @Expose()
   isSameAs(dan: UniDM, options?: { skipDanuniMerge?: boolean }): boolean {
+    // 引用相同直接返回
+    if (this === dan) return true
     // 不支持比较高级弹幕
     if (this.mode === Modes.Ext || dan.mode === Modes.Ext) return false
     // 合并过视为不同，防止存在合并完成弹幕后再次合并造成计数错误
@@ -586,25 +588,20 @@ export class UniDM {
   @Expose()
   minify() {
     type UObj = Partial<UniDMObj> & Pick<UniDMObj, 'SOID'>
-    const def: UObj = UniDM.create()
-    const dan: UObj = UniDM.create(this)
-    const shouldKeep = (key: keyof UObj, value: UObj[keyof UObj]) => {
-      if (key === 'SOID') return true
-      if (value === undefined || value === null) return false
-      if (value === def[key]) return false
-      if (key === 'attr' && Array.isArray(value) && value.length === 0)
-        return false
-      if (key === 'extraStr' && value === '{}') return false
-      return true
-    }
-    const result: UObj = { SOID: dan.SOID }
-    for (const key of Object.keys(dan) as (keyof UObj)[]) {
-      const value = dan[key]
-      if (shouldKeep(key, value)) {
-        if (key === 'SOID') continue
-        Reflect.set(result, key, value)
-      }
-    }
+    const def = new UniDM()
+    const result: UObj = { SOID: this.SOID }
+    if (this.progress !== def.progress) result.progress = this.progress
+    if (this.mode !== def.mode) result.mode = this.mode
+    if (this.fontsize !== def.fontsize) result.fontsize = this.fontsize
+    if (this.color !== def.color) result.color = this.color
+    if (this.senderID !== def.senderID) result.senderID = this.senderID
+    if (this.content !== def.content) result.content = this.content
+    if (this.weight !== def.weight) result.weight = this.weight
+    if (this.pool !== def.pool) result.pool = this.pool
+    if (this.attr.length > 0) result.attr = this.attr
+    if (this.platform !== undefined) result.platform = this.platform
+    if (this.extraStr && this.extraStr !== '{}') result.extraStr = this.extraStr
+    if (this.DMID !== undefined) result.DMID = this.DMID
     return result
   }
   @Expose()