@dan-uni/dan-any 0.9.2 → 0.9.3

package/dist/src/index.d.ts

@@ -52,6 +52,11 @@ export interface DM_JSON_DDPlay {
 }
 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';
 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 UniPoolPipe = (that: UniPool) => Promise<UniPool>;
 type UniPoolPipeSync = (that: UniPool) => UniPool;
 export interface Options {
@@ -76,44 +81,9 @@ export declare class UniPool {
     pipe(fn: UniPoolPipe): Promise<UniPool>;
     pipeSync(fn: UniPoolPipeSync): UniPool;
     get shared(): shareItems;
-    get stat(): {
-        SOID: {
-            val: string;
-            count: number;
-        }[];
-        mode: {
-            val: UniDMTools.Modes;
-            count: number;
-        }[];
-        fontsize: {
-            val: number;
-            count: number;
-        }[];
-        color: {
-            val: number;
-            count: number;
-        }[];
-        senderID: {
-            val: string;
-            count: number;
-        }[];
-        content: {
-            val: string;
-            count: number;
-        }[];
-        weight: {
-            val: number;
-            count: number;
-        }[];
-        pool: {
-            val: UniDMTools.Pools;
-            count: number;
-        }[];
-        platform: {
-            val?: string;
-            count: number;
-        }[];
-    };
+    getShared(key: keyof shareItems): shareItems[keyof shareItems];
+    getStat(key: keyof statItems): Stat[];
+    getMost(key: keyof statItems): Stat;
     get most(): {
         mode: UniDMTools.Modes;
         fontsize: number;
@@ -147,7 +117,7 @@ export declare class UniPool {
         pool: UniPool;
         fmt: DM_format;
     };
-    convert2(format: DM_format, continue_on_error?: boolean): string | Uint8Array<ArrayBufferLike> | UniDM[] | (DM_JSON_Dplayer & {
+    convert2(format: DM_format, continue_on_error?: boolean): string | Uint8Array<ArrayBuffer> | UniDM[] | (DM_JSON_Dplayer & {
         danuni?: DanUniConvertTip;
     }) | (DM_JSON_Artplayer & {
         danuni?: DanUniConvertTip;
@@ -158,7 +128,7 @@ export declare class UniPool {
     /**
      * 转为 protobuf 二进制
      */
-    toPb(): Uint8Array<ArrayBufferLike>;
+    toPb(): Uint8Array<ArrayBuffer>;
     static fromBiliXML(xml: string, options?: Options): UniPool;
     toBiliXML(options?: {
         /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dan-uni/dan-any",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "A danmaku transformer lib, supporting danmaku from different platforms.",
   "type": "module",
   "keywords": [
@@ -32,7 +32,7 @@
     "buf": "buf generate"
   },
   "dependencies": {
-    "@bufbuild/protobuf": "^2.6.3",
+    "@bufbuild/protobuf": "^2.7.0",
     "base16384": "^1.0.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.2",
@@ -45,11 +45,11 @@
   },
   "devDependencies": {
     "@bufbuild/buf": "^1.56.0",
-    "@bufbuild/protoc-gen-es": "^2.6.3",
+    "@bufbuild/protoc-gen-es": "^2.7.0",
     "@types/fs-extra": "^11.0.4",
     "@types/hh-mm-ss": "^1.2.3",
     "@types/json-bigint": "^1.0.4",
-    "canvas": "^3.1.2",
-    "protobufjs": "^7.5.3"
+    "canvas": "^3.2.0",
+    "protobufjs": "^7.5.4"
   }
 }

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

@@ -16,8 +16,8 @@ export default (
   context: Context = { filename: 'unknown', title: 'unknown' },
   rawConfig?: RawConfig,
 ) => {
-  const Elist = UniPool2DanmakuLists(list),
-    ErawList = UniPool2DanmakuLists(rawList)
+  const Elist = UniPool2DanmakuLists(list)
+  const ErawList = UniPool2DanmakuLists(rawList)
   const content = [info(config, context), style(config), event(Elist, config)]
 
   if (config.includeRaw) {

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

@@ -9,8 +9,8 @@ import type { Context, Danmaku, SubtitleStyle } from '../types'
 
 type compressType = 'brotli' | 'gzip'
 type baseType = 'base64' | 'base18384'
-const compressTypes = ['brotli', 'gzip'],
-  baseTypes = ['base64', 'base18384']
+const compressTypes = ['brotli', 'gzip']
+const baseTypes = ['base64', 'base18384']
 
 export interface RawConfig {
   compressType: compressType
@@ -32,8 +32,8 @@ export function raw(
   compressType: compressType = 'brotli',
   baseType: baseType = 'base18384',
 ) {
-  const raw = { list, config, context },
-    rawText = JSON.stringify(raw)
+  const raw = { list, config, context }
+  const rawText = JSON.stringify(raw)
   let compress: Buffer
   if (compressType === 'brotli') compress = brotliCompressSync(rawText)
   else compress = gzipSync(rawText)
@@ -47,25 +47,25 @@ export function deRaw(ass: string):
       context: Context
     }
   | undefined {
-  const arr = ass.split('\n'),
-    lineCompressType = arr.find((line) => line.startsWith(';RawCompressType:')),
-    lineBaseType = arr.find((line) => line.startsWith(';RawBaseType:')),
-    lineRaw = arr.find((line) => line.startsWith(';Raw:'))
+  const arr = ass.split('\n')
+  const lineCompressType = arr.find((line) =>
+    line.startsWith(';RawCompressType:'),
+  )
+  const lineBaseType = arr.find((line) => line.startsWith(';RawBaseType:'))
+  const lineRaw = arr.find((line) => line.startsWith(';Raw:'))
   if (!lineCompressType || !lineBaseType || !lineRaw) return undefined
   else {
-    let compressType = lineCompressType
-        .replace(';RawCompressType: ', '')
-        .trim(),
-      baseType = lineBaseType.replace(';RawBaseType: ', '').trim()
+    let compressType = lineCompressType.replace(';RawCompressType: ', '').trim()
+    let baseType = lineBaseType.replace(';RawBaseType: ', '').trim()
     if (!compressTypes.includes(compressType)) compressType = 'gzip'
     if (!baseTypes.includes(baseType)) baseType = 'base64'
-    const text = lineRaw.replace(';Raw: ', '').trim(),
-      buffer =
-        baseType === 'base64'
-          ? Buffer.from(text, 'base64')
-          : Buffer.from(
-              base16384.decode(Buffer.from(text, 'utf-8').toString('utf-8')),
-            )
+    const text = lineRaw.replace(';Raw: ', '').trim()
+    const buffer =
+      baseType === 'base64'
+        ? Buffer.from(text, 'base64')
+        : Buffer.from(
+            base16384.decode(Buffer.from(text, 'utf-8').toString('utf-8')),
+          )
     let decompress: Buffer
     if (compressType === 'brotli') decompress = brotliDecompressSync(buffer)
     else decompress = gunzipSync(buffer)

package/src/index.test.ts

@@ -41,18 +41,18 @@ describe('转化自', () => {
   })
   it('artplayer(json)', () => {
     const json = {
-        danmuku: [
-          {
-            text: 'artplayer测试弹幕', // 弹幕文本
-            time: 10, // 弹幕时间, 默认为当前播放器时间
-            mode: 0, // 弹幕模式: 0: 滚动(默认)，1: 顶部，2: 底部
-            color: '#FFFFFF', // 弹幕颜色，默认为白色
-            border: false, // 弹幕是否有描边, 默认为 false
-            style: { border: '10rem' }, // 弹幕自定义样式, 默认为空对象
-          },
-        ],
-      },
-      pool = UniPool.fromArtplayer(json, 'playerid-test', 'acfun')
+      danmuku: [
+        {
+          text: 'artplayer测试弹幕', // 弹幕文本
+          time: 10, // 弹幕时间, 默认为当前播放器时间
+          mode: 0, // 弹幕模式: 0: 滚动(默认)，1: 顶部，2: 底部
+          color: '#FFFFFF', // 弹幕颜色，默认为白色
+          border: false, // 弹幕是否有描边, 默认为 false
+          style: { border: '10rem' }, // 弹幕自定义样式, 默认为空对象
+        },
+      ],
+    }
+    const pool = UniPool.fromArtplayer(json, 'playerid-test', 'acfun')
     console.info(json)
     console.info(pool)
     const imp = UniPool.import(json)
@@ -90,7 +90,14 @@ describe('转化自', () => {
 describe('共通值', () => {
   const pool = UniPool.fromBiliXML(xml)
   it('获取shared', () => {
+    console.info(pool.getMost('SOID'))
     console.info(pool.shared)
+    expect(pool.getShared('SOID')).toBe(pool.shared.SOID)
+  })
+  it('获取most', () => {
+    console.info(pool.getMost('senderID'))
+    console.info(pool.most)
+    expect(pool.getMost('senderID').val).toBe(pool.most.senderID)
   })
   it('按pool分组', () => {
     console.info(pool.split('pool'))

package/src/index.ts

@@ -102,6 +102,24 @@ type shareItems = Partial<
     '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 UniPoolPipe = (that: UniPool) => Promise<UniPool>
 type UniPoolPipeSync = (that: UniPool) => UniPool
@@ -144,104 +162,38 @@ export class UniPool {
       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 }[],
+  getShared(key: keyof shareItems): shareItems[keyof shareItems] {
+    const isShared = (key: keyof UniDMTools.UniDMObj) => {
+      return this.dans.every((d) => d[key])
     }
-    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 })
+    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) {
+        stat.push({ val: dan[key], count: 1 })
       } else {
-        platform.count++
+        valWithCount.count++
       }
-      return s
+      return stat
     }, default_stat)
-    return stat
+    return stats
+  }
+  getMost(key: keyof statItems) {
+    return this.getStat(key).sort((a, b) => b.count - a.count)[0]
   }
   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,
+      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,
     }
   }
   static create(options?: Options) {
@@ -361,8 +313,8 @@ export class UniPool {
       const key = ['content', 'mode', 'platform', 'pool']
         .map((k) => danmaku[k as keyof UniDM])
         .join('|')
-      const extra = result[i].extra,
-        mergeData = mergeObj[key]
+      const extra = result[i].extra
+      const mergeData = mergeObj[key]
       result[i].extraStr = JSON.stringify({
         ...extra,
         danuni: {
@@ -574,16 +526,17 @@ export class UniPool {
     )
   }
   static fromBiliXML(xml: string, options?: Options) {
-    const parser = new XMLParser({ ignoreAttributes: false }),
-      oriData: DM_XML_Bili & { danuni?: DanUniConvertTip } = parser.parse(xml),
-      dans = oriData.i.d,
-      fromConverted = !!oriData.danuni,
-      cid = BigInt(oriData.i.chatid)
+    const parser = new XMLParser({ ignoreAttributes: false })
+    const oriData: DM_XML_Bili & { danuni?: DanUniConvertTip } =
+      parser.parse(xml)
+    const dans = oriData.i.d
+    const fromConverted = !!oriData.danuni
+    const cid = BigInt(oriData.i.chatid)
     return new UniPool(
       dans
         .map((d) => {
-          const p_str = d['@_p'],
-            p_arr = p_str.split(',')
+          const p_str = d['@_p']
+          const p_arr = p_str.split(',')
           return UniDM.fromBili(
             {
               content: d['#text'],
@@ -657,8 +610,8 @@ export class UniPool {
     })
   }
   static fromBiliGrpc(bin: Uint8Array | ArrayBuffer, options?: Options) {
-    const data = fromBinary(DmSegMobileReplySchema, new Uint8Array(bin)),
-      json = data.elems
+    const data = fromBinary(DmSegMobileReplySchema, new Uint8Array(bin))
+    const json = data.elems
     return new UniPool(
       json.map((d) => {
         return UniDM.fromBili(
@@ -674,8 +627,8 @@ export class UniPool {
    * @param bin 符合`DmWebViewReplySchema`(bili视频meta)的protobuf二进制
    */
   static fromBiliCommandGrpc(bin: Uint8Array | ArrayBuffer, options?: Options) {
-    const data = fromBinary(DmWebViewReplySchema, new Uint8Array(bin)),
-      json = data.commandDms
+    const data = fromBinary(DmWebViewReplySchema, new Uint8Array(bin))
+    const json = data.commandDms
     return new UniPool(
       json.map((d) => {
         return UniDM.fromBiliCommand(d, d.oid, options)

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

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v2.6.3 with parameter "target=ts"
+// @generated by protoc-gen-es v2.7.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.6.3 with parameter "target=ts"
+// @generated by protoc-gen-es v2.7.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

@@ -83,9 +83,9 @@ describe('其它', () => {
     expect(pool.dans[0].content).toBe('喜欢')
     expect(pool.dans[1].content).toBe('不喜欢')
     // 正式测试
-    const a = pool.dans[0].isSameAs(pool.dans[1]),
-      b = pool.dans[1].isSameAs(pool.dans[2]),
-      c = pool.dans[1].isSameAs(pool.dans[3])
+    const a = pool.dans[0].isSameAs(pool.dans[1])
+    const b = pool.dans[1].isSameAs(pool.dans[2])
+    const c = pool.dans[1].isSameAs(pool.dans[3])
     console.info(a, b, c)
     expect(a).toBe(false)
     expect(b).toBe(true)

package/src/utils/dm-gen.ts

@@ -87,8 +87,8 @@ export enum DMAttr {
 }
 const DMAttrUtils = {
   fromBin(bin: number = 0, format?: PlatformDanmakuSource) {
-    const array = toBits(bin),
-      attr: DMAttr[] = []
+    const array = toBits(bin)
+    const attr: DMAttr[] = []
     if (format === 'bili') {
       if (array[0]) attr.push(DMAttr.Protect)
       if (array[1]) attr.push(DMAttr.FromLive)
@@ -567,28 +567,28 @@ export class UniDM {
       (this.extra.danuni?.merge || dan.extra.danuni?.merge)
     )
       return false
-    const isSame = (k: keyof UniDMObj) => this[k] === dan[k],
-      checks = (
-        [
-          'SOID',
-          'content',
-          'mode',
-          'pool',
-          'platform',
-        ] satisfies (keyof UniDMObj)[]
-      ).every((k) => isSame(k))
+    const isSame = (k: keyof UniDMObj) => this[k] === dan[k]
+    const checks = (
+      [
+        'SOID',
+        'content',
+        'mode',
+        'pool',
+        'platform',
+      ] satisfies (keyof UniDMObj)[]
+    ).every((k) => isSame(k))
     // 忽略使用了extra字段却不在mode里标记的弹幕
     return checks
   }
   @Expose()
   minify() {
     type UObj = Partial<UniDMObj> & Pick<UniDMObj, 'SOID'>
-    const def: UObj = UniDM.create(),
-      dan: UObj = UniDM.create(this)
+    const def: UObj = UniDM.create()
+    const dan: UObj = UniDM.create(this)
     // const prototypes = Object.getOwnPropertyNames(this)
     for (const key in dan) {
-      const k = key as keyof UObj,
-        v = dan[k]
+      const k = key as keyof UObj
+      const v = dan[k]
       // if (key in prototypes) continue
       if (key === 'SOID') continue
       else if (!v) delete dan[k]
@@ -746,16 +746,15 @@ export class UniDM {
     }
     if (args.oid && !cid) cid = args.oid
     const SOID =
-        recSOID ||
-        `def_${PlatformVideoSource.Bilibili}+${ID.fromBili({ cid })}`,
-      senderID = isEmail(args.midHash, { require_tld: false })
-        ? args.midHash
-        : ID.fromBili({ midHash: args.midHash })
+      recSOID || `def_${PlatformVideoSource.Bilibili}+${ID.fromBili({ cid })}`
+    const senderID = isEmail(args.midHash, { require_tld: false })
+      ? args.midHash
+      : ID.fromBili({ midHash: args.midHash })
     let mode = Modes.Normal
-    const pool = args.pool, //暂时不做处理，兼容bili的pool格式
-      extra: TExtra = {
-        bili: { mode: args.mode, pool: args.pool, dmid: args.id },
-      }
+    const pool = args.pool //暂时不做处理，兼容bili的pool格式
+    const extra: TExtra = {
+      bili: { mode: args.mode, pool: args.pool, dmid: args.id },
+    }
     //重复 transMode ，但此处有关于extra的额外处理
     switch (args.mode) {
       case 4:
@@ -873,8 +872,8 @@ export class UniDM {
   }
   static fromBiliCommand(args: DMBiliCommand, cid?: bigint, options?: Options) {
     if (args.oid && !cid) cid = args.oid
-    const SOID = `def_${PlatformVideoSource.Bilibili}+${ID.fromBili({ cid })}`,
-      senderID = ID.fromBili({ mid: args.mid })
+    const SOID = `def_${PlatformVideoSource.Bilibili}+${ID.fromBili({ cid })}`
+    const senderID = ID.fromBili({ mid: args.mid })
     return this.create(
       {
         ...args,
@@ -905,8 +904,8 @@ export class UniDM {
     domain: string,
     options?: Options,
   ) {
-    const SOID = ID.fromUnknown(playerID, domain),
-      senderID = ID.fromUnknown(args.midHash, domain)
+    const SOID = ID.fromUnknown(playerID, domain)
+    const senderID = ID.fromUnknown(args.midHash, domain)
     return this.create(
       {
         ...args,
@@ -941,8 +940,8 @@ export class UniDM {
     domain: string,
     options?: Options,
   ) {
-    const SOID = ID.fromUnknown(playerID, domain),
-      senderID = ID.fromUnknown('', domain)
+    const SOID = ID.fromUnknown(playerID, domain)
+    const senderID = ID.fromUnknown('', domain)
     let extra = args.border
       ? ({ artplayer: { border: args.border, style: {} } } as Extra)
       : undefined