koishipro-core.js 1.1.1 → 1.1.2

package/README.md

@@ -22,9 +22,9 @@ npm install koishipro-core.js
 ```ts
 import {
   createOcgcoreWrapper,
-  ZipReader,
-  DirReader,
-  createSqljsCardReader,
+  ZipScriptReader,
+  DirScriptReader,
+  SqljsCardReader,
 } from 'koishipro-core.js';
 import initSqlJs from 'sql.js';
 
@@ -33,13 +33,13 @@ const wrapper = await createOcgcoreWrapper();
 // Provide scripts via zip + local directory fallback (Node only)
 const zipBytes = await fetch('/script.zip').then((r) => r.arrayBuffer());
 wrapper
-  .setScriptReader(await ZipReader(new Uint8Array(zipBytes)), true)
-  .setScriptReader(DirReader('./ygopro-scripts'));
+  .setScriptReader(await ZipScriptReader(new Uint8Array(zipBytes)), true)
+  .setScriptReader(DirScriptReader('./ygopro-scripts'));
 
 // Provide cards via sql.js
 const SQL = await initSqlJs();
 const db = new SQL.Database(await fetch('/cards.cdb').then((r) => r.arrayBuffer()));
-wrapper.setCardReader(createSqljsCardReader(db));
+wrapper.setCardReader(SqljsCardReader(db));
 
 // Optional: log messages from ocgcore (multiple handlers allowed)
 wrapper
@@ -202,29 +202,32 @@ Represents a single duel instance with full lifecycle management.
 
 ### Script Readers
 
-#### `MapReader(...maps: Map<string, string | Uint8Array>[]): ScriptReader`
+#### `MapScriptReader(...maps: Map<string, string | Uint8Array>[]): ScriptReader`
 Resolve Lua scripts from one or more Maps with fallback order.
 
 ```ts
 const scripts = new Map([
   ['c12345.lua', 'function c12345.initial_effect(c) end'],
 ]);
-wrapper.setScriptReader(MapReader(scripts));
+wrapper.setScriptReader(MapScriptReader(scripts));
 ```
 
-#### `ZipReader(...zipBytes: Uint8Array[]): Promise<ScriptReader>`
+#### `ZipScriptReader(...zipBytes: Uint8Array[]): Promise<ScriptReader>`
 Load all `.lua` files from one or more zips.
 
 ```ts
 const zipBytes = await fetch('/scripts.zip').then(r => r.arrayBuffer());
-wrapper.setScriptReader(await ZipReader(new Uint8Array(zipBytes)));
+wrapper.setScriptReader(await ZipScriptReader(new Uint8Array(zipBytes)));
 ```
 
-#### `DirReader(...dirs: string[]): ScriptReader`
+#### `DirScriptReader(...dirs: string[]): ScriptReader`
 Node-only directory reader with fallback order.
 
 ```ts
-wrapper.setScriptReader(DirReader('./ygopro-scripts', './custom-scripts'));
+wrapper.setScriptReader(DirScriptReader('./ygopro-scripts', './custom-scripts'));
+
+#### `DirScriptReaderEx(...dirs: string[]): Promise<ScriptReader>`
+Node-only directory reader with zip/ypk fallback. Zips are scanned in project root and `expansions/` with lower priority than filesystem scripts.
 ```
 
 ### Replay Functions
@@ -266,7 +269,7 @@ for (const { duel, result } of playYrpStep(wrapper, yrpBytes)) {
 
 ### Card Reader
 
-#### `createSqljsCardReader(...dbs: Database[]): CardReader`
+#### `SqljsCardReader(...dbs: Database[]): CardReader`
 Build a `CardReader` from one or more SQL.js databases with fallback order.
 
 ```ts
@@ -277,7 +280,10 @@ const db1 = new SQL.Database(officialCards);
 const db2 = new SQL.Database(customCards);
 
 // Try db1 first, fallback to db2
-wrapper.setCardReader(createSqljsCardReader(db1, db2));
+wrapper.setCardReader(SqljsCardReader(db1, db2));
+
+#### `DirCardReader(sqljs: SqlJsStatic, ...dirs: string[]): Promise<CardReader>`
+Node-only card reader that loads `cards.cdb`, `expansions/*.cdb`, and root-level `.cdb` files inside `*.zip`/`*.ypk` archives under each directory.
 ```
 
 ### Constants

package/dist/index.cjs

@@ -38,12 +38,16 @@ var __decorateClass = (decorators, target, key, kind) => {
 var index_exports = {};
 __export(index_exports, {
   CardDataStruct: () => CardDataStruct,
+  DirCardReader: () => DirCardReader,
   DirReader: () => DirReader,
+  DirScriptReader: () => DirScriptReader,
+  DirScriptReaderEx: () => DirScriptReaderEx,
   LEN_EMPTY: () => LEN_EMPTY,
   LEN_FAIL: () => LEN_FAIL,
   LEN_HEADER: () => LEN_HEADER,
   MESSAGE_BUFFER_SIZE: () => MESSAGE_BUFFER_SIZE,
   MapReader: () => MapReader,
+  MapScriptReader: () => MapScriptReader,
   OcgcoreCommonConstants: () => OcgcoreCommonConstants,
   OcgcoreDuel: () => OcgcoreDuel,
   OcgcoreDuelOptionFlag: () => OcgcoreDuelOptionFlag,
@@ -53,7 +57,9 @@ __export(index_exports, {
   OcgcoreWrapper: () => OcgcoreWrapper,
   QUERY_BUFFER_SIZE: () => QUERY_BUFFER_SIZE,
   REGISTRY_BUFFER_SIZE: () => REGISTRY_BUFFER_SIZE,
+  SqljsCardReader: () => SqljsCardReader,
   ZipReader: () => ZipReader,
+  ZipScriptReader: () => ZipScriptReader,
   createOcgcoreWrapper: () => createOcgcoreWrapper,
   createSqljsCardReader: () => createSqljsCardReader,
   normalizeStartDuelOptions: () => normalizeStartDuelOptions,
@@ -1212,114 +1218,6 @@ async function createOcgcoreWrapper(options = {}) {
   return new OcgcoreWrapper(moduleInstance);
 }
 
-// src/adapters/script-readers.ts
-var import_jszip = __toESM(require("jszip"));
-var SCRIPT_PREFIX = "./script/";
-function normalizePath(input) {
-  let path = input.replace(/\\/g, "/");
-  if (path.startsWith(SCRIPT_PREFIX)) {
-    path = path.slice(SCRIPT_PREFIX.length);
-  }
-  return path;
-}
-function buildCandidates(filename) {
-  const entries = [
-    filename,
-    `specials/${filename}`,
-    `expansions/script/${filename}`,
-    `script/${filename}`
-  ];
-  const candidates = [];
-  for (const entry of entries) {
-    candidates.push(entry);
-    if (!entry.startsWith("./")) {
-      const dotEntry = entry.startsWith("/") ? `./${entry.slice(1)}` : `./${entry}`;
-      candidates.push(dotEntry);
-    }
-  }
-  return candidates;
-}
-function joinPath(baseDir, relativePath) {
-  const pathMod = getNodePath();
-  if (pathMod) {
-    return pathMod.join(baseDir, relativePath);
-  }
-  const trimmedBase = baseDir.replace(/[/\\]+$/, "");
-  const trimmedRel = relativePath.replace(/^[/\\]+/, "");
-  return `${trimmedBase}/${trimmedRel}`;
-}
-function MapReader(...maps) {
-  return (path) => {
-    const filename = normalizePath(path);
-    if (!filename.toLowerCase().endsWith(".lua")) {
-      return null;
-    }
-    const candidates = buildCandidates(filename);
-    for (const candidate of candidates) {
-      for (const map of maps) {
-        if (map.has(candidate)) {
-          return map.get(candidate) ?? null;
-        }
-      }
-    }
-    return null;
-  };
-}
-function DirReader(...baseDirs) {
-  const fs = getNodeFs();
-  return (path) => {
-    const filename = normalizePath(path);
-    if (!filename.toLowerCase().endsWith(".lua")) {
-      return null;
-    }
-    const candidates = buildCandidates(filename);
-    for (const baseDir of baseDirs) {
-      for (const candidate of candidates) {
-        const normalized = candidate.startsWith("/") ? candidate.slice(1) : candidate;
-        const fullPath = joinPath(baseDir, normalized);
-        if (fs.existsSync(fullPath)) {
-          return fs.readFileSync(fullPath);
-        }
-      }
-    }
-    return null;
-  };
-}
-function normalizeZipEntryName(name) {
-  const normalized = name.replace(/\\/g, "/").replace(/^\.?\//, "");
-  const names = /* @__PURE__ */ new Set();
-  names.add(normalized);
-  if (normalized.startsWith("script/")) {
-    names.add(normalized.slice("script/".length));
-  }
-  return Array.from(names);
-}
-async function ZipReader(...inputs) {
-  const maps = await Promise.all(
-    inputs.map(async (data) => {
-      const zip = await import_jszip.default.loadAsync(data);
-      const map = /* @__PURE__ */ new Map();
-      const entries = Object.values(zip.files);
-      await Promise.all(
-        entries.map(async (entry) => {
-          if (entry.dir) {
-            return;
-          }
-          if (!entry.name.toLowerCase().endsWith(".lua")) {
-            return;
-          }
-          const content = await entry.async("uint8array");
-          for (const name of normalizeZipEntryName(entry.name)) {
-            map.set(name, content);
-          }
-        })
-      );
-      return map;
-    })
-  );
-  return MapReader(...maps);
-}
-
 // src/vendor/script-constants.ts
 var OcgcoreScriptConstants = {
   ACTIVITY_ATTACK: 5,
@@ -2158,7 +2056,207 @@ var OcgcoreScriptConstants = {
   TYPE_XYZ: 8388608
 };
 
-// src/sqljs-card-reader.ts
+// src/script-reader/script-readers.ts
+var import_jszip = __toESM(require("jszip"));
+var SCRIPT_PREFIX = "./script/";
+function normalizePath(input) {
+  let path = input.replace(/\\/g, "/");
+  if (path.startsWith(SCRIPT_PREFIX)) {
+    path = path.slice(SCRIPT_PREFIX.length);
+  }
+  return path;
+}
+function buildCandidates(filename) {
+  const entries = [
+    filename,
+    `specials/${filename}`,
+    `expansions/script/${filename}`,
+    `script/${filename}`
+  ];
+  const candidates = [];
+  for (const entry of entries) {
+    candidates.push(entry);
+    if (!entry.startsWith("./")) {
+      const dotEntry = entry.startsWith("/") ? `./${entry.slice(1)}` : `./${entry}`;
+      candidates.push(dotEntry);
+    }
+  }
+  return candidates;
+}
+function joinPath(baseDir, relativePath) {
+  const pathMod = getNodePath();
+  if (pathMod) {
+    return pathMod.join(baseDir, relativePath);
+  }
+  const trimmedBase = baseDir.replace(/[/\\]+$/, "");
+  const trimmedRel = relativePath.replace(/^[/\\]+/, "");
+  return `${trimmedBase}/${trimmedRel}`;
+}
+function MapScriptReader(...maps) {
+  return (path) => {
+    const filename = normalizePath(path);
+    if (!filename.toLowerCase().endsWith(".lua")) {
+      return null;
+    }
+    const candidates = buildCandidates(filename);
+    for (const candidate of candidates) {
+      for (const map of maps) {
+        if (map.has(candidate)) {
+          return map.get(candidate) ?? null;
+        }
+      }
+    }
+    return null;
+  };
+}
+function DirScriptReader(...baseDirs) {
+  const fs = getNodeFs();
+  return (path) => {
+    const filename = normalizePath(path);
+    if (!filename.toLowerCase().endsWith(".lua")) {
+      return null;
+    }
+    const candidates = buildCandidates(filename);
+    for (const baseDir of baseDirs) {
+      for (const candidate of candidates) {
+        const normalized = candidate.startsWith("/") ? candidate.slice(1) : candidate;
+        const fullPath = joinPath(baseDir, normalized);
+        if (fs.existsSync(fullPath)) {
+          return fs.readFileSync(fullPath);
+        }
+      }
+    }
+    return null;
+  };
+}
+function normalizeZipEntryName(name) {
+  const normalized = name.replace(/\\/g, "/").replace(/^\.?\//, "");
+  const names = /* @__PURE__ */ new Set();
+  names.add(normalized);
+  if (normalized.startsWith("script/")) {
+    names.add(normalized.slice("script/".length));
+  }
+  return Array.from(names);
+}
+async function ZipScriptReader(...inputs) {
+  const maps = await Promise.all(
+    inputs.map(async (data) => {
+      const zip = await import_jszip.default.loadAsync(data);
+      const map = /* @__PURE__ */ new Map();
+      const entries = Object.values(zip.files);
+      await Promise.all(
+        entries.map(async (entry) => {
+          if (entry.dir) {
+            return;
+          }
+          if (!entry.name.toLowerCase().endsWith(".lua")) {
+            return;
+          }
+          const content = await entry.async("uint8array");
+          for (const name of normalizeZipEntryName(entry.name)) {
+            map.set(name, content);
+          }
+        })
+      );
+      return map;
+    })
+  );
+  return MapScriptReader(...maps);
+}
+function MapReader(...maps) {
+  return MapScriptReader(...maps);
+}
+function DirReader(...baseDirs) {
+  return DirScriptReader(...baseDirs);
+}
+async function ZipReader(...inputs) {
+  return ZipScriptReader(...inputs);
+}
+
+// src/utility/search-zips.ts
+function joinPath2(pathMod, baseDir, rel) {
+  if (pathMod) {
+    return pathMod.join(baseDir, rel);
+  }
+  const trimmedBase = baseDir.replace(/[/\\]+$/, "");
+  const trimmedRel = rel.replace(/^[/\\]+/, "");
+  return `${trimmedBase}/${trimmedRel}`;
+}
+async function safeReadDir(fs, dirPath) {
+  try {
+    return await fs.promises.readdir(dirPath);
+  } catch {
+    return [];
+  }
+}
+async function searchZips(fs, pathMod, baseDir) {
+  const results = [];
+  const rootEntries = await safeReadDir(fs, baseDir);
+  for (const entry of rootEntries) {
+    const lower = entry.toLowerCase();
+    if (!lower.endsWith(".zip") && !lower.endsWith(".ypk")) {
+      continue;
+    }
+    const fullPath = joinPath2(pathMod, baseDir, entry);
+    try {
+      const stats = await fs.promises.stat(fullPath);
+      if (stats.isFile()) {
+        results.push(fullPath);
+      }
+    } catch {
+      continue;
+    }
+  }
+  const expansionsDir = joinPath2(pathMod, baseDir, "expansions");
+  const expansionEntries = await safeReadDir(fs, expansionsDir);
+  for (const entry of expansionEntries) {
+    const lower = entry.toLowerCase();
+    if (!lower.endsWith(".zip") && !lower.endsWith(".ypk")) {
+      continue;
+    }
+    const fullPath = joinPath2(pathMod, expansionsDir, entry);
+    try {
+      const stats = await fs.promises.stat(fullPath);
+      if (stats.isFile()) {
+        results.push(fullPath);
+      }
+    } catch {
+      continue;
+    }
+  }
+  return results;
+}
+
+// src/script-reader/dir-script-reader-ex.ts
+function getNodeModuleOrThrow(value, label) {
+  if (!value) {
+    throw new Error(`${label} is not supported in this runtime.`);
+  }
+  return value;
+}
+async function DirScriptReaderEx(...baseDirs) {
+  const fs = getNodeModuleOrThrow(getNodeFs(), "DirScriptReaderEx");
+  const pathMod = getNodeModuleOrThrow(getNodePath(), "DirScriptReaderEx");
+  const fsReader = DirScriptReader(...baseDirs);
+  const zipInputs = [];
+  for (const baseDir of baseDirs) {
+    const zipPaths = await searchZips(fs, pathMod, baseDir);
+    for (const zipPath of zipPaths) {
+      try {
+        zipInputs.push(await fs.promises.readFile(zipPath));
+      } catch {
+        continue;
+      }
+    }
+  }
+  if (zipInputs.length === 0) {
+    return fsReader;
+  }
+  const zipReader = await ZipScriptReader(...zipInputs);
+  return (path) => fsReader(path) ?? zipReader(path);
+}
+
+// src/card-reader/sqljs-card-reader.ts
 function toUint16ArrayFromSetcode(value) {
   let raw = typeof value === "bigint" ? value : BigInt(value >>> 0);
   const list = new Uint16Array(16);
@@ -2239,7 +2337,7 @@ function queryOne(db, cardId) {
     attribute: row[8]
   });
 }
-function createSqljsCardReader(...dbs) {
+function SqljsCardReader(...dbs) {
   return (cardId) => {
     for (const db of dbs) {
       const data = queryOne(db, cardId);
@@ -2250,6 +2348,105 @@ function createSqljsCardReader(...dbs) {
     return null;
   };
 }
+function createSqljsCardReader(...dbs) {
+  return SqljsCardReader(...dbs);
+}
+
+// src/card-reader/dir-card-reader.ts
+var import_jszip2 = __toESM(require("jszip"));
+function joinPath3(pathMod, baseDir, rel) {
+  if (pathMod) {
+    return pathMod.join(baseDir, rel);
+  }
+  const trimmedBase = baseDir.replace(/[/\\]+$/, "");
+  const trimmedRel = rel.replace(/^[/\\]+/, "");
+  return `${trimmedBase}/${trimmedRel}`;
+}
+function getNodeModuleOrThrow2(value, label) {
+  if (!value) {
+    throw new Error(`${label} is not supported in this runtime.`);
+  }
+  return value;
+}
+async function safeReadDir2(fs, dirPath) {
+  try {
+    return await fs.promises.readdir(dirPath);
+  } catch {
+    return [];
+  }
+}
+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);
+      }
+    } catch {
+      continue;
+    }
+  }
+  return results;
+}
+function isRootCdbEntry(entryName) {
+  const normalized = entryName.replace(/\\/g, "/").replace(/^\.?\//, "");
+  return !normalized.includes("/") && normalized.toLowerCase().endsWith(".cdb");
+}
+async function DirCardReader(sqljs, ...baseDirs) {
+  const fs = getNodeModuleOrThrow2(getNodeFs(), "DirCardReader");
+  const pathMod = getNodeModuleOrThrow2(getNodePath(), "DirCardReader");
+  const dbs = [];
+  for (const baseDir of baseDirs) {
+    const dbPaths = await collectFsDbPaths(fs, pathMod, baseDir);
+    for (const dbPath of dbPaths) {
+      try {
+        const bytes = await fs.promises.readFile(dbPath);
+        dbs.push(new sqljs.Database(bytes));
+      } catch {
+        continue;
+      }
+    }
+  }
+  for (const baseDir of baseDirs) {
+    const zipPaths = await searchZips(fs, pathMod, baseDir);
+    for (const zipPath of zipPaths) {
+      try {
+        const bytes = await fs.promises.readFile(zipPath);
+        const zip = await import_jszip2.default.loadAsync(bytes);
+        const entries = Object.values(zip.files);
+        for (const entry of entries) {
+          if (entry.dir || !isRootCdbEntry(entry.name)) {
+            continue;
+          }
+          try {
+            const content = await entry.async("uint8array");
+            dbs.push(new sqljs.Database(content));
+          } catch {
+            continue;
+          }
+        }
+      } catch {
+        continue;
+      }
+    }
+  }
+  return SqljsCardReader(...dbs);
+}
 
 // src/play-yrp.ts
 var import_ygopro_yrp_encode = require("ygopro-yrp-encode");
@@ -2368,7 +2565,8 @@ function* playYrpStep(ocgcoreWrapper, yrpInput) {
       const result = duel.process();
       yield {
         duel,
-        result
+        result,
+        responses
       };
       if (result.raw.length > 0 && result.raw[0] === OcgcoreCommonConstants.MSG_RETRY) {
         throw new Error("Got MSG_RETRY");
@@ -2451,12 +2649,16 @@ if (typeof globalThis !== "undefined" && !globalThis.Buffer) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CardDataStruct,
+  DirCardReader,
   DirReader,
+  DirScriptReader,
+  DirScriptReaderEx,
   LEN_EMPTY,
   LEN_FAIL,
   LEN_HEADER,
   MESSAGE_BUFFER_SIZE,
   MapReader,
+  MapScriptReader,
   OcgcoreCommonConstants,
   OcgcoreDuel,
   OcgcoreDuelOptionFlag,
@@ -2466,7 +2668,9 @@ if (typeof globalThis !== "undefined" && !globalThis.Buffer) {
   OcgcoreWrapper,
   QUERY_BUFFER_SIZE,
   REGISTRY_BUFFER_SIZE,
+  SqljsCardReader,
   ZipReader,
+  ZipScriptReader,
   createOcgcoreWrapper,
   createSqljsCardReader,
   normalizeStartDuelOptions,