ygopro-msg-encode 1.1.18 → 1.1.20

package/dist/index.cjs

@@ -57,6 +57,7 @@ __export(index_exports, {
   OcgcoreScriptConstants: () => OcgcoreScriptConstants,
   PayloadBase: () => PayloadBase,
   PlayerChangeState: () => PlayerChangeState,
+  ProtoRegistryBase: () => ProtoRegistryBase,
   RegistryBase: () => RegistryBase,
   RoomStatus: () => RoomStatus,
   SEND_TO_ALL: () => SEND_TO_ALL,
@@ -1568,10 +1569,77 @@ var _RegistryBase = class _RegistryBase {
       data.slice(this.options.dataOffset ?? 0)
     );
   }
+  getInstancesFromPayload(data) {
+    const instances = [];
+    const identifierOffset = this.options.identifierOffset ?? 0;
+    const dataOffset = this.options.dataOffset ?? 0;
+    const minLength = Math.max(identifierOffset + 1, dataOffset);
+    let remaining = data;
+    while (remaining.length > 0) {
+      if (remaining.length < minLength) {
+        break;
+      }
+      try {
+        const instance = this.getInstanceFromPayload(remaining);
+        if (!instance) {
+          break;
+        }
+        const consumed = dataOffset + instance.toPayload().length;
+        if (consumed <= 0 || consumed > remaining.length) {
+          break;
+        }
+        instances.push(instance);
+        remaining = remaining.slice(consumed);
+      } catch {
+        break;
+      }
+    }
+    return instances;
+  }
 };
 __name(_RegistryBase, "RegistryBase");
 var RegistryBase = _RegistryBase;
 
+// src/proto-base/proto-registry-base.ts
+var _ProtoRegistryBase = class _ProtoRegistryBase extends RegistryBase {
+  constructor(payloadClass) {
+    super(payloadClass, {
+      identifierOffset: 2,
+      dataOffset: 3
+    });
+  }
+  getInstancesFromPayload(data) {
+    const instances = [];
+    let offset = 0;
+    while (offset + 2 <= data.length) {
+      const declaredLength = data[offset] | data[offset + 1] << 8;
+      if (declaredLength <= 0) {
+        break;
+      }
+      const packetLength = 2 + declaredLength;
+      if (offset + packetLength > data.length) {
+        break;
+      }
+      const chunk = data.slice(offset, offset + packetLength);
+      const identifier = chunk[2];
+      const proto = this.get(identifier);
+      if (!proto) {
+        break;
+      }
+      try {
+        const instance = new proto().fromFullPayload(chunk);
+        instances.push(instance);
+      } catch {
+        break;
+      }
+      offset += packetLength;
+    }
+    return instances;
+  }
+};
+__name(_ProtoRegistryBase, "ProtoRegistryBase");
+var ProtoRegistryBase = _ProtoRegistryBase;
+
 // src/protos/ctos/proto/response.ts
 var _YGOProCtosResponse = class _YGOProCtosResponse extends YGOProCtosBase {
   fromPayload(data) {
@@ -1864,10 +1932,7 @@ _YGOProCtosRequestField.identifier = 48;
 var YGOProCtosRequestField = _YGOProCtosRequestField;
 
 // src/protos/ctos/registry.ts
-var YGOProCtos = new RegistryBase(YGOProCtosBase, {
-  identifierOffset: 2,
-  dataOffset: 3
-});
+var YGOProCtos = new ProtoRegistryBase(YGOProCtosBase);
 YGOProCtos.register(YGOProCtosResponse);
 YGOProCtos.register(YGOProCtosUpdateDeck);
 YGOProCtos.register(YGOProCtosHandResult);
@@ -3486,6 +3551,9 @@ var _YGOProMsgDraw = class _YGOProMsgDraw extends YGOProMsgBase {
     });
     return view;
   }
+  teammateView() {
+    return this.opponentView();
+  }
 };
 __name(_YGOProMsgDraw, "YGOProMsgDraw");
 _YGOProMsgDraw.identifier = OcgcoreCommonConstants.MSG_DRAW;
@@ -5272,6 +5340,9 @@ var _YGOProMsgShuffleExtra = class _YGOProMsgShuffleExtra extends YGOProMsgBase
     view.cards = view.cards.map(() => 0);
     return view;
   }
+  teammateView() {
+    return this.opponentView();
+  }
 };
 __name(_YGOProMsgShuffleExtra, "YGOProMsgShuffleExtra");
 _YGOProMsgShuffleExtra.identifier = OcgcoreCommonConstants.MSG_SHUFFLE_EXTRA;
@@ -5294,6 +5365,9 @@ var _YGOProMsgShuffleHand = class _YGOProMsgShuffleHand extends YGOProMsgBase {
     view.cards = view.cards.map(() => 0);
     return view;
   }
+  teammateView() {
+    return this.opponentView();
+  }
   getRequireRefreshZones() {
     return [
       {
@@ -5687,14 +5761,14 @@ __decorateClass([
   BinaryField("u8", 4)
 ], _YGOProMsgTagSwap.prototype, "handCount", 2);
 __decorateClass([
-  BinaryField("i32", 5, (obj) => obj.handCount)
+  BinaryField("i32", 5)
+], _YGOProMsgTagSwap.prototype, "topCode", 2);
+__decorateClass([
+  BinaryField("i32", 9, (obj) => obj.handCount)
 ], _YGOProMsgTagSwap.prototype, "handCards", 2);
 __decorateClass([
-  BinaryField("i32", (obj) => 5 + obj.handCount * 4, (obj) => obj.extraCount)
+  BinaryField("i32", (obj) => 9 + obj.handCount * 4, (obj) => obj.extraCount)
 ], _YGOProMsgTagSwap.prototype, "extraCards", 2);
-__decorateClass([
-  BinaryField("u32", (obj) => 5 + obj.handCount * 4 + obj.extraCount * 4)
-], _YGOProMsgTagSwap.prototype, "mzoneFlags", 2);
 var YGOProMsgTagSwap = _YGOProMsgTagSwap;
 
 // src/protos/msg/proto/toss-coin.ts
@@ -6422,10 +6496,7 @@ __decorateClass([
 var YGOProStocSrvproRoomlist = _YGOProStocSrvproRoomlist;
 
 // src/protos/stoc/registry.ts
-var YGOProStoc = new RegistryBase(YGOProStocBase, {
-  identifierOffset: 2,
-  dataOffset: 3
-});
+var YGOProStoc = new ProtoRegistryBase(YGOProStocBase);
 YGOProStoc.register(YGOProStocGameMsg);
 YGOProStoc.register(YGOProStocErrorMsg);
 YGOProStoc.register(YGOProStocSelectHand);
@@ -6471,6 +6542,7 @@ YGOProStoc.register(YGOProStocSrvproRoomlist);
   OcgcoreScriptConstants,
   PayloadBase,
   PlayerChangeState,
+  ProtoRegistryBase,
   RegistryBase,
   RoomStatus,
   SEND_TO_ALL,