@dan-uni/dan-any 0.6.9 → 0.7.4

package/dist/index.js

@@ -125,7 +125,7 @@ class id_gen_UniID {
         return this.fromNull(domain);
     }
 }
-function createDMID(content = '', senderID, ctime, extraStr, slice = 8) {
+function createDMID(content = '', senderID = id_gen_UniID.fromNull().toString(), ctime = new Date().toISOString(), extraStr, slice = 8) {
     return new jssha('SHA3-256', 'TEXT').update(`${content}|${senderID}|${UniDM.transCtime(ctime).toISOString()}|${extraStr}`).getHash('HEX').slice(0, slice);
 }
 function _ts_decorate(decorators, target, key, desc) {
@@ -167,7 +167,7 @@ const toBits = (number)=>{
         bits.unshift(!!(1 & number));
         number >>= 1;
     }while (number);
-    return bits.reverse();
+    return bits.toReversed();
 };
 var dm_gen_DMAttr = /*#__PURE__*/ function(DMAttr) {
     DMAttr["Protect"] = "Protect";
@@ -250,8 +250,10 @@ var dm_gen_Pools = /*#__PURE__*/ function(Pools) {
     return Pools;
 }({});
 class UniDM {
-    init() {
+    init(options) {
+        this.options = options || this.options;
         const def = new UniDM();
+        if (void 0 === this.options.dmid || true === this.options.dmid) this.options.dmid = createDMID;
         if (!this.SOID) this.SOID = def.SOID;
         if (!this.progress) this.progress = def.progress;
         if (!this.mode) this.mode = def.mode;
@@ -263,7 +265,7 @@ class UniDM {
         if (!this.weight) this.weight = def.weight;
         if (!this.pool) this.pool = def.pool;
         if (!this.attr) this.attr = def.attr;
-        if (!this.DMID) this.DMID = this.toDMID();
+        if (!this.DMID && false !== this.options.dmid) this.DMID = this.toDMID();
         this.progress = Number.parseFloat(this.progress.toFixed(3));
         if (this.extraStr) this.extraStr = dm_gen_JSON.stringify(cleanEmptyObjects(dm_gen_JSON.parse(this.extraStr)));
         if ('{}' === this.extraStr) this.extraStr = void 0;
@@ -281,13 +283,13 @@ class UniDM {
     async validate() {
         return validateOrReject(this);
     }
-    static create(pjson) {
+    static create(pjson, options) {
         return pjson ? plainToInstance(UniDM, pjson.extra ? {
             ...pjson,
             extraStr: pjson.extra ? dm_gen_JSON.stringify(pjson.extra) : pjson.extraStr
         } : pjson, {
             excludeExtraneousValues: true
-        }).init() : new UniDM();
+        }).init(options) : new UniDM();
     }
     get extra() {
         const extra = dm_gen_JSON.parse(this.extraStr || '{}');
@@ -298,7 +300,10 @@ class UniDM {
         return false;
     }
     toDMID() {
-        return createDMID(this.content, this.senderID, this.ctime, this.extraStr);
+        if (false === this.options.dmid) return;
+        if (true === this.options.dmid) return createDMID(this.content, this.senderID, this.ctime, this.extraStr);
+        if ('number' == typeof this.options.dmid) return createDMID(this.content, this.senderID, this.ctime, this.extraStr, this.options.dmid);
+        return this.options.dmid(this.content, this.senderID, this.ctime, this.extraStr);
     }
     isSameAs(dan, options) {
         if (4 === this.mode || 4 === dan.mode) return false;
@@ -416,7 +421,7 @@ class UniDM {
         }
         return mode;
     }
-    static fromBili(args, cid) {
+    static fromBili(args, cid, options) {
         if (args.oid && !cid) cid = args.oid;
         const SOID = `def_${platform_PlatformVideoSource.Bilibili}+${id_gen_UniID.fromBili({
             cid
@@ -459,7 +464,7 @@ class UniDM {
         }
         return this.create({
             ...args,
-            SOID: SOID.toString(),
+            SOID,
             mode,
             senderID: senderID.toString(),
             ctime: this.transCtime(args.ctime, 's'),
@@ -468,7 +473,7 @@ class UniDM {
             attr: DMAttrUtils.fromBin(args.attr, platform_PlatformVideoSource.Bilibili),
             platform: platform_PlatformVideoSource.Bilibili,
             extra
-        });
+        }, options);
     }
     toBiliXML(options) {
         if (options?.skipBiliCommand && this.extra.bili?.command) return null;
@@ -523,16 +528,16 @@ class UniDM {
             ].join(',')
         };
     }
-    static fromBiliCommand(args, cid) {
+    static fromBiliCommand(args, cid, options) {
         if (args.oid && !cid) cid = args.oid;
-        const SOID = id_gen_UniID.fromBili({
+        const SOID = `def_${platform_PlatformVideoSource.Bilibili}+${id_gen_UniID.fromBili({
             cid
-        }), senderID = id_gen_UniID.fromBili({
+        })}`, senderID = id_gen_UniID.fromBili({
             mid: args.mid
         });
         return this.create({
             ...args,
-            SOID: SOID.toString(),
+            SOID,
             mode: 4,
             senderID: senderID.toString(),
             ctime: new Date(`${args.ctime} GMT+0800`),
@@ -547,9 +552,9 @@ class UniDM {
                     command: args
                 }
             }
-        });
+        }, options);
     }
-    static fromDplayer(args, playerID, domain) {
+    static fromDplayer(args, playerID, domain, options) {
         const SOID = id_gen_UniID.fromUnknown(playerID, domain), senderID = id_gen_UniID.fromUnknown(args.midHash, domain);
         return this.create({
             ...args,
@@ -557,7 +562,7 @@ class UniDM {
             mode: this.transMode(args.mode, 'dplayer'),
             senderID: senderID.toString(),
             platform: domain
-        });
+        }, options);
     }
     toDplayer() {
         let mode = 0;
@@ -571,7 +576,7 @@ class UniDM {
             content: this.content
         };
     }
-    static fromArtplayer(args, playerID, domain) {
+    static fromArtplayer(args, playerID, domain, options) {
         const SOID = id_gen_UniID.fromUnknown(playerID, domain), senderID = id_gen_UniID.fromUnknown('', domain);
         let extra = args.border ? {
             artplayer: {
@@ -597,7 +602,7 @@ class UniDM {
             senderID: senderID.toString(),
             platform: domain,
             extra
-        });
+        }, options);
     }
     toArtplayer() {
         let mode = 0;
@@ -611,7 +616,7 @@ class UniDM {
             style: this.extra.artplayer?.style
         };
     }
-    static fromDDplay(args, episodeId, domain = platform_PlatformDanmakuOnlySource.DanDanPlay) {
+    static fromDDplay(args, episodeId, domain = platform_PlatformDanmakuOnlySource.DanDanPlay, options) {
         const SOID = id_gen_UniID.fromUnknown(`def_${platform_PlatformDanmakuOnlySource.DanDanPlay}+${episodeId}`, domain);
         return this.create({
             ...args,
@@ -621,7 +626,7 @@ class UniDM {
             content: args.m,
             platform: domain,
             DMID: args.cid.toString()
-        });
+        }, options);
     }
     toDDplay() {
         let mode = 1;
@@ -648,6 +653,9 @@ class UniDM {
         this.weight = 0;
         this.pool = 0;
         this.attr = [];
+        this.options = {
+            dmid: createDMID
+        };
     }
 }
 _ts_decorate([
@@ -750,7 +758,9 @@ _ts_decorate([
 _ts_decorate([
     Expose(),
     _ts_metadata("design:type", Function),
-    _ts_metadata("design:paramtypes", []),
+    _ts_metadata("design:paramtypes", [
+        "undefined" == typeof Options ? Object : Options
+    ]),
     _ts_metadata("design:returntype", void 0)
 ], UniDM.prototype, "init", null);
 _ts_decorate([
@@ -973,8 +983,8 @@ class UniPool {
             platform: s.platform.sort((a, b)=>b.count - a.count)[0].val
         };
     }
-    static create() {
-        return new UniPool([]);
+    static create(options) {
+        return new UniPool([], options);
     }
     assign(dans) {
         if (dans instanceof UniPool) return new UniPool([
@@ -1003,11 +1013,13 @@ class UniPool {
             }));
     }
     dedupe() {
-        const map = new Map();
-        this.dans.forEach((d)=>map.set(d.DMID || d.toDMID(), d));
-        this.dans = [
-            ...map.values()
-        ];
+        if (false !== this.options.dmid) {
+            const map = new Map();
+            this.dans.forEach((d)=>map.set(d.DMID || d.toDMID(), d));
+            this.dans = [
+                ...map.values()
+            ];
+        }
         this.options.dedupe = false;
     }
     merge(lifetime = 0) {
@@ -1136,7 +1148,7 @@ class UniPool {
                 }
         }
     }
-    static fromPb(bin) {
+    static fromPb(bin, options) {
         const data = fromBinary(DanmakuReplySchema, new Uint8Array(bin));
         return new UniPool(data.danmakus.map((d)=>UniDM.create({
                 ...d,
@@ -1144,7 +1156,7 @@ class UniPool {
                 ctime: timestampDate(d.ctime || timestampNow()),
                 pool: d.pool,
                 attr: d.attr
-            })));
+            }, options)), options);
     }
     toPb() {
         return toBinary(DanmakuReplySchema, create(DanmakuReplySchema, {
@@ -1166,7 +1178,7 @@ class UniPool {
                 }))
         }));
     }
-    static fromBiliXML(xml) {
+    static fromBiliXML(xml, options) {
         const parser = new XMLParser({
             ignoreAttributes: false
         }), oriData = parser.parse(xml), dans = oriData.i.d;
@@ -1183,8 +1195,8 @@ class UniPool {
                 midHash: p_arr[6],
                 id: BigInt(p_arr[7]),
                 weight: Number.parseInt(p_arr[8])
-            }, BigInt(oriData.i.chatid));
-        }).filter((d)=>null !== d));
+            }, BigInt(oriData.i.chatid), options);
+        }).filter((d)=>null !== d), options);
     }
     toBiliXML() {
         const genCID = (id)=>{
@@ -1215,25 +1227,25 @@ class UniPool {
             }
         });
     }
-    static fromBiliGrpc(bin) {
+    static fromBiliGrpc(bin, options) {
         const data = fromBinary(DmSegMobileReplySchema, new Uint8Array(bin)), json = data.elems;
         return new UniPool(json.map((d)=>UniDM.fromBili({
                 ...d,
                 progress: d.progress / 1000
-            })));
+            }, d.oid, options)), options);
     }
-    static fromBiliCommandGrpc(bin) {
+    static fromBiliCommandGrpc(bin, options) {
         const data = fromBinary(DmWebViewReplySchema, new Uint8Array(bin)), json = data.commandDms;
-        return new UniPool(json.map((d)=>UniDM.fromBiliCommand(d)));
+        return new UniPool(json.map((d)=>UniDM.fromBiliCommand(d, d.oid, options)), options);
     }
-    static fromDplayer(json, playerID, domain = 'other') {
+    static fromDplayer(json, playerID, domain = 'other', options) {
         return new UniPool(json.data.map((d)=>UniDM.fromDplayer({
                 content: d[4],
                 progress: d[0],
                 mode: d[1],
                 color: d[2],
                 midHash: d[3]
-            }, playerID, domain)));
+            }, playerID, domain, options)), options);
     }
     toDplayer() {
         return {
@@ -1250,14 +1262,14 @@ class UniPool {
             })
         };
     }
-    static fromArtplayer(json, playerID, domain = 'other') {
+    static fromArtplayer(json, playerID, domain = 'other', options) {
         return new UniPool(json.map((d)=>UniDM.fromArtplayer({
                 content: d.text,
                 progress: d.time || 0,
                 mode: d.mode || 0,
                 color: Number((d.color || 'FFFFFF').replace('#', '0x')),
                 style: d.style
-            }, playerID, domain)));
+            }, playerID, domain, options)), options);
     }
     toArtplayer() {
         return this.dans.map((dan)=>{
@@ -1272,7 +1284,7 @@ class UniPool {
             };
         });
     }
-    static fromDDPlay(json, episodeId) {
+    static fromDDPlay(json, episodeId, options) {
         return new UniPool(json.comments.map((d)=>{
             const p_arr = d.p.split(',');
             return UniDM.fromDDplay({
@@ -1282,8 +1294,8 @@ class UniPool {
                 mode: Number.parseInt(p_arr[1]),
                 progress: Number.parseFloat(p_arr[0]),
                 uid: p_arr[3]
-            }, episodeId);
-        }));
+            }, episodeId, void 0, options);
+        }), options);
     }
     toDDplay() {
         return {
@@ -1625,7 +1637,7 @@ function raw_raw(list, config, context, compressType = 'brotli', baseType = 'bas
         config,
         context
     }, rawText = JSON.stringify(raw1);
-    let compress = Buffer.from('');
+    let compress;
     compress = 'brotli' === compressType ? brotliCompressSync(rawText) : gzipSync(rawText);
     return `;RawCompressType: ${compressType}\n;RawBaseType: ${baseType}\n;Raw: ${'base64' === baseType ? compress.toString('base64') : fromUint16Array(external_base16384_encode(compress))}`;
 }
@@ -1637,7 +1649,7 @@ function deRaw(ass) {
         if (!compressTypes.includes(compressType)) compressType = 'gzip';
         if (!baseTypes.includes(baseType)) baseType = 'base64';
         const text = lineRaw.replace(';Raw: ', '').trim(), buffer = 'base64' === baseType ? Buffer.from(text, 'base64') : Buffer.from(decode(Buffer.from(text, 'utf-8').toString('utf-8')));
-        let decompress = Buffer.from('');
+        let decompress;
         decompress = 'brotli' === compressType ? brotliDecompressSync(buffer) : gunzipSync(buffer);
         try {
             return JSON.parse(decompress.toString('utf-8'));
@@ -1899,8 +1911,8 @@ class src_UniPool {
             platform: s.platform.sort((a, b)=>b.count - a.count)[0].val
         };
     }
-    static create() {
-        return new src_UniPool([]);
+    static create(options) {
+        return new src_UniPool([], options);
     }
     assign(dans) {
         if (dans instanceof src_UniPool) return new src_UniPool([
@@ -1929,11 +1941,13 @@ class src_UniPool {
             }));
     }
     dedupe() {
-        const map = new Map();
-        this.dans.forEach((d)=>map.set(d.DMID || d.toDMID(), d));
-        this.dans = [
-            ...map.values()
-        ];
+        if (false !== this.options.dmid) {
+            const map = new Map();
+            this.dans.forEach((d)=>map.set(d.DMID || d.toDMID(), d));
+            this.dans = [
+                ...map.values()
+            ];
+        }
         this.options.dedupe = false;
     }
     merge(lifetime = 0) {
@@ -2062,7 +2076,7 @@ class src_UniPool {
                 }
         }
     }
-    static fromPb(bin) {
+    static fromPb(bin, options) {
         const data = fromBinary(DanmakuReplySchema, new Uint8Array(bin));
         return new src_UniPool(data.danmakus.map((d)=>UniDM.create({
                 ...d,
@@ -2070,7 +2084,7 @@ class src_UniPool {
                 ctime: timestampDate(d.ctime || timestampNow()),
                 pool: d.pool,
                 attr: d.attr
-            })));
+            }, options)), options);
     }
     toPb() {
         return toBinary(DanmakuReplySchema, create(DanmakuReplySchema, {
@@ -2092,7 +2106,7 @@ class src_UniPool {
                 }))
         }));
     }
-    static fromBiliXML(xml) {
+    static fromBiliXML(xml, options) {
         const parser = new XMLParser({
             ignoreAttributes: false
         }), oriData = parser.parse(xml), dans = oriData.i.d;
@@ -2109,8 +2123,8 @@ class src_UniPool {
                 midHash: p_arr[6],
                 id: BigInt(p_arr[7]),
                 weight: Number.parseInt(p_arr[8])
-            }, BigInt(oriData.i.chatid));
-        }).filter((d)=>null !== d));
+            }, BigInt(oriData.i.chatid), options);
+        }).filter((d)=>null !== d), options);
     }
     toBiliXML() {
         const genCID = (id)=>{
@@ -2141,25 +2155,25 @@ class src_UniPool {
             }
         });
     }
-    static fromBiliGrpc(bin) {
+    static fromBiliGrpc(bin, options) {
         const data = fromBinary(DmSegMobileReplySchema, new Uint8Array(bin)), json = data.elems;
         return new src_UniPool(json.map((d)=>UniDM.fromBili({
                 ...d,
                 progress: d.progress / 1000
-            })));
+            }, d.oid, options)), options);
     }
-    static fromBiliCommandGrpc(bin) {
+    static fromBiliCommandGrpc(bin, options) {
         const data = fromBinary(DmWebViewReplySchema, new Uint8Array(bin)), json = data.commandDms;
-        return new src_UniPool(json.map((d)=>UniDM.fromBiliCommand(d)));
+        return new src_UniPool(json.map((d)=>UniDM.fromBiliCommand(d, d.oid, options)), options);
     }
-    static fromDplayer(json, playerID, domain = 'other') {
+    static fromDplayer(json, playerID, domain = 'other', options) {
         return new src_UniPool(json.data.map((d)=>UniDM.fromDplayer({
                 content: d[4],
                 progress: d[0],
                 mode: d[1],
                 color: d[2],
                 midHash: d[3]
-            }, playerID, domain)));
+            }, playerID, domain, options)), options);
     }
     toDplayer() {
         return {
@@ -2176,14 +2190,14 @@ class src_UniPool {
             })
         };
     }
-    static fromArtplayer(json, playerID, domain = 'other') {
+    static fromArtplayer(json, playerID, domain = 'other', options) {
         return new src_UniPool(json.map((d)=>UniDM.fromArtplayer({
                 content: d.text,
                 progress: d.time || 0,
                 mode: d.mode || 0,
                 color: Number((d.color || 'FFFFFF').replace('#', '0x')),
                 style: d.style
-            }, playerID, domain)));
+            }, playerID, domain, options)), options);
     }
     toArtplayer() {
         return this.dans.map((dan)=>{
@@ -2198,7 +2212,7 @@ class src_UniPool {
             };
         });
     }
-    static fromDDPlay(json, episodeId) {
+    static fromDDPlay(json, episodeId, options) {
         return new src_UniPool(json.comments.map((d)=>{
             const p_arr = d.p.split(',');
             return UniDM.fromDDplay({
@@ -2208,8 +2222,8 @@ class src_UniPool {
                 mode: Number.parseInt(p_arr[1]),
                 progress: Number.parseFloat(p_arr[0]),
                 uid: p_arr[3]
-            }, episodeId);
-        }));
+            }, episodeId, void 0, options);
+        }), options);
     }
     toDDplay() {
         return {