@dan-uni/dan-any 1.3.0 → 1.3.4

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

@@ -10,6 +10,7 @@ interface DanUniConvertTip {
     version: string;
     data?: string;
 }
+export type DM_JSON_DanuniMin = Partial<UniDMTools.UniDMObj>[];
 export interface DM_XML_Bili {
     i: {
         chatserver: string;
@@ -140,6 +141,22 @@ export interface Options {
      */
     dmid?: boolean | number | UniIDTools.DMIDGenerator;
 }
+type Convert2Format = DM_format.DanuniJson | DM_format.DanuniMinJson | DM_format.DanuniPbBin | DM_format.BiliXml | DM_format.DplayerJson | DM_format.ArtplayerJson | DM_format.DdplayJson;
+type Convert2ResultMap = {
+    [DM_format.DanuniJson]: UniDM[];
+    [DM_format.DanuniMinJson]: DM_JSON_DanuniMin;
+    [DM_format.DanuniPbBin]: Uint8Array;
+    [DM_format.BiliXml]: string;
+    [DM_format.DplayerJson]: DM_JSON_Dplayer & {
+        danuni?: DanUniConvertTip;
+    };
+    [DM_format.ArtplayerJson]: DM_JSON_Artplayer & {
+        danuni?: DanUniConvertTip;
+    };
+    [DM_format.DdplayJson]: DM_JSON_DDPlay & {
+        danuni?: DanUniConvertTip;
+    };
+};
 export declare class UniPool {
     dans: UniDM[];
     options: Options;
@@ -200,19 +217,15 @@ export declare class UniPool {
     minify(): (Partial<UniDMTools.UniDMObj> & Pick<UniDMTools.UniDMObj, "SOID">)[];
     static import(file: unknown, options?: Options, 
     /**
-     * 加载指定解析模块，为空则全选
+     * 加载指定解析模块，为空则全选，为字符串则视为文件名解析加载模块
      */
-    mod?: ('json' | 'str' | 'bin')[]): {
+    mod?: string | ('json' | 'str' | 'bin')[]): {
         pool: UniPool;
         fmt: DM_format;
     };
-    convert2(format: DM_format, continue_on_error?: boolean): string | Uint8Array<ArrayBuffer> | UniDM[] | (Partial<UniDMTools.UniDMObj> & Pick<UniDMTools.UniDMObj, "SOID">)[] | (DM_JSON_Dplayer & {
-        danuni?: DanUniConvertTip;
-    }) | (DM_JSON_Artplayer & {
-        danuni?: DanUniConvertTip;
-    }) | (DM_JSON_DDPlay & {
-        danuni?: DanUniConvertTip;
-    });
+    convert2<T extends Convert2Format>(format: T, file_wrapper: true, continue_on_error?: boolean): File;
+    convert2<T extends Convert2Format>(format: T, file_wrapper?: false, continue_on_error?: boolean): Convert2ResultMap[T];
+    static fromMin(json: DM_JSON_DanuniMin, options?: Options): UniPool;
     static fromPb(bin: Uint8Array | ArrayBuffer, options?: Options): UniPool;
     /**
      * 转为 protobuf 二进制

package/dist/umd/src/utils/fileParser.d.ts

@@ -0,0 +1,3 @@
+export declare function fileParser(file: unknown, mod: 'bin'): ArrayBuffer | Uint8Array;
+export declare function fileParser(file: unknown, mod: 'string'): string;
+export declare function fileParser<T extends object>(file: unknown, mod: 'json'): T;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dan-uni/dan-any",
   "type": "module",
-  "version": "1.3.0",
+  "version": "1.3.4",
   "description": "A danmaku transformer lib, supporting danmaku from different platforms.",
   "author": "rinne",
   "license": "LGPL-3.0-or-later",
@@ -35,9 +35,8 @@
     "@bufbuild/protobuf": "^2.11.0",
     "base16384": "^1.0.0",
     "class-transformer": "^0.5.1",
-    "class-validator": "^0.14.3",
-    "fast-xml-parser": "^5.3.6",
-    "fs-extra": "^11.3.3",
+    "class-validator": "^0.15.1",
+    "fast-xml-parser": "^5.5.8",
     "hh-mm-ss": "^1.2.0",
     "json-bigint": "^1.0.0",
     "jssha": "^3.3.1",
@@ -45,13 +44,12 @@
     "reflect-metadata": "^0.2.2"
   },
   "devDependencies": {
-    "@bufbuild/buf": "^1.65.0",
+    "@bufbuild/buf": "^1.66.1",
     "@bufbuild/protoc-gen-es": "^2.11.0",
-    "@types/fs-extra": "^11.0.4",
     "@types/hh-mm-ss": "^1.2.3",
     "@types/json-bigint": "^1.0.4",
     "@types/luxon": "^3.7.1",
-    "canvas": "^3.2.1",
+    "canvas": "^3.2.2",
     "protobufjs": "^8.0.0"
   }
 }

package/src/index.test.ts

@@ -37,6 +37,8 @@ describe('转化自', () => {
     const imp = UniPool.import(xml)
     expect(imp.fmt).toBe('bili.xml')
     expect(imp.pool).toEqual(pool)
+    const imp2 = UniPool.import(xml, undefined, 'test-bili.xml')
+    expect(imp2).toEqual(imp)
   })
   it('artplayer(json)', () => {
     const json = {
@@ -56,7 +58,10 @@ describe('转化自', () => {
     console.info(pool)
     const imp = UniPool.import(json)
     expect(imp.fmt).toBe('artplayer.json')
+    // 该适配器ctime始终为now，无法双向测试
     // expect(imp.pool).toEqual(pool)
+    UniPool.import(json, undefined, 'test-artplayer.json')
+    // expect(imp2).toEqual(imp)
   })
   it('ass[双向]', () => {
     const canvas = createCanvas(50, 50)
@@ -67,6 +72,8 @@ describe('转化自', () => {
     const imp = UniPool.import(ass)
     expect(imp.fmt).toBe('common.ass')
     expect(imp.pool).toEqual(pool)
+    const imp2 = UniPool.import(ass, undefined, 'test-common.ass')
+    expect(imp2).toEqual(imp)
   })
   it('pb[双向]', () => {
     const pool = UniPool.fromBiliXML(xml)
@@ -75,6 +82,8 @@ describe('转化自', () => {
     const imp = UniPool.import(pb)
     expect(imp.fmt).toBe('danuni.binpb')
     expect(imp.pool).toEqual(pool)
+    const imp2 = UniPool.import(pb, undefined, 'test-danuni.binpb')
+    expect(imp2).toEqual(imp)
   })
   it('DDplay[双向]', () => {
     const pool = UniPool.fromBiliXML(xml)
@@ -82,7 +91,20 @@ describe('转化自', () => {
     console.info(UniPool.fromDDPlay(ddplay, '1'))
     const imp = UniPool.import(ddplay)
     expect(imp.fmt).toBe('ddplay.json')
+    // 该适配器ctime始终为now，无法双向测试
+    UniPool.import(ddplay, undefined, 'test-ddplay.json')
+    // expect(imp2).toEqual(imp)
+  })
+  it('min[双向]', () => {
+    const pool = UniPool.fromBiliXML(xml)
+    const min = pool.minify()
+    console.info(min)
+    const imp = UniPool.import(min)
+    expect(imp.fmt).toBe('danuni.min.json')
+    // 该适配器ctime始终为now，无法双向测试
     // expect(imp.pool).toEqual(pool)
+    UniPool.import(min, undefined, 'test-danuni.min.json')
+    // expect(imp2).toEqual(imp)
   })
 })
 

package/src/index.ts

@@ -1,6 +1,6 @@
 import 'reflect-metadata/lite'
 
-import { isJSON, isObject, isString } from 'class-validator'
+import { isJSON, isString } from 'class-validator'
 import { XMLBuilder, XMLParser } from 'fast-xml-parser'
 import JSONbig from 'json-bigint'
 import type { Options as AssGenOptions, CanvasCtx } from './ass-gen'
@@ -26,6 +26,7 @@ import { ListDanResponseSchema } from './proto/gen/danuni/danmaku/v1/danmaku_pb'
 
 import { UniDM } from './utils/dm-gen'
 import * as UniDMTools from './utils/dm-gen'
+import { fileParser } from './utils/fileParser'
 import { UniID as ID } from './utils/id-gen'
 import * as UniIDTools from './utils/id-gen'
 import * as platform from './utils/platform'
@@ -45,6 +46,8 @@ interface DanUniConvertTip {
   data?: string
 }
 
+export type DM_JSON_DanuniMin = Partial<UniDMTools.UniDMObj>[]
+
 export interface DM_XML_Bili {
   i: {
     chatserver: string
@@ -197,6 +200,24 @@ export interface Options {
   dmid?: boolean | number | UniIDTools.DMIDGenerator
 }
 
+type Convert2Format =
+  | DM_format.DanuniJson
+  | DM_format.DanuniMinJson
+  | DM_format.DanuniPbBin
+  | DM_format.BiliXml
+  | DM_format.DplayerJson
+  | DM_format.ArtplayerJson
+  | DM_format.DdplayJson
+type Convert2ResultMap = {
+  [DM_format.DanuniJson]: UniDM[]
+  [DM_format.DanuniMinJson]: DM_JSON_DanuniMin
+  [DM_format.DanuniPbBin]: Uint8Array
+  [DM_format.BiliXml]: string
+  [DM_format.DplayerJson]: DM_JSON_Dplayer & { danuni?: DanUniConvertTip }
+  [DM_format.ArtplayerJson]: DM_JSON_Artplayer & { danuni?: DanUniConvertTip }
+  [DM_format.DdplayJson]: DM_JSON_DDPlay & { danuni?: DanUniConvertTip }
+}
+
 export class UniPool {
   constructor(
     public dans: UniDM[],
@@ -449,10 +470,120 @@ export class UniPool {
     file: unknown,
     options?: Options,
     /**
-     * 加载指定解析模块，为空则全选
+     * 加载指定解析模块，为空则全选，为字符串则视为文件名解析加载模块
      */
-    mod?: ('json' | 'str' | 'bin')[],
+    mod?: string | ('json' | 'str' | 'bin')[],
   ): { pool: UniPool; fmt: DM_format } {
+    const handlers = {
+      [DM_format.DanuniJson]: (json: UniDM[]) => ({
+        pool: new UniPool(json, options),
+        fmt: DM_format.DanuniJson,
+      }),
+      [DM_format.DanuniMinJson]: (json: DM_JSON_DanuniMin) => ({
+        pool: this.fromMin(json, options),
+        fmt: DM_format.DanuniMinJson,
+      }),
+      [DM_format.DanuniPbBin]: (
+        file: ArrayBuffer | Uint8Array<ArrayBufferLike>,
+      ) => ({
+        pool: this.fromPb(file),
+        fmt: DM_format.DanuniPbBin,
+      }),
+      [DM_format.BiliXml]: (file: string) => ({
+        pool: this.fromBiliXML(file, options),
+        fmt: DM_format.BiliXml,
+      }),
+      [DM_format.BiliPbBin]: (
+        file: ArrayBuffer | Uint8Array<ArrayBufferLike>,
+      ) => ({
+        pool: this.fromBiliGrpc(file),
+        fmt: DM_format.BiliPbBin,
+      }),
+      [DM_format.BiliCmdPbBin]: (
+        file: ArrayBuffer | Uint8Array<ArrayBufferLike>,
+      ) => ({
+        pool: this.fromBiliCommandGrpc(file),
+        fmt: DM_format.BiliCmdPbBin,
+      }),
+      [DM_format.BiliUpJson]: (json: DM_JSON_BiliUp) => ({
+        pool: this.fromBiliUp(json, options),
+        fmt: DM_format.BiliUpJson,
+      }),
+      [DM_format.DplayerJson]: (
+        json: DM_JSON_Dplayer & {
+          danuni?: DanUniConvertTip
+        },
+      ) => ({
+        pool: this.fromDplayer(
+          json,
+          json.danuni?.data ?? '',
+          undefined,
+          options,
+        ),
+        fmt: DM_format.DplayerJson,
+      }),
+      [DM_format.ArtplayerJson]: (
+        json: DM_JSON_Artplayer & {
+          danuni?: DanUniConvertTip
+        },
+      ) => ({
+        pool: this.fromArtplayer(
+          json,
+          json.danuni?.data ?? '',
+          undefined,
+          options,
+        ),
+        fmt: DM_format.ArtplayerJson,
+      }),
+      [DM_format.DdplayJson]: (
+        json: DM_JSON_DDPlay & {
+          danuni?: DanUniConvertTip
+        },
+      ) => ({
+        pool: this.fromDDPlay(json, json.danuni?.data ?? '', options),
+        fmt: DM_format.DdplayJson,
+      }),
+      [DM_format.CommonAss]: (file: string) => ({
+        pool: this.fromASS(file, options),
+        fmt: DM_format.CommonAss,
+      }),
+    }
+
+    if (typeof mod === 'string') {
+      const fn = mod
+      // 直接按照默认模式处理匹配后缀的文件
+      try {
+        if (fn.endsWith(DM_format.DanuniJson)) {
+          return handlers[DM_format.DanuniJson](fileParser(file, 'json'))
+        } else if (fn.endsWith(DM_format.DanuniMinJson))
+          return handlers[DM_format.DanuniMinJson](fileParser(file, 'json'))
+        else if (fn.endsWith(DM_format.DanuniPbBin))
+          return handlers[DM_format.DanuniPbBin](fileParser(file, 'bin'))
+        else if (fn.endsWith(DM_format.BiliXml))
+          return handlers[DM_format.BiliXml](fileParser(file, 'string'))
+        else if (fn.endsWith(DM_format.BiliPbBin))
+          return handlers[DM_format.BiliPbBin](fileParser(file, 'bin'))
+        else if (fn.endsWith(DM_format.BiliCmdPbBin))
+          return handlers[DM_format.BiliCmdPbBin](fileParser(file, 'bin'))
+        else if (fn.endsWith(DM_format.BiliUpJson))
+          return handlers[DM_format.BiliUpJson](fileParser(file, 'json'))
+        else if (fn.endsWith(DM_format.DplayerJson))
+          return handlers[DM_format.DplayerJson](fileParser(file, 'json'))
+        else if (fn.endsWith(DM_format.ArtplayerJson))
+          return handlers[DM_format.ArtplayerJson](fileParser(file, 'json'))
+        else if (fn.endsWith(DM_format.DdplayJson))
+          return handlers[DM_format.DdplayJson](fileParser(file, 'json'))
+        else if (fn.endsWith(DM_format.CommonAss))
+          return handlers[DM_format.CommonAss](fileParser(file, 'string'))
+      } catch {}
+      // 按照后缀设定启用模块
+      const ext = fn.split('.').pop()?.toLowerCase()
+      if (ext) {
+        if (ext === 'json') mod = ['json']
+        else if (['xml', 'ass'].includes(ext)) mod = ['str']
+        else if (['binpb', 'bin', 'so'].includes(ext)) mod = ['bin']
+      }
+    }
     if (!mod) mod = ['json', 'str', 'bin']
     const err = '无法识别该文件，请手动指定格式！'
     const parseJSON = (
@@ -463,42 +594,23 @@ export class UniPool {
     ): { pool: UniPool; fmt: DM_format } | undefined => {
       try {
         if (Array.isArray(json) && json.every((d) => d.SOID)) {
-          return { pool: new UniPool(json, options), fmt: DM_format.DanuniJson }
+          return handlers[DM_format.DanuniMinJson](json) // 使用兼容性参数，danuni.min.json解析器可以解析danuni.json
         } else if (json.danmuku && json.danmuku.every((d) => d.text)) {
-          return {
-            pool: this.fromArtplayer(
-              json,
-              json.danuni?.data ?? '',
-              undefined,
-              options,
-            ),
-            fmt: DM_format.ArtplayerJson,
-          }
+          return handlers[DM_format.ArtplayerJson](json)
         } else if (
           json.count &&
           json.comments &&
           Array.isArray(json.comments) &&
           json.comments.every((d) => d.m)
         ) {
-          return {
-            pool: this.fromDDPlay(json, json.danuni?.data ?? '', options),
-            fmt: DM_format.DdplayJson,
-          }
+          return handlers[DM_format.DdplayJson](json)
         } else if (
           json.code == 0 &&
           json.data &&
           Array.isArray(json.data) &&
           json.data.every((d) => Array.isArray(d))
         ) {
-          return {
-            pool: this.fromDplayer(
-              json,
-              json.danuni?.data ?? '',
-              undefined,
-              options,
-            ),
-            fmt: DM_format.DplayerJson,
-          }
+          return handlers[DM_format.DplayerJson](json)
         } else if (
           json.code == 0 &&
           json.message == '0' &&
@@ -508,10 +620,7 @@ export class UniPool {
           Array.isArray(json.data.result) &&
           json.data.result.every((d) => d.id && d.oid)
         ) {
-          return {
-            pool: this.fromBiliUp(json, options),
-            fmt: DM_format.BiliUpJson,
-          }
+          return handlers[DM_format.BiliUpJson](json)
         }
       } catch {}
     }
@@ -531,33 +640,26 @@ export class UniPool {
         try {
           const xmlParser = new XMLParser({ ignoreAttributes: false })
           const xml = xmlParser.parse(file)
-          if (xml?.i?.d)
-            return {
-              pool: this.fromBiliXML(file, options),
-              fmt: DM_format.BiliXml,
-            }
+          if (xml?.i?.d) return handlers[DM_format.BiliXml](file)
         } catch {}
         try {
-          return { pool: this.fromASS(file, options), fmt: DM_format.CommonAss }
+          return handlers[DM_format.CommonAss](file)
         } catch {}
       }
     }
     let errmesg
-    if (isObject(file)) {
+    if (typeof file === 'object' || Array.isArray(file)) {
       if (file instanceof ArrayBuffer || file instanceof Uint8Array) {
         // pure-bin (pb)
         if (mod.includes('bin')) {
           try {
-            return { pool: this.fromPb(file), fmt: DM_format.DanuniPbBin }
+            return handlers[DM_format.DanuniPbBin](file)
           } catch {}
           try {
-            return { pool: this.fromBiliGrpc(file), fmt: DM_format.BiliPbBin }
+            return handlers[DM_format.BiliPbBin](file)
           } catch {}
           try {
-            return {
-              pool: this.fromBiliCommandGrpc(file),
-              fmt: DM_format.BiliCmdPbBin,
-            }
+            return handlers[DM_format.BiliCmdPbBin](file)
           } catch {}
         }
         // str-bin (pure-str + json-str)
@@ -585,27 +687,87 @@ export class UniPool {
     }
     throw new Error(errmesg ?? err)
   }
-  convert2(format: DM_format, continue_on_error = false) {
+  convert2<T extends Convert2Format>(
+    format: T,
+    file_wrapper: true,
+    continue_on_error?: boolean,
+  ): File
+  convert2<T extends Convert2Format>(
+    format: T,
+    file_wrapper?: false,
+    continue_on_error?: boolean,
+  ): Convert2ResultMap[T]
+  convert2(
+    format: DM_format,
+    file_wrapper = false,
+    continue_on_error = false,
+  ): File | Convert2ResultMap[Convert2Format] | string {
     switch (format) {
-      case 'danuni.json':
-        return this.dans
-      case 'danuni.min.json':
-        return this.minify()
-      case 'danuni.binpb':
-        return this.toPb()
-      case 'bili.xml':
-        return this.toBiliXML()
-      // case 'bili.binpb':
+      case DM_format.DanuniJson:
+        if (file_wrapper)
+          return new File([JSON.stringify(this.dans)], DM_format.DanuniJson, {
+            type: 'application/json',
+          })
+        else return this.dans
+      case DM_format.DanuniMinJson:
+        if (file_wrapper)
+          return new File(
+            [JSON.stringify(this.minify())],
+            DM_format.DanuniMinJson,
+            {
+              type: 'application/json',
+            },
+          )
+        else return this.minify()
+      case DM_format.DanuniPbBin:
+        if (file_wrapper)
+          return new File([this.toPb()], DM_format.DanuniPbBin, {
+            type: 'application/protobuf',
+          })
+        else return this.toPb()
+      case DM_format.BiliXml:
+        if (file_wrapper)
+          return new File([this.toBiliXML()], DM_format.BiliXml, {
+            type: 'application/xml',
+          })
+        else return this.toBiliXML()
+      // case DM_format.BiliPbBin:
       //   return this.toBiliBin()
-      // case 'bili.cmd.binpb':
+      // case DM_format.BiliCmdPbBin:
       //   return this.toBiliCmdBin()
-      case 'dplayer.json':
+      // case DM_format.BiliUpJson:
+      //   return this.toBiliUp()
+      case DM_format.DplayerJson:
+        if (file_wrapper)
+          return new File(
+            [JSON.stringify(this.toDplayer())],
+            DM_format.DplayerJson,
+            {
+              type: 'application/json',
+            },
+          )
         return this.toDplayer()
-      case 'artplayer.json':
+      case DM_format.ArtplayerJson:
+        if (file_wrapper)
+          return new File(
+            [JSON.stringify(this.toArtplayer())],
+            DM_format.ArtplayerJson,
+            {
+              type: 'application/json',
+            },
+          )
         return this.toArtplayer()
-      case 'ddplay.json':
+      case DM_format.DdplayJson:
+        if (file_wrapper)
+          return new File(
+            [JSON.stringify(this.toDDplay())],
+            DM_format.DdplayJson,
+            {
+              type: 'application/json',
+            },
+          )
         return this.toDDplay()
-      // case 'common.ass':
+      // case DM_format.CommonAss:
       //   return this.toASS()
       default: {
         const message = '(err) Unknown format or unsupported now!'
@@ -614,6 +776,9 @@ export class UniPool {
       }
     }
   }
+  static fromMin(json: DM_JSON_DanuniMin, options?: Options) {
+    return new UniPool(json.map((d: any) => UniDM.create(d, options)))
+  }
   static fromPb(bin: Uint8Array | ArrayBuffer, options?: Options) {
     const data = fromBinary(ListDanResponseSchema, new Uint8Array(bin))
     return new UniPool(

package/src/utils/dm-gen.ts

@@ -479,7 +479,7 @@ export class UniDM {
     if (!this.SOID) this.SOID = def.SOID
     if (!this.progress) this.progress = def.progress
     if (!this.mode) this.mode = def.mode
-    if (!this.fontsize) this.fontsize = def.mode
+    if (!this.fontsize) this.fontsize = def.fontsize
     if (!this.color) this.color = def.color
     if (!this.senderID) this.senderID = def.senderID
     if (!this.content) this.content = def.content

package/src/utils/fileParser.ts

@@ -0,0 +1,37 @@
+export function fileParser(file: unknown, mod: 'bin'): ArrayBuffer | Uint8Array
+export function fileParser(file: unknown, mod: 'string'): string
+export function fileParser<T extends object>(file: unknown, mod: 'json'): T
+export function fileParser(
+  file: unknown,
+  mod: 'bin' | 'string' | 'json',
+): ArrayBuffer | Uint8Array | string | object {
+  const isBinary = file instanceof ArrayBuffer || file instanceof Uint8Array
+  switch (mod) {
+    case 'bin': {
+      if (isBinary) return file
+      throw new TypeError('Expected binary data for mod "bin"')
+    }
+    case 'string': {
+      if (typeof file === 'string') return file
+      if (isBinary) return new TextDecoder().decode(file)
+      throw new TypeError('Expected binary data or string for mod "string"')
+    }
+    case 'json': {
+      if (typeof file === 'object' && file !== null && !isBinary) return file
+      if (typeof file !== 'string' && !isBinary) {
+        throw new TypeError(
+          'Expected object, JSON string, or binary data for mod "json"',
+        )
+      }
+      const str =
+        typeof file === 'string' ? file : new TextDecoder().decode(file)
+      try {
+        return JSON.parse(str)
+      } catch {
+        throw new Error('Invalid JSON string')
+      }
+    }
+    default:
+      throw new Error(`Unsupported mod "${mod}"`)
+  }
+}