@dan-uni/dan-any 0.9.4 → 0.9.6

package/src/utils/dm-gen.ts

@@ -160,6 +160,7 @@ interface DMBili {
   mode: number // xml 1
   fontsize: number // xml 2
   color: number // xml 3
+  mid?: number // 仅创作中心源
   midHash: string // xml 6
   /**
    * 特殊类型解析：
@@ -239,6 +240,8 @@ interface ExtraBili {
   mode?: number //原弹幕类型
   pool?: number //原弹幕池
   dmid?: bigint //原弹幕ID
+  attr?: number //原弹幕属性
+  mid?: number //发送者mid(仅创作中心源)
   adv?: string
   code?: string
   bas?: string
@@ -585,35 +588,36 @@ export class UniDM {
     type UObj = Partial<UniDMObj> & Pick<UniDMObj, 'SOID'>
     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
-      const v = dan[k]
-      // if (key in prototypes) continue
-      if (key === 'SOID') 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]
+    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)
       }
     }
-    return JSON.parse(JSON.stringify(dan)) as UObj
+    return result
   }
   @Expose()
-  downgradeAdvcancedDan(
-    {
-      include,
-      exclude,
-      cleanExtra = false,
-    }: {
-      include?: (keyof Extra)[]
-      exclude?: (keyof Extra)[]
-      cleanExtra?: boolean
-    } = { include: [], exclude: [] },
-  ) {
-    if (!this.extra) return this
-    else {
+  downgradeAdvcancedDan({
+    include,
+    exclude,
+    cleanExtra = false,
+  }: {
+    include?: (keyof Extra)[]
+    exclude?: (keyof Extra)[]
+    cleanExtra?: boolean
+  } = {}) {
+    if (this.extra) {
       if (!include) include = []
       if (!exclude) exclude = []
       const check = (k: keyof Extra) =>
@@ -649,7 +653,7 @@ export class UniDM {
       clone.attr.push(DMAttr.Compatible)
       if (cleanExtra) clone.extraStr = undefined
       return clone
-    }
+    } else return this
   }
   /**
    * 将各种类型的时间进行格式化
@@ -753,7 +757,13 @@ export class UniDM {
     let mode = Modes.Normal
     const pool = args.pool //暂时不做处理，兼容bili的pool格式
     const extra: TExtra = {
-      bili: { mode: args.mode, pool: args.pool, dmid: args.id },
+      bili: {
+        mode: args.mode,
+        pool: args.pool,
+        dmid: args.id,
+        attr: args.attr,
+        mid: args.mid,
+      },
     }
     //重复 transMode ，但此处有关于extra的额外处理
     switch (args.mode) {
@@ -794,7 +804,7 @@ export class UniDM {
         senderID: senderID.toString(),
         // content: args.content,
         ctime: this.transCtime(args.ctime, 's'),
-        weight: args.weight ? args.weight : pool === Pools.Ix ? 1 : 0,
+        weight: args.weight || (pool === Pools.Ix ? 1 : 0),
         pool,
         attr: DMAttrUtils.fromBin(args.attr, PlatformVideoSource.Bilibili),
         platform: PlatformVideoSource.Bilibili,

package/types/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"version":"5.9.2"}
+{"version":"5.9.3"}