@dan-uni/dan-any 1.2.5 → 1.3.0

package/src/proto/gen/danuni/danmaku/v1/danmaku_pb.ts

@@ -0,0 +1,223 @@
+// @generated by protoc-gen-es v2.11.0 with parameter "target=ts"
+// @generated from file danuni/danmaku/v1/danmaku.proto (package danuni.danmaku.v1, syntax proto3)
+/* eslint-disable */
+
+import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";
+import { enumDesc, fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2";
+import type { Timestamp } from "@bufbuild/protobuf/wkt";
+import { file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";
+import type { Message } from "@bufbuild/protobuf";
+
+/**
+ * Describes the file danuni/danmaku/v1/danmaku.proto.
+ */
+export const file_danuni_danmaku_v1_danmaku: GenFile = /*@__PURE__*/
+  fileDesc("Ch9kYW51bmkvZGFubWFrdS92MS9kYW5tYWt1LnByb3RvEhFkYW51bmkuZGFubWFrdS52MSI2Cg5MaXN0RGFuUmVxdWVzdBIKCgJpZBgBIAEoCRIQCgNzZWcYAiABKAVIAIgBAUIGCgRfc2VnIusCCgdEYW5tYWt1EhIKBHNvaWQYASABKAlSBFNPSUQSEgoEZG1pZBgCIAEoCVIERE1JRBIQCghwcm9ncmVzcxgDIAEoBRIlCgRtb2RlGAQgASgOMhcuZGFudW5pLmRhbm1ha3UudjEuTW9kZRIQCghmb250c2l6ZRgFIAEoBRINCgVjb2xvchgGIAEoBRIbCglzZW5kZXJfaWQYByABKAlSCHNlbmRlcklEEg8KB2NvbnRlbnQYCCABKAkSKQoFY3RpbWUYCSABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEg4KBndlaWdodBgKIAEoBRIlCgRwb29sGAsgASgOMhcuZGFudW5pLmRhbm1ha3UudjEuUG9vbBIMCgRhdHRyGAwgAygJEhUKCHBsYXRmb3JtGA0gASgJSACIAQESEgoFZXh0cmEYDiABKAlIAYgBAUILCglfcGxhdGZvcm1CCAoGX2V4dHJhIj8KD0xpc3REYW5SZXNwb25zZRIsCghkYW5tYWt1cxgBIAMoCzIaLmRhbnVuaS5kYW5tYWt1LnYxLkRhbm1ha3UqYgoETW9kZRIbChdNT0RFX05PUk1BTF9VTlNQRUNJRklFRBAAEg8KC01PREVfQk9UVE9NEAESDAoITU9ERV9UT1AQAhIQCgxNT0RFX1JFVkVSU0UQAxIMCghNT0RFX0VYVBAEKkkKBFBvb2wSGAoUUE9PTF9ERUZfVU5TUEVDSUZJRUQQABIMCghQT09MX1NVQhABEgwKCFBPT0xfQURWEAISCwoHUE9PTF9JWBADMmQKDkRhbm1ha3VTZXJ2aWNlElIKB0xpc3REYW4SIS5kYW51bmkuZGFubWFrdS52MS5MaXN0RGFuUmVxdWVzdBoiLmRhbnVuaS5kYW5tYWt1LnYxLkxpc3REYW5SZXNwb25zZSIAQosBChVjb20uZGFudW5pLmRhbm1ha3UudjFCDERhbm1ha3VQcm90b1ABogIDRERYqgIRRGFudW5pLkRhbm1ha3UuVjHKAhFEYW51bmlcRGFubWFrdVxWMeICHURhbnVuaVxEYW5tYWt1XFYxXEdQQk1ldGFkYXRh6gITRGFudW5pOjpEYW5tYWt1OjpWMWIGcHJvdG8z", [file_google_protobuf_timestamp]);
+
+/**
+ * @generated from message danuni.danmaku.v1.ListDanRequest
+ */
+export type ListDanRequest = Message<"danuni.danmaku.v1.ListDanRequest"> & {
+  /**
+   * @generated from field: string id = 1;
+   */
+  id: string;
+
+  /**
+   * @generated from field: optional int32 seg = 2;
+   */
+  seg?: number;
+};
+
+/**
+ * Describes the message danuni.danmaku.v1.ListDanRequest.
+ * Use `create(ListDanRequestSchema)` to create a new message.
+ */
+export const ListDanRequestSchema: GenMessage<ListDanRequest> = /*@__PURE__*/
+  messageDesc(file_danuni_danmaku_v1_danmaku, 0);
+
+/**
+ * @generated from message danuni.danmaku.v1.Danmaku
+ */
+export type Danmaku = Message<"danuni.danmaku.v1.Danmaku"> & {
+  /**
+   * @generated from field: string soid = 1 [json_name = "SOID"];
+   */
+  soid: string;
+
+  /**
+   * @generated from field: string dmid = 2 [json_name = "DMID"];
+   */
+  dmid: string;
+
+  /**
+   * @generated from field: int32 progress = 3;
+   */
+  progress: number;
+
+  /**
+   * @generated from field: danuni.danmaku.v1.Mode mode = 4;
+   */
+  mode: Mode;
+
+  /**
+   * @generated from field: int32 fontsize = 5;
+   */
+  fontsize: number;
+
+  /**
+   * @generated from field: int32 color = 6;
+   */
+  color: number;
+
+  /**
+   * @generated from field: string sender_id = 7 [json_name = "senderID"];
+   */
+  senderId: string;
+
+  /**
+   * @generated from field: string content = 8;
+   */
+  content: string;
+
+  /**
+   * @generated from field: google.protobuf.Timestamp ctime = 9;
+   */
+  ctime?: Timestamp;
+
+  /**
+   * @generated from field: int32 weight = 10;
+   */
+  weight: number;
+
+  /**
+   * @generated from field: danuni.danmaku.v1.Pool pool = 11;
+   */
+  pool: Pool;
+
+  /**
+   * @generated from field: repeated string attr = 12;
+   */
+  attr: string[];
+
+  /**
+   * @generated from field: optional string platform = 13;
+   */
+  platform?: string;
+
+  /**
+   * @generated from field: optional string extra = 14;
+   */
+  extra?: string;
+};
+
+/**
+ * Describes the message danuni.danmaku.v1.Danmaku.
+ * Use `create(DanmakuSchema)` to create a new message.
+ */
+export const DanmakuSchema: GenMessage<Danmaku> = /*@__PURE__*/
+  messageDesc(file_danuni_danmaku_v1_danmaku, 1);
+
+/**
+ * @generated from message danuni.danmaku.v1.ListDanResponse
+ */
+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.ListDanResponse.
+ * Use `create(ListDanResponseSchema)` to create a new message.
+ */
+export const ListDanResponseSchema: GenMessage<ListDanResponse> = /*@__PURE__*/
+  messageDesc(file_danuni_danmaku_v1_danmaku, 2);
+
+/**
+ * 此处作为数字应与danuni库相应类型一一对应
+ *
+ * @generated from enum danuni.danmaku.v1.Mode
+ */
+export enum Mode {
+  /**
+   * @generated from enum value: MODE_NORMAL_UNSPECIFIED = 0;
+   */
+  NORMAL_UNSPECIFIED = 0,
+
+  /**
+   * @generated from enum value: MODE_BOTTOM = 1;
+   */
+  BOTTOM = 1,
+
+  /**
+   * @generated from enum value: MODE_TOP = 2;
+   */
+  TOP = 2,
+
+  /**
+   * @generated from enum value: MODE_REVERSE = 3;
+   */
+  REVERSE = 3,
+
+  /**
+   * @generated from enum value: MODE_EXT = 4;
+   */
+  EXT = 4,
+}
+
+/**
+ * Describes the enum danuni.danmaku.v1.Mode.
+ */
+export const ModeSchema: GenEnum<Mode> = /*@__PURE__*/
+  enumDesc(file_danuni_danmaku_v1_danmaku, 0);
+
+/**
+ * 此处作为数字应与danuni库相应类型一一对应
+ *
+ * @generated from enum danuni.danmaku.v1.Pool
+ */
+export enum Pool {
+  /**
+   * @generated from enum value: POOL_DEF_UNSPECIFIED = 0;
+   */
+  DEF_UNSPECIFIED = 0,
+
+  /**
+   * @generated from enum value: POOL_SUB = 1;
+   */
+  SUB = 1,
+
+  /**
+   * @generated from enum value: POOL_ADV = 2;
+   */
+  ADV = 2,
+
+  /**
+   * @generated from enum value: POOL_IX = 3;
+   */
+  IX = 3,
+}
+
+/**
+ * Describes the enum danuni.danmaku.v1.Pool.
+ */
+export const PoolSchema: GenEnum<Pool> = /*@__PURE__*/
+  enumDesc(file_danuni_danmaku_v1_danmaku, 1);
+
+/**
+ * @generated from service danuni.danmaku.v1.DanmakuService
+ */
+export const DanmakuService: GenService<{
+  /**
+   * @generated from rpc danuni.danmaku.v1.DanmakuService.ListDan
+   */
+  listDan: {
+    methodKind: "unary";
+    input: typeof ListDanRequestSchema;
+    output: typeof ListDanResponseSchema;
+  },
+}> = /*@__PURE__*/
+  serviceDesc(file_danuni_danmaku_v1_danmaku, 0);
+

package/src/proto/src/danuni/danmaku/v1/danmaku.proto

@@ -0,0 +1,52 @@
+syntax = "proto3";
+
+package danuni.danmaku.v1;
+
+import "google/protobuf/timestamp.proto";
+
+service DanmakuService {
+  rpc ListDan(ListDanRequest) returns (ListDanResponse) {}
+}
+
+message ListDanRequest {
+  string id = 1;
+  optional int32 seg = 2;
+}
+
+// 此处作为数字应与danuni库相应类型一一对应
+enum Mode {
+  MODE_NORMAL_UNSPECIFIED = 0;
+  MODE_BOTTOM = 1;
+  MODE_TOP = 2;
+  MODE_REVERSE = 3;
+  MODE_EXT = 4;
+}
+
+// 此处作为数字应与danuni库相应类型一一对应
+enum Pool {
+  POOL_DEF_UNSPECIFIED = 0;
+  POOL_SUB = 1;
+  POOL_ADV = 2;
+  POOL_IX = 3;
+}
+
+message Danmaku {
+  string soid = 1 [json_name = "SOID"];
+  string dmid = 2 [json_name = "DMID"];
+  int32 progress = 3;
+  Mode mode = 4;
+  int32 fontsize = 5;
+  int32 color = 6;
+  string sender_id = 7 [json_name = "senderID"];
+  string content = 8;
+  google.protobuf.Timestamp ctime = 9;
+  int32 weight = 10;
+  Pool pool = 11;
+  repeated string attr = 12;
+  optional string platform = 13;
+  optional string extra = 14;
+}
+
+message ListDanResponse {
+  repeated Danmaku danmakus = 1;
+}

package/src/utils/dm-gen.ts

@@ -626,7 +626,7 @@ export class UniDM {
     if (this.attr.length > 0) result.attr = this.attr
     if (this.platform !== undefined) result.platform = this.platform
     if (this.extraStr && this.extraStr !== '{}') result.extraStr = this.extraStr
-    if (this.DMID !== undefined) result.DMID = this.DMID
+    if (this.DMID !== undefined && this.options.dmid) result.DMID = this.DMID
     return result
   }
   @Expose()
@@ -791,7 +791,7 @@ export class UniDM {
     const senderID = isEmail(args.midHash, { require_tld: false })
       ? args.midHash
       : ID.fromBili({ midHash: args.midHash })
-    let mode = Modes.Normal
+    let mode: Modes
     const pool = args.pool //暂时不做处理，兼容bili的pool格式
     const extra: TExtra = {
       bili: {

package/src/proto/gen/danuni_pb.ts

@@ -1,219 +0,0 @@
-// @generated by protoc-gen-es v2.11.0 with parameter "target=ts"
-// @generated from file danuni.proto (package danuni.danmaku.v1, syntax proto3)
-/* eslint-disable */
-
-import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";
-import { enumDesc, fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2";
-import type { Timestamp } from "@bufbuild/protobuf/wkt";
-import { file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";
-import type { Message } from "@bufbuild/protobuf";
-
-/**
- * Describes the file danuni.proto.
- */
-export const file_danuni: GenFile = /*@__PURE__*/
-  fileDesc("CgxkYW51bmkucHJvdG8SEWRhbnVuaS5kYW5tYWt1LnYxIjIKCmxpc3REYW5SZXESCgoCSUQYASABKAkSEAoDc2VnGAIgASgFSACIAQFCBgoEX3NlZyLUAgoHRGFubWFrdRIMCgRTT0lEGAEgASgJEgwKBERNSUQYAiABKAkSEAoIcHJvZ3Jlc3MYAyABKAUSJQoEbW9kZRgEIAEoDjIXLmRhbnVuaS5kYW5tYWt1LnYxLk1vZGUSEAoIZm9udHNpemUYBSABKAUSDQoFY29sb3IYBiABKAUSEAoIc2VuZGVySUQYByABKAkSDwoHY29udGVudBgIIAEoCRIpCgVjdGltZRgJIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASDgoGd2VpZ2h0GAogASgFEiUKBHBvb2wYCyABKA4yFy5kYW51bmkuZGFubWFrdS52MS5Qb29sEgwKBGF0dHIYDCADKAkSFQoIcGxhdGZvcm0YDSABKAlIAIgBARISCgVleHRyYRgOIAEoCUgBiAEBQgsKCV9wbGF0Zm9ybUIICgZfZXh0cmEiPAoMRGFubWFrdVJlcGx5EiwKCGRhbm1ha3VzGAEgAygLMhouZGFudW5pLmRhbm1ha3UudjEuRGFubWFrdSo9CgRNb2RlEgoKBk5vcm1hbBAAEgoKBkJvdHRvbRABEgcKA1RvcBACEgsKB1JldmVyc2UQAxIHCgNFeHQQBCopCgRQb29sEgcKA0RlZhAAEgcKA1N1YhABEgcKA0FkdhACEgYKAkl4EAMyXQoORGFubWFrdVNlcnZpY2USSwoHbGlzdERhbhIdLmRhbnVuaS5kYW5tYWt1LnYxLmxpc3REYW5SZXEaHy5kYW51bmkuZGFubWFrdS52MS5EYW5tYWt1UmVwbHkiAFAAYgZwcm90bzM", [file_google_protobuf_timestamp]);
-
-/**
- * @generated from message danuni.danmaku.v1.listDanReq
- */
-export type listDanReq = Message<"danuni.danmaku.v1.listDanReq"> & {
-  /**
-   * @generated from field: string ID = 1;
-   */
-  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.
- */
-export const listDanReqSchema: GenMessage<listDanReq> = /*@__PURE__*/
-  messageDesc(file_danuni, 0);
-
-/**
- * @generated from message danuni.danmaku.v1.Danmaku
- */
-export type Danmaku = Message<"danuni.danmaku.v1.Danmaku"> & {
-  /**
-   * @generated from field: string SOID = 1;
-   */
-  SOID: string;
-
-  /**
-   * @generated from field: string DMID = 2;
-   */
-  DMID: string;
-
-  /**
-   * @generated from field: int32 progress = 3;
-   */
-  progress: number;
-
-  /**
-   * @generated from field: danuni.danmaku.v1.Mode mode = 4;
-   */
-  mode: Mode;
-
-  /**
-   * @generated from field: int32 fontsize = 5;
-   */
-  fontsize: number;
-
-  /**
-   * @generated from field: int32 color = 6;
-   */
-  color: number;
-
-  /**
-   * @generated from field: string senderID = 7;
-   */
-  senderID: string;
-
-  /**
-   * @generated from field: string content = 8;
-   */
-  content: string;
-
-  /**
-   * @generated from field: google.protobuf.Timestamp ctime = 9;
-   */
-  ctime?: Timestamp;
-
-  /**
-   * @generated from field: int32 weight = 10;
-   */
-  weight: number;
-
-  /**
-   * @generated from field: danuni.danmaku.v1.Pool pool = 11;
-   */
-  pool: Pool;
-
-  /**
-   * @generated from field: repeated string attr = 12;
-   */
-  attr: string[];
-
-  /**
-   * @generated from field: optional string platform = 13;
-   */
-  platform?: string;
-
-  /**
-   * @generated from field: optional string extra = 14;
-   */
-  extra?: string;
-};
-
-/**
- * Describes the message danuni.danmaku.v1.Danmaku.
- * Use `create(DanmakuSchema)` to create a new message.
- */
-export const DanmakuSchema: GenMessage<Danmaku> = /*@__PURE__*/
-  messageDesc(file_danuni, 1);
-
-/**
- * @generated from message danuni.danmaku.v1.DanmakuReply
- */
-export type DanmakuReply = Message<"danuni.danmaku.v1.DanmakuReply"> & {
-  /**
-   * @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.
- */
-export const DanmakuReplySchema: GenMessage<DanmakuReply> = /*@__PURE__*/
-  messageDesc(file_danuni, 2);
-
-/**
- * @generated from enum danuni.danmaku.v1.Mode
- */
-export enum Mode {
-  /**
-   * @generated from enum value: Normal = 0;
-   */
-  Normal = 0,
-
-  /**
-   * @generated from enum value: Bottom = 1;
-   */
-  Bottom = 1,
-
-  /**
-   * @generated from enum value: Top = 2;
-   */
-  Top = 2,
-
-  /**
-   * @generated from enum value: Reverse = 3;
-   */
-  Reverse = 3,
-
-  /**
-   * @generated from enum value: Ext = 4;
-   */
-  Ext = 4,
-}
-
-/**
- * Describes the enum danuni.danmaku.v1.Mode.
- */
-export const ModeSchema: GenEnum<Mode> = /*@__PURE__*/
-  enumDesc(file_danuni, 0);
-
-/**
- * @generated from enum danuni.danmaku.v1.Pool
- */
-export enum Pool {
-  /**
-   * @generated from enum value: Def = 0;
-   */
-  Def = 0,
-
-  /**
-   * @generated from enum value: Sub = 1;
-   */
-  Sub = 1,
-
-  /**
-   * @generated from enum value: Adv = 2;
-   */
-  Adv = 2,
-
-  /**
-   * @generated from enum value: Ix = 3;
-   */
-  Ix = 3,
-}
-
-/**
- * Describes the enum danuni.danmaku.v1.Pool.
- */
-export const PoolSchema: GenEnum<Pool> = /*@__PURE__*/
-  enumDesc(file_danuni, 1);
-
-/**
- * @generated from service danuni.danmaku.v1.DanmakuService
- */
-export const DanmakuService: GenService<{
-  /**
-   * @generated from rpc danuni.danmaku.v1.DanmakuService.listDan
-   */
-  listDan: {
-    methodKind: "unary";
-    input: typeof listDanReqSchema;
-    output: typeof DanmakuReplySchema;
-  },
-}> = /*@__PURE__*/
-  serviceDesc(file_danuni, 0);
-

package/src/proto/src/danuni.proto

@@ -1,50 +0,0 @@
-syntax = "proto3";
-
-package danuni.danmaku.v1;
-
-import public "google/protobuf/timestamp.proto";
-
-service DanmakuService {
-  rpc listDan (listDanReq) returns (DanmakuReply) {}
-}
-
-message listDanReq {
-  string ID = 1;
-  optional int32 seg = 2;
-}
-
-enum Mode {
-  Normal = 0;
-  Bottom = 1;
-  Top = 2;
-  Reverse = 3;
-  Ext = 4;
-}
-
-enum Pool {
-  Def = 0;
-  Sub = 1;
-  Adv = 2;
-  Ix = 3;
-}
-
-message Danmaku {
-  string SOID = 1;
-  string DMID = 2;
-  int32 progress = 3;
-  Mode mode = 4;
-  int32 fontsize = 5;
-  int32 color = 6;
-  string senderID = 7;
-  string content = 8;
-  google.protobuf.Timestamp ctime = 9;
-  int32 weight = 10;
-  Pool pool = 11;
-  repeated string attr = 12;
-  optional string platform = 13;
-  optional string extra = 14;
-}
-
-message DanmakuReply {
-  repeated Danmaku danmakus = 1;
-}