@dan-uni/dan-any 0.9.4 → 0.9.6

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

@@ -1,5 +1,4 @@
 import type { UniPool } from '../..';
 import type { Context, SubtitleStyle } from '../types';
 import type { RawConfig } from './raw';
-declare const _default: (list: UniPool, rawList: UniPool, config: SubtitleStyle, context?: Context, rawConfig?: RawConfig) => string;
-export default _default;
+export declare const ass: (list: UniPool, rawList: UniPool, config: SubtitleStyle, context?: Context, rawConfig?: RawConfig) => string;

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

@@ -1,6 +1,6 @@
 import type { RGB } from '../types';
 import { DanmakuType } from '../types';
-declare const _default: (danmaku: {
+export declare const dialogue: (danmaku: {
     type: (typeof DanmakuType)[keyof typeof DanmakuType];
     color: RGB;
     fontSizeType: number;
@@ -14,4 +14,3 @@ declare const _default: (danmaku: {
     scrollTime: number;
     fixTime: number;
 }) => string;
-export default _default;

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

@@ -1,3 +1,2 @@
 import type { Danmaku, SubtitleStyle } from '../types';
-declare const _default: (list: Danmaku[], config: SubtitleStyle) => string;
-export default _default;
+export declare const event: (list: Danmaku[], config: SubtitleStyle) => string;

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

@@ -4,5 +4,5 @@ type Resolution = {
     playResX: number;
     playResY: number;
 };
-declare const _default: ({ playResX, playResY }: Resolution, { filename, title }: ExtraInfo) => string;
-export default _default;
+export declare const info: ({ playResX, playResY }: Resolution, { filename, title }: ExtraInfo) => string;
+export {};

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

@@ -1,3 +1,2 @@
 import type { SubtitleStyle } from '../types';
-declare const _default: ({ fontName, fontSize, color: configColor, outlineColor, backColor, bold, outline, shadow, opacity, }: SubtitleStyle) => string;
-export default _default;
+export declare const style: ({ fontName, fontSize, color: configColor, outlineColor, backColor, bold, outline, shadow, opacity, }: SubtitleStyle) => string;

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

@@ -1,3 +1,2 @@
 import type { SubtitleStyle } from './types';
-declare const _default: (overrides?: {}) => SubtitleStyle;
-export default _default;
+export declare const getConfig: (overrides?: {}) => SubtitleStyle;

package/dist/src/index.d.ts

@@ -25,8 +25,74 @@ export interface DM_XML_Bili {
         }[];
     };
 }
+export interface DM_JSON_BiliUp {
+    /** 接口状态码，0 表示成功 */
+    code: number;
+    /** 文本形式的状态码，约定为字符串 "0" */
+    message: string;
+    /** TTL（time to live） 标识，本接口常量为 1 */
+    ttl: number;
+    data: {
+        /** 分页元信息 */
+        page: {
+            /** 当前页序号，从 1 开始 */
+            num: number;
+            /** 每页返回的弹幕条数 */
+            size: number;
+            /** 总页数 */
+            total: number;
+        };
+        result: {
+            /** 弹幕 ID，int64 */
+            id: number;
+            /** 弹幕 ID 字符串形式 */
+            id_str: string;
+            /** 弹幕类型：1 表示视频弹幕（当前接口恒为 1） */
+            type: number;
+            aid: number;
+            bvid: string;
+            oid: number;
+            mid: number;
+            /** 发送者 mid 的 CRC 哈希（正常接口里用的是这个，保护隐私） */
+            mid_hash: string;
+            /** 弹幕池 */
+            pool: number;
+            /** 属性位字符串，逗号分隔的数字列表，对应 attr 二进制位 */
+            attrs: string;
+            /** 弹幕出现时间，单位毫秒(注意，此处与protobuf接口保持一致，但xml中progress是秒) */
+            progress: number;
+            mode: number;
+            /** 弹幕内容, content */
+            msg: string;
+            state: number;
+            fontsize: number;
+            /** 弹幕颜色，需将16进制转化为普通弹幕的10进制，示例："ffffff" */
+            color: string;
+            /** 发送时间戳，单位秒 */
+            ctime: number;
+            /** 发送者昵称 */
+            uname: string;
+            /** 发送者头像链接 */
+            uface: string;
+            /** 视频主标题 */
+            title: string;
+            self_seen: boolean;
+            /** 弹幕点赞数 */
+            like_count: number;
+            user_like: number;
+            /** 分 P 标题 */
+            p_title: string;
+            /** 视频封面链接 */
+            cover: string;
+            is_charge: boolean;
+            is_charge_plus: boolean;
+            following: boolean;
+            extra_cps: null;
+        }[];
+    };
+}
 export interface DM_JSON_Dplayer {
-    code: 0;
+    code: number;
     /**
      * progress,mode,color,midHash,content
      */
@@ -151,6 +217,7 @@ export declare class UniPool {
      * @param bin 符合`DmWebViewReplySchema`(bili视频meta)的protobuf二进制
      */
     static fromBiliCommandGrpc(bin: Uint8Array | ArrayBuffer, options?: Options): UniPool;
+    static fromBiliUp(json: DM_JSON_BiliUp, options?: Options): UniPool;
     static fromDplayer(json: DM_JSON_Dplayer & {
         danuni?: DanUniConvertTip;
     }, playerID: string, domain?: string, options?: Options): UniPool;

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

@@ -18,6 +18,7 @@ interface DMBili {
     mode: number;
     fontsize: number;
     color: number;
+    mid?: number;
     midHash: string;
     /**
      * 特殊类型解析：
@@ -97,6 +98,8 @@ interface ExtraBili {
     mode?: number;
     pool?: number;
     dmid?: bigint;
+    attr?: number;
+    mid?: number;
     adv?: string;
     code?: string;
     bas?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dan-uni/dan-any",
-  "version": "0.9.4",
+  "version": "0.9.6",
   "description": "A danmaku transformer lib, supporting danmaku from different platforms.",
   "type": "module",
   "keywords": [
@@ -32,20 +32,20 @@
     "buf": "buf generate"
   },
   "dependencies": {
-    "@bufbuild/protobuf": "^2.7.0",
+    "@bufbuild/protobuf": "^2.9.0",
     "base16384": "^1.0.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.2",
-    "fast-xml-parser": "^5.2.5",
-    "fs-extra": "^11.3.1",
+    "fast-xml-parser": "^5.3.0",
+    "fs-extra": "^11.3.2",
     "hh-mm-ss": "^1.2.0",
     "json-bigint": "^1.0.0",
     "jssha": "^3.3.1",
     "reflect-metadata": "^0.2.2"
   },
   "devDependencies": {
-    "@bufbuild/buf": "^1.56.0",
-    "@bufbuild/protoc-gen-es": "^2.7.0",
+    "@bufbuild/buf": "^1.57.2",
+    "@bufbuild/protoc-gen-es": "^2.9.0",
     "@types/fs-extra": "^11.0.4",
     "@types/hh-mm-ss": "^1.2.3",
     "@types/json-bigint": "^1.0.4",

package/src/ass-gen/__tests__/generate.test.ts

@@ -12,7 +12,7 @@ const __dirname = dirname(fileURLToPath(import.meta.url))
 it('generate ass from xml', () => {
   const filename = '898651903.xml'
   const xmlPath = path.join(__dirname, filename)
-  const xmlText = fs.readFileSync(xmlPath, 'utf-8')
+  const xmlText = fs.readFileSync(xmlPath, 'utf8')
   const canvas = createCanvas(50, 50)
   const assText = generateASS(
     UniPool.fromBiliXML(xmlText),
@@ -22,5 +22,5 @@ it('generate ass from xml', () => {
     },
     canvas.getContext('2d') as unknown as CanvasRenderingContext2D,
   )
-  fs.writeFileSync(path.join(__dirname, `${filename}.ass`), assText, 'utf-8')
+  fs.writeFileSync(path.join(__dirname, `${filename}.ass`), assText, 'utf8')
 })

package/src/ass-gen/ass/create.ts

@@ -3,17 +3,18 @@ import type { Context, SubtitleStyle } from '../types'
 import type { RawConfig } from './raw'
 
 import { UniPool2DanmakuLists } from '../util'
-import event from './event'
-import info from './info'
+import { event } from './event'
+import { info } from './info'
 import { raw } from './raw'
-import style from './style'
+import { style } from './style'
 
-// eslint-disable-next-line import/no-default-export
-export default (
+const default_context = { filename: 'unknown', title: 'unknown' }
+
+export const ass = (
   list: UniPool,
   rawList: UniPool,
   config: SubtitleStyle,
-  context: Context = { filename: 'unknown', title: 'unknown' },
+  context: Context = default_context,
   rawConfig?: RawConfig,
 ) => {
   const Elist = UniPool2DanmakuLists(list)

package/src/ass-gen/ass/dialogue.ts

@@ -40,8 +40,7 @@ const fixCommand = ({ top, left }: { top: number; left: number }) =>
 const colorCommand = (color: RGB) => `\\c${formatColor(color)}`
 const borderColorCommand = (color: RGB) => `\\3c${formatColor(color)}`
 
-// eslint-disable-next-line import/no-default-export
-export default (
+export const dialogue = (
   danmaku: {
     type: (typeof DanmakuType)[keyof typeof DanmakuType]
     color: RGB

package/src/ass-gen/ass/event.ts

@@ -1,7 +1,7 @@
 import type { Danmaku, SubtitleStyle } from '../types'
 
 import { DanmakuType } from '../types'
-import dialogue from './dialogue'
+import { dialogue } from './dialogue'
 
 const calculateDanmakuPosition = (danmaku: Danmaku, config: SubtitleStyle) => {
   const { playResX, playResY, scrollTime, fixTime } = config
@@ -43,8 +43,7 @@ const calculateDanmakuPosition = (danmaku: Danmaku, config: SubtitleStyle) => {
   }
 }
 
-// eslint-disable-next-line import/no-default-export
-export default (list: Danmaku[], config: SubtitleStyle) => {
+export const event = (list: Danmaku[], config: SubtitleStyle) => {
   const content = [
     '[Events]',
     'Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text',

package/src/ass-gen/ass/info.ts

@@ -9,8 +9,7 @@ type Resolution = {
   playResY: number
 }
 
-// eslint-disable-next-line import/no-default-export
-export default (
+export const info = (
   { playResX, playResY }: Resolution,
   { filename, title }: ExtraInfo,
 ) => {

package/src/ass-gen/ass/raw.ts

@@ -9,8 +9,8 @@ import type { Context, Danmaku, SubtitleStyle } from '../types'
 
 type compressType = 'brotli' | 'gzip'
 type baseType = 'base64' | 'base18384'
-const compressTypes = ['brotli', 'gzip']
-const baseTypes = ['base64', 'base18384']
+const compressTypes = new Set(['brotli', 'gzip'])
+const baseTypes = new Set(['base64', 'base18384'])
 
 export interface RawConfig {
   compressType: compressType
@@ -20,7 +20,7 @@ export interface RawConfig {
 function fromUint16Array(array: Uint16Array): string {
   let result = ''
   for (const element of array) {
-    result += String.fromCharCode(element)
+    result += String.fromCodePoint(element)
   }
   return result
 }
@@ -57,20 +57,20 @@ export function deRaw(ass: string):
   else {
     let compressType = lineCompressType.replace(';RawCompressType: ', '').trim()
     let baseType = lineBaseType.replace(';RawBaseType: ', '').trim()
-    if (!compressTypes.includes(compressType)) compressType = 'gzip'
-    if (!baseTypes.includes(baseType)) baseType = 'base64'
+    if (!compressTypes.has(compressType)) compressType = 'gzip'
+    if (!baseTypes.has(baseType)) baseType = 'base64'
     const text = lineRaw.replace(';Raw: ', '').trim()
     const buffer =
       baseType === 'base64'
         ? Buffer.from(text, 'base64')
         : Buffer.from(
-            base16384.decode(Buffer.from(text, 'utf-8').toString('utf-8')),
+            base16384.decode(Buffer.from(text, 'utf8').toString('utf8')),
           )
     let decompress: Buffer
     if (compressType === 'brotli') decompress = brotliDecompressSync(buffer)
     else decompress = gunzipSync(buffer)
     try {
-      return JSON.parse(decompress.toString('utf-8'))
+      return JSON.parse(decompress.toString('utf8'))
     } catch {
       return undefined
     }

package/src/ass-gen/ass/style.ts

@@ -2,8 +2,7 @@ import type { SubtitleStyle } from '../types'
 
 import { formatColor, getDecoratingColor, hexColorToRGB } from '../util'
 
-// eslint-disable-next-line import/no-default-export
-export default ({
+export const style = ({
   fontName,
   fontSize,
   color: configColor,

package/src/ass-gen/config.ts

@@ -11,7 +11,7 @@ import { assign, formatColor, hexColorToRGB } from './util'
 // const convertBlockRule = (rule: string) =>
 //     builtinRules[rule] ? rule : new RegExp(rule)
 
-export default (overrides = {}): SubtitleStyle => {
+export const getConfig = (overrides = {}): SubtitleStyle => {
   const defaults = {
     fontSize: [25, 25, 36],
     fontName: 'SimHei',

package/src/ass-gen/index.ts

@@ -4,9 +4,9 @@ import type { RawConfig } from './ass/raw'
 import type { CanvasCtx, SubtitleStyle } from './types'
 
 import { UniPool } from '..'
-import ass from './ass/create'
+import { ass } from './ass/create'
 import { deRaw } from './ass/raw'
-import getConfig from './config'
+import { getConfig } from './config'
 import { DanmakuList2UniPool, layoutDanmaku } from './util'
 
 export { CanvasCtx }
@@ -65,6 +65,9 @@ export function parseAssRawField(
   options?: UniPoolOptions,
 ): UniPool {
   const raw = deRaw(ass)
-  if (!raw) return UniPool.create()
-  else return DanmakuList2UniPool(raw.list, options)
+  if (raw) {
+    return DanmakuList2UniPool(raw.list, options)
+  } else {
+    return UniPool.create()
+  }
 }

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

@@ -233,7 +233,7 @@ export const layoutDanmaku = (
   config: SubtitleStyle,
   canvasCtx: CanvasCtx,
 ): UniPool => {
-  const list = [...UniPool2DanmakuLists(inputList)].sort(
+  const list = [...UniPool2DanmakuLists(inputList)].toSorted(
     (x, y) => x.time - y.time,
   )
   const layout = initializeLayout(config, canvasCtx)

package/src/index.test.ts

@@ -1,4 +1,3 @@
-//基于以下注释，根据vitest生成测试用例
 import { createCanvas } from 'canvas'
 import { describe, expect, it } from 'vitest'
 

package/src/index.ts

@@ -59,8 +59,74 @@ export interface DM_XML_Bili {
     }[]
   }
 }
+export interface DM_JSON_BiliUp {
+  /** 接口状态码，0 表示成功 */
+  code: number
+  /** 文本形式的状态码，约定为字符串 "0" */
+  message: string
+  /** TTL（time to live） 标识，本接口常量为 1 */
+  ttl: number
+  data: {
+    /** 分页元信息 */
+    page: {
+      /** 当前页序号，从 1 开始 */
+      num: number
+      /** 每页返回的弹幕条数 */
+      size: number
+      /** 总页数 */
+      total: number
+    }
+    result: {
+      /** 弹幕 ID，int64 */
+      id: number
+      /** 弹幕 ID 字符串形式 */
+      id_str: string
+      /** 弹幕类型：1 表示视频弹幕（当前接口恒为 1） */
+      type: number
+      aid: number
+      bvid: string
+      oid: number
+      mid: number
+      /** 发送者 mid 的 CRC 哈希（正常接口里用的是这个，保护隐私） */
+      mid_hash: string
+      /** 弹幕池 */
+      pool: number
+      /** 属性位字符串，逗号分隔的数字列表，对应 attr 二进制位 */
+      attrs: string
+      /** 弹幕出现时间，单位毫秒(注意，此处与protobuf接口保持一致，但xml中progress是秒) */
+      progress: number
+      mode: number
+      /** 弹幕内容, content */
+      msg: string
+      state: number // ?
+      fontsize: number
+      /** 弹幕颜色，需将16进制转化为普通弹幕的10进制，示例："ffffff" */
+      color: string
+      /** 发送时间戳，单位秒 */
+      ctime: number
+      /** 发送者昵称 */
+      uname: string
+      /** 发送者头像链接 */
+      uface: string
+      /** 视频主标题 */
+      title: string
+      self_seen: boolean // 尽自己可见?
+      /** 弹幕点赞数 */
+      like_count: number
+      user_like: number // ?
+      /** 分 P 标题 */
+      p_title: string
+      /** 视频封面链接 */
+      cover: string
+      is_charge: boolean // 该up是否开通充电计划?
+      is_charge_plus: boolean // 该up是否开通高级充电计划?
+      following: boolean // 当前登录用户是否关注该发送者?
+      extra_cps: null // ?
+    }[]
+  }
+}
 export interface DM_JSON_Dplayer {
-  code: 0
+  code: number
   /**
    * progress,mode,color,midHash,content
    */
@@ -172,17 +238,17 @@ export class UniPool {
     const default_stat: Stat[] = []
     const stats = this.dans.reduce((stat, dan) => {
       const valWithCount = stat.find((i) => i.val === dan[key])
-      if (!valWithCount) {
-        stat.push({ val: dan[key], count: 1 })
-      } else {
+      if (valWithCount) {
         valWithCount.count++
+      } else {
+        stat.push({ val: dan[key], count: 1 })
       }
       return stat
     }, default_stat)
     return stats
   }
   getMost(key: keyof statItems) {
-    return this.getStat(key).sort((a, b) => b.count - a.count)[0]
+    return this.getStat(key).toSorted((a, b) => b.count - a.count)[0]
   }
   get most() {
     return {
@@ -449,8 +515,11 @@ export class UniPool {
         try {
           const fileStr = new TextDecoder().decode(file)
           const prStr = parseStr(fileStr)
-          if (!prStr) errmesg = `${err}(定位: bin->string)`
-          else return prStr
+          if (prStr) {
+            return prStr
+          } else {
+            errmesg = `${err}(定位: bin->string)`
+          }
         } catch {}
       } else if (mod.includes('json')) {
         // pure-json
@@ -611,6 +680,7 @@ export class UniPool {
     return builder.build({
       '?xml': {
         '@_version': '1.0',
+        // eslint-disable-next-line unicorn/text-encoding-identifier-case
         '@_encoding': 'UTF-8',
       },
       danuni: { ...DanUniConvertTipTemplate, data: this.shared.SOID },
@@ -653,6 +723,41 @@ export class UniPool {
       options,
     )
   }
+  static fromBiliUp(json: DM_JSON_BiliUp, options?: Options) {
+    return new UniPool(
+      json.data.result.map((d) => {
+        // 处理 attrs 字符串转换为 attr 二进制
+        // attrs 格式如 "1,13,21"，每个数字对应二进制位
+        const attrBin = d.attrs
+          ? d.attrs
+              .split(',')
+              .map(Number)
+              .reduce((bin, bitPosition) => bin | (1 << (bitPosition - 1)), 0)
+          : 0
+
+        return UniDM.fromBili(
+          {
+            id: BigInt(d.id_str || d.id),
+            progress: d.progress / 1000, // 毫秒转秒
+            mode: d.mode,
+            fontsize: d.fontsize,
+            color: Number.parseInt(d.color, 16),
+            mid: d.mid,
+            midHash: d.mid_hash,
+            content: d.msg,
+            ctime: BigInt(d.ctime),
+            pool: d.pool,
+            // idStr: d.id_str,
+            attr: attrBin,
+            oid: BigInt(d.oid),
+          },
+          BigInt(d.oid),
+          options,
+        )
+      }),
+      options,
+    )
+  }
   static fromDplayer(
     json: DM_JSON_Dplayer & { danuni?: DanUniConvertTip },
     playerID: string,
@@ -785,12 +890,15 @@ export class UniPool {
   /**
    * 转换为ASS字幕格式的弹幕，需播放器支持多行ASS渲染
    */
-  toASS(
-    canvasCtx: CanvasCtx,
-    options: AssGenOptions = { substyle: {} },
-  ): string {
+  toASS(canvasCtx: CanvasCtx, options?: AssGenOptions): string {
+    const defaultOptions: AssGenOptions = { substyle: {} }
+    const finalOptions = options ?? defaultOptions
     const fn = this.shared.SOID
-    return generateASS(this, { filename: fn, title: fn, ...options }, canvasCtx)
+    return generateASS(
+      this,
+      { filename: fn, title: fn, ...finalOptions },
+      canvasCtx,
+    )
   }
 }
 

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

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v2.7.0 with parameter "target=ts"
+// @generated by protoc-gen-es v2.9.0 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.7.0 with parameter "target=ts"
+// @generated by protoc-gen-es v2.9.0 with parameter "target=ts"
 // @generated from file danuni.proto (package danuni.danmaku.v1, syntax proto3)
 /* eslint-disable */