@dan-uni/dan-any 0.4.8 → 0.5.0

package/README.md

@@ -30,6 +30,8 @@
 
 - [dan-any-plugin-detalu](https://github.com/ani-uni/danuni/tree/master/packages/dan-any-plugin-detalu): 基于pakku.js的弹幕过滤器
 
+## 特殊字段提示
+
 ### ASS Raw 字段
 
 为便于由ASS格式还原，由本工具生成的ASS弹幕格式中，包含以下字段：`RawCompressType` `RawBaseType` `Raw`  
@@ -38,7 +40,8 @@
 
 ## TODO
 
-- [ ] 反向转换bili弹幕格式
+- [ ] 完善弹幕降级显示功能(使高级弹幕有损转换为普通弹幕)
+- [ ] 完善使用文档
 
 ## License 许可证
 

package/dist/index.js

@@ -4948,7 +4948,7 @@ const toBits = (number)=>{
         bits.unshift(!!(1 & number));
         number >>= 1;
     }while (number);
-    return bits;
+    return bits.reverse();
 };
 const DMAttrUtils = {
     fromBin (bin = 0, format) {
@@ -5051,9 +5051,9 @@ class UniDM {
         this.DMID = DMID;
         if (progress < 0) this.progress = 0;
         if (mode < 0 || mode > 4) this.mode = 0;
-        if (fontsize <= 0) this.fontsize = 25;
+        if (fontsize < 10 || fontsize > 127) this.fontsize = 25;
         if (color <= 0) this.color = 16777215;
-        if (weight < 0 || weight > 10) this.weight = 5;
+        if (weight < 0 || weight > 11) this.weight = 5;
         if (pool < 0 || pool > 3) this.pool = 0;
         if (!DMID) DMID = this.toDMID();
         this.progress = Number.parseFloat(progress.toFixed(3));
@@ -5218,7 +5218,8 @@ class UniDM {
         const pool = args.pool, extra = {
             bili: {
                 mode: args.mode,
-                pool: args.pool
+                pool: args.pool,
+                dmid: args.id
             }
         };
         switch(args.mode){
@@ -5281,7 +5282,7 @@ class UniDM {
                     return 1;
             }
         };
-        const rMode = recMode(this.mode, this.extra?.bili);
+        const rMode = this.extra.bili?.mode || recMode(this.mode, this.extra?.bili);
         let content;
         switch(rMode){
             case 7:
@@ -5305,9 +5306,9 @@ class UniDM {
                 this.fontsize,
                 this.color,
                 this.ctime.getTime() / 1000,
-                this.pool,
+                this.extra.bili?.pool || this.pool,
                 this.senderID,
-                this.DMID || this.toDMID(),
+                this.extra.bili?.dmid || this.DMID || this.toDMID(),
                 this.weight
             ].join(',')
         };

package/dist/index.umd.min.js

@@ -18993,7 +18993,7 @@
                     bits.unshift(!!(1 & number));
                     number >>= 1;
                 }while (number);
-                return bits;
+                return bits.reverse();
             };
             const DMAttrUtils = {
                 fromBin (bin = 0, format) {
@@ -19096,9 +19096,9 @@
                     this.DMID = DMID;
                     if (progress < 0) this.progress = 0;
                     if (mode < 0 || mode > 4) this.mode = 0;
-                    if (fontsize <= 0) this.fontsize = 25;
+                    if (fontsize < 10 || fontsize > 127) this.fontsize = 25;
                     if (color <= 0) this.color = 16777215;
-                    if (weight < 0 || weight > 10) this.weight = 5;
+                    if (weight < 0 || weight > 11) this.weight = 5;
                     if (pool < 0 || pool > 3) this.pool = 0;
                     if (!DMID) DMID = this.toDMID();
                     this.progress = Number.parseFloat(progress.toFixed(3));
@@ -19263,7 +19263,8 @@
                     const pool = args.pool, extra = {
                         bili: {
                             mode: args.mode,
-                            pool: args.pool
+                            pool: args.pool,
+                            dmid: args.id
                         }
                     };
                     switch(args.mode){
@@ -19326,7 +19327,7 @@
                                 return 1;
                         }
                     };
-                    const rMode = recMode(this.mode, this.extra?.bili);
+                    const rMode = this.extra.bili?.mode || recMode(this.mode, this.extra?.bili);
                     let content;
                     switch(rMode){
                         case 7:
@@ -19350,9 +19351,9 @@
                             this.fontsize,
                             this.color,
                             this.ctime.getTime() / 1000,
-                            this.pool,
+                            this.extra.bili?.pool || this.pool,
                             this.senderID,
-                            this.DMID || this.toDMID(),
+                            this.extra.bili?.dmid || this.DMID || this.toDMID(),
                             this.weight
                         ].join(',')
                     };

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

@@ -86,6 +86,7 @@ interface ExtraArtplayer {
 interface ExtraBili {
     mode?: number;
     pool?: number;
+    dmid?: bigint;
     adv?: string;
     code?: string;
     bas?: string;
@@ -175,9 +176,13 @@ export declare class UniDM {
     /**
      * 字号
      * @default 25
+     * - 12
+     * - 16
      * - 18：小
      * - 25：标准
      * - 36：大
+     * - 45
+     * - 64
      */
     fontsize: number;
     /**
@@ -247,9 +252,13 @@ export declare class UniDM {
     /**
      * 字号
      * @default 25
+     * - 12
+     * - 16
      * - 18：小
      * - 25：标准
      * - 36：大
+     * - 45
+     * - 64
      */
     fontsize?: number, 
     /**

package/package.json

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

package/src/utils/dm-gen.ts

@@ -42,6 +42,11 @@ class SetBin {
     this.bin &= ~(1 << bit)
   }
 }
+
+/**
+ * 获得数字的二进制，每位以boolean(true/false)表示1/0，从低位向高位
+ * @param number 任意进制数字
+ */
 const toBits = (number: number) => {
   // 低速方案
   // return [...number.toString(2)].map(Number)
@@ -52,7 +57,7 @@ const toBits = (number: number) => {
     // bits.unshift(number & 1) // (0|1)[]
     number >>= 1
   } while (number)
-  return bits
+  return bits.reverse()
 }
 
 export type DMAttr =
@@ -217,6 +222,7 @@ interface ExtraArtplayer {
 interface ExtraBili {
   mode?: number //原弹幕类型
   pool?: number //原弹幕池
+  dmid?: bigint //原弹幕ID
   adv?: string
   code?: string
   bas?: string
@@ -338,9 +344,13 @@ export class UniDM {
     /**
      * 字号
      * @default 25
+     * - 12
+     * - 16
      * - 18：小
      * - 25：标准
      * - 36：大
+     * - 45
+     * - 64
      */
     public fontsize: number = 25,
     /**
@@ -395,10 +405,10 @@ export class UniDM {
     //TODO 引入class-validator
     if (progress < 0) this.progress = 0
     if (mode < Modes.Normal || mode > Modes.Ext) this.mode = Modes.Normal
-    if (fontsize <= 0) this.fontsize = 25
+    if (fontsize < 10 || fontsize > 127) this.fontsize = 25
     if (color <= 0) this.color = 16777215 //虽然不知道为0是否为可用值，但过为少见，利用其作为默认位
     // if (ctime <= 0n) this.ctime = BigInt(Date.now())
-    if (weight < 0 || weight > 10) this.weight = 5
+    if (weight < 0 || weight > 11) this.weight = 5
     if (pool < Pools.Def || pool > Pools.Ix) this.pool = Pools.Def
     // if (attr < 0 || attr > 0b111) this.attr = 0
     if (!DMID) DMID = this.toDMID()
@@ -658,7 +668,9 @@ export class UniDM {
       senderID = ID.fromBili({ midHash: args.midHash })
     let mode = Modes.Normal
     const pool = args.pool, //暂时不做处理，兼容bili的pool格式
-      extra: TExtra = { bili: { mode: args.mode, pool: args.pool } }
+      extra: TExtra = {
+        bili: { mode: args.mode, pool: args.pool, dmid: args.id },
+      }
     //重复 transMode ，但此处有关于extra的额外处理
     switch (args.mode) {
       case 4:
@@ -687,9 +699,6 @@ export class UniDM {
         mode = Modes.Normal
         break
     }
-    // if (args.mode === 7) extra.bili.adv = args.content
-    // else if (args.mode === 8) extra.bili.code = args.content
-    // else if (args.mode === 9) extra.bili.bas = args.content
     return this.create({
       ...args,
       SOID: SOID.toString(),
@@ -732,7 +741,7 @@ export class UniDM {
           return 1
       }
     }
-    const rMode = recMode(this.mode, this.extra?.bili)
+    const rMode = this.extra.bili?.mode || recMode(this.mode, this.extra?.bili)
     let content
     switch (rMode) {
       case 7:
@@ -756,9 +765,9 @@ export class UniDM {
         this.fontsize,
         this.color,
         this.ctime.getTime() / 1000,
-        this.pool, // 目前pool与bili兼容
+        this.extra.bili?.pool || this.pool, // 目前pool与bili兼容
         this.senderID,
-        this.DMID || this.toDMID(),
+        this.extra.bili?.dmid || this.DMID || this.toDMID(),
         this.weight,
       ].join(','),
     }