@dan-uni/dan-any 0.0.7 → 0.1.0

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

@@ -142,7 +142,8 @@ export interface UniDMObj {
     attr: DMAttr[];
     platform: platfrom | string;
     SPMO: string;
-    extra: string;
+    extra: string | Extra;
+    extraStr: string;
     DMID: string;
 }
 /**
@@ -154,7 +155,7 @@ export declare class UniDM {
      */
     FCID: string;
     /**
-     * 弹幕出现位置(单位ms)
+     * 弹幕出现位置(单位s;精度为ms,即保留三位小数)
      */
     progress: number;
     /**
@@ -236,7 +237,7 @@ export declare class UniDM {
      */
     FCID: string, 
     /**
-     * 弹幕出现位置(单位ms)
+     * 弹幕出现位置(单位s;精度为ms,即保留三位小数)
      */
     progress?: number, 
     /**
@@ -308,7 +309,7 @@ export declare class UniDM {
      * - Artplayer: style不为空时，将其JSON.stringify()存入
      */
     extraStr?: string | undefined, DMID?: string | undefined);
-    static create(args: Partial<UniDMObj>): UniDM;
+    static create(args?: Partial<UniDMObj>): UniDM;
     get extra(): Extra;
     get isFrom3rdPlatform(): boolean;
     /**
@@ -317,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.7",
+  "version": "0.1.0",
   "description": "A danmaku transformer lib, supporting danmaku from different platforms.",
   "keywords": [
     "bangumi",

package/src/index.test.ts

@@ -59,3 +59,10 @@ describe('共通值', () => {
     console.info(pool.split('pool'))
   })
 })
+
+describe('其它', () => {
+  const pool = UniPool.fromBiliXML(xml)
+  it('最小化', () => {
+    console.info(pool.minify())
+  })
+})

package/src/index.ts

@@ -111,6 +111,9 @@ export class UniPool {
       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

@@ -256,7 +256,8 @@ export interface UniDMObj {
   attr: DMAttr[]
   platform: platfrom | string
   SPMO: string
-  extra: string
+  extra: string | Extra
+  extraStr: string
   DMID: string
 }
 
@@ -274,7 +275,7 @@ export class UniDM {
      */
     public FCID: string,
     /**
-     * 弹幕出现位置(单位ms)
+     * 弹幕出现位置(单位s;精度为ms,即保留三位小数)
      */
     public progress: number = 0,
     /**
@@ -359,25 +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<UniDMObj>) {
-    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.7 (2025-01-26)
-
-
-### Features
-
-* **dan-any:** add `.split(key)` method to split UniPool by shared value ([2568c76](https://github.com/ani-uni/danuni/commit/2568c7645f95c6b564bf22cfef2ca1a05d96f8ba))
-
-
-