@dan-uni/dan-any 0.8.7 → 0.9.0

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

@@ -1,3 +1,4 @@
+import type { Options as UniPoolOptions } from '..';
 import type { RawConfig } from './ass/raw';
 import type { CanvasCtx, SubtitleStyle } from './types';
 import { UniPool } from '..';
@@ -26,4 +27,4 @@ fs.writeFileSync(`${filename}.ass`, assText, 'utf-8')
 ```
  */
 export declare function generateASS(danmaku: UniPool, options: Options, canvasCtx: CanvasCtx): string;
-export declare function parseAssRawField(ass: string): UniPool;
+export declare function parseAssRawField(ass: string, options?: UniPoolOptions): UniPool;

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

@@ -1,4 +1,5 @@
+import type { Options as UniPoolOptions } from '../..';
 import type { Danmaku } from '../types';
 import { UniPool } from '../..';
 export declare function UniPool2DanmakuLists(UP: UniPool): Danmaku[];
-export declare function DanmakuList2UniPool(d: Danmaku[]): UniPool;
+export declare function DanmakuList2UniPool(d: Danmaku[], options?: UniPoolOptions): UniPool;

package/dist/src/index.d.ts

@@ -50,11 +50,11 @@ export interface DM_JSON_DDPlay {
         m: string;
     }[];
 }
-export type DM_format = 'danuni.json' | 'danuni.bin' | 'danuni.pb.zst' | 'bili.xml' | 'bili.bin' | 'bili.cmd.bin' | 'dplayer.json' | 'artplayer.json' | 'ddplay.json' | 'common.ass';
+export type DM_format = 'danuni.json' | 'danuni.pb.bin' | 'bili.xml' | 'bili.pb.bin' | 'bili.cmd.pb.bin' | 'dplayer.json' | 'artplayer.json' | 'ddplay.json' | 'common.ass';
 type shareItems = Partial<Pick<UniDMTools.UniDMObj, 'SOID' | 'senderID' | 'platform' | 'SOID' | 'pool' | 'mode' | 'color'>>;
 type UniPoolPipe = (that: UniPool) => Promise<UniPool>;
 type UniPoolPipeSync = (that: UniPool) => UniPool;
-interface Options {
+export interface Options {
     dedupe?: boolean;
     dmid?: boolean | number | UniIDTools.DMIDGenerator;
 }
@@ -143,6 +143,10 @@ export declare class UniPool {
      */
     merge(lifetime?: number): UniPool;
     minify(): (Partial<UniDMTools.UniDMObj> & Pick<UniDMTools.UniDMObj, "SOID">)[];
+    static import(file: unknown, options?: Options): {
+        pool: UniPool;
+        fmt: DM_format;
+    };
     convert2(format: DM_format, continue_on_error?: boolean): string | Uint8Array<ArrayBufferLike> | UniDM[] | (DM_JSON_Dplayer & {
         danuni?: DanUniConvertTip;
     }) | (DM_JSON_Artplayer & {
@@ -191,7 +195,7 @@ export declare class UniPool {
     toDDplay(): DM_JSON_DDPlay & {
         danuni?: DanUniConvertTip;
     };
-    static fromASS(ass: string): UniPool;
+    static fromASS(ass: string, options?: Options): UniPool;
     /**
      * 转换为ASS字幕格式的弹幕，需播放器支持多行ASS渲染
      */

package/package.json

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

package/src/ass-gen/index.ts

@@ -1,4 +1,5 @@
 // import parse from './parse/bilibili'
+import type { Options as UniPoolOptions } from '..'
 import type { RawConfig } from './ass/raw'
 import type { CanvasCtx, SubtitleStyle } from './types'
 
@@ -59,8 +60,11 @@ export function generateASS(
   return content
 }
 
-export function parseAssRawField(ass: string): UniPool {
+export function parseAssRawField(
+  ass: string,
+  options?: UniPoolOptions,
+): UniPool {
   const raw = deRaw(ass)
   if (!raw) return UniPool.create()
-  else return DanmakuList2UniPool(raw.list)
+  else return DanmakuList2UniPool(raw.list, options)
 }

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

@@ -1,3 +1,4 @@
+import type { Options as UniPoolOptions } from '../..'
 import type { Danmaku, RGB } from '../types'
 
 import { UniPool } from '../..'
@@ -31,6 +32,12 @@ export function UniPool2DanmakuLists(UP: UniPool): Danmaku[] {
     } satisfies Danmaku
   })
 }
-export function DanmakuList2UniPool(d: Danmaku[]): UniPool {
-  return new UniPool(d.map((d) => UniDM.create(d.extra)))
+export function DanmakuList2UniPool(
+  d: Danmaku[],
+  options?: UniPoolOptions,
+): UniPool {
+  return new UniPool(
+    d.map((d) => UniDM.create(d.extra)),
+    options,
+  )
 }

package/src/index.test.ts

@@ -1,6 +1,6 @@
 //基于以下注释，根据vitest生成测试用例
 import { createCanvas } from 'canvas'
-import { describe, it } from 'vitest'
+import { describe, expect, it } from 'vitest'
 
 import { UniPool } from './index'
 
@@ -35,6 +35,9 @@ describe('转化自', () => {
     console.info(pool)
     console.info(pool.toBiliXML())
     console.info(pool.toBiliXML({ avoidSenderIDWithAt: true }))
+    const imp = UniPool.import(xml)
+    expect(imp.fmt).toBe('bili.xml')
+    expect(imp.pool).toEqual(pool)
   })
   it('artplayer(json)', () => {
     const json = {
@@ -52,6 +55,9 @@ describe('转化自', () => {
       pool = UniPool.fromArtplayer(json, 'playerid-test', 'acfun')
     console.info(json)
     console.info(pool)
+    const imp = UniPool.import(json)
+    expect(imp.fmt).toBe('artplayer.json')
+    // expect(imp.pool).toEqual(pool)
   })
   it('ass[双向]', () => {
     const canvas = createCanvas(50, 50)
@@ -59,16 +65,25 @@ describe('转化自', () => {
     const ass = pool.toASS(canvas.getContext('2d'))
     console.info(ass)
     console.info(UniPool.fromASS(ass))
+    const imp = UniPool.import(ass)
+    expect(imp.fmt).toBe('common.ass')
+    expect(imp.pool).toEqual(pool)
   })
   it('pb[双向]', () => {
     const pool = UniPool.fromBiliXML(xml)
     const pb = pool.toPb()
     console.info(UniPool.fromPb(pb))
+    const imp = UniPool.import(pb)
+    expect(imp.fmt).toBe('danuni.pb.bin')
+    expect(imp.pool).toEqual(pool)
   })
   it('DDplay[双向]', () => {
     const pool = UniPool.fromBiliXML(xml)
     const ddplay = pool.toDDplay()
     console.info(UniPool.fromDDPlay(ddplay, '1'))
+    const imp = UniPool.import(ddplay)
+    expect(imp.fmt).toBe('ddplay.json')
+    // expect(imp.pool).toEqual(pool)
   })
 })
 

package/src/index.ts

@@ -1,5 +1,6 @@
 import 'reflect-metadata/lite'
 
+import { isJSON, isObject, 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'
@@ -86,11 +87,10 @@ export interface DM_JSON_DDPlay {
 
 export type DM_format =
   | 'danuni.json'
-  | 'danuni.bin'
-  | 'danuni.pb.zst'
+  | 'danuni.pb.bin'
   | 'bili.xml'
-  | 'bili.bin'
-  | 'bili.cmd.bin'
+  | 'bili.pb.bin'
+  | 'bili.cmd.pb.bin'
   | 'dplayer.json'
   | 'artplayer.json'
   | 'ddplay.json'
@@ -106,7 +106,7 @@ type shareItems = Partial<
 type UniPoolPipe = (that: UniPool) => Promise<UniPool>
 type UniPoolPipeSync = (that: UniPool) => UniPool
 
-interface Options {
+export interface Options {
   dedupe?: boolean
   dmid?: boolean | number | UniIDTools.DMIDGenerator
 }
@@ -396,11 +396,111 @@ export class UniPool {
   minify() {
     return this.dans.map((d) => d.minify())
   }
+  static import(
+    file: unknown,
+    options?: Options,
+  ): { pool: UniPool; fmt: DM_format } {
+    const err = '无法识别该文件，请手动指定格式！'
+    const parseJSON = (
+      json: DM_JSON_Artplayer &
+        DM_JSON_DDPlay &
+        DM_JSON_Dplayer & { danuni?: DanUniConvertTip },
+    ): { pool: UniPool; fmt: DM_format } | undefined => {
+      try {
+        if (Array.isArray(json) && json.every((d) => d.SOID)) {
+          return { pool: new UniPool(json, options), fmt: 'danuni.json' }
+        } else if (json.danmuku && json.danmuku.every((d) => d.text)) {
+          return {
+            pool: this.fromArtplayer(
+              json,
+              json.danuni?.data ?? '',
+              undefined,
+              options,
+            ),
+            fmt: 'artplayer.json',
+          }
+        } else if (
+          json.count &&
+          json.comments &&
+          json.comments.every((d) => d.m)
+        ) {
+          return {
+            pool: this.fromDDPlay(json, json.danuni?.data ?? '', options),
+            fmt: 'ddplay.json',
+          }
+        } else if (
+          json.code &&
+          json.code == 0 &&
+          json.data &&
+          json.data.every((d) => Array.isArray(d))
+        ) {
+          return {
+            pool: this.fromDplayer(
+              json,
+              json.danuni?.data ?? '',
+              undefined,
+              options,
+            ),
+            fmt: 'dplayer.json',
+          }
+        }
+      } catch {}
+    }
+    const parseStr = (
+      file: string,
+    ): { pool: UniPool; fmt: DM_format } | undefined => {
+      try {
+        if (isJSON(file)) {
+          const json = JSON.parse(file)
+          return parseJSON(json)
+        }
+      } catch {}
+      try {
+        const xmlParser = new XMLParser({ ignoreAttributes: false })
+        const xml = xmlParser.parse(file)
+        if (xml?.i?.d)
+          return { pool: this.fromBiliXML(file, options), fmt: 'bili.xml' }
+      } catch {}
+      try {
+        return { pool: this.fromASS(file, options), fmt: 'common.ass' }
+      } catch {}
+    }
+    if (isObject(file)) {
+      if (file instanceof ArrayBuffer || file instanceof Uint8Array) {
+        try {
+          const fileStr = new TextDecoder().decode(file)
+          const prStr = parseStr(fileStr)
+          if (!prStr) throw new Error(`${err}(定位: bin->string)`)
+        } catch {}
+        try {
+          return { pool: this.fromPb(file), fmt: 'danuni.pb.bin' }
+        } catch {}
+        try {
+          return { pool: this.fromBiliGrpc(file), fmt: 'bili.pb.bin' }
+        } catch {}
+        try {
+          return {
+            pool: this.fromBiliCommandGrpc(file),
+            fmt: 'bili.cmd.pb.bin',
+          }
+        } catch {}
+      } else {
+        const prJSON = parseJSON(file as any)
+        if (!prJSON) throw new Error(`${err}(定位: json)`)
+        return prJSON
+      }
+    } else if (isString(file)) {
+      const prStr = parseStr(file)
+      if (!prStr) throw new Error(`${err}(定位: string)`)
+      return prStr
+    }
+    throw new Error(err)
+  }
   convert2(format: DM_format, continue_on_error = false) {
     switch (format) {
       case 'danuni.json':
         return this.dans
-      case 'danuni.bin':
+      case 'danuni.pb.bin':
         return this.toPb()
       case 'bili.xml':
         return this.toBiliXML()
@@ -435,6 +535,8 @@ export class UniPool {
             ctime: timestampDate(d.ctime || timestampNow()),
             pool: d.pool as number,
             attr: d.attr as UniDMTools.DMAttr[],
+            extra: undefined,
+            extraStr: d.extra,
           },
           options,
         ),
@@ -588,9 +690,6 @@ export class UniPool {
   ) {
     return new UniPool(
       json.data.map((d) => {
-        // let TYPE = 0
-        // if (d[1] === 1) TYPE = 5
-        // else if (d[1] === 2) TYPE = 4
         return UniDM.fromDplayer(
           {
             content: d[4],
@@ -611,7 +710,10 @@ export class UniPool {
   toDplayer(): DM_JSON_Dplayer & { danuni?: DanUniConvertTip } {
     return {
       code: 0,
-      danuni: DanUniConvertTipTemplate,
+      danuni: {
+        ...DanUniConvertTipTemplate,
+        data: this.dans[0].SOID.split('@')[0],
+      },
       data: this.dans.map((dan) => {
         const d = dan.toDplayer()
         return [d.progress, d.mode, d.color, d.midHash, d.content]
@@ -626,9 +728,6 @@ export class UniPool {
   ) {
     return new UniPool(
       json.danmuku.map((d) => {
-        // let TYPE = 0
-        // if (d.mode === 1) TYPE = 5
-        // else if (d.mode === 2) TYPE = 4
         return UniDM.fromArtplayer(
           {
             content: d.text,
@@ -648,7 +747,10 @@ export class UniPool {
   }
   toArtplayer(): DM_JSON_Artplayer & { danuni?: DanUniConvertTip } {
     return {
-      danuni: DanUniConvertTipTemplate,
+      danuni: {
+        ...DanUniConvertTipTemplate,
+        data: this.dans[0].SOID.split('@')[0],
+      },
       danmuku: this.dans.map((dan) => {
         const d = dan.toArtplayer()
         return {
@@ -689,8 +791,12 @@ export class UniPool {
     )
   }
   toDDplay(): DM_JSON_DDPlay & { danuni?: DanUniConvertTip } {
+    const episodeId = this.dans[0].SOID.split('@')[0].replaceAll(
+      `def_${platform.PlatformDanmakuOnlySource.DanDanPlay}+`,
+      '',
+    )
     return {
-      danuni: DanUniConvertTipTemplate,
+      danuni: { ...DanUniConvertTipTemplate, data: episodeId },
       count: this.dans.length,
       comments: this.dans.map((dan) => {
         const d = dan.toDDplay()
@@ -702,8 +808,8 @@ export class UniPool {
       }),
     }
   }
-  static fromASS(ass: string) {
-    return parseAssRawField(ass)
+  static fromASS(ass: string, options?: Options) {
+    return parseAssRawField(ass, options)
   }
   /**
    * 转换为ASS字幕格式的弹幕，需播放器支持多行ASS渲染

package/src/utils/dm-gen.ts

@@ -471,6 +471,7 @@ export class UniDM {
       this.options.dmid = createDMID
 
     this.content = String(this.content)
+    this.ctime = UniDM.transCtime(this.ctime)
 
     if (!this.SOID) this.SOID = def.SOID
     if (!this.progress) this.progress = def.progress