koishipro-core.js 1.2.1 → 1.2.3

package/dist/index.mjs

@@ -1,17 +1,8 @@
 var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-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 as Buffer2 } from "buffer";
@@ -145,7 +136,10 @@ function normalizeStartDuelOptions(options) {
 }
 
 // src/ocgcore-duel.ts
-import { YGOProMessages } from "ygopro-msg-encode";
+import {
+  YGOProMessages,
+  YGOProMsgRetry
+} from "ygopro-msg-encode";
 var OcgcoreDuel = class {
   constructor(ocgcoreWrapper, duelPtr) {
     this.ocgcoreWrapper = ocgcoreWrapper;
@@ -212,6 +206,22 @@ var OcgcoreDuel = class {
       message: parsedMessage
     };
   }
+  *advance(advancor) {
+    while (true) {
+      const res = this.process();
+      yield res;
+      if (res.status === 2 || res.message instanceof YGOProMsgRetry) {
+        break;
+      }
+      if (res.status === 1 && res.raw.length > 0) {
+        const response = advancor?.();
+        if (!response) {
+          break;
+        }
+        this.setResponse(response);
+      }
+    }
+  }
   newCard(card) {
     this.ocgcoreWrapper.ocgcoreModule._new_card(
       this.duelPtr,
@@ -383,59 +393,8 @@ var OcgcoreDuel = class {
   }
 };
 
-// src/structs/card-data.ts
-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/ocgcore-wrapper.ts
+import { CardData } from "ygopro-msg-encode";
 
 // src/types/ocgcore-enums.ts
 var OcgcoreMessageType = /* @__PURE__ */ ((OcgcoreMessageType2) => {
@@ -513,34 +472,7 @@ var OcgcoreWrapper = class {
       if (!data) {
         return 0;
       }
-      let buf;
-      if (data instanceof CardDataStruct) {
-        buf = data.toBytes();
-      } else {
-        const cardData = new CardDataStruct();
-        cardData.code = data.code;
-        cardData.alias = data.alias;
-        const targetSetcode = new Uint16Array(16);
-        targetSetcode.fill(0);
-        if (data.setcode instanceof Uint16Array && data.setcode.length === 16) {
-          targetSetcode.set(data.setcode);
-        } else {
-          for (let i = 0; i < 16 && i < data.setcode.length; i++) {
-            targetSetcode[i] = data.setcode[i];
-          }
-        }
-        cardData.setcode = targetSetcode;
-        cardData.type = data.type;
-        cardData.level = data.level;
-        cardData.attribute = data.attribute;
-        cardData.race = data.race;
-        cardData.attack = data.attack;
-        cardData.defense = data.defense;
-        cardData.lscale = data.lscale;
-        cardData.rscale = data.rscale;
-        cardData.linkMarker = data.linkMarker;
-        buf = cardData.toBytes();
-      }
+      const buf = new CardData().fromPartial(data).toPayload();
       this.heapU8.set(buf, cardDataPtr);
       return 0;
     }, "iii");
@@ -1005,15 +937,13 @@ async function DirScriptReaderEx(...baseDirs) {
 }
 
 // src/card-reader/sqljs-card-reader.ts
-function toUint16ArrayFromSetcode(value) {
+function toNumberArrayFromSetcode(value) {
   let raw = typeof value === "bigint" ? value : BigInt(value >>> 0);
-  const list = new Uint16Array(16);
-  let idx = 0;
-  while (raw !== 0n && idx < 16) {
+  const list = [];
+  while (raw !== 0n && list.length < 16) {
     const chunk = raw & 0xffffn;
     if (chunk !== 0n) {
-      list[idx] = Number(chunk);
-      idx++;
+      list.push(Number(chunk));
     }
     raw >>= 16n;
   }
@@ -1035,7 +965,7 @@ function mapRowToCardData(row) {
   return {
     code: row.id,
     alias: row.alias ?? 0,
-    setcode: toUint16ArrayFromSetcode(row.setcode ?? 0),
+    setcode: toNumberArrayFromSetcode(row.setcode ?? 0),
     type,
     level,
     attribute: (row.attribute ?? 0) >>> 0,
@@ -1196,6 +1126,7 @@ async function DirCardReader(sqljs, ...baseDirs) {
 
 // src/play-yrp.ts
 import { YGOProYrp } from "ygopro-yrp-encode";
+import { YGOProMsgRetry as YGOProMsgRetry2 } from "ygopro-msg-encode";
 var { LOCATION_DECK, LOCATION_EXTRA, POS_FACEDOWN_DEFENSE } = OcgcoreScriptConstants;
 function normalizeYrp(input) {
   if (input instanceof YGOProYrp) {
@@ -1295,45 +1226,19 @@ function createDuelFromYrp(wrapper, yrpInput) {
   duel.startDuel(yrp.opt >>> 0);
   return { yrp, duel };
 }
-function consumeResponseFromOcgcoreProcess(duel, result, responses) {
-  if (result.raw.length > 0 && result.raw[0] === OcgcoreCommonConstants.MSG_RETRY) {
-    throw new Error("Got MSG_RETRY");
-  }
-  if (result.status === 0) {
-    return false;
-  }
-  if (result.status === 1) {
-    if (result.raw.length === 0) {
-      return false;
-    }
-    const response = responses.shift();
-    if (!response) {
-      return true;
-    }
-    duel.setResponse(response);
-    return false;
-  }
-  return true;
-}
-function* processYrpDuelStep(duel, yrp) {
-  const responses = yrp.responses.slice();
-  while (true) {
-    const result = duel.process();
-    yield {
-      duel,
-      result,
-      responses
-    };
-    if (consumeResponseFromOcgcoreProcess(duel, result, responses)) {
-      break;
-    }
-  }
-}
 function* playYrpStep(ocgcoreWrapper, yrpInput) {
   const { yrp, duel } = createDuelFromYrp(ocgcoreWrapper, yrpInput);
+  const responses = yrp.responses.slice();
   try {
-    for (const stepResult of processYrpDuelStep(duel, yrp)) {
-      yield stepResult;
+    for (const result of duel.advance(() => responses.shift())) {
+      yield {
+        duel,
+        result,
+        responses
+      };
+      if (result.message instanceof YGOProMsgRetry2) {
+        throw new Error("Got MSG_RETRY");
+      }
     }
   } finally {
     duel.endDuel();
@@ -1395,7 +1300,6 @@ if (typeof globalThis !== "undefined" && !globalThis.Buffer) {
   globalThis.Buffer = Buffer2;
 }
 export {
-  CardDataStruct,
   DirCardReader,
   DirReader,
   DirScriptReader,
@@ -1417,7 +1321,6 @@ export {
   ZipReader,
   ZipScriptReader,
   vendor_exports as _OcgcoreConstants,
-  consumeResponseFromOcgcoreProcess,
   createDuelFromYrp,
   createOcgcoreWrapper,
   createSqljsCardReader,
@@ -1429,7 +1332,6 @@ export {
   parseRegistryKeys,
   playYrp,
   playYrpStep,
-  processYrpDuelStep,
   testCard
 };
 //# sourceMappingURL=index.mjs.map