@dan-uni/dan-any 0.0.7 → 0.2.0

package/src/utils/dm-gen.ts

@@ -6,6 +6,29 @@ import { createDMID, domainPreset, UniID as ID, platforms } from './id-gen'
 const BigIntSerializer = (k: string, v: any) =>
   typeof v === 'bigint' ? v.toString() : v
 
+function cleanEmptyObjects(obj: object): object {
+  if (obj === null || typeof obj !== 'object') {
+    return obj
+  }
+  if (Array.isArray(obj)) {
+    return obj
+  }
+  const cleaned: any = {}
+  for (const [key, value] of Object.entries(obj)) {
+    const cleanedValue = cleanEmptyObjects(value)
+    if (
+      cleanedValue !== undefined &&
+      !(
+        typeof cleanedValue === 'object' &&
+        Object.keys(cleanedValue).length === 0
+      )
+    ) {
+      cleaned[key] = cleanedValue
+    }
+  }
+  return Object.keys(cleaned).length > 0 ? cleaned : {}
+}
+
 class SetBin {
   constructor(public bin: number) {}
   set1(bit: number) {
@@ -193,14 +216,21 @@ interface ExtraBili {
   command?: DMBiliCommand
 }
 export interface ExtraDanUni {
-  chapter?: {
-    // seg: {
-    //   st: number //开始时刻
-    // } //起止时间(ms)
-    duration: number //持续时间
-    type: ExtraDanUniChapterType
-    // action: ExtraDanUniChapterAction
-  }
+  chapter?: ExtraDanUniChapter
+  merge?: ExtraDanUniMerge
+}
+export interface ExtraDanUniChapter {
+  // seg: {
+  //   st: number //开始时刻
+  // } //起止时间(ms)
+  duration: number //持续时间
+  type: ExtraDanUniChapterType
+  // action: ExtraDanUniChapterAction
+}
+export interface ExtraDanUniMerge {
+  duration: number //持续时间(重复内容第一次出现时间开始到合并了的弹幕中最后一次出现的时间)
+  count: number //重复次数
+  senders: string[] //发送者
 }
 export enum ExtraDanUniChapterType {
   Chapter = 'ch', //其它片段(用于标记章节)
@@ -256,7 +286,8 @@ export interface UniDMObj {
   attr: DMAttr[]
   platform: platfrom | string
   SPMO: string
-  extra: string
+  extra: string | Extra
+  extraStr: string
   DMID: string
 }
 
@@ -274,7 +305,7 @@ export class UniDM {
      */
     public FCID: string,
     /**
-     * 弹幕出现位置(单位ms)
+     * 弹幕出现位置(单位s;精度为ms,即保留三位小数)
      */
     public progress: number = 0,
     /**
@@ -359,29 +390,40 @@ 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))
+    if (extraStr)
+      this.extraStr = JSON.stringify(cleanEmptyObjects(JSON.parse(extraStr)))
+    if (extraStr === '{}') this.extraStr = undefined
   }
-  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() {
+  get extra(): Extra {
     const extra = JSON.parse(this.extraStr || '{}')
-    return (typeof extra === 'object' ? extra : {}) as Extra
+    // this.extraStr = JSON.stringify(cleanEmptyObjects(extra))
+    return extra
+    // return cleanEmptyObjects(extra) as Extra
   }
   get isFrom3rdPlatform() {
     if (this.platform && platforms.includes(this.platform as platfrom))
@@ -396,15 +438,92 @@ export class UniDM {
   toDMID() {
     return createDMID(this.content, this.senderID, this.ctime)
   }
+  isSameAs(dan: UniDM, _check2 = false): boolean {
+    const isSame = (k: keyof UniDMObj) => this[k] === dan[k],
+      checks = (
+        [
+          'FCID',
+          'content',
+          'mode',
+          'platform',
+          'pool',
+          'SPMO',
+        ] satisfies (keyof UniDMObj)[]
+      ).every((k) => isSame(k))
+    // 如果两个对象的extra都是空对象，只检查基本字段
+    if (
+      JSON.stringify(this.extra) === '{}' &&
+      JSON.stringify(dan.extra) === '{}'
+    ) {
+      return checks
+    }
+    // 特殊情况：只包含danuni.merge的情况
+    const thisHasOnlyMerge =
+      this.extra.danuni?.merge &&
+      !this.extra.artplayer &&
+      !this.extra.bili &&
+      !this.extra.danuni.chapter
+    const danHasOnlyMerge =
+      dan.extra.danuni?.merge &&
+      !dan.extra.artplayer &&
+      !dan.extra.bili &&
+      !dan.extra.danuni.chapter
+    if (thisHasOnlyMerge && danHasOnlyMerge) {
+      return checks
+    }
+    if (_check2) {
+      return isSame('extraStr') && checks
+    }
+    const a = { ...this.extra }
+    const b = { ...dan.extra }
+    if (a.danuni) delete a.danuni.merge
+    if (b.danuni) delete b.danuni.merge
+    return UniDM.create({ ...a, extraStr: JSON.stringify(a) }).isSameAs(
+      UniDM.create({ ...b, extraStr: JSON.stringify(b) }),
+      true,
+    )
+  }
+  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} 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 +641,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/tsconfig.json

@@ -24,12 +24,6 @@
     /* Modules */
     "module": "ESNext", /* Skip type checking all .d.ts files. */
     "moduleResolution": "Node",
-    "allowImportingTsExtensions": true, /* Ensure that casing is correct in imports. */
-    /* Type Checking */
-    "strict": true, /* Enable all strict type-checking options. */
-    "noImplicitAny": true,
-    "declaration": true,
-    "emitDeclarationOnly": true, /* Specify what module code is generated. */
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
     // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
@@ -43,7 +37,13 @@
     // "resolvePackageJsonExports": true,                /* Use the package.json 'exports' field when resolving package imports. */
     // "resolvePackageJsonImports": true,                /* Use the package.json 'imports' field when resolving imports. */
     // "customConditions": [],                           /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
-    // "resolveJsonModule": true,                        /* Enable importing .json files. */
+    "resolveJsonModule": true, /* Enable importing .json files. */
+    "allowImportingTsExtensions": true, /* Ensure that casing is correct in imports. */
+    /* Type Checking */
+    "strict": true, /* Enable all strict type-checking options. */
+    "noImplicitAny": true,
+    "declaration": true,
+    "emitDeclarationOnly": true, /* Specify what module code is generated. */
     // "allowArbitraryExtensions": true,                 /* Enable importing files with any extension, provided a declaration file is present. */
     // "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
     /* JavaScript Support */

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))
-
-
-