@dan-uni/dan-any 1.0.0 → 1.0.1

package/dist/rslib-runtime.js

@@ -0,0 +1,37 @@
+var __webpack_module_cache__ = {};
+function __webpack_require__(moduleId) {
+    var cachedModule = __webpack_module_cache__[moduleId];
+    if (void 0 !== cachedModule) return cachedModule.exports;
+    var module = __webpack_module_cache__[moduleId] = {
+        exports: {}
+    };
+    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+    return module.exports;
+}
+(()=>{
+    __webpack_require__.add = function(modules) {
+        Object.assign(__webpack_require__.m, modules);
+    };
+})();
+(()=>{
+    __webpack_require__.d = (exports, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) Object.defineProperty(exports, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports, '__esModule', {
+            value: true
+        });
+    };
+})();
+export { __webpack_require__ };

package/dist/rslib-runtime.min.js

@@ -0,0 +1,49 @@
+var __webpack_modules__ = {};
+var __webpack_module_cache__ = {};
+function __webpack_require__(moduleId) {
+    var cachedModule = __webpack_module_cache__[moduleId];
+    if (void 0 !== cachedModule) return cachedModule.exports;
+    var module = __webpack_module_cache__[moduleId] = {
+        exports: {}
+    };
+    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+    return module.exports;
+}
+__webpack_require__.m = __webpack_modules__;
+(()=>{
+    __webpack_require__.add = function(modules) {
+        Object.assign(__webpack_require__.m, modules);
+    };
+})();
+(()=>{
+    __webpack_require__.d = (exports, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) Object.defineProperty(exports, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.g = (()=>{
+        if ('object' == typeof globalThis) return globalThis;
+        try {
+            return this || new Function('return this')();
+        } catch (e) {
+            if ('object' == typeof window) return window;
+        }
+    })();
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports, '__esModule', {
+            value: true
+        });
+    };
+})();
+export { __webpack_require__ };

package/dist/src/ass-gen/util/index.d.ts

@@ -1,4 +1,4 @@
 export { decimalColorToRGB, formatColor, getDecoratingColor, hexColorToRGB, isWhite, } from './color';
-export { layoutDanmaku } from './layout';
-export { arrayOfLength, assign, uniqueArray } from './lang';
 export { DanmakuList2UniPool, UniPool2DanmakuLists } from './danconvert';
+export { arrayOfLength, assign, uniqueArray } from './lang';
+export { layoutDanmaku } from './layout';

package/dist/src/index.d.ts

@@ -13,7 +13,7 @@ interface DanUniConvertTip {
 export interface DM_XML_Bili {
     i: {
         chatserver: string;
-        chatid: number;
+        chatid: bigint;
         mission: number;
         maxlimit: number;
         state: number;
@@ -44,15 +44,15 @@ export interface DM_JSON_BiliUp {
         };
         result: {
             /** 弹幕 ID，int64 */
-            id: number;
+            id: bigint;
             /** 弹幕 ID 字符串形式 */
             id_str: string;
             /** 弹幕类型：1 表示视频弹幕（当前接口恒为 1） */
             type: number;
-            aid: number;
+            aid: bigint;
             bvid: string;
-            oid: number;
-            mid: number;
+            oid: bigint;
+            mid: bigint;
             /** 发送者 mid 的 CRC 哈希（正常接口里用的是这个，保护隐私） */
             mid_hash: string;
             /** 弹幕池 */
@@ -111,7 +111,7 @@ export interface DM_JSON_Artplayer {
 export interface DM_JSON_DDPlay {
     count: number | string;
     comments: {
-        cid: number;
+        cid: bigint;
         p: string;
         m: string;
     }[];

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

@@ -18,7 +18,7 @@ interface DMBili {
     mode: number;
     fontsize: number;
     color: number;
-    mid?: number;
+    mid?: bigint;
     midHash: string;
     /**
      * 特殊类型解析：
@@ -63,7 +63,7 @@ interface DMArtplayer {
     style?: object;
 }
 interface DMDDplay {
-    cid: number;
+    cid: bigint;
     /**
      * content
      */
@@ -99,7 +99,7 @@ interface ExtraBili {
     pool?: number;
     dmid?: bigint;
     attr?: number;
-    mid?: number;
+    mid?: bigint;
     adv?: string;
     code?: string;
     bas?: string;

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "@dan-uni/dan-any",
-  "version": "1.0.0",
-  "description": "A danmaku transformer lib, supporting danmaku from different platforms.",
   "type": "module",
-  "keywords": [
-    "bangumi",
-    "danmaku"
-  ],
+  "version": "1.0.1",
+  "description": "A danmaku transformer lib, supporting danmaku from different platforms.",
+  "author": "rinne",
   "license": "LGPL-3.0-or-later",
   "homepage": "https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme",
-  "bugs": {
-    "url": "https://github.com/ani-uni/danuni/issues"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ani-uni/danuni.git"
   },
-  "author": "rinne",
+  "bugs": {
+    "url": "https://github.com/ani-uni/danuni/issues"
+  },
+  "keywords": [
+    "bangumi",
+    "danmaku"
+  ],
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/src/index.d.ts",
@@ -32,24 +32,24 @@
     "buf": "buf generate"
   },
   "dependencies": {
-    "@bufbuild/protobuf": "^2.10.1",
+    "@bufbuild/protobuf": "^2.10.2",
     "base16384": "^1.0.0",
     "class-transformer": "^0.5.1",
-    "class-validator": "^0.14.2",
-    "fast-xml-parser": "^5.3.2",
-    "fs-extra": "^11.3.2",
+    "class-validator": "^0.14.3",
+    "fast-xml-parser": "^5.3.3",
+    "fs-extra": "^11.3.3",
     "hh-mm-ss": "^1.2.0",
     "json-bigint": "^1.0.0",
     "jssha": "^3.3.1",
     "reflect-metadata": "^0.2.2"
   },
   "devDependencies": {
-    "@bufbuild/buf": "^1.60.0",
-    "@bufbuild/protoc-gen-es": "^2.10.1",
+    "@bufbuild/buf": "^1.63.0",
+    "@bufbuild/protoc-gen-es": "^2.10.2",
     "@types/fs-extra": "^11.0.4",
     "@types/hh-mm-ss": "^1.2.3",
     "@types/json-bigint": "^1.0.4",
-    "canvas": "^3.2.0",
-    "protobufjs": "^7.5.4"
+    "canvas": "^3.2.1",
+    "protobufjs": "^8.0.0"
   }
 }

package/rslib.config.ts

@@ -8,7 +8,7 @@ export default defineConfig({
     {
       format: 'esm',
       output: {
-        filename: { js: 'index.js' },
+        filename: { js: '[name].js' },
         target: 'node',
       },
       dts: true,
@@ -16,7 +16,7 @@ export default defineConfig({
     {
       format: 'esm',
       output: {
-        filename: { js: 'index.min.js' },
+        filename: { js: '[name].min.js' },
         target: 'web',
       },
       dts: true,
@@ -25,7 +25,7 @@ export default defineConfig({
     {
       format: 'umd',
       output: {
-        filename: { js: 'index.umd.min.js' },
+        filename: { js: '[name].umd.min.js' },
         target: 'web',
       },
       dts: true,

package/src/ass-gen/util/index.ts

@@ -5,6 +5,6 @@ export {
   hexColorToRGB,
   isWhite,
 } from './color'
-export { layoutDanmaku } from './layout'
-export { arrayOfLength, assign, uniqueArray } from './lang'
 export { DanmakuList2UniPool, UniPool2DanmakuLists } from './danconvert'
+export { arrayOfLength, assign, uniqueArray } from './lang'
+export { layoutDanmaku } from './layout'

package/src/index.ts

@@ -47,7 +47,7 @@ interface DanUniConvertTip {
 export interface DM_XML_Bili {
   i: {
     chatserver: string
-    chatid: number
+    chatid: bigint
     mission: number
     maxlimit: number
     state: number
@@ -78,15 +78,15 @@ export interface DM_JSON_BiliUp {
     }
     result: {
       /** 弹幕 ID，int64 */
-      id: number
+      id: bigint
       /** 弹幕 ID 字符串形式 */
       id_str: string
       /** 弹幕类型：1 表示视频弹幕（当前接口恒为 1） */
       type: number
-      aid: number
+      aid: bigint
       bvid: string
-      oid: number
-      mid: number
+      oid: bigint
+      mid: bigint
       /** 发送者 mid 的 CRC 哈希（正常接口里用的是这个，保护隐私） */
       mid_hash: string
       /** 弹幕池 */
@@ -145,7 +145,7 @@ export interface DM_JSON_Artplayer {
 export interface DM_JSON_DDPlay {
   count: number | string
   comments: {
-    cid: number
+    cid: bigint
     p: string
     m: string
   }[]

package/src/proto/gen/bili/dm_pb.ts

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v2.10.1 with parameter "target=ts"
+// @generated by protoc-gen-es v2.10.2 with parameter "target=ts"
 // @generated from file bili/dm.proto (package bilibili.community.service.dm.v1, syntax proto3)
 /* eslint-disable */
 

package/src/proto/gen/danuni_pb.ts

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v2.10.1 with parameter "target=ts"
+// @generated by protoc-gen-es v2.10.2 with parameter "target=ts"
 // @generated from file danuni.proto (package danuni.danmaku.v1, syntax proto3)
 /* eslint-disable */
 

package/src/utils/dm-gen.test.ts

@@ -88,8 +88,8 @@ describe('其它', () => {
     const c = pool.dans[1].isSameAs(pool.dans[3])
     console.info(a, b, c)
     expect(a).toBe(false)
-    expect(b).toBe(true)
-    expect(c).toBe(true)
+    expect(b).toBe(false)
+    expect(c).toBe(false)
   })
   it('比较(extra)', () => {
     const commonSample = {

package/src/utils/dm-gen.ts

@@ -160,7 +160,7 @@ interface DMBili {
   mode: number // xml 1
   fontsize: number // xml 2
   color: number // xml 3
-  mid?: number // 仅创作中心源
+  mid?: bigint // 仅创作中心源
   midHash: string // xml 6
   /**
    * 特殊类型解析：
@@ -204,7 +204,7 @@ interface DMArtplayer {
   style?: object
 }
 interface DMDDplay {
-  cid: number
+  cid: bigint
   /**
    * content
    */
@@ -241,7 +241,7 @@ interface ExtraBili {
   pool?: number //原弹幕池
   dmid?: bigint //原弹幕ID
   attr?: number //原弹幕属性
-  mid?: number //发送者mid(仅创作中心源)
+  mid?: bigint //发送者mid(仅创作中心源)
   adv?: string
   code?: string
   bas?: string
@@ -572,6 +572,31 @@ export class UniDM {
       (this.extra.danuni?.merge || dan.extra.danuni?.merge)
     )
       return false
+    // 如果是bili弹幕，则以dmid判断是否相同
+    if (this.extra.bili?.dmid && dan.extra.bili?.dmid) {
+      // 当来源不同(标准源/创作中心源)时，视为不同弹幕
+      if (
+        (this.extra.bili.dmid && !dan.extra.bili.dmid) ||
+        (!this.extra.bili.dmid && dan.extra.bili.dmid)
+      )
+        return false
+      if (this.extra.bili.dmid === dan.extra.bili.dmid) return true
+      else return false
+    }
+    // 如果是artplayer弹幕，需额外比较extra项目
+    if (
+      (this.extra.artplayer && !dan.extra.artplayer) ||
+      (!this.extra.artplayer && dan.extra.artplayer)
+    )
+      return false
+    else if (
+      this.extra.artplayer &&
+      dan.extra.artplayer &&
+      (this.extra.artplayer.border !== dan.extra.artplayer.border ||
+        JSON.stringify(this.extra.artplayer.style) !==
+          JSON.stringify(dan.extra.artplayer.style))
+    )
+      return false
     const isSame = (k: keyof UniDMObj) => this[k] === dan[k]
     const checks = (
       [
@@ -1042,8 +1067,8 @@ export class UniDM {
       uid: this.senderID,
       m: this.content,
       cid: this.DMID
-        ? Number.parseInt(Buffer.from(this.DMID).toString('hex'), 16)
-        : 0,
+        ? BigInt(`0x${Buffer.from(this.DMID).toString('hex')}`)
+        : 0n,
     }
   }
 }