koishipro-core.js 1.1.2 → 1.1.4

package/dist/index.mjs

@@ -499,6 +499,7 @@ var OcgcoreDuel = class {
     this.duelPtr = duelPtr;
     this.returnPtr = 0;
     this.returnSize = 512;
+    this.ended = false;
   }
   startDuel(options) {
     if (!this.returnPtr) {
@@ -508,6 +509,8 @@ var OcgcoreDuel = class {
     this.ocgcoreWrapper.ocgcoreModule._start_duel(this.duelPtr, optionValue);
   }
   endDuel() {
+    if (this.ended) return;
+    this.ended = true;
     this.ocgcoreWrapper.ocgcoreModule._end_duel(this.duelPtr);
     if (this.returnPtr) {
       this.ocgcoreWrapper.free(this.returnPtr);
@@ -628,6 +631,10 @@ var OcgcoreDuel = class {
     this.ocgcoreWrapper.ocgcoreModule._set_responsei(this.duelPtr, value);
   }
   setResponse(response) {
+    if (typeof response === "number") {
+      this.setResponseInt(response);
+      return;
+    }
     if (response.length > this.returnSize) {
       this.ocgcoreWrapper.free(this.returnPtr);
       this.returnPtr = this.ocgcoreWrapper.malloc(response.length);
@@ -2291,31 +2298,29 @@ async function safeReadDir2(fs, dirPath) {
   }
 }
 async function collectFsDbPaths(fs, pathMod, baseDir) {
-  const results = [];
-  const baseDb = joinPath3(pathMod, baseDir, "cards.cdb");
-  try {
-    const stats = await fs.promises.stat(baseDb);
-    if (stats.isFile()) {
-      results.push(baseDb);
-    }
-  } catch {
-  }
-  const expansionsDir = joinPath3(pathMod, baseDir, "expansions");
-  const entries = await safeReadDir2(fs, expansionsDir);
-  for (const entry of entries) {
-    if (!entry.toLowerCase().endsWith(".cdb")) {
-      continue;
-    }
-    const fullPath = joinPath3(pathMod, expansionsDir, entry);
-    try {
-      const stats = await fs.promises.stat(fullPath);
-      if (stats.isFile()) {
-        results.push(fullPath);
+  const collectCdbFiles = async (dirPath) => {
+    const paths = [];
+    const entries = await safeReadDir2(fs, dirPath);
+    for (const entry of entries) {
+      if (!entry.toLowerCase().endsWith(".cdb")) {
+        continue;
+      }
+      const fullPath = joinPath3(pathMod, dirPath, entry);
+      try {
+        const stats = await fs.promises.stat(fullPath);
+        if (stats.isFile()) {
+          paths.push(fullPath);
+        }
+      } catch {
+        continue;
       }
-    } catch {
-      continue;
     }
-  }
+    return paths;
+  };
+  const results = [];
+  results.push(...await collectCdbFiles(baseDir));
+  const expansionsDir = joinPath3(pathMod, baseDir, "expansions");
+  results.push(...await collectCdbFiles(expansionsDir));
   return results;
 }
 function isRootCdbEntry(entryName) {
@@ -2372,14 +2377,6 @@ function normalizeYrp(input) {
   }
   return new YGOProYrp().fromYrp(input);
 }
-function createReplayDuel(wrapper, yrp) {
-  const header = yrp.header;
-  const seedSequence = header?.seedSequence ?? [];
-  if (seedSequence.length > 0) {
-    return wrapper.createDuelV2(seedSequence);
-  }
-  return wrapper.createDuel(header?.seed ?? 0);
-}
 function loadDeck(duel, deck, owner, player) {
   if (!deck) return;
   for (const code of deck.main ?? []) {
@@ -2423,87 +2420,97 @@ function loadTagDeck(duel, deck, owner) {
 function setRegistryValue(duel, key, value) {
   duel.setRegistryValue(key, value);
 }
-function* playYrpStep(ocgcoreWrapper, yrpInput) {
+function createDuelFromYrp(wrapper, yrpInput) {
   const yrp = normalizeYrp(yrpInput);
-  const responses = yrp.responses.slice();
-  const duel = createReplayDuel(ocgcoreWrapper, yrp);
-  let ended = false;
-  const endDuel = () => {
-    if (ended) return;
-    duel.endDuel();
-    ended = true;
-  };
-  try {
-    setRegistryValue(duel, "duel_mode", yrp.isTag ? "tag" : "single");
-    setRegistryValue(duel, "start_lp", String(yrp.startLp));
-    setRegistryValue(duel, "start_hand", String(yrp.startHand));
-    setRegistryValue(duel, "draw_count", String(yrp.drawCount));
-    const playerNames = yrp.isTag ? [
-      yrp.hostName,
-      yrp.tagHostName ?? "",
-      yrp.tagClientName ?? "",
-      yrp.clientName
-    ] : [yrp.hostName, yrp.clientName];
-    for (let i = 0; i < playerNames.length; i++) {
-      setRegistryValue(duel, `player_name_${i}`, playerNames[i] ?? "");
+  const header = yrp.header;
+  const seedSequence = header?.seedSequence ?? [];
+  const duel = seedSequence.length > 0 ? wrapper.createDuelV2(seedSequence) : wrapper.createDuel(header?.seed ?? 0);
+  setRegistryValue(duel, "duel_mode", yrp.isTag ? "tag" : "single");
+  setRegistryValue(duel, "start_lp", String(yrp.startLp));
+  setRegistryValue(duel, "start_hand", String(yrp.startHand));
+  setRegistryValue(duel, "draw_count", String(yrp.drawCount));
+  const playerNames = yrp.isTag ? [
+    yrp.hostName,
+    yrp.tagHostName ?? "",
+    yrp.tagClientName ?? "",
+    yrp.clientName
+  ] : [yrp.hostName, yrp.clientName];
+  for (let i = 0; i < playerNames.length; i++) {
+    setRegistryValue(duel, `player_name_${i}`, playerNames[i] ?? "");
+  }
+  setRegistryValue(duel, "player_type_0", "0");
+  setRegistryValue(duel, "player_type_1", "1");
+  duel.setPlayerInfo({
+    player: 0,
+    lp: yrp.startLp,
+    startHand: yrp.startHand,
+    drawCount: yrp.drawCount
+  });
+  duel.setPlayerInfo({
+    player: 1,
+    lp: yrp.startLp,
+    startHand: yrp.startHand,
+    drawCount: yrp.drawCount
+  });
+  duel.preloadScript("./script/patches/entry.lua");
+  duel.preloadScript("./script/special.lua");
+  duel.preloadScript("./script/init.lua");
+  if (yrp.isSingleMode && yrp.singleScript) {
+    duel.preloadScript(`./single/${yrp.singleScript}`);
+  } else if (yrp.isTag) {
+    loadDeck(duel, yrp.hostDeck, 0, 0);
+    loadTagDeck(duel, yrp.tagHostDeck, 0);
+    loadDeck(duel, yrp.clientDeck, 1, 1);
+    loadTagDeck(duel, yrp.tagClientDeck, 1);
+  } else {
+    loadDeck(duel, yrp.hostDeck, 0, 0);
+    loadDeck(duel, yrp.clientDeck, 1, 1);
+  }
+  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;
     }
-    setRegistryValue(duel, "player_type_0", "0");
-    setRegistryValue(duel, "player_type_1", "1");
-    duel.setPlayerInfo({
-      player: 0,
-      lp: yrp.startLp,
-      startHand: yrp.startHand,
-      drawCount: yrp.drawCount
-    });
-    duel.setPlayerInfo({
-      player: 1,
-      lp: yrp.startLp,
-      startHand: yrp.startHand,
-      drawCount: yrp.drawCount
-    });
-    duel.preloadScript("./script/patches/entry.lua");
-    duel.preloadScript("./script/special.lua");
-    duel.preloadScript("./script/init.lua");
-    if (yrp.isSingleMode && yrp.singleScript) {
-      duel.preloadScript(`./single/${yrp.singleScript}`);
-    } else if (yrp.isTag) {
-      loadDeck(duel, yrp.hostDeck, 0, 0);
-      loadTagDeck(duel, yrp.tagHostDeck, 0);
-      loadDeck(duel, yrp.clientDeck, 1, 1);
-      loadTagDeck(duel, yrp.tagClientDeck, 1);
-    } else {
-      loadDeck(duel, yrp.hostDeck, 0, 0);
-      loadDeck(duel, yrp.clientDeck, 1, 1);
+    const response = responses.shift();
+    if (!response) {
+      return true;
     }
-    duel.startDuel(yrp.opt >>> 0);
-    while (true) {
-      const result = duel.process();
-      yield {
-        duel,
-        result,
-        responses
-      };
-      if (result.raw.length > 0 && result.raw[0] === OcgcoreCommonConstants.MSG_RETRY) {
-        throw new Error("Got MSG_RETRY");
-      }
-      if (result.status === 0) {
-        continue;
-      }
-      if (result.status === 1) {
-        if (result.raw.length === 0) {
-          continue;
-        }
-        const response = responses.shift();
-        if (!response) {
-          break;
-        }
-        duel.setResponse(response);
-        continue;
-      }
+    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);
+  try {
+    for (const stepResult of processYrpDuelStep(duel, yrp)) {
+      yield stepResult;
+    }
   } finally {
-    endDuel();
+    duel.endDuel();
   }
 }
 var playYrp = (ocgcoreWrapper, yrpInput) => {
@@ -2585,6 +2592,8 @@ export {
   SqljsCardReader,
   ZipReader,
   ZipScriptReader,
+  consumeResponseFromOcgcoreProcess,
+  createDuelFromYrp,
   createOcgcoreWrapper,
   createSqljsCardReader,
   normalizeStartDuelOptions,
@@ -2595,6 +2604,7 @@ export {
   parseRegistryKeys,
   playYrp,
   playYrpStep,
+  processYrpDuelStep,
   testCard
 };
 //# sourceMappingURL=index.mjs.map