@dan-uni/dan-any 0.0.7 → 0.2.0

package/dist/index.umd.min.js.LICENSE.txt

@@ -0,0 +1,17 @@
+/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>
+ * @license  MIT
+ */
+
+/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
+
+/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
+
+/*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */

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

@@ -0,0 +1 @@
+export {};

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

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

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

@@ -0,0 +1,17 @@
+import type { RGB } from '../types';
+import { DanmakuType } from '../types';
+declare const _default: (danmaku: {
+    type: (typeof DanmakuType)[keyof typeof DanmakuType];
+    color: RGB;
+    fontSizeType: number;
+    content: string;
+    time: number;
+    start: number;
+    end: number;
+    top: number;
+    left: number;
+}, config: {
+    scrollTime: number;
+    fixTime: number;
+}) => string;
+export default _default;

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

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

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

@@ -0,0 +1,8 @@
+import type { Context } from '../types';
+type ExtraInfo = Context;
+type Resolution = {
+    playResX: number;
+    playResY: number;
+};
+declare const _default: ({ playResX, playResY }: Resolution, { filename, title }: ExtraInfo) => string;
+export default _default;

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

@@ -0,0 +1,10 @@
+import type { Context, Danmaku, SubtitleStyle } from '../types';
+type compressType = 'brotli' | 'gzip';
+type baseType = 'base64' | 'base18384';
+declare const _default: (list: Danmaku[], config: SubtitleStyle, context: Context, compressType?: compressType, baseType?: baseType) => string;
+export default _default;
+export declare function deRaw(ass: string): {
+    list: Danmaku[];
+    config: SubtitleStyle;
+    context: Context;
+} | undefined;

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

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

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

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

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

@@ -0,0 +1,26 @@
+import type { SubtitleStyle } from './types';
+import { UniPool } from '..';
+export type Options = {
+    filename?: string;
+    title?: string;
+    substyle?: Partial<SubtitleStyle>;
+};
+/**
+ * 使用bilibili弹幕(XMl)生成ASS字幕文件
+ * @param {string} danmaku XML弹幕文件内容
+ * @param {Options} options 杂项
+ * @returns {string} 返回ASS字幕文件内容
+ * @description 杂项相关
+`filename`: 还原文件为XML时使用的默认文件名
+`title`: ASS [Script Info] Title 项的值,显示于播放器字幕选择
+`substyle`: ASS字幕样式
+ * @example ```ts
+import fs from 'fs'
+const filename = 'example.xml'
+const xmlText = fs.readFileSync(filename, 'utf-8')
+const assText = generateASS(xmlText, { filename, title: 'Quick Example' })
+fs.writeFileSync(`${filename}.ass`, assText, 'utf-8')
+```
+ */
+export declare function generateASS(danmaku: UniPool, options: Options): string;
+export declare function parseAssRawField(ass: string): UniPool;

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

@@ -0,0 +1,47 @@
+import type { UniDM } from '../utils/dm-gen';
+export interface Context {
+    filename: string;
+    title: string;
+}
+export interface SubtitleStyle {
+    fontSize: number[];
+    fontName: string;
+    color: string;
+    outlineColor?: string;
+    backColor?: string;
+    outline: number;
+    shadow: number;
+    bold: boolean;
+    padding: number[];
+    playResX: number;
+    playResY: number;
+    scrollTime: number;
+    fixTime: number;
+    opacity: number;
+    bottomSpace: number;
+    includeRaw: boolean;
+    mergeIn: number;
+}
+export type RGB = {
+    r: number;
+    g: number;
+    b: number;
+};
+export declare const DanmakuType: {
+    SCROLL: number;
+    BOTTOM: number;
+    TOP: number;
+};
+export declare const FontSize: {
+    SMALL: number;
+    NORMAL: number;
+    LARGE: number;
+};
+export type Danmaku = {
+    time: number;
+    type: number;
+    fontSizeType: number;
+    color: RGB;
+    content: string;
+    extra: UniDM;
+};

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

@@ -0,0 +1,18 @@
+import type { RGB } from '../types';
+export declare const hexColorToRGB: (hex: string) => {
+    r: number;
+    g: number;
+    b: number;
+};
+export declare const decimalColorToRGB: (decimal: number) => {
+    r: number;
+    g: number;
+    b: number;
+};
+export declare const formatColor: ({ r, g, b }: RGB, opacity?: number) => string;
+export declare const getDecoratingColor: (color: RGB) => {
+    r: number;
+    g: number;
+    b: number;
+};
+export declare const isWhite: (color: RGB) => boolean;

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

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

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

@@ -0,0 +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';

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

@@ -0,0 +1,3 @@
+export declare const assign: <T extends object>(source: T, ...targets: Partial<T>[]) => T;
+export declare const arrayOfLength: <T>(length: number, defaultValue: T) => T[];
+export declare const uniqueArray: <T>(array: T[]) => T[];

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

@@ -0,0 +1,4 @@
+import type { UniPool } from '../..';
+import type { SubtitleStyle } from '../types';
+export declare const measureTextWidth: (fontName: string, fontSize: number, bold: boolean, text: string) => number;
+export declare const layoutDanmaku: (inputList: UniPool, config: SubtitleStyle) => UniPool;

package/dist/{index.d.ts → src/index.d.ts}

@@ -1,3 +1,4 @@
+import type { Options as AssGenOptions } from './ass-gen';
 import type { CommandDm as DM_JSON_BiliCommandGrpc } from './proto/gen/bili/dm_pb';
 import type { platfrom } from './utils/id-gen';
 import { UniDM } from './utils/dm-gen';
@@ -41,15 +42,27 @@ 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';
+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';
 type shareItems = Partial<Pick<UniDMTools.UniDMObj, 'FCID' | 'senderID' | 'platform' | 'SPMO' | 'pool' | 'mode'>>;
 export declare class UniPool {
     dans: UniDM[];
     readonly shared: shareItems;
     constructor(dans: UniDM[]);
     static create(): UniPool;
+    /**
+     * 合并弹幕/弹幕库
+     */
     assign(dans: UniPool | UniDM | UniDM[]): UniPool;
+    /**
+     * 按共通属性拆分弹幕库
+     */
     split(key: keyof shareItems): UniPool[];
+    /**
+     * 合并一定时间段内的重复弹幕，防止同屏出现过多
+     * @param lifetime 查重时间区段，单位秒 (默认为0，表示不查重)
+     */
+    merge(lifetime?: number): UniPool;
+    minify(): (Partial<UniDMTools.UniDMObj> & Pick<UniDMTools.UniDMObj, "FCID">)[];
     convert2(format: DM_format): string | Uint8Array<ArrayBufferLike> | DM_JSON_Dplayer | DM_JSON_DDPlay | DM_JSON_Artplayer[];
     static fromPb(bin: Uint8Array | ArrayBuffer): UniPool;
     /**
@@ -70,5 +83,7 @@ export declare class UniPool {
     toArtplayer(): DM_JSON_Artplayer[];
     static fromDDPlay(json: DM_JSON_DDPlay, episodeId: string, domain?: string): UniPool;
     toDDplay(): DM_JSON_DDPlay;
+    static fromASS(ass: string): UniPool;
+    toASS(options?: AssGenOptions): string;
 }
 export { UniDM, UniDMTools, UniIDTools, type DM_JSON_BiliCommandGrpc, type platfrom, };

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

@@ -0,0 +1 @@
+export {};

package/dist/{utils → src/utils}/dm-gen.d.ts

@@ -91,10 +91,17 @@ interface ExtraBili {
     command?: DMBiliCommand;
 }
 export interface ExtraDanUni {
-    chapter?: {
-        duration: number;
-        type: ExtraDanUniChapterType;
-    };
+    chapter?: ExtraDanUniChapter;
+    merge?: ExtraDanUniMerge;
+}
+export interface ExtraDanUniChapter {
+    duration: number;
+    type: ExtraDanUniChapterType;
+}
+export interface ExtraDanUniMerge {
+    duration: number;
+    count: number;
+    senders: string[];
 }
 export declare enum ExtraDanUniChapterType {
     Chapter = "ch",//其它片段(用于标记章节)
@@ -142,7 +149,8 @@ export interface UniDMObj {
     attr: DMAttr[];
     platform: platfrom | string;
     SPMO: string;
-    extra: string;
+    extra: string | Extra;
+    extraStr: string;
     DMID: string;
 }
 /**
@@ -154,7 +162,7 @@ export declare class UniDM {
      */
     FCID: string;
     /**
-     * 弹幕出现位置(单位ms)
+     * 弹幕出现位置(单位s;精度为ms,即保留三位小数)
      */
     progress: number;
     /**
@@ -236,7 +244,7 @@ export declare class UniDM {
      */
     FCID: string, 
     /**
-     * 弹幕出现位置(单位ms)
+     * 弹幕出现位置(单位s;精度为ms,即保留三位小数)
      */
     progress?: number, 
     /**
@@ -308,7 +316,7 @@ export declare class UniDM {
      * - Artplayer: style不为空时，将其JSON.stringify()存入
      */
     extraStr?: string | undefined, DMID?: string | undefined);
-    static create(args: Partial<UniDMObj>): UniDM;
+    static create(args?: Partial<UniDMObj>): UniDM;
     get extra(): Extra;
     get isFrom3rdPlatform(): boolean;
     /**
@@ -317,8 +325,17 @@ export declare class UniDM {
      * @description 同一FCID下唯一
      */
     toDMID(): string;
+    isSameAs(dan: UniDM, _check2?: boolean): boolean;
+    minify(): Partial<UniDMObj> & Pick<UniDMObj, "FCID">;
     downgradeAdvcancedDan(): this | undefined;
-    static transCtime(oriCtime: ctime): Date;
+    /**
+     * 将各种类型的时间进行格式化
+     * @param oriCtime
+     * @param tsUnit 当`oriCtime`为数字类型表时间戳时的单位;
+     * 为 毫秒(ms)/秒(s)
+     * @returns {Date} Date格式时间
+     */
+    static transCtime(oriCtime: ctime, tsUnit?: 'ms' | 's'): Date;
     static transMode(oriMode: number, fmt: 'bili' | 'dplayer' | 'artplayer' | 'ddplay'): Modes;
     static fromBili(args: DMBili, SPMO?: string, cid?: bigint): UniDM;
     static fromBiliCommand(args: DMBiliCommand, SPMO?: string, cid?: bigint): UniDM;

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

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dan-uni/dan-any",
-  "version": "0.0.7",
+  "version": "0.2.0",
   "description": "A danmaku transformer lib, supporting danmaku from different platforms.",
   "keywords": [
     "bangumi",
@@ -26,20 +26,22 @@
     "coverage": "vitest run --coverage",
     "bench": "vitest bench",
     "lint": "eslint",
-    "build": "pnpm buf && rollup -c",
+    "build": "pnpm buf && rslib build",
     "build:types": "tsc",
-    "dev": "pnpm build && node bundle.js",
     "buf": "buf generate"
   },
   "dependencies": {
+    "base16384": "^1.0.0",
+    "canvas": "^3.1.0",
     "fast-xml-parser": "^4.5.1",
-    "jssha": "^3.3.1"
+    "jssha": "^3.3.1",
+    "pako": "^2.1.0"
   },
   "devDependencies": {
     "@bufbuild/buf": "^1.50.0",
     "@bufbuild/protobuf": "^2.2.3",
     "@bufbuild/protoc-gen-es": "^2.2.3",
-    "protobufjs": "^7.4.0",
-    "tslib": "^2.8.1"
+    "@types/pako": "^2.0.3",
+    "protobufjs": "^7.4.0"
   }
-}
+}

package/rslib.config.ts

@@ -0,0 +1,81 @@
+import { pluginNodePolyfill } from '@rsbuild/plugin-node-polyfill'
+import { defineConfig } from '@rslib/core'
+
+import pkg from './package.json'
+
+export default defineConfig({
+  lib: [
+    {
+      format: 'esm',
+      output: {
+        filename: { js: 'index.js' },
+        target: 'node',
+      },
+      dts: true,
+    },
+    {
+      format: 'umd',
+      output: {
+        filename: { js: 'index.umd.min.js' },
+        target: 'web',
+      },
+      dts: true,
+      umdName: pkg.name,
+      plugins: [pluginNodePolyfill()],
+    },
+  ],
+})
+
+// import path from 'node:path'
+// import type { Configuration } from '@rspack/cli'
+// import type { SwcLoaderOptions } from '@rspack/core'
+
+// import { RsdoctorRspackPlugin } from '@rsdoctor/rspack-plugin'
+
+// const config: Configuration = {
+//   entry: './src/index.ts',
+//   output: { path: path.resolve(__dirname, 'dist'), clean: true },
+//   resolve: {
+//     extensions: ['.ts', '.js'],
+//   },
+//   experiments: {
+//     futureDefaults: true,
+//   },
+//   plugins: [
+//     // 仅在 RSDOCTOR 为 true 时注册插件，因为插件会增加构建耗时
+//     process.env.RSDOCTOR &&
+//       new RsdoctorRspackPlugin({
+//         // 插件选项
+//       }),
+//   ].filter(Boolean),
+//   module: {
+//     rules: [
+//       {
+//         test: /\.(ts|js)$/,
+//         exclude: [/node_modules/],
+//         loader: 'builtin:swc-loader',
+//         options: {
+//           jsc: {
+//             parser: {
+//               syntax: 'typescript',
+//             },
+//           },
+//           env: {
+//             mode: 'usage',
+//             coreJs: '3',
+//             targets: [
+//               'chrome >= 87',
+//               'edge >= 88',
+//               'firefox >= 78',
+//               'safari >= 14',
+//             ],
+//           },
+//           isModule: 'unknown',
+//         } satisfies SwcLoaderOptions,
+//         type: 'javascript/auto',
+//       },
+//     ],
+//   },
+// }
+
+// export default config