@dan-uni/dan-any 0.0.5 → 0.1.0

package/dist/utils/dm-gen.d.ts

@@ -128,6 +128,24 @@ export declare enum Pools {
     Ix = 3
 }
 export type ctime = string | number | bigint | Date;
+export interface UniDMObj {
+    FCID: string;
+    progress: number;
+    mode: Modes;
+    fontsize: number;
+    color: number;
+    senderID: string;
+    content: string;
+    ctime: Date;
+    weight: number;
+    pool: Pools;
+    attr: DMAttr[];
+    platform: platfrom | string;
+    SPMO: string;
+    extra: string | Extra;
+    extraStr: string;
+    DMID: string;
+}
 /**
  * 所有 number/bigint 值设为0自动转换为默认
  */
@@ -137,7 +155,7 @@ export declare class UniDM {
      */
     FCID: string;
     /**
-     * 弹幕出现位置(单位ms)
+     * 弹幕出现位置(单位s;精度为ms,即保留三位小数)
      */
     progress: number;
     /**
@@ -219,7 +237,7 @@ export declare class UniDM {
      */
     FCID: string, 
     /**
-     * 弹幕出现位置(单位ms)
+     * 弹幕出现位置(单位s;精度为ms,即保留三位小数)
      */
     progress?: number, 
     /**
@@ -291,23 +309,7 @@ export declare class UniDM {
      * - Artplayer: style不为空时，将其JSON.stringify()存入
      */
     extraStr?: string | undefined, DMID?: string | undefined);
-    static create(args: Partial<{
-        FCID: string;
-        progress: number;
-        mode: Modes;
-        fontsize: number;
-        color: number;
-        senderID: string;
-        content: string;
-        ctime: Date;
-        weight: number;
-        pool: Pools;
-        attr: DMAttr[];
-        platform: platfrom | string;
-        SPMO: string;
-        extra: string;
-        DMID: string;
-    }>): UniDM;
+    static create(args?: Partial<UniDMObj>): UniDM;
     get extra(): Extra;
     get isFrom3rdPlatform(): boolean;
     /**
@@ -316,8 +318,16 @@ export declare class UniDM {
      * @description 同一FCID下唯一
      */
     toDMID(): string;
+    minify(): Partial<UniDMObj> & Pick<UniDMObj, "FCID">;
     downgradeAdvcancedDan(): this | undefined;
-    static transCtime(oriCtime: ctime): Date;
+    /**
+     * 将各种类型的时间进行格式化
+     * @param oriCtime
+     * @param tsUnit 当`oriCtime`为数字类型表时间戳时的单位;
+     * 为 毫秒(ms)/秒(s)
+     * @returns {Date}
+     */
+    static transCtime(oriCtime: ctime, tsUnit?: 'ms' | 's'): Date;
     static transMode(oriMode: number, fmt: 'bili' | 'dplayer' | 'artplayer' | 'ddplay'): Modes;
     static fromBili(args: DMBili, SPMO?: string, cid?: bigint): UniDM;
     static fromBiliCommand(args: DMBiliCommand, SPMO?: string, cid?: bigint): UniDM;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dan-uni/dan-any",
-  "version": "0.0.5",
+  "version": "0.1.0",
   "description": "A danmaku transformer lib, supporting danmaku from different platforms.",
   "keywords": [
     "bangumi",

package/src/index.test.ts

@@ -3,9 +3,7 @@ import { describe, it } from 'vitest'
 
 import { UniPool } from './index'
 
-describe('转化自', () => {
-  it('bili(xml)', () => {
-    const xml = `<i>
+const xml = `<i>
 <chatserver>chat.bilibili.com</chatserver>
 <chatid>1156756312</chatid>
 <mission>0</mission>
@@ -28,8 +26,10 @@ describe('转化自', () => {
 <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,1335553202649003264">不喜欢</d>
-</i>`,
-      pool = UniPool.fromBiliXML(xml)
+</i>`
+describe('转化自', () => {
+  it('bili(xml)', () => {
+    const pool = UniPool.fromBiliXML(xml)
     console.info(xml)
     console.info(pool)
   })
@@ -49,3 +49,20 @@ describe('转化自', () => {
     console.info(pool)
   })
 })
+
+describe('共通值', () => {
+  const pool = UniPool.fromBiliXML(xml)
+  it('获取shared', () => {
+    console.info(pool.shared)
+  })
+  it('按pool分组', () => {
+    console.info(pool.split('pool'))
+  })
+})
+
+describe('其它', () => {
+  const pool = UniPool.fromBiliXML(xml)
+  it('最小化', () => {
+    console.info(pool.minify())
+  })
+})

package/src/index.ts

@@ -72,8 +72,26 @@ export type DM_format =
   | 'artplayer.json'
   | 'ddplay.json'
 
+type shareItems = Partial<
+  Pick<
+    UniDMTools.UniDMObj,
+    'FCID' | 'senderID' | 'platform' | 'SPMO' | 'pool' | 'mode'
+  >
+>
+
 export class UniPool {
-  constructor(public dans: UniDM[]) {}
+  readonly shared: shareItems = {}
+  constructor(public dans: UniDM[]) {
+    function isShared(key: keyof UniDMTools.UniDMObj) {
+      return new Set(dans.map((d) => d[key])).size === 1
+    }
+    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([])
   }
@@ -86,6 +104,16 @@ export class UniPool {
       return new UniPool([...this.dans, ...dans])
     } else return this
   }
+  split(key: keyof shareItems) {
+    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))
+    })
+  }
+  minify() {
+    return this.dans.map((d) => d.minify())
+  }
   convert2(format: DM_format) {
     switch (format) {
       case 'danuni.json':

package/src/utils/dm-gen.ts

@@ -242,6 +242,25 @@ export type ctime = string | number | bigint | Date
 //   dateStr = 'dateStr',
 // }
 
+export interface UniDMObj {
+  FCID: string
+  progress: number
+  mode: Modes
+  fontsize: number
+  color: number
+  senderID: string
+  content: string
+  ctime: Date
+  weight: number
+  pool: Pools
+  attr: DMAttr[]
+  platform: platfrom | string
+  SPMO: string
+  extra: string | Extra
+  extraStr: string
+  DMID: string
+}
+
 /**
  * 所有 number/bigint 值设为0自动转换为默认
  */
@@ -256,7 +275,7 @@ export class UniDM {
      */
     public FCID: string,
     /**
-     * 弹幕出现位置(单位ms)
+     * 弹幕出现位置(单位s;精度为ms,即保留三位小数)
      */
     public progress: number = 0,
     /**
@@ -341,43 +360,31 @@ export class UniDM {
     if (pool < Pools.Def || pool > Pools.Ix) this.pool = Pools.Def
     // if (attr < 0 || attr > 0b111) this.attr = 0
     if (!DMID) DMID = this.toDMID()
+
+    this.progress = Number.parseFloat(progress.toFixed(3))
   }
-  static create(
-    args: Partial<{
-      FCID: string
-      progress: number
-      mode: Modes
-      fontsize: number
-      color: number
-      senderID: string
-      content: string
-      ctime: Date
-      weight: number
-      pool: Pools
-      attr: DMAttr[]
-      platform: platfrom | string
-      SPMO: string
-      extra: string
-      DMID: string
-    }>,
-  ) {
-    return new UniDM(
-      args.FCID || ID.fromNull().toString(),
-      args.progress,
-      args.mode,
-      args.fontsize,
-      args.color,
-      args.senderID,
-      args.content,
-      args.ctime,
-      args.weight,
-      args.pool,
-      args.attr,
-      args.platform,
-      args.SPMO,
-      args.extra,
-      args.DMID,
-    )
+  static create(args?: Partial<UniDMObj>) {
+    return args
+      ? new UniDM(
+          args.FCID || ID.fromNull().toString(),
+          args.progress,
+          args.mode,
+          args.fontsize,
+          args.color,
+          args.senderID,
+          args.content,
+          args.ctime,
+          args.weight,
+          args.pool,
+          args.attr,
+          args.platform,
+          args.SPMO,
+          typeof args.extra === 'object'
+            ? JSON.stringify(args.extra)
+            : args.extra || args.extraStr,
+          args.DMID,
+        )
+      : new UniDM(ID.fromNull().toString())
   }
   get extra() {
     const extra = JSON.parse(this.extraStr || '{}')
@@ -396,15 +403,47 @@ export class UniDM {
   toDMID() {
     return createDMID(this.content, this.senderID, this.ctime)
   }
+  minify() {
+    type UObj = Partial<UniDMObj> & Pick<UniDMObj, 'FCID'>
+    const def: UObj = UniDM.create(),
+      dan: UObj = UniDM.create(this)
+    // const prototypes = Object.getOwnPropertyNames(this)
+    for (const key in dan) {
+      const k = key as keyof UObj,
+        v = dan[k]
+      // if (key in prototypes) continue
+      if (key === 'FCID') continue
+      else if (!v) delete dan[k]
+      else if (v === def[k]) delete dan[k]
+      else {
+        if (k === 'attr' && Array.isArray(v) && v.length === 0) delete dan[k]
+        if (k === 'extraStr' && v === '{}') delete dan[k]
+      }
+    }
+    return JSON.parse(JSON.stringify(dan)) as UObj
+  }
   downgradeAdvcancedDan() {
     if (!this.extra) return this
     else {
       // TODO 分别对 mode7/8/9 command artplayer等正常播放器无法绘制的弹幕做降级处理
     }
   }
-  static transCtime(oriCtime: ctime) {
-    if (typeof oriCtime === 'number') return new Date(oriCtime)
-    else if (typeof oriCtime === 'bigint') return new Date(Number(oriCtime))
+  /**
+   * 将各种类型的时间进行格式化
+   * @param oriCtime
+   * @param tsUnit 当`oriCtime`为数字类型表时间戳时的单位;
+   * 为 毫秒(ms)/秒(s)
+   * @returns {Date}
+   */
+  static transCtime(oriCtime: ctime, tsUnit?: 'ms' | 's'): Date {
+    function isMsTs(ts: number | bigint) {
+      if (tsUnit === 'ms') return true
+      else if (tsUnit === 's') return false
+      else return ts < 100000000
+    }
+    if (typeof oriCtime === 'number' || typeof oriCtime === 'bigint')
+      if (isMsTs(oriCtime)) return new Date(Number(oriCtime))
+      else return new Date(Number(oriCtime) * 1000)
     else if (typeof oriCtime === 'string') {
       if (/^\d+n$/.test(oriCtime))
         return new Date(Number(oriCtime.slice(0, -1)))
@@ -522,7 +561,7 @@ export class UniDM {
       // color: args.color,
       senderID: senderID.toString(),
       // content: args.content,
-      ctime: this.transCtime(args.ctime),
+      ctime: this.transCtime(args.ctime, 's'),
       weight: args.weight ? args.weight : pool === Pools.Ix ? 1 : 0,
       pool,
       attr: DMAttrUtils.fromBin(args.attr, 'bili'),

package/CHANGELOG.md

@@ -1,9 +0,0 @@
-## 0.0.5 (2025-01-23)
-
-
-### Features
-
-* **dan-any:** add `.assign()` method to help merge dans ([d7c7a86](https://github.com/ani-uni/danuni/commit/d7c7a86dd6363051083cadae2ef775fcd0c93275))
-
-
-