migrate to ygopro-cdb-encode

package.json

@@ -38,11 +38,12 @@
     "@angular/router": "^21.1.0",
     "bootstrap": "^5.3.8",
     "jszip": "^3.10.1",
-    "koishipro-core.js": "^1.2.2",
+    "koishipro-core.js": "^1.2.11",
     "rxjs": "~7.8.0",
     "sql.js": "^1.13.0",
     "tslib": "^2.3.0",
-    "ygopro-msg-encode": "^1.1.2"
+    "ygopro-cdb-encode": "^1.0.1",
+    "ygopro-msg-encode": "^1.1.7"
   },
   "devDependencies": {
     "@angular-eslint/eslint-plugin": "^21.1.0",

src/app/app.ts

@@ -18,6 +18,7 @@ import {
 } from 'koishipro-core.js';
 import { YGOPRO_CDB_URL, YGOPRO_SCRIPT_ZIP_URL } from './resource-urls';
 import { OcgcoreCommonConstants } from 'ygopro-msg-encode';
+import { YGOProCdb } from 'ygopro-cdb-encode';
 
 type PackageStatus = 'pending' | 'running' | 'done' | 'error';
 type CdbStatus = 'pending' | 'running' | 'done' | 'error';
@@ -69,12 +70,6 @@ type ProgressSnapshot = {
   percent: number;
 };
 
-type SqlCardRow = {
-  id: number;
-  name: string | null;
-  type: number | null;
-};
-
 type ZipCdbEntry = {
   zipName: string;
   displayName: string;
@@ -608,7 +603,8 @@ export class App {
       const sql = await this.getSqlModule();
       const cdbBytes = await zipEntry.async('uint8array');
       db = new sql.Database(cdbBytes);
-      const cards = this.queryTestCards(db);
+      const cdb = new YGOProCdb(db);
+      const cards = this.queryTestCards(cdb);
 
       if (cards.length === 0) {
         this.updateCdb(packageIndex, cdbIndex, (cdb) => ({
@@ -832,34 +828,28 @@ export class App {
     }
   }
 
-  private queryTestCards(db: Database): Array<{ id: number; name: string; skipTest: boolean }> {
+  private queryTestCards(cdb: YGOProCdb): Array<{ id: number; name: string; skipTest: boolean }> {
     const normalMonsterType =
       (OcgcoreCommonConstants.TYPE_NORMAL | OcgcoreCommonConstants.TYPE_MONSTER) >>> 0;
     const tokenType = OcgcoreCommonConstants.TYPE_TOKEN >>> 0;
-    const stmt = db.prepare(
-      'SELECT datas.id as id, texts.name as name, datas.type as type FROM datas INNER JOIN texts ON datas.id = texts.id',
-    );
 
-    try {
-      const result: Array<{ id: number; name: string; skipTest: boolean }> = [];
-      while (stmt.step()) {
-        const row = stmt.getAsObject() as unknown as SqlCardRow;
-        if (!row || row.id == null) {
-          continue;
-        }
-        const typeValue = (row.type ?? 0) >>> 0;
-        const skipTest =
-          typeValue === normalMonsterType || (typeValue & tokenType) !== 0;
-        result.push({
-          id: row.id,
-          name: row.name ?? '未命名卡片',
-          skipTest,
-        });
+    const entries = cdb.find();
+    const result: Array<{ id: number; name: string; skipTest: boolean }> = [];
+    for (const entry of entries) {
+      const id = entry.code;
+      if (!Number.isFinite(id)) {
+        continue;
       }
-      return result;
-    } finally {
-      stmt.free();
-    }
+      const typeValue = (entry.type ?? 0) >>> 0;
+      const skipTest =
+        typeValue === normalMonsterType || (typeValue & tokenType) !== 0;
+      result.push({
+        id,
+        name: entry.name || '未命名卡片',
+        skipTest,
+      });
+    }
+    return result;
   }
 
   private updatePackage(