add CtosHsToObserver and CtosHsToDuelList support

neos-protobuf @ d6c01dd8

-Subproject commit 30f4ea7acd79b9cb18a358548520ca939e22dc5f
+Subproject commit d6c01dd88fd72f22c432a52ba74eee9ece267499

src/api/ocgcore/idl/ocgcore.ts

@@ -353,7 +353,7 @@ export namespace ygopro {
         }
     }
     export class YgoCtosMsg extends pb_1.Message {
-        #one_of_decls: number[][] = [[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]];
+        #one_of_decls: number[][] = [[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]];
         constructor(data?: any[] | ({} & (({
             ctos_player_info?: CtosPlayerInfo;
             ctos_join_game?: never;
@@ -367,6 +367,8 @@ export namespace ygopro {
             ctos_response?: never;
             ctos_chat?: never;
             ctos_surrender?: never;
+            ctos_hs_to_observer?: never;
+            ctos_hs_to_duel_list?: never;
         } | {
             ctos_player_info?: never;
             ctos_join_game?: CtosJoinGame;
@@ -380,6 +382,8 @@ export namespace ygopro {
             ctos_response?: never;
             ctos_chat?: never;
             ctos_surrender?: never;
+            ctos_hs_to_observer?: never;
+            ctos_hs_to_duel_list?: never;
         } | {
             ctos_player_info?: never;
             ctos_join_game?: never;
@@ -393,6 +397,8 @@ export namespace ygopro {
             ctos_response?: never;
             ctos_chat?: never;
             ctos_surrender?: never;
+            ctos_hs_to_observer?: never;
+            ctos_hs_to_duel_list?: never;
         } | {
             ctos_player_info?: never;
             ctos_join_game?: never;
@@ -406,6 +412,8 @@ export namespace ygopro {
             ctos_response?: never;
             ctos_chat?: never;
             ctos_surrender?: never;
+            ctos_hs_to_observer?: never;
+            ctos_hs_to_duel_list?: never;
         } | {
             ctos_player_info?: never;
             ctos_join_game?: never;
@@ -419,6 +427,8 @@ export namespace ygopro {
             ctos_response?: never;
             ctos_chat?: never;
             ctos_surrender?: never;
+            ctos_hs_to_observer?: never;
+            ctos_hs_to_duel_list?: never;
         } | {
             ctos_player_info?: never;
             ctos_join_game?: never;
@@ -432,6 +442,8 @@ export namespace ygopro {
             ctos_response?: never;
             ctos_chat?: never;
             ctos_surrender?: never;
+            ctos_hs_to_observer?: never;
+            ctos_hs_to_duel_list?: never;
         } | {
             ctos_player_info?: never;
             ctos_join_game?: never;
@@ -445,6 +457,8 @@ export namespace ygopro {
             ctos_response?: never;
             ctos_chat?: never;
             ctos_surrender?: never;
+            ctos_hs_to_observer?: never;
+            ctos_hs_to_duel_list?: never;
         } | {
             ctos_player_info?: never;
             ctos_join_game?: never;
@@ -458,6 +472,8 @@ export namespace ygopro {
             ctos_response?: never;
             ctos_chat?: never;
             ctos_surrender?: never;
+            ctos_hs_to_observer?: never;
+            ctos_hs_to_duel_list?: never;
         } | {
             ctos_player_info?: never;
             ctos_join_game?: never;
@@ -471,6 +487,8 @@ export namespace ygopro {
             ctos_response?: never;
             ctos_chat?: never;
             ctos_surrender?: never;
+            ctos_hs_to_observer?: never;
+            ctos_hs_to_duel_list?: never;
         } | {
             ctos_player_info?: never;
             ctos_join_game?: never;
@@ -484,6 +502,8 @@ export namespace ygopro {
             ctos_response?: CtosGameMsgResponse;
             ctos_chat?: never;
             ctos_surrender?: never;
+            ctos_hs_to_observer?: never;
+            ctos_hs_to_duel_list?: never;
         } | {
             ctos_player_info?: never;
             ctos_join_game?: never;
@@ -497,6 +517,8 @@ export namespace ygopro {
             ctos_response?: never;
             ctos_chat?: CtosChat;
             ctos_surrender?: never;
+            ctos_hs_to_observer?: never;
+            ctos_hs_to_duel_list?: never;
         } | {
             ctos_player_info?: never;
             ctos_join_game?: never;
@@ -510,6 +532,38 @@ export namespace ygopro {
             ctos_response?: never;
             ctos_chat?: never;
             ctos_surrender?: CtosSurrender;
+            ctos_hs_to_observer?: never;
+            ctos_hs_to_duel_list?: never;
+        } | {
+            ctos_player_info?: never;
+            ctos_join_game?: never;
+            ctos_update_deck?: never;
+            ctos_hs_ready?: never;
+            ctos_hs_start?: never;
+            ctos_hs_not_ready?: never;
+            ctos_hand_result?: never;
+            ctos_tp_result?: never;
+            ctos_time_confirm?: never;
+            ctos_response?: never;
+            ctos_chat?: never;
+            ctos_surrender?: never;
+            ctos_hs_to_observer?: CtosHsToObserver;
+            ctos_hs_to_duel_list?: never;
+        } | {
+            ctos_player_info?: never;
+            ctos_join_game?: never;
+            ctos_update_deck?: never;
+            ctos_hs_ready?: never;
+            ctos_hs_start?: never;
+            ctos_hs_not_ready?: never;
+            ctos_hand_result?: never;
+            ctos_tp_result?: never;
+            ctos_time_confirm?: never;
+            ctos_response?: never;
+            ctos_chat?: never;
+            ctos_surrender?: never;
+            ctos_hs_to_observer?: never;
+            ctos_hs_to_duel_list?: CtosHsToDuelList;
         })))) {
             super();
             pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
@@ -550,6 +604,12 @@ export namespace ygopro {
                 if ("ctos_surrender" in data && data.ctos_surrender != undefined) {
                     this.ctos_surrender = data.ctos_surrender;
                 }
+                if ("ctos_hs_to_observer" in data && data.ctos_hs_to_observer != undefined) {
+                    this.ctos_hs_to_observer = data.ctos_hs_to_observer;
+                }
+                if ("ctos_hs_to_duel_list" in data && data.ctos_hs_to_duel_list != undefined) {
+                    this.ctos_hs_to_duel_list = data.ctos_hs_to_duel_list;
+                }
             }
         }
         get ctos_player_info() {
@@ -660,9 +720,27 @@ export namespace ygopro {
         get has_ctos_surrender() {
             return pb_1.Message.getField(this, 12) != null;
         }
+        get ctos_hs_to_observer() {
+            return pb_1.Message.getWrapperField(this, CtosHsToObserver, 13) as CtosHsToObserver;
+        }
+        set ctos_hs_to_observer(value: CtosHsToObserver) {
+            pb_1.Message.setOneofWrapperField(this, 13, this.#one_of_decls[0], value);
+        }
+        get has_ctos_hs_to_observer() {
+            return pb_1.Message.getField(this, 13) != null;
+        }
+        get ctos_hs_to_duel_list() {
+            return pb_1.Message.getWrapperField(this, CtosHsToDuelList, 14) as CtosHsToDuelList;
+        }
+        set ctos_hs_to_duel_list(value: CtosHsToDuelList) {
+            pb_1.Message.setOneofWrapperField(this, 14, this.#one_of_decls[0], value);
+        }
+        get has_ctos_hs_to_duel_list() {
+            return pb_1.Message.getField(this, 14) != null;
+        }
         get msg() {
             const cases: {
-                [index: number]: "none" | "ctos_player_info" | "ctos_join_game" | "ctos_update_deck" | "ctos_hs_ready" | "ctos_hs_start" | "ctos_hs_not_ready" | "ctos_hand_result" | "ctos_tp_result" | "ctos_time_confirm" | "ctos_response" | "ctos_chat" | "ctos_surrender";
+                [index: number]: "none" | "ctos_player_info" | "ctos_join_game" | "ctos_update_deck" | "ctos_hs_ready" | "ctos_hs_start" | "ctos_hs_not_ready" | "ctos_hand_result" | "ctos_tp_result" | "ctos_time_confirm" | "ctos_response" | "ctos_chat" | "ctos_surrender" | "ctos_hs_to_observer" | "ctos_hs_to_duel_list";
             } = {
                 0: "none",
                 1: "ctos_player_info",
@@ -676,9 +754,11 @@ export namespace ygopro {
                 9: "ctos_time_confirm",
                 10: "ctos_response",
                 11: "ctos_chat",
-                12: "ctos_surrender"
+                12: "ctos_surrender",
+                13: "ctos_hs_to_observer",
+                14: "ctos_hs_to_duel_list"
             };
-            return cases[pb_1.Message.computeOneofCase(this, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12])];
+            return cases[pb_1.Message.computeOneofCase(this, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14])];
         }
         static fromObject(data: {
             ctos_player_info?: ReturnType<typeof CtosPlayerInfo.prototype.toObject>;
@@ -693,6 +773,8 @@ export namespace ygopro {
             ctos_response?: ReturnType<typeof CtosGameMsgResponse.prototype.toObject>;
             ctos_chat?: ReturnType<typeof CtosChat.prototype.toObject>;
             ctos_surrender?: ReturnType<typeof CtosSurrender.prototype.toObject>;
+            ctos_hs_to_observer?: ReturnType<typeof CtosHsToObserver.prototype.toObject>;
+            ctos_hs_to_duel_list?: ReturnType<typeof CtosHsToDuelList.prototype.toObject>;
         }): YgoCtosMsg {
             const message = new YgoCtosMsg({});
             if (data.ctos_player_info != null) {
@@ -731,6 +813,12 @@ export namespace ygopro {
             if (data.ctos_surrender != null) {
                 message.ctos_surrender = CtosSurrender.fromObject(data.ctos_surrender);
             }
+            if (data.ctos_hs_to_observer != null) {
+                message.ctos_hs_to_observer = CtosHsToObserver.fromObject(data.ctos_hs_to_observer);
+            }
+            if (data.ctos_hs_to_duel_list != null) {
+                message.ctos_hs_to_duel_list = CtosHsToDuelList.fromObject(data.ctos_hs_to_duel_list);
+            }
             return message;
         }
         toObject() {
@@ -747,6 +835,8 @@ export namespace ygopro {
                 ctos_response?: ReturnType<typeof CtosGameMsgResponse.prototype.toObject>;
                 ctos_chat?: ReturnType<typeof CtosChat.prototype.toObject>;
                 ctos_surrender?: ReturnType<typeof CtosSurrender.prototype.toObject>;
+                ctos_hs_to_observer?: ReturnType<typeof CtosHsToObserver.prototype.toObject>;
+                ctos_hs_to_duel_list?: ReturnType<typeof CtosHsToDuelList.prototype.toObject>;
             } = {};
             if (this.ctos_player_info != null) {
                 data.ctos_player_info = this.ctos_player_info.toObject();
@@ -784,6 +874,12 @@ export namespace ygopro {
             if (this.ctos_surrender != null) {
                 data.ctos_surrender = this.ctos_surrender.toObject();
             }
+            if (this.ctos_hs_to_observer != null) {
+                data.ctos_hs_to_observer = this.ctos_hs_to_observer.toObject();
+            }
+            if (this.ctos_hs_to_duel_list != null) {
+                data.ctos_hs_to_duel_list = this.ctos_hs_to_duel_list.toObject();
+            }
             return data;
         }
         serialize(): Uint8Array;
@@ -814,6 +910,10 @@ export namespace ygopro {
                 writer.writeMessage(11, this.ctos_chat, () => this.ctos_chat.serialize(writer));
             if (this.has_ctos_surrender)
                 writer.writeMessage(12, this.ctos_surrender, () => this.ctos_surrender.serialize(writer));
+            if (this.has_ctos_hs_to_observer)
+                writer.writeMessage(13, this.ctos_hs_to_observer, () => this.ctos_hs_to_observer.serialize(writer));
+            if (this.has_ctos_hs_to_duel_list)
+                writer.writeMessage(14, this.ctos_hs_to_duel_list, () => this.ctos_hs_to_duel_list.serialize(writer));
             if (!w)
                 return writer.getResultBuffer();
         }
@@ -859,6 +959,12 @@ export namespace ygopro {
                     case 12:
                         reader.readMessage(message.ctos_surrender, () => message.ctos_surrender = CtosSurrender.deserialize(reader));
                         break;
+                    case 13:
+                        reader.readMessage(message.ctos_hs_to_observer, () => message.ctos_hs_to_observer = CtosHsToObserver.deserialize(reader));
+                        break;
+                    case 14:
+                        reader.readMessage(message.ctos_hs_to_duel_list, () => message.ctos_hs_to_duel_list = CtosHsToDuelList.deserialize(reader));
+                        break;
                     default: reader.skipField();
                 }
             }
@@ -1815,6 +1921,86 @@ export namespace ygopro {
             return CtosHsNotReady.deserialize(bytes);
         }
     }
+    export class CtosHsToObserver extends pb_1.Message {
+        #one_of_decls: number[][] = [];
+        constructor(data?: any[] | {}) {
+            super();
+            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
+            if (!Array.isArray(data) && typeof data == "object") { }
+        }
+        static fromObject(data: {}): CtosHsToObserver {
+            const message = new CtosHsToObserver({});
+            return message;
+        }
+        toObject() {
+            const data: {} = {};
+            return data;
+        }
+        serialize(): Uint8Array;
+        serialize(w: pb_1.BinaryWriter): void;
+        serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
+            const writer = w || new pb_1.BinaryWriter();
+            if (!w)
+                return writer.getResultBuffer();
+        }
+        static deserialize(bytes: Uint8Array | pb_1.BinaryReader): CtosHsToObserver {
+            const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new CtosHsToObserver();
+            while (reader.nextField()) {
+                if (reader.isEndGroup())
+                    break;
+                switch (reader.getFieldNumber()) {
+                    default: reader.skipField();
+                }
+            }
+            return message;
+        }
+        serializeBinary(): Uint8Array {
+            return this.serialize();
+        }
+        static deserializeBinary(bytes: Uint8Array): CtosHsToObserver {
+            return CtosHsToObserver.deserialize(bytes);
+        }
+    }
+    export class CtosHsToDuelList extends pb_1.Message {
+        #one_of_decls: number[][] = [];
+        constructor(data?: any[] | {}) {
+            super();
+            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
+            if (!Array.isArray(data) && typeof data == "object") { }
+        }
+        static fromObject(data: {}): CtosHsToDuelList {
+            const message = new CtosHsToDuelList({});
+            return message;
+        }
+        toObject() {
+            const data: {} = {};
+            return data;
+        }
+        serialize(): Uint8Array;
+        serialize(w: pb_1.BinaryWriter): void;
+        serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
+            const writer = w || new pb_1.BinaryWriter();
+            if (!w)
+                return writer.getResultBuffer();
+        }
+        static deserialize(bytes: Uint8Array | pb_1.BinaryReader): CtosHsToDuelList {
+            const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new CtosHsToDuelList();
+            while (reader.nextField()) {
+                if (reader.isEndGroup())
+                    break;
+                switch (reader.getFieldNumber()) {
+                    default: reader.skipField();
+                }
+            }
+            return message;
+        }
+        serializeBinary(): Uint8Array {
+            return this.serialize();
+        }
+        static deserializeBinary(bytes: Uint8Array): CtosHsToDuelList {
+            return CtosHsToDuelList.deserialize(bytes);
+        }
+    }
     export class CtosHsStart extends pb_1.Message {
         #one_of_decls: number[][] = [];
         constructor(data?: any[] | {}) {

src/api/ocgcore/ocgAdapter/ctos/ctosHsNotReady.ts

@@ -5,9 +5,9 @@ import { CTOS_HS_NOT_READY } from "../protoDecl";
 /*
  * CTOS HsReady
  *
- * @usage - 告诉ygopro服务端当前玩家准备完毕
+ * @usage - 告诉ygopro服务端当前玩家取消准备
  * */
-export default class CtosHsReady extends YgoProPacket {
+export default class CtosHsNotReady extends YgoProPacket {
   constructor(_: ygopro.YgoCtosMsg) {
     super(1, CTOS_HS_NOT_READY, new Uint8Array(0));
   }

src/api/ocgcore/ocgAdapter/ctos/ctosHsToDuelList.ts

+import { ygopro } from "../../idl/ocgcore";
+import { YgoProPacket } from "../packet";
+import { CTOS_HS_TO_DUEL_LIST } from "../protoDecl";
+
+/*
+ * CTOS HsReady
+ *
+ * @usage - 告诉ygopro服务端当前玩家进入决斗者行列
+ * */
+export default class CtosHsToDuelList extends YgoProPacket {
+  constructor(_: ygopro.YgoCtosMsg) {
+    super(1, CTOS_HS_TO_DUEL_LIST, new Uint8Array(0));
+  }
+}

src/api/ocgcore/ocgAdapter/ctos/ctosHsToObserver.ts

+import { ygopro } from "../../idl/ocgcore";
+import { YgoProPacket } from "../packet";
+import { CTOS_HS_TO_OBSERVER } from "../protoDecl";
+
+/*
+ * CTOS HsReady
+ *
+ * @usage - 告诉ygopro服务端当前玩家进入观战者行列
+ * */
+export default class CtosHsToObserver extends YgoProPacket {
+  constructor(_: ygopro.YgoCtosMsg) {
+    super(1, CTOS_HS_TO_OBSERVER, new Uint8Array(0));
+  }
+}

src/api/ocgcore/ocgAdapter/protoDecl.ts

@@ -5,6 +5,8 @@
 export const CTOS_PLAYER_INFO = 16;
 export const CTOS_JOIN_GAME = 18;
 export const CTOS_UPDATE_DECK = 2;
+export const CTOS_HS_TO_DUEL_LIST = 32;
+export const CTOS_HS_TO_OBSERVER = 33;
 export const CTOS_HS_READY = 34;
 export const CTOS_HS_NOT_READY = 35;
 export const CTOS_HS_START = 37;

src/api/ocgcore/ocgHelper.ts

@@ -12,6 +12,8 @@ import HandResult from "./ocgAdapter/ctos/ctosHandResult";
 import HsNotReadyAdapter from "./ocgAdapter/ctos/ctosHsNotReady";
 import HsReadyAdapter from "./ocgAdapter/ctos/ctosHsReady";
 import HsStartAdapter from "./ocgAdapter/ctos/ctosHsStart";
+import HsToDuelListAdapter from "./ocgAdapter/ctos/ctosHsToDuelList";
+import HsToObserverAdapter from "./ocgAdapter/ctos/ctosHsToObserver";
 import JoinGameAdapter from "./ocgAdapter/ctos/ctosJoinGame";
 import PlayerInfoAdapter from "./ocgAdapter/ctos/ctosPlayerInfo";
 import Surrender from "./ocgAdapter/ctos/ctosSurrender";
@@ -52,6 +54,24 @@ export function sendHsNotReady() {
   socketMiddleWare({ cmd: socketCmd.SEND, payload });
 }
 
+export function sendHsToObserver() {
+  const hasToObserver = new ygopro.YgoCtosMsg({
+    ctos_hs_to_observer: new ygopro.CtosHsToObserver({}),
+  });
+  const payload = new HsToObserverAdapter(hasToObserver).serialize();
+
+  socketMiddleWare({ cmd: socketCmd.SEND, payload });
+}
+
+export function sendHsToDuelList() {
+  const hasToDuelList = new ygopro.YgoCtosMsg({
+    ctos_hs_to_duel_list: new ygopro.CtosHsToDuelList({}),
+  });
+  const payload = new HsToDuelListAdapter(hasToDuelList).serialize();
+
+  socketMiddleWare({ cmd: socketCmd.SEND, payload });
+}
+
 export function sendHsStart() {
   const hasStart = new ygopro.YgoCtosMsg({
     ctos_hs_start: new ygopro.CtosHsStart({}),