koishipro-core.js 1.1.4 → 1.1.6

package/dist/index.cjs

@@ -897,17 +897,7 @@ var OcgcoreWrapper = class {
     this.logBufferSize = options?.logBufferSize ?? 1024;
     this.scriptReaderFunc = this.createFunction((scriptPtr, lenPtr) => {
       const scriptPath = this.getUTF8String(scriptPtr);
-      let content;
-      for (const reader of this.scriptReaders) {
-        try {
-          content = reader(scriptPath);
-        } catch {
-          content = null;
-        }
-        if (content != null) {
-          break;
-        }
-      }
+      const content = this.readScript(scriptPath);
       if (content == null) {
         return 0;
       }
@@ -916,7 +906,7 @@ var OcgcoreWrapper = class {
           this.scriptBufferSize
         );
       }
-      const bytes = typeof content === "string" ? this.encoder.encode(content) : content;
+      const bytes = content;
       if (bytes.length > this.scriptBufferSize) {
         this.ocgcoreModule._free(this.scriptBufferPtr);
         this.scriptBufferPtr = this.ocgcoreModule._malloc(bytes.length);
@@ -928,17 +918,7 @@ var OcgcoreWrapper = class {
     }, "iii");
     this.ocgcoreModule._set_script_reader(this.scriptReaderFunc);
     this.cardReaderFunc = this.createFunction((cardId, cardDataPtr) => {
-      let data;
-      for (const reader of this.cardReaders) {
-        try {
-          data = reader(cardId);
-        } catch {
-          data = null;
-        }
-        if (data) {
-          break;
-        }
-      }
+      const data = this.readCard(cardId);
       if (!data) {
         return 0;
       }
@@ -982,15 +962,46 @@ var OcgcoreWrapper = class {
       const message = this.getUTF8String(this.logBufferPtr);
       const type = messageType === 2 ? "DebugMessage" /* DebugMessage */ : "ScriptError" /* ScriptError */;
       const duel = this.getOrCreateDuel(duelPtr);
-      for (const handler of this.messageHandlers) {
-        try {
-          handler(duel, message, type);
-        } catch {
-        }
-      }
+      this.handleMessage(duel, message, type);
     }, "iii");
     this.ocgcoreModule._set_message_handler(this.messageHandlerFunc);
   }
+  readScript(scriptPath) {
+    let content;
+    for (const reader of this.scriptReaders) {
+      try {
+        content = reader(scriptPath);
+      } catch {
+        content = null;
+      }
+      if (content != null) {
+        break;
+      }
+    }
+    return typeof content === "string" ? this.encoder.encode(content) : content ?? null;
+  }
+  readCard(cardId) {
+    let data;
+    for (const reader of this.cardReaders) {
+      try {
+        data = reader(cardId);
+      } catch {
+        data = null;
+      }
+      if (data) {
+        break;
+      }
+    }
+    return data ?? null;
+  }
+  handleMessage(duel, message, type) {
+    for (const handler of this.messageHandlers) {
+      try {
+        handler(duel, message, type);
+      } catch {
+      }
+    }
+  }
   getUTF8String(ptr) {
     let length = 0;
     while (this.heapU8[ptr + length] !== 0) {
@@ -2406,9 +2417,9 @@ async function collectFsDbPaths(fs, pathMod, baseDir) {
     return paths;
   };
   const results = [];
-  results.push(...await collectCdbFiles(baseDir));
   const expansionsDir = joinPath3(pathMod, baseDir, "expansions");
   results.push(...await collectCdbFiles(expansionsDir));
+  results.push(...await collectCdbFiles(baseDir));
   return results;
 }
 function isRootCdbEntry(entryName) {