From 81daf7ba066fb8d78914d77feca89e20d6ea22fe Mon Sep 17 00:00:00 2001 From: Seijo Cecilia Date: Mon, 2 Sep 2024 15:21:52 +0800 Subject: [PATCH] update: move to laana v0.1.2 --- .../action/index.ts | 2 +- src/{laana-v0.1.1 => laana-v0.1.2}/index.ts | 0 .../proto/action/contact.proto | 0 .../proto/action/file.proto | 0 .../proto/action/group.proto | 0 .../proto/action/message.proto | 11 +- .../proto/action/request.proto | 0 .../proto/action/wrapper.proto | 0 .../proto/entity/file.proto | 0 .../proto/entity/group.proto | 0 .../proto/entity/message.proto | 0 .../proto/entity/user.proto | 0 .../proto/event/buddy.proto | 0 .../proto/event/group.proto | 0 .../proto/event/request.proto | 0 .../proto/event/wrapper.proto | 0 .../proto/laana.proto | 0 .../types/action/contact.ts | 0 .../types/action/file.ts | 0 .../types/action/group.ts | 0 .../types/action/message.ts | 115 ++---------------- .../types/action/request.ts | 0 .../types/action/wrapper.ts | 0 .../types/entity/file.ts | 0 .../types/entity/group.ts | 0 .../types/entity/message.ts | 0 .../types/entity/user.ts | 0 .../types/event/buddy.ts | 0 .../types/event/group.ts | 0 .../types/event/request.ts | 0 .../types/event/wrapper.ts | 0 .../types/laana.ts | 0 .../utils/message.ts | 6 +- 33 files changed, 15 insertions(+), 119 deletions(-) rename src/{laana-v0.1.1 => laana-v0.1.2}/action/index.ts (90%) rename src/{laana-v0.1.1 => laana-v0.1.2}/index.ts (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/proto/action/contact.proto (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/proto/action/file.proto (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/proto/action/group.proto (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/proto/action/message.proto (87%) rename src/{laana-v0.1.1 => laana-v0.1.2}/proto/action/request.proto (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/proto/action/wrapper.proto (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/proto/entity/file.proto (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/proto/entity/group.proto (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/proto/entity/message.proto (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/proto/entity/user.proto (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/proto/event/buddy.proto (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/proto/event/group.proto (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/proto/event/request.proto (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/proto/event/wrapper.proto (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/proto/laana.proto (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/types/action/contact.ts (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/types/action/file.ts (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/types/action/group.ts (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/types/action/message.ts (88%) rename src/{laana-v0.1.1 => laana-v0.1.2}/types/action/request.ts (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/types/action/wrapper.ts (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/types/entity/file.ts (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/types/entity/group.ts (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/types/entity/message.ts (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/types/entity/user.ts (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/types/event/buddy.ts (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/types/event/group.ts (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/types/event/request.ts (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/types/event/wrapper.ts (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/types/laana.ts (100%) rename src/{laana-v0.1.1 => laana-v0.1.2}/utils/message.ts (97%) diff --git a/src/laana-v0.1.1/action/index.ts b/src/laana-v0.1.2/action/index.ts similarity index 90% rename from src/laana-v0.1.1/action/index.ts rename to src/laana-v0.1.2/action/index.ts index 936fd112..41775e42 100644 --- a/src/laana-v0.1.1/action/index.ts +++ b/src/laana-v0.1.2/action/index.ts @@ -1,4 +1,4 @@ -import { ActionPing, ActionPong } from '@/laana-v0.1.1/types/action/wrapper'; +import { ActionPing, ActionPong } from '@/laana-v0.1.2/types/action/wrapper'; type ExtractFromPongOrVoid = Extract extends never ? void : diff --git a/src/laana-v0.1.1/index.ts b/src/laana-v0.1.2/index.ts similarity index 100% rename from src/laana-v0.1.1/index.ts rename to src/laana-v0.1.2/index.ts diff --git a/src/laana-v0.1.1/proto/action/contact.proto b/src/laana-v0.1.2/proto/action/contact.proto similarity index 100% rename from src/laana-v0.1.1/proto/action/contact.proto rename to src/laana-v0.1.2/proto/action/contact.proto diff --git a/src/laana-v0.1.1/proto/action/file.proto b/src/laana-v0.1.2/proto/action/file.proto similarity index 100% rename from src/laana-v0.1.1/proto/action/file.proto rename to src/laana-v0.1.2/proto/action/file.proto diff --git a/src/laana-v0.1.1/proto/action/group.proto b/src/laana-v0.1.2/proto/action/group.proto similarity index 100% rename from src/laana-v0.1.1/proto/action/group.proto rename to src/laana-v0.1.2/proto/action/group.proto diff --git a/src/laana-v0.1.1/proto/action/message.proto b/src/laana-v0.1.2/proto/action/message.proto similarity index 87% rename from src/laana-v0.1.1/proto/action/message.proto rename to src/laana-v0.1.2/proto/action/message.proto index 61eaabab..b12ae042 100644 --- a/src/laana-v0.1.1/proto/action/message.proto +++ b/src/laana-v0.1.2/proto/action/message.proto @@ -29,15 +29,6 @@ message SendMessagePing { message SendMessagePong { string msgId = 1; - - message BubbleSegmentsFileCacheRef { - repeated string fileCacheIds = 1; - } - - oneof fileCacheId { - BubbleSegmentsFileCacheRef fromBubbleSegments = 11; - string fromSingleFile = 12; - } } message SendPackedMessagesPing { @@ -48,7 +39,7 @@ message SendPackedMessagesPing { message SendPackedMessagesPong { string packedMsgId = 1; ForwardMessageRef forwardMsgRef = 2; - repeated SendMessagePong messagePongs = 3; + repeated string msgIds = 3; } message GetMessagePing { diff --git a/src/laana-v0.1.1/proto/action/request.proto b/src/laana-v0.1.2/proto/action/request.proto similarity index 100% rename from src/laana-v0.1.1/proto/action/request.proto rename to src/laana-v0.1.2/proto/action/request.proto diff --git a/src/laana-v0.1.1/proto/action/wrapper.proto b/src/laana-v0.1.2/proto/action/wrapper.proto similarity index 100% rename from src/laana-v0.1.1/proto/action/wrapper.proto rename to src/laana-v0.1.2/proto/action/wrapper.proto diff --git a/src/laana-v0.1.1/proto/entity/file.proto b/src/laana-v0.1.2/proto/entity/file.proto similarity index 100% rename from src/laana-v0.1.1/proto/entity/file.proto rename to src/laana-v0.1.2/proto/entity/file.proto diff --git a/src/laana-v0.1.1/proto/entity/group.proto b/src/laana-v0.1.2/proto/entity/group.proto similarity index 100% rename from src/laana-v0.1.1/proto/entity/group.proto rename to src/laana-v0.1.2/proto/entity/group.proto diff --git a/src/laana-v0.1.1/proto/entity/message.proto b/src/laana-v0.1.2/proto/entity/message.proto similarity index 100% rename from src/laana-v0.1.1/proto/entity/message.proto rename to src/laana-v0.1.2/proto/entity/message.proto diff --git a/src/laana-v0.1.1/proto/entity/user.proto b/src/laana-v0.1.2/proto/entity/user.proto similarity index 100% rename from src/laana-v0.1.1/proto/entity/user.proto rename to src/laana-v0.1.2/proto/entity/user.proto diff --git a/src/laana-v0.1.1/proto/event/buddy.proto b/src/laana-v0.1.2/proto/event/buddy.proto similarity index 100% rename from src/laana-v0.1.1/proto/event/buddy.proto rename to src/laana-v0.1.2/proto/event/buddy.proto diff --git a/src/laana-v0.1.1/proto/event/group.proto b/src/laana-v0.1.2/proto/event/group.proto similarity index 100% rename from src/laana-v0.1.1/proto/event/group.proto rename to src/laana-v0.1.2/proto/event/group.proto diff --git a/src/laana-v0.1.1/proto/event/request.proto b/src/laana-v0.1.2/proto/event/request.proto similarity index 100% rename from src/laana-v0.1.1/proto/event/request.proto rename to src/laana-v0.1.2/proto/event/request.proto diff --git a/src/laana-v0.1.1/proto/event/wrapper.proto b/src/laana-v0.1.2/proto/event/wrapper.proto similarity index 100% rename from src/laana-v0.1.1/proto/event/wrapper.proto rename to src/laana-v0.1.2/proto/event/wrapper.proto diff --git a/src/laana-v0.1.1/proto/laana.proto b/src/laana-v0.1.2/proto/laana.proto similarity index 100% rename from src/laana-v0.1.1/proto/laana.proto rename to src/laana-v0.1.2/proto/laana.proto diff --git a/src/laana-v0.1.1/types/action/contact.ts b/src/laana-v0.1.2/types/action/contact.ts similarity index 100% rename from src/laana-v0.1.1/types/action/contact.ts rename to src/laana-v0.1.2/types/action/contact.ts diff --git a/src/laana-v0.1.1/types/action/file.ts b/src/laana-v0.1.2/types/action/file.ts similarity index 100% rename from src/laana-v0.1.1/types/action/file.ts rename to src/laana-v0.1.2/types/action/file.ts diff --git a/src/laana-v0.1.1/types/action/group.ts b/src/laana-v0.1.2/types/action/group.ts similarity index 100% rename from src/laana-v0.1.1/types/action/group.ts rename to src/laana-v0.1.2/types/action/group.ts diff --git a/src/laana-v0.1.1/types/action/message.ts b/src/laana-v0.1.2/types/action/message.ts similarity index 88% rename from src/laana-v0.1.1/types/action/message.ts rename to src/laana-v0.1.2/types/action/message.ts index 520f3d15..74d5f75f 100644 --- a/src/laana-v0.1.1/types/action/message.ts +++ b/src/laana-v0.1.2/types/action/message.ts @@ -99,33 +99,6 @@ export interface SendMessagePong { * @generated from protobuf field: string msgId = 1; */ msgId: string; - /** - * @generated from protobuf oneof: fileCacheId - */ - fileCacheId: { - oneofKind: "fromBubbleSegments"; - /** - * @generated from protobuf field: Laana.SendMessagePong.BubbleSegmentsFileCacheRef fromBubbleSegments = 11; - */ - fromBubbleSegments: SendMessagePong_BubbleSegmentsFileCacheRef; - } | { - oneofKind: "fromSingleFile"; - /** - * @generated from protobuf field: string fromSingleFile = 12; - */ - fromSingleFile: string; - } | { - oneofKind: undefined; - }; -} -/** - * @generated from protobuf message Laana.SendMessagePong.BubbleSegmentsFileCacheRef - */ -export interface SendMessagePong_BubbleSegmentsFileCacheRef { - /** - * @generated from protobuf field: repeated string fileCacheIds = 1; - */ - fileCacheIds: string[]; } /** * @generated from protobuf message Laana.SendPackedMessagesPing @@ -153,9 +126,9 @@ export interface SendPackedMessagesPong { */ forwardMsgRef?: ForwardMessageRef; /** - * @generated from protobuf field: repeated Laana.SendMessagePong messagePongs = 3; + * @generated from protobuf field: repeated string msgIds = 3; */ - messagePongs: SendMessagePong[]; + msgIds: string[]; } /** * @generated from protobuf message Laana.GetMessagePing @@ -434,15 +407,12 @@ export const SendMessagePing = new SendMessagePing$Type(); class SendMessagePong$Type extends MessageType { constructor() { super("Laana.SendMessagePong", [ - { no: 1, name: "msgId", kind: "scalar", T: 9 /*ScalarType.STRING*/ }, - { no: 11, name: "fromBubbleSegments", kind: "message", oneof: "fileCacheId", T: () => SendMessagePong_BubbleSegmentsFileCacheRef }, - { no: 12, name: "fromSingleFile", kind: "scalar", oneof: "fileCacheId", T: 9 /*ScalarType.STRING*/ } + { no: 1, name: "msgId", kind: "scalar", T: 9 /*ScalarType.STRING*/ } ]); } create(value?: PartialMessage): SendMessagePong { const message = globalThis.Object.create((this.messagePrototype!)); message.msgId = ""; - message.fileCacheId = { oneofKind: undefined }; if (value !== undefined) reflectionMergePartial(this, message, value); return message; @@ -455,18 +425,6 @@ class SendMessagePong$Type extends MessageType { case /* string msgId */ 1: message.msgId = reader.string(); break; - case /* Laana.SendMessagePong.BubbleSegmentsFileCacheRef fromBubbleSegments */ 11: - message.fileCacheId = { - oneofKind: "fromBubbleSegments", - fromBubbleSegments: SendMessagePong_BubbleSegmentsFileCacheRef.internalBinaryRead(reader, reader.uint32(), options, (message.fileCacheId as any).fromBubbleSegments) - }; - break; - case /* string fromSingleFile */ 12: - message.fileCacheId = { - oneofKind: "fromSingleFile", - fromSingleFile: reader.string() - }; - break; default: let u = options.readUnknownField; if (u === "throw") @@ -482,12 +440,6 @@ class SendMessagePong$Type extends MessageType { /* string msgId = 1; */ if (message.msgId !== "") writer.tag(1, WireType.LengthDelimited).string(message.msgId); - /* Laana.SendMessagePong.BubbleSegmentsFileCacheRef fromBubbleSegments = 11; */ - if (message.fileCacheId.oneofKind === "fromBubbleSegments") - SendMessagePong_BubbleSegmentsFileCacheRef.internalBinaryWrite(message.fileCacheId.fromBubbleSegments, writer.tag(11, WireType.LengthDelimited).fork(), options).join(); - /* string fromSingleFile = 12; */ - if (message.fileCacheId.oneofKind === "fromSingleFile") - writer.tag(12, WireType.LengthDelimited).string(message.fileCacheId.fromSingleFile); let u = options.writeUnknownFields; if (u !== false) (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer); @@ -499,53 +451,6 @@ class SendMessagePong$Type extends MessageType { */ export const SendMessagePong = new SendMessagePong$Type(); // @generated message type with reflection information, may provide speed optimized methods -class SendMessagePong_BubbleSegmentsFileCacheRef$Type extends MessageType { - constructor() { - super("Laana.SendMessagePong.BubbleSegmentsFileCacheRef", [ - { no: 1, name: "fileCacheIds", kind: "scalar", repeat: 2 /*RepeatType.UNPACKED*/, T: 9 /*ScalarType.STRING*/ } - ]); - } - create(value?: PartialMessage): SendMessagePong_BubbleSegmentsFileCacheRef { - const message = globalThis.Object.create((this.messagePrototype!)); - message.fileCacheIds = []; - if (value !== undefined) - reflectionMergePartial(this, message, value); - return message; - } - internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: SendMessagePong_BubbleSegmentsFileCacheRef): SendMessagePong_BubbleSegmentsFileCacheRef { - let message = target ?? this.create(), end = reader.pos + length; - while (reader.pos < end) { - let [fieldNo, wireType] = reader.tag(); - switch (fieldNo) { - case /* repeated string fileCacheIds */ 1: - message.fileCacheIds.push(reader.string()); - break; - default: - let u = options.readUnknownField; - if (u === "throw") - throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`); - let d = reader.skip(wireType); - if (u !== false) - (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d); - } - } - return message; - } - internalBinaryWrite(message: SendMessagePong_BubbleSegmentsFileCacheRef, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter { - /* repeated string fileCacheIds = 1; */ - for (let i = 0; i < message.fileCacheIds.length; i++) - writer.tag(1, WireType.LengthDelimited).string(message.fileCacheIds[i]); - let u = options.writeUnknownFields; - if (u !== false) - (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer); - return writer; - } -} -/** - * @generated MessageType for protobuf message Laana.SendMessagePong.BubbleSegmentsFileCacheRef - */ -export const SendMessagePong_BubbleSegmentsFileCacheRef = new SendMessagePong_BubbleSegmentsFileCacheRef$Type(); -// @generated message type with reflection information, may provide speed optimized methods class SendPackedMessagesPing$Type extends MessageType { constructor() { super("Laana.SendPackedMessagesPing", [ @@ -605,13 +510,13 @@ class SendPackedMessagesPong$Type extends MessageType { super("Laana.SendPackedMessagesPong", [ { no: 1, name: "packedMsgId", kind: "scalar", T: 9 /*ScalarType.STRING*/ }, { no: 2, name: "forwardMsgRef", kind: "message", T: () => ForwardMessageRef }, - { no: 3, name: "messagePongs", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => SendMessagePong } + { no: 3, name: "msgIds", kind: "scalar", repeat: 2 /*RepeatType.UNPACKED*/, T: 9 /*ScalarType.STRING*/ } ]); } create(value?: PartialMessage): SendPackedMessagesPong { const message = globalThis.Object.create((this.messagePrototype!)); message.packedMsgId = ""; - message.messagePongs = []; + message.msgIds = []; if (value !== undefined) reflectionMergePartial(this, message, value); return message; @@ -627,8 +532,8 @@ class SendPackedMessagesPong$Type extends MessageType { case /* Laana.ForwardMessageRef forwardMsgRef */ 2: message.forwardMsgRef = ForwardMessageRef.internalBinaryRead(reader, reader.uint32(), options, message.forwardMsgRef); break; - case /* repeated Laana.SendMessagePong messagePongs */ 3: - message.messagePongs.push(SendMessagePong.internalBinaryRead(reader, reader.uint32(), options)); + case /* repeated string msgIds */ 3: + message.msgIds.push(reader.string()); break; default: let u = options.readUnknownField; @@ -648,9 +553,9 @@ class SendPackedMessagesPong$Type extends MessageType { /* Laana.ForwardMessageRef forwardMsgRef = 2; */ if (message.forwardMsgRef) ForwardMessageRef.internalBinaryWrite(message.forwardMsgRef, writer.tag(2, WireType.LengthDelimited).fork(), options).join(); - /* repeated Laana.SendMessagePong messagePongs = 3; */ - for (let i = 0; i < message.messagePongs.length; i++) - SendMessagePong.internalBinaryWrite(message.messagePongs[i], writer.tag(3, WireType.LengthDelimited).fork(), options).join(); + /* repeated string msgIds = 3; */ + for (let i = 0; i < message.msgIds.length; i++) + writer.tag(3, WireType.LengthDelimited).string(message.msgIds[i]); let u = options.writeUnknownFields; if (u !== false) (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer); diff --git a/src/laana-v0.1.1/types/action/request.ts b/src/laana-v0.1.2/types/action/request.ts similarity index 100% rename from src/laana-v0.1.1/types/action/request.ts rename to src/laana-v0.1.2/types/action/request.ts diff --git a/src/laana-v0.1.1/types/action/wrapper.ts b/src/laana-v0.1.2/types/action/wrapper.ts similarity index 100% rename from src/laana-v0.1.1/types/action/wrapper.ts rename to src/laana-v0.1.2/types/action/wrapper.ts diff --git a/src/laana-v0.1.1/types/entity/file.ts b/src/laana-v0.1.2/types/entity/file.ts similarity index 100% rename from src/laana-v0.1.1/types/entity/file.ts rename to src/laana-v0.1.2/types/entity/file.ts diff --git a/src/laana-v0.1.1/types/entity/group.ts b/src/laana-v0.1.2/types/entity/group.ts similarity index 100% rename from src/laana-v0.1.1/types/entity/group.ts rename to src/laana-v0.1.2/types/entity/group.ts diff --git a/src/laana-v0.1.1/types/entity/message.ts b/src/laana-v0.1.2/types/entity/message.ts similarity index 100% rename from src/laana-v0.1.1/types/entity/message.ts rename to src/laana-v0.1.2/types/entity/message.ts diff --git a/src/laana-v0.1.1/types/entity/user.ts b/src/laana-v0.1.2/types/entity/user.ts similarity index 100% rename from src/laana-v0.1.1/types/entity/user.ts rename to src/laana-v0.1.2/types/entity/user.ts diff --git a/src/laana-v0.1.1/types/event/buddy.ts b/src/laana-v0.1.2/types/event/buddy.ts similarity index 100% rename from src/laana-v0.1.1/types/event/buddy.ts rename to src/laana-v0.1.2/types/event/buddy.ts diff --git a/src/laana-v0.1.1/types/event/group.ts b/src/laana-v0.1.2/types/event/group.ts similarity index 100% rename from src/laana-v0.1.1/types/event/group.ts rename to src/laana-v0.1.2/types/event/group.ts diff --git a/src/laana-v0.1.1/types/event/request.ts b/src/laana-v0.1.2/types/event/request.ts similarity index 100% rename from src/laana-v0.1.1/types/event/request.ts rename to src/laana-v0.1.2/types/event/request.ts diff --git a/src/laana-v0.1.1/types/event/wrapper.ts b/src/laana-v0.1.2/types/event/wrapper.ts similarity index 100% rename from src/laana-v0.1.1/types/event/wrapper.ts rename to src/laana-v0.1.2/types/event/wrapper.ts diff --git a/src/laana-v0.1.1/types/laana.ts b/src/laana-v0.1.2/types/laana.ts similarity index 100% rename from src/laana-v0.1.1/types/laana.ts rename to src/laana-v0.1.2/types/laana.ts diff --git a/src/laana-v0.1.1/utils/message.ts b/src/laana-v0.1.2/utils/message.ts similarity index 97% rename from src/laana-v0.1.1/utils/message.ts rename to src/laana-v0.1.2/utils/message.ts index 290cd390..80d31ffe 100644 --- a/src/laana-v0.1.1/utils/message.ts +++ b/src/laana-v0.1.2/utils/message.ts @@ -1,7 +1,7 @@ import { AtType, ChatType, ElementType, NapCatCore, Peer, SendMessageElement, SendTextElement } from '@/core'; -import { NapCatLaanaAdapter } from '@/laana-v0.1.1'; -import { OutgoingMessage, SendMessagePing } from '@/laana-v0.1.1/types/action/message'; -import { Peer as LaanaPeer, Peer_Type } from '@/laana-v0.1.1/types/entity/message'; +import { NapCatLaanaAdapter } from '..'; +import { OutgoingMessage, SendMessagePing } from '@/laana-v0.1.2/types/action/message'; +import { Peer as LaanaPeer, Peer_Type } from '@/laana-v0.1.2/types/entity/message'; import faceConfig from '@/core/external/face_config.json'; type Laana2RawConverters = {