@dan-uni/dan-any 1.3.8 → 1.4.0

package/dist/umd/src/index.d.ts

@@ -237,6 +237,10 @@ export declare class UniPool {
          * 当SOID非来源bili时，若此处指定则使用该值为cid，否则使用SOID
          */
         cid?: bigint;
+        /**
+         * 跳过command类型的特殊弹幕
+         */
+        skipBiliCommand?: boolean;
         /**
          * 当仅含有来自bili的弹幕时，启用将保持发送者标识不含`@`
          * @description
@@ -275,3 +279,4 @@ export declare class UniPool {
     toASS(canvasCtx: CanvasCtx, options?: AssGenOptions): string;
 }
 export { platform, UniDM, UniDMTools, UniIDTools, type DM_JSON_BiliCommandGrpc, };
+export * as plugins from './plugins';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dan-uni/dan-any",
   "type": "module",
-  "version": "1.3.8",
+  "version": "1.4.0",
   "description": "A danmaku transformer lib, supporting danmaku from different platforms.",
   "author": "rinne",
   "license": "LGPL-3.0-or-later",
@@ -36,7 +36,7 @@
     "base16384": "^1.0.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.15.1",
-    "fast-xml-parser": "^5.5.8",
+    "fast-xml-parser": "^5.5.11",
     "hh-mm-ss": "^1.2.0",
     "json-bigint": "^1.0.0",
     "jssha": "^3.3.1",
@@ -44,12 +44,12 @@
     "reflect-metadata": "^0.2.2"
   },
   "devDependencies": {
-    "@bufbuild/buf": "^1.66.1",
+    "@bufbuild/buf": "^1.67.0",
     "@bufbuild/protoc-gen-es": "^2.11.0",
     "@types/hh-mm-ss": "^1.2.3",
     "@types/json-bigint": "^1.0.4",
     "@types/luxon": "^3.7.1",
-    "canvas": "^3.2.2",
-    "protobufjs": "^8.0.0"
+    "canvas": "^3.2.3",
+    "protobufjs": "^8.0.1"
   }
 }

package/src/index.ts

@@ -858,6 +858,10 @@ export class UniPool {
      * 当SOID非来源bili时，若此处指定则使用该值为cid，否则使用SOID
      */
     cid?: bigint
+    /**
+     * 跳过command类型的特殊弹幕
+     */
+    skipBiliCommand?: boolean
     /**
      * 当仅含有来自bili的弹幕时，启用将保持发送者标识不含`@`
      * @description
@@ -884,6 +888,8 @@ export class UniPool {
       )
       if (!ok) throw new Error('存在其他来源的senderID，请关闭该功能再试！')
     }
+    let ds = this.dans.map((dan) => dan.toBiliXML(options))
+    if (options?.skipBiliCommand) ds = ds.filter((d) => d !== null)
     const builder = new XMLBuilder({ ignoreAttributes: false })
     return builder.build({
       '?xml': {
@@ -900,7 +906,7 @@ export class UniPool {
         real_name: 0,
         source: 'k-v',
         danuni: { ...DanUniConvertTipTemplate, data: this.getShared('SOID') },
-        d: this.dans.map((dan) => dan.toBiliXML(options)),
+        d: ds,
       },
     })
   }
@@ -1120,3 +1126,4 @@ export {
   // type UniDMType,
   // type UniIDType,
 }
+export * as plugins from './plugins'

package/src/plugins/bili/dedupe.ts

@@ -10,7 +10,7 @@ function main(that: UniPool) {
   that.dans.forEach((d) => {
     if (d.platform !== PlatformVideoSource.Bilibili)
       throw new Error('bili-dedupe: 仅支持B站(主站)的弹幕')
-    if (!d.extra.bili?.dmid)
+    if (!d.extra.bili?.dmid && !d.extra.bili?.command?.id)
       throw new Error('bili-dedupe: 弹幕缺少bili extra dmid字段')
   })
   const map = new Map<bigint, UniDM>()

package/src/utils/dm-gen.ts

@@ -241,7 +241,7 @@ interface ExtraBili {
   pool?: number //原弹幕池
   dmid?: bigint //原弹幕ID
   attr?: number //原弹幕属性
-  mid?: bigint //发送者mid(仅创作中心源)
+  mid?: bigint //发送者mid(仅创作中心源、command弹幕)
   adv?: string
   code?: string
   bas?: string
@@ -938,6 +938,9 @@ export class UniDM {
         platform: PlatformVideoSource.Bilibili,
         extra: {
           bili: {
+            dmid: args.id,
+            attr: args.attr,
+            mid: args.mid,
             command: args,
           },
         },

package/tsconfig.json

@@ -23,14 +23,7 @@
     // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
     /* Modules */
     "module": "ESNext" /* Skip type checking all .d.ts files. */,
-    "moduleResolution": "Node",
-    // "rootDir": "./",                                  /* Specify the root folder within your source files. */
-    // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
-    // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
-    // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
-    // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
-    // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
-    // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
+    "moduleResolution": "bundler",
     // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
     // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */
     // "allowImportingTsExtensions": true,               /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */
@@ -38,6 +31,15 @@
     // "resolvePackageJsonImports": true,                /* Use the package.json 'imports' field when resolving imports. */
     // "customConditions": [],                           /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
     "resolveJsonModule": true /* Enable importing .json files. */,
+    // "rootDir": "./",                                  /* Specify the root folder within your source files. */
+    // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
+    // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
+    // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
+    // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
+    // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
+    "types": [
+      "node"
+    ] /* Specify type package names to be included without being referenced in a source file. */,
     "allowImportingTsExtensions": true /* Ensure that casing is correct in imports. */,
     /* Type Checking */
     "strict": true /* Enable all strict type-checking options. */,

package/types/tsconfig.tsbuildinfo

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