koishipro-core.js 1.0.10 → 1.1.1

package/dist/index.mjs

@@ -1,5 +1,16 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __decorateClass = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp(target, key, result);
+  return result;
+};
+
 // index.ts
-import { Buffer } from "buffer";
+import { Buffer as Buffer2 } from "buffer";
 
 // src/vendor/ocgcore-constants.ts
 var OcgcoreCommonConstants = {
@@ -372,9 +383,6 @@ var LEN_EMPTY = 4;
 var LEN_HEADER = 8;
 
 // src/utility/binary.ts
-function readU8(buf, offset) {
-  return buf[offset] ?? 0;
-}
 function readU16(buf, offset) {
   return new DataView(buf.buffer, buf.byteOffset, buf.byteLength).getUint16(
     offset,
@@ -387,160 +395,22 @@ function readI32(buf, offset) {
     true
   );
 }
-function readU32(buf, offset) {
-  return new DataView(buf.buffer, buf.byteOffset, buf.byteLength).getUint32(
-    offset,
-    true
-  );
-}
 
 // src/utility/utf8.ts
 var encoder = new TextEncoder();
 var decoder = new TextDecoder("utf-8");
-function encodeUtf8(value) {
-  return encoder.encode(value);
-}
 function decodeUtf8(value) {
   return decoder.decode(value);
 }
 
 // src/adapters/ocgcore-parsers.ts
-function parseCardInfo(payload) {
-  let offset = 0;
-  const flags = readI32(payload, offset) >>> 0;
-  offset += 4;
-  const info = { flags, empty: flags === 0 };
-  if (flags === 0) {
-    return info;
-  }
-  if (flags & OcgcoreCommonConstants.QUERY_CODE) {
-    info.code = readI32(payload, offset);
-    offset += 4;
-  }
-  if (flags & OcgcoreCommonConstants.QUERY_POSITION) {
-    const pdata = readI32(payload, offset);
-    offset += 4;
-    info.position = (pdata >>> 24 & 255) >>> 0;
-  }
-  if (flags & OcgcoreCommonConstants.QUERY_ALIAS) {
-    info.alias = readI32(payload, offset);
-    offset += 4;
-  }
-  if (flags & OcgcoreCommonConstants.QUERY_TYPE) {
-    info.type = readI32(payload, offset);
-    offset += 4;
-  }
-  if (flags & OcgcoreCommonConstants.QUERY_LEVEL) {
-    info.level = readI32(payload, offset);
-    offset += 4;
-  }
-  if (flags & OcgcoreCommonConstants.QUERY_RANK) {
-    info.rank = readI32(payload, offset);
-    offset += 4;
-  }
-  if (flags & OcgcoreCommonConstants.QUERY_ATTRIBUTE) {
-    info.attribute = readI32(payload, offset);
-    offset += 4;
-  }
-  if (flags & OcgcoreCommonConstants.QUERY_RACE) {
-    info.race = readI32(payload, offset);
-    offset += 4;
-  }
-  if (flags & OcgcoreCommonConstants.QUERY_ATTACK) {
-    info.attack = readI32(payload, offset);
-    offset += 4;
-  }
-  if (flags & OcgcoreCommonConstants.QUERY_DEFENSE) {
-    info.defense = readI32(payload, offset);
-    offset += 4;
-  }
-  if (flags & OcgcoreCommonConstants.QUERY_BASE_ATTACK) {
-    info.baseAttack = readI32(payload, offset);
-    offset += 4;
-  }
-  if (flags & OcgcoreCommonConstants.QUERY_BASE_DEFENSE) {
-    info.baseDefense = readI32(payload, offset);
-    offset += 4;
-  }
-  if (flags & OcgcoreCommonConstants.QUERY_REASON) {
-    info.reason = readI32(payload, offset);
-    offset += 4;
-  }
-  if (flags & OcgcoreCommonConstants.QUERY_REASON_CARD) {
-    offset += 4;
-  }
-  if (flags & OcgcoreCommonConstants.QUERY_EQUIP_CARD) {
-    const controller = readU8(payload, offset) >>> 0;
-    const location = readU8(payload, offset + 1) >>> 0;
-    const sequence = readU8(payload, offset + 2) >>> 0;
-    info.equipCard = { controller, location, sequence };
-    offset += 4;
-  }
-  if (flags & OcgcoreCommonConstants.QUERY_TARGET_CARD) {
-    const count = readI32(payload, offset);
-    offset += 4;
-    const targets = [];
-    for (let i = 0; i < count; i++) {
-      const controller = readU8(payload, offset) >>> 0;
-      const location = readU8(payload, offset + 1) >>> 0;
-      const sequence = readU8(payload, offset + 2) >>> 0;
-      targets.push({ controller, location, sequence });
-      offset += 4;
-    }
-    info.targetCards = targets;
-  }
-  if (flags & OcgcoreCommonConstants.QUERY_OVERLAY_CARD) {
-    const count = readI32(payload, offset);
-    offset += 4;
-    const overlay = [];
-    for (let i = 0; i < count; i++) {
-      overlay.push(readI32(payload, offset));
-      offset += 4;
-    }
-    info.overlayCards = overlay;
-  }
-  if (flags & OcgcoreCommonConstants.QUERY_COUNTERS) {
-    const count = readI32(payload, offset);
-    offset += 4;
-    const counters = [];
-    for (let i = 0; i < count; i++) {
-      const type = readU16(payload, offset) >>> 0;
-      const ccount = readU16(payload, offset + 2) >>> 0;
-      counters.push({ type, count: ccount });
-      offset += 4;
-    }
-    info.counters = counters;
-  }
-  if (flags & OcgcoreCommonConstants.QUERY_OWNER) {
-    info.owner = readI32(payload, offset);
-    offset += 4;
-  }
-  if (flags & OcgcoreCommonConstants.QUERY_STATUS) {
-    info.status = readI32(payload, offset);
-    offset += 4;
-  }
-  if (flags & OcgcoreCommonConstants.QUERY_LSCALE) {
-    info.lscale = readI32(payload, offset);
-    offset += 4;
-  }
-  if (flags & OcgcoreCommonConstants.QUERY_RSCALE) {
-    info.rscale = readI32(payload, offset);
-    offset += 4;
-  }
-  if (flags & OcgcoreCommonConstants.QUERY_LINK) {
-    info.link = readI32(payload, offset);
-    offset += 4;
-    info.linkMarker = readI32(payload, offset);
-    offset += 4;
-  }
-  return info;
-}
+import { CardQuery, YGOProMsgReloadField } from "ygopro-msg-encode";
 function parseCardQuery(raw, length) {
   if (length <= LEN_HEADER) {
     return null;
   }
   const payload = raw.subarray(4, length);
-  return parseCardInfo(payload);
+  return new CardQuery().fromPayload(payload);
 }
 function parseFieldCardQuery(raw, length) {
   const cards = [];
@@ -552,85 +422,20 @@ function parseFieldCardQuery(raw, length) {
     }
     const end = Math.min(length, offset + chunkLen);
     if (chunkLen <= LEN_HEADER) {
-      cards.push({ flags: 0, empty: true });
+      const emptyCard = new CardQuery();
+      emptyCard.flags = 0;
+      emptyCard.empty = true;
+      cards.push(emptyCard);
     } else {
       const payload = raw.subarray(offset + 4, end);
-      cards.push(parseCardInfo(payload));
+      cards.push(new CardQuery().fromPayload(payload));
     }
     offset += chunkLen;
   }
   return cards;
 }
 function parseFieldInfo(raw) {
-  let offset = 0;
-  const message = readU8(raw, offset++) >>> 0;
-  const duelRule = readU8(raw, offset++) >>> 0;
-  const players = [];
-  for (let i = 0; i < 2; i++) {
-    const lp = readI32(raw, offset) >>> 0;
-    offset += 4;
-    const mzone = [];
-    for (let seq = 0; seq < 7; seq++) {
-      const occupied = readU8(raw, offset++) >>> 0 !== 0;
-      if (occupied) {
-        const position = readU8(raw, offset++) >>> 0;
-        const xyzCount = readU8(raw, offset++) >>> 0;
-        mzone.push({ occupied, position, xyzCount });
-      } else {
-        mzone.push({ occupied });
-      }
-    }
-    const szone = [];
-    for (let seq = 0; seq < 8; seq++) {
-      const occupied = readU8(raw, offset++) >>> 0 !== 0;
-      if (occupied) {
-        const position = readU8(raw, offset++) >>> 0;
-        szone.push({ occupied, position });
-      } else {
-        szone.push({ occupied });
-      }
-    }
-    const deckCount = readU8(raw, offset++) >>> 0;
-    const handCount = readU8(raw, offset++) >>> 0;
-    const graveCount = readU8(raw, offset++) >>> 0;
-    const removedCount = readU8(raw, offset++) >>> 0;
-    const extraCount = readU8(raw, offset++) >>> 0;
-    const extraPCount = readU8(raw, offset++) >>> 0;
-    players[i] = {
-      lp,
-      mzone,
-      szone,
-      deckCount,
-      handCount,
-      graveCount,
-      removedCount,
-      extraCount,
-      extraPCount
-    };
-  }
-  const chainCount = readU8(raw, offset++) >>> 0;
-  const chains = [];
-  for (let i = 0; i < chainCount; i++) {
-    const code = readU32(raw, offset) >>> 0;
-    offset += 4;
-    const infoLocation = readU32(raw, offset) >>> 0;
-    offset += 4;
-    const chainCard = {
-      controller: (infoLocation & 255) >>> 0,
-      location: (infoLocation >>> 8 & 255) >>> 0,
-      sequence: (infoLocation >>> 16 & 255) >>> 0,
-      subSequence: (infoLocation >>> 24 & 255) >>> 0
-    };
-    const trigger = {
-      controller: readU8(raw, offset++) >>> 0,
-      location: readU8(raw, offset++) >>> 0,
-      sequence: readU8(raw, offset++) >>> 0
-    };
-    const description = readU32(raw, offset) >>> 0;
-    offset += 4;
-    chains.push({ code, chainCard, trigger, description });
-  }
-  return { message, duelRule, players, chains };
+  return new YGOProMsgReloadField().fromPayload(raw);
 }
 function parseRegistryKeys(raw) {
   const keys = [];
@@ -687,6 +492,7 @@ function normalizeStartDuelOptions(options) {
 }
 
 // src/ocgcore-duel.ts
+import { YGOProMessages } from "ygopro-msg-encode";
 var OcgcoreDuel = class {
   constructor(ocgcoreWrapper, duelPtr) {
     this.ocgcoreWrapper = ocgcoreWrapper;
@@ -712,9 +518,9 @@ var OcgcoreDuel = class {
   setPlayerInfo(info) {
     this.ocgcoreWrapper.ocgcoreModule._set_player_info(
       this.duelPtr,
-      info.playerId,
+      info.player,
       info.lp,
-      info.startCount,
+      info.startHand,
       info.drawCount
     );
   }
@@ -735,15 +541,27 @@ var OcgcoreDuel = class {
     const result = this.ocgcoreWrapper.ocgcoreModule._process(this.duelPtr);
     const length = (result & 268435455) >>> 0;
     const status = (result >>> 28 & 15) >>> 0;
-    const message = this.getMessage(length);
-    return { length: message.length, raw: message.raw, status };
+    const messageData = this.getMessage(length);
+    let parsedMessage;
+    if (messageData.raw.length > 0) {
+      try {
+        parsedMessage = YGOProMessages.getInstanceFromPayload(messageData.raw);
+      } catch (e) {
+      }
+    }
+    return {
+      length: messageData.length,
+      raw: messageData.raw,
+      status,
+      message: parsedMessage
+    };
   }
   newCard(card) {
     this.ocgcoreWrapper.ocgcoreModule._new_card(
       this.duelPtr,
       card.code,
       card.owner,
-      card.playerId,
+      card.player,
       card.location,
       card.sequence,
       card.position
@@ -761,7 +579,7 @@ var OcgcoreDuel = class {
     const ptr = this.ocgcoreWrapper.malloc(QUERY_BUFFER_SIZE);
     const length = this.ocgcoreWrapper.ocgcoreModule._query_card(
       this.duelPtr,
-      query.playerId,
+      query.player,
       query.location,
       query.sequence,
       query.queryFlag,
@@ -776,7 +594,7 @@ var OcgcoreDuel = class {
   queryFieldCount(query) {
     return this.ocgcoreWrapper.ocgcoreModule._query_field_count(
       this.duelPtr,
-      query.playerId,
+      query.player,
       query.location
     );
   }
@@ -784,7 +602,7 @@ var OcgcoreDuel = class {
     const ptr = this.ocgcoreWrapper.malloc(QUERY_BUFFER_SIZE);
     const length = this.ocgcoreWrapper.ocgcoreModule._query_field_card(
       this.duelPtr,
-      query.playerId,
+      query.player,
       query.location,
       query.queryFlag,
       ptr,
@@ -828,13 +646,11 @@ var OcgcoreDuel = class {
     );
   }
   getRegistryValue(key) {
-    const keyBytes = encodeUtf8(key);
     const outPtr = this.ocgcoreWrapper.malloc(REGISTRY_BUFFER_SIZE);
     const length = this.ocgcoreWrapper.useTmpData(
       (keyPtr) => this.ocgcoreWrapper.ocgcoreModule._get_registry_value(
         this.duelPtr,
         keyPtr,
-        keyBytes.length,
         outPtr
       ),
       key
@@ -846,15 +662,11 @@ var OcgcoreDuel = class {
     return { length, raw, value, text };
   }
   setRegistryValue(key, value) {
-    const keyBytes = encodeUtf8(key);
-    const valueBytes = encodeUtf8(value);
     this.ocgcoreWrapper.useTmpData(
       (keyPtr, valuePtr) => this.ocgcoreWrapper.ocgcoreModule._set_registry_value(
         this.duelPtr,
         keyPtr,
-        keyBytes.length,
-        valuePtr,
-        valueBytes.length
+        valuePtr
       ),
       key,
       value
@@ -882,24 +694,88 @@ var OcgcoreDuel = class {
     );
     const raw = this.ocgcoreWrapper.copyHeap(outPtr, Math.max(0, length));
     this.ocgcoreWrapper.free(outPtr);
-    const entries = length >= 0 ? parseRegistryDump(raw) : [];
-    return { length, raw, entries };
+    const dict = {};
+    if (length > 0) {
+      const entries = parseRegistryDump(raw);
+      for (const entry of entries) {
+        if (entry.valueText !== void 0) {
+          dict[entry.key] = entry.valueText;
+        }
+      }
+    }
+    return { length, raw, dict };
   }
   loadRegistry(input) {
-    this.ocgcoreWrapper.useTmpData(
-      (ptr) => this.ocgcoreWrapper.ocgcoreModule._load_registry(
-        this.duelPtr,
-        ptr,
-        input.length
-      ),
-      input
-    );
+    if (input instanceof Uint8Array) {
+      this.ocgcoreWrapper.useTmpData(
+        (ptr) => this.ocgcoreWrapper.ocgcoreModule._load_registry(
+          this.duelPtr,
+          ptr,
+          input.length
+        ),
+        input
+      );
+    } else {
+      for (const [key, value] of Object.entries(input)) {
+        this.setRegistryValue(key, value);
+      }
+    }
   }
 };
 
 // src/structs/card-data.ts
-import Struct from "typed-struct";
-var CardDataStruct = new Struct().UInt32LE("code").UInt32LE("alias").UInt16Array("setcode", 16).UInt32LE("type").UInt32LE("level").UInt32LE("attribute").UInt32LE("race").Int32LE("attack").Int32LE("defense").UInt32LE("lscale").UInt32LE("rscale").UInt32LE("linkMarker").compile();
+import {
+  BinaryField,
+  fillBinaryFields,
+  toBinaryFields
+} from "ygopro-msg-encode";
+var _CardDataStruct = class _CardDataStruct {
+  static fromBytes(data) {
+    const obj = new _CardDataStruct();
+    fillBinaryFields(obj, data, _CardDataStruct);
+    return obj;
+  }
+  toBytes() {
+    return toBinaryFields(this, _CardDataStruct);
+  }
+};
+__decorateClass([
+  BinaryField("u32", 0)
+], _CardDataStruct.prototype, "code", 2);
+__decorateClass([
+  BinaryField("u32", 4)
+], _CardDataStruct.prototype, "alias", 2);
+__decorateClass([
+  BinaryField("u16", 8, 16)
+], _CardDataStruct.prototype, "setcode", 2);
+__decorateClass([
+  BinaryField("u32", 40)
+], _CardDataStruct.prototype, "type", 2);
+__decorateClass([
+  BinaryField("u32", 44)
+], _CardDataStruct.prototype, "level", 2);
+__decorateClass([
+  BinaryField("u32", 48)
+], _CardDataStruct.prototype, "attribute", 2);
+__decorateClass([
+  BinaryField("u32", 52)
+], _CardDataStruct.prototype, "race", 2);
+__decorateClass([
+  BinaryField("i32", 56)
+], _CardDataStruct.prototype, "attack", 2);
+__decorateClass([
+  BinaryField("i32", 60)
+], _CardDataStruct.prototype, "defense", 2);
+__decorateClass([
+  BinaryField("u32", 64)
+], _CardDataStruct.prototype, "lscale", 2);
+__decorateClass([
+  BinaryField("u32", 68)
+], _CardDataStruct.prototype, "rscale", 2);
+__decorateClass([
+  BinaryField("u32", 72)
+], _CardDataStruct.prototype, "linkMarker", 2);
+var CardDataStruct = _CardDataStruct;
 
 // src/types/ocgcore-enums.ts
 var OcgcoreMessageType = /* @__PURE__ */ ((OcgcoreMessageType2) => {
@@ -997,15 +873,14 @@ var OcgcoreWrapper = class {
       if (!data) {
         return 0;
       }
-      const CardDataCtor = CardDataStruct;
       let buf;
-      if (data instanceof CardDataCtor) {
-        buf = CardDataStruct.raw(data);
+      if (data instanceof CardDataStruct) {
+        buf = data.toBytes();
       } else {
-        const cardData = new CardDataCtor();
+        const cardData = new CardDataStruct();
         cardData.code = data.code;
         cardData.alias = data.alias;
-        const targetSetcode = cardData.setcode;
+        const targetSetcode = new Uint16Array(16);
         targetSetcode.fill(0);
         if (data.setcode instanceof Uint16Array && data.setcode.length === 16) {
           targetSetcode.set(data.setcode);
@@ -1014,6 +889,7 @@ var OcgcoreWrapper = class {
             targetSetcode[i] = data.setcode[i];
           }
         }
+        cardData.setcode = targetSetcode;
         cardData.type = data.type;
         cardData.level = data.level;
         cardData.attribute = data.attribute;
@@ -1023,7 +899,7 @@ var OcgcoreWrapper = class {
         cardData.lscale = data.lscale;
         cardData.rscale = data.rscale;
         cardData.linkMarker = data.linkMarker;
-        buf = CardDataStruct.raw(cardData);
+        buf = cardData.toBytes();
       }
       this.heapU8.set(buf, cardDataPtr);
       return 0;
@@ -2313,13 +2189,13 @@ function createReplayDuel(wrapper, yrp) {
   }
   return wrapper.createDuel(header?.seed ?? 0);
 }
-function loadDeck(duel, deck, owner, playerId) {
+function loadDeck(duel, deck, owner, player) {
   if (!deck) return;
   for (const code of deck.main ?? []) {
     duel.newCard({
       code,
       owner,
-      playerId,
+      player,
       location: LOCATION_DECK,
       sequence: 0,
       position: POS_FACEDOWN_DEFENSE
@@ -2329,7 +2205,7 @@ function loadDeck(duel, deck, owner, playerId) {
     duel.newCard({
       code,
       owner,
-      playerId,
+      player,
       location: LOCATION_EXTRA,
       sequence: 0,
       position: POS_FACEDOWN_DEFENSE
@@ -2383,15 +2259,15 @@ function* playYrpStep(ocgcoreWrapper, yrpInput) {
     setRegistryValue(duel, "player_type_0", "0");
     setRegistryValue(duel, "player_type_1", "1");
     duel.setPlayerInfo({
-      playerId: 0,
+      player: 0,
       lp: yrp.startLp,
-      startCount: yrp.startHand,
+      startHand: yrp.startHand,
       drawCount: yrp.drawCount
     });
     duel.setPlayerInfo({
-      playerId: 1,
+      player: 1,
       lp: yrp.startLp,
-      startCount: yrp.startHand,
+      startHand: yrp.startHand,
       drawCount: yrp.drawCount
     });
     duel.preloadScript("./script/patches/entry.lua");
@@ -2462,13 +2338,13 @@ function testCard(ocgcoreWrapper, ...ids) {
   });
   duel.preloadScript("./script/special.lua");
   duel.preloadScript("./script/init.lua");
-  duel.setPlayerInfo({ playerId: 0, lp: 8e3, startCount: 5, drawCount: 1 });
-  duel.setPlayerInfo({ playerId: 1, lp: 8e3, startCount: 5, drawCount: 1 });
+  duel.setPlayerInfo({ player: 0, lp: 8e3, startHand: 5, drawCount: 1 });
+  duel.setPlayerInfo({ player: 1, lp: 8e3, startHand: 5, drawCount: 1 });
   for (const code of ids) {
     duel.newCard({
       code,
       owner: 0,
-      playerId: 0,
+      player: 0,
       location: LOCATION_DECK2,
       sequence: 0,
       position: POS_FACEUP_ATTACK
@@ -2491,7 +2367,7 @@ function testCard(ocgcoreWrapper, ...ids) {
 
 // index.ts
 if (typeof globalThis !== "undefined" && !globalThis.Buffer) {
-  globalThis.Buffer = Buffer;
+  globalThis.Buffer = Buffer2;
 }
 export {
   CardDataStruct,