@dan-uni/dan-any 0.7.3 → 0.7.5

package/dist/index.js

@@ -125,8 +125,8 @@ class id_gen_UniID {
         return this.fromNull(domain);
     }
 }
-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 createDMID(dan, slice = 8) {
+    return new jssha('SHA3-256', 'TEXT').update(`${dan.content}|${dan.senderID}|${UniDM.transCtime(dan.ctime).toISOString()}|${dan.extraStr}`).getHash('HEX').slice(0, slice);
 }
 function _ts_decorate(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -301,9 +301,9 @@ class UniDM {
     }
     toDMID() {
         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);
+        if (true === this.options.dmid) return createDMID(this);
+        if ('number' == typeof this.options.dmid) return createDMID(this, this.options.dmid);
+        return this.options.dmid(this);
     }
     isSameAs(dan, options) {
         if (4 === this.mode || 4 === dan.mode) return false;
@@ -1013,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) {
@@ -1939,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) {

package/dist/index.umd.min.js

@@ -23095,8 +23095,8 @@ and limitations under the License.
                     return this.fromNull(domain);
                 }
             }
-            function createDMID(content = '', senderID = id_gen_UniID.fromNull().toString(), ctime = new Date().toISOString(), extraStr, slice = 8) {
-                return new ht('SHA3-256', 'TEXT').update(`${content}|${senderID}|${UniDM.transCtime(ctime).toISOString()}|${extraStr}`).getHash('HEX').slice(0, slice);
+            function createDMID(dan, slice = 8) {
+                return new ht('SHA3-256', 'TEXT').update(`${dan.content}|${dan.senderID}|${UniDM.transCtime(dan.ctime).toISOString()}|${dan.extraStr}`).getHash('HEX').slice(0, slice);
             }
             function _ts_decorate(decorators, target, key, desc) {
                 var c = arguments.length, r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -23271,9 +23271,9 @@ and limitations under the License.
                 }
                 toDMID() {
                     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);
+                    if (true === this.options.dmid) return createDMID(this);
+                    if ('number' == typeof this.options.dmid) return createDMID(this, this.options.dmid);
+                    return this.options.dmid(this);
                 }
                 isSameAs(dan, options) {
                     if (4 === this.mode || 4 === dan.mode) return false;
@@ -23984,11 +23984,13 @@ and limitations under the License.
                         }));
                 }
                 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) {
@@ -24915,11 +24917,13 @@ and limitations under the License.
                         }));
                 }
                 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) {

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

@@ -1,5 +1,5 @@
-import type { ctime } from './dm-gen';
 import type { PlatformSource } from './platform';
+import { UniDM } from './dm-gen';
 export declare class UniID {
     /**
      * @description 每个domain下应为唯一值
@@ -46,5 +46,5 @@ export declare class UniID {
      */
     domain: PlatformSource | string): UniID;
 }
-export type DMIDGenerator = (content?: string, senderID?: string, ctime?: ctime, extraStr?: string, slice?: number) => string;
-export declare function createDMID(content?: string, senderID?: string, ctime?: ctime, extraStr?: string, slice?: number): string;
+export type DMIDGenerator = (dan: UniDM, slice?: number) => string;
+export declare function createDMID(dan: UniDM, slice?: number): string;

package/package.json

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

package/src/index.test.ts

@@ -92,8 +92,7 @@ describe('其它', () => {
   it('自定义DMID生成器', () => {
     console.info(
       UniPool.fromBiliXML(xml, {
-        dmid: (_content, _senderID, ctime = new Date(), _extraStr) =>
-          ctime.toString() + Math.random(),
+        dmid: (dan) => dan.ctime.toString() + Math.random(),
       }),
     )
   })

package/src/index.ts

@@ -256,9 +256,11 @@ export class UniPool {
    * 基于DMID的基本去重功能，用于解决该class下dans为array而非Set的问题
    */
   private dedupe() {
-    const map = new Map()
-    this.dans.forEach((d) => map.set(d.DMID || d.toDMID(), d))
-    this.dans = [...map.values()]
+    if (this.options.dmid !== false) {
+      const map = new Map()
+      this.dans.forEach((d) => map.set(d.DMID || d.toDMID(), d))
+      this.dans = [...map.values()]
+    }
     this.options.dedupe = false
   }
   /**

package/src/utils/dm-gen.ts

@@ -548,22 +548,10 @@ export class UniDM {
   @Expose()
   toDMID() {
     if (this.options.dmid === false) return
-    else if (this.options.dmid === true)
-      return createDMID(this.content, this.senderID, this.ctime, this.extraStr)
+    else if (this.options.dmid === true) return createDMID(this)
     else if (typeof this.options.dmid === 'number')
-      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,
-    )
+      return createDMID(this, this.options.dmid)
+    return this.options.dmid!(this)
   }
   @Expose()
   isSameAs(dan: UniDM, options?: { skipDanuniMerge?: boolean }): boolean {

package/src/utils/id-gen.ts

@@ -1,5 +1,4 @@
 import jsSHA from 'jssha'
-import type { ctime } from './dm-gen'
 import type { PlatformSource } from './platform'
 
 import { UniDM } from './dm-gen'
@@ -62,24 +61,12 @@ export class UniID {
   }
 }
 
-export type DMIDGenerator = (
-  content?: string,
-  senderID?: string,
-  ctime?: ctime,
-  extraStr?: string,
-  slice?: number,
-) => string
+export type DMIDGenerator = (dan: UniDM, slice?: number) => string
 
-export function createDMID(
-  content: string = '',
-  senderID: string = UniID.fromNull().toString(),
-  ctime: ctime = new Date().toISOString(),
-  extraStr?: string,
-  slice = 8,
-) {
+export function createDMID(dan: UniDM, slice = 8) {
   return new jsSHA('SHA3-256', 'TEXT')
     .update(
-      `${content}|${senderID}|${UniDM.transCtime(ctime).toISOString()}|${extraStr}`,
+      `${dan.content}|${dan.senderID}|${UniDM.transCtime(dan.ctime).toISOString()}|${dan.extraStr}`,
     )
     .getHash('HEX')
     .slice(0, slice)