@dan-uni/dan-any 1.2.5 → 1.3.0

package/dist/{node/src/proto/gen/danuni_pb.d.ts → umd/src/proto/gen/danuni/danmaku/v1/danmaku_pb.d.ts}

@@ -2,39 +2,39 @@ import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobu
 import type { Timestamp } from "@bufbuild/protobuf/wkt";
 import type { Message } from "@bufbuild/protobuf";
 /**
- * Describes the file danuni.proto.
+ * Describes the file danuni/danmaku/v1/danmaku.proto.
  */
-export declare const file_danuni: GenFile;
+export declare const file_danuni_danmaku_v1_danmaku: GenFile;
 /**
- * @generated from message danuni.danmaku.v1.listDanReq
+ * @generated from message danuni.danmaku.v1.ListDanRequest
  */
-export type listDanReq = Message<"danuni.danmaku.v1.listDanReq"> & {
+export type ListDanRequest = Message<"danuni.danmaku.v1.ListDanRequest"> & {
     /**
-     * @generated from field: string ID = 1;
+     * @generated from field: string id = 1;
      */
-    ID: string;
+    id: string;
     /**
      * @generated from field: optional int32 seg = 2;
      */
     seg?: number;
 };
 /**
- * Describes the message danuni.danmaku.v1.listDanReq.
- * Use `create(listDanReqSchema)` to create a new message.
+ * Describes the message danuni.danmaku.v1.ListDanRequest.
+ * Use `create(ListDanRequestSchema)` to create a new message.
  */
-export declare const listDanReqSchema: GenMessage<listDanReq>;
+export declare const ListDanRequestSchema: GenMessage<ListDanRequest>;
 /**
  * @generated from message danuni.danmaku.v1.Danmaku
  */
 export type Danmaku = Message<"danuni.danmaku.v1.Danmaku"> & {
     /**
-     * @generated from field: string SOID = 1;
+     * @generated from field: string soid = 1 [json_name = "SOID"];
      */
-    SOID: string;
+    soid: string;
     /**
-     * @generated from field: string DMID = 2;
+     * @generated from field: string dmid = 2 [json_name = "DMID"];
      */
-    DMID: string;
+    dmid: string;
     /**
      * @generated from field: int32 progress = 3;
      */
@@ -52,9 +52,9 @@ export type Danmaku = Message<"danuni.danmaku.v1.Danmaku"> & {
      */
     color: number;
     /**
-     * @generated from field: string senderID = 7;
+     * @generated from field: string sender_id = 7 [json_name = "senderID"];
      */
-    senderID: string;
+    senderId: string;
     /**
      * @generated from field: string content = 8;
      */
@@ -90,68 +90,72 @@ export type Danmaku = Message<"danuni.danmaku.v1.Danmaku"> & {
  */
 export declare const DanmakuSchema: GenMessage<Danmaku>;
 /**
- * @generated from message danuni.danmaku.v1.DanmakuReply
+ * @generated from message danuni.danmaku.v1.ListDanResponse
  */
-export type DanmakuReply = Message<"danuni.danmaku.v1.DanmakuReply"> & {
+export type ListDanResponse = Message<"danuni.danmaku.v1.ListDanResponse"> & {
     /**
      * @generated from field: repeated danuni.danmaku.v1.Danmaku danmakus = 1;
      */
     danmakus: Danmaku[];
 };
 /**
- * Describes the message danuni.danmaku.v1.DanmakuReply.
- * Use `create(DanmakuReplySchema)` to create a new message.
+ * Describes the message danuni.danmaku.v1.ListDanResponse.
+ * Use `create(ListDanResponseSchema)` to create a new message.
  */
-export declare const DanmakuReplySchema: GenMessage<DanmakuReply>;
+export declare const ListDanResponseSchema: GenMessage<ListDanResponse>;
 /**
+ * 此处作为数字应与danuni库相应类型一一对应
+ *
  * @generated from enum danuni.danmaku.v1.Mode
  */
 export declare enum Mode {
     /**
-     * @generated from enum value: Normal = 0;
+     * @generated from enum value: MODE_NORMAL_UNSPECIFIED = 0;
      */
-    Normal = 0,
+    NORMAL_UNSPECIFIED = 0,
     /**
-     * @generated from enum value: Bottom = 1;
+     * @generated from enum value: MODE_BOTTOM = 1;
      */
-    Bottom = 1,
+    BOTTOM = 1,
     /**
-     * @generated from enum value: Top = 2;
+     * @generated from enum value: MODE_TOP = 2;
      */
-    Top = 2,
+    TOP = 2,
     /**
-     * @generated from enum value: Reverse = 3;
+     * @generated from enum value: MODE_REVERSE = 3;
      */
-    Reverse = 3,
+    REVERSE = 3,
     /**
-     * @generated from enum value: Ext = 4;
+     * @generated from enum value: MODE_EXT = 4;
      */
-    Ext = 4
+    EXT = 4
 }
 /**
  * Describes the enum danuni.danmaku.v1.Mode.
  */
 export declare const ModeSchema: GenEnum<Mode>;
 /**
+ * 此处作为数字应与danuni库相应类型一一对应
+ *
  * @generated from enum danuni.danmaku.v1.Pool
  */
 export declare enum Pool {
     /**
-     * @generated from enum value: Def = 0;
+     * @generated from enum value: POOL_DEF_UNSPECIFIED = 0;
      */
-    Def = 0,
+    DEF_UNSPECIFIED = 0,
     /**
-     * @generated from enum value: Sub = 1;
+     * @generated from enum value: POOL_SUB = 1;
      */
-    Sub = 1,
+    SUB = 1,
     /**
-     * @generated from enum value: Adv = 2;
+     * @generated from enum value: POOL_ADV = 2;
      */
-    Adv = 2,
+    ADV = 2,
     /**
-     * @generated from enum value: Ix = 3;
+     * @generated from enum value: POOL_IX = 3;
      */
-    Ix = 3
+    IX = 3
 }
 /**
  * Describes the enum danuni.danmaku.v1.Pool.
@@ -162,11 +166,11 @@ export declare const PoolSchema: GenEnum<Pool>;
  */
 export declare const DanmakuService: GenService<{
     /**
-     * @generated from rpc danuni.danmaku.v1.DanmakuService.listDan
+     * @generated from rpc danuni.danmaku.v1.DanmakuService.ListDan
      */
     listDan: {
         methodKind: "unary";
-        input: typeof listDanReqSchema;
-        output: typeof DanmakuReplySchema;
+        input: typeof ListDanRequestSchema;
+        output: typeof ListDanResponseSchema;
     };
 }>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dan-uni/dan-any",
   "type": "module",
-  "version": "1.2.5",
+  "version": "1.3.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.14.3",
-    "fast-xml-parser": "^5.3.4",
+    "fast-xml-parser": "^5.3.6",
     "fs-extra": "^11.3.3",
     "hh-mm-ss": "^1.2.0",
     "json-bigint": "^1.0.0",
@@ -45,7 +45,7 @@
     "reflect-metadata": "^0.2.2"
   },
   "devDependencies": {
-    "@bufbuild/buf": "^1.64.0",
+    "@bufbuild/buf": "^1.65.0",
     "@bufbuild/protoc-gen-es": "^2.11.0",
     "@types/fs-extra": "^11.0.4",
     "@types/hh-mm-ss": "^1.2.3",

package/src/index.test.ts

@@ -73,7 +73,7 @@ describe('转化自', () => {
     const pb = pool.toPb()
     console.info(UniPool.fromPb(pb))
     const imp = UniPool.import(pb)
-    expect(imp.fmt).toBe('danuni.pb.bin')
+    expect(imp.fmt).toBe('danuni.binpb')
     expect(imp.pool).toEqual(pool)
   })
   it('DDplay[双向]', () => {

package/src/index.ts

@@ -4,7 +4,8 @@ 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'
-import type { CommandDm as DM_JSON_BiliCommandGrpc } from './proto/gen/bili/dm_pb'
+import type { CommandDm as DM_JSON_BiliCommandGrpc } from './proto/gen/bilibili/community/service/dm/v1/dm_pb'
+import type { Danmaku } from './proto/gen/danuni/danmaku/v1/danmaku_pb'
 
 import { create, fromBinary, toBinary } from '@bufbuild/protobuf'
 import {
@@ -19,8 +20,8 @@ import {
   // DanmakuElem as DM_JSON_BiliGrpc,
   DmSegMobileReplySchema,
   DmWebViewReplySchema,
-} from './proto/gen/bili/dm_pb'
-import { DanmakuReplySchema } from './proto/gen/danuni_pb'
+} from './proto/gen/bilibili/community/service/dm/v1/dm_pb'
+import { ListDanResponseSchema } from './proto/gen/danuni/danmaku/v1/danmaku_pb'
 // import type * as UniIDType from './utils/id-gen'
 
 import { UniDM } from './utils/dm-gen'
@@ -151,17 +152,19 @@ export interface DM_JSON_DDPlay {
   }[]
 }
 
-export type DM_format =
-  | 'danuni.json'
-  | 'danuni.pb.bin'
-  | 'bili.xml'
-  | 'bili.pb.bin'
-  | 'bili.cmd.pb.bin'
-  | 'bili.up.json'
-  | 'dplayer.json'
-  | 'artplayer.json'
-  | 'ddplay.json'
-  | 'common.ass'
+export enum DM_format {
+  DanuniJson = 'danuni.json',
+  DanuniMinJson = 'danuni.min.json',
+  DanuniPbBin = 'danuni.binpb',
+  BiliXml = 'bili.xml',
+  BiliPbBin = 'bili.binpb',
+  BiliCmdPbBin = 'bili.cmd.binpb',
+  BiliUpJson = 'bili.up.json',
+  DplayerJson = 'dplayer.json',
+  ArtplayerJson = 'artplayer.json',
+  DdplayJson = 'ddplay.json',
+  CommonAss = 'common.ass',
+}
 
 type shareItems = Partial<
   Pick<
@@ -460,7 +463,7 @@ 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: 'danuni.json' }
+          return { pool: new UniPool(json, options), fmt: DM_format.DanuniJson }
         } else if (json.danmuku && json.danmuku.every((d) => d.text)) {
           return {
             pool: this.fromArtplayer(
@@ -469,7 +472,7 @@ export class UniPool {
               undefined,
               options,
             ),
-            fmt: 'artplayer.json',
+            fmt: DM_format.ArtplayerJson,
           }
         } else if (
           json.count &&
@@ -479,7 +482,7 @@ export class UniPool {
         ) {
           return {
             pool: this.fromDDPlay(json, json.danuni?.data ?? '', options),
-            fmt: 'ddplay.json',
+            fmt: DM_format.DdplayJson,
           }
         } else if (
           json.code == 0 &&
@@ -494,7 +497,7 @@ export class UniPool {
               undefined,
               options,
             ),
-            fmt: 'dplayer.json',
+            fmt: DM_format.DplayerJson,
           }
         } else if (
           json.code == 0 &&
@@ -507,7 +510,7 @@ export class UniPool {
         ) {
           return {
             pool: this.fromBiliUp(json, options),
-            fmt: 'bili.up.json',
+            fmt: DM_format.BiliUpJson,
           }
         }
       } catch {}
@@ -529,10 +532,13 @@ export class UniPool {
           const xmlParser = new XMLParser({ ignoreAttributes: false })
           const xml = xmlParser.parse(file)
           if (xml?.i?.d)
-            return { pool: this.fromBiliXML(file, options), fmt: 'bili.xml' }
+            return {
+              pool: this.fromBiliXML(file, options),
+              fmt: DM_format.BiliXml,
+            }
         } catch {}
         try {
-          return { pool: this.fromASS(file, options), fmt: 'common.ass' }
+          return { pool: this.fromASS(file, options), fmt: DM_format.CommonAss }
         } catch {}
       }
     }
@@ -542,15 +548,15 @@ export class UniPool {
         // pure-bin (pb)
         if (mod.includes('bin')) {
           try {
-            return { pool: this.fromPb(file), fmt: 'danuni.pb.bin' }
+            return { pool: this.fromPb(file), fmt: DM_format.DanuniPbBin }
           } catch {}
           try {
-            return { pool: this.fromBiliGrpc(file), fmt: 'bili.pb.bin' }
+            return { pool: this.fromBiliGrpc(file), fmt: DM_format.BiliPbBin }
           } catch {}
           try {
             return {
               pool: this.fromBiliCommandGrpc(file),
-              fmt: 'bili.cmd.pb.bin',
+              fmt: DM_format.BiliCmdPbBin,
             }
           } catch {}
         }
@@ -583,13 +589,15 @@ export class UniPool {
     switch (format) {
       case 'danuni.json':
         return this.dans
-      case 'danuni.pb.bin':
+      case 'danuni.min.json':
+        return this.minify()
+      case 'danuni.binpb':
         return this.toPb()
       case 'bili.xml':
         return this.toBiliXML()
-      // case 'bili.bin':
+      // case 'bili.binpb':
       //   return this.toBiliBin()
-      // case 'bili.cmd.bin':
+      // case 'bili.cmd.binpb':
       //   return this.toBiliCmdBin()
       case 'dplayer.json':
         return this.toDplayer()
@@ -607,14 +615,17 @@ export class UniPool {
     }
   }
   static fromPb(bin: Uint8Array | ArrayBuffer, options?: Options) {
-    const data = fromBinary(DanmakuReplySchema, new Uint8Array(bin))
+    const data = fromBinary(ListDanResponseSchema, new Uint8Array(bin))
     return new UniPool(
       data.danmakus.map((d) =>
         UniDM.create(
           {
             ...d,
+            SOID: d.soid,
+            DMID: d.dmid,
             progress: d.progress / 1000,
             mode: d.mode as number,
+            senderID: d.senderId,
             ctime: timestampDate(d.ctime || timestampNow()),
             pool: d.pool as number,
             attr: d.attr as UniDMTools.DMAttr[],
@@ -632,17 +643,17 @@ export class UniPool {
    */
   toPb() {
     return toBinary(
-      DanmakuReplySchema,
-      create(DanmakuReplySchema, {
+      ListDanResponseSchema,
+      create(ListDanResponseSchema, {
         danmakus: this.dans.map((d) => {
           return {
-            SOID: d.SOID,
-            DMID: d.DMID,
+            soid: d.SOID,
+            dmid: d.DMID ?? '',
             progress: Math.round(d.progress * 1000),
             mode: d.mode as number,
             fontsize: d.fontsize,
             color: d.color,
-            senderID: d.senderID,
+            senderId: d.senderID,
             content: d.content,
             ctime: timestampFromDate(d.ctime),
             weight: d.weight,
@@ -650,7 +661,7 @@ export class UniPool {
             attr: d.attr,
             platform: d.platform,
             extra: d.extraStr,
-          }
+          } satisfies Omit<Danmaku, '$typeName'>
         }),
       }),
     )