Skip to content

Y
ygopro-cardtest-web
Commit 3e83ac87 authored by nanahira's avatar nanahira
Browse files
Options

migrate

parent 07155ba3
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 17 deletions
package-lock.json
View file @ 3e83ac87
...@@ -16,10 +16,11 @@ ...@@ -16,10 +16,11 @@
"@angular/router": "^21.1.0", "@angular/router": "^21.1.0",
"bootstrap": "^5.3.8", "bootstrap": "^5.3.8",
"jszip": "^3.10.1", "jszip": "^3.10.1",
"koishipro-core.js": "^1.1.0", "koishipro-core.js": "^1.2.2",
"rxjs": "~7.8.0", "rxjs": "~7.8.0",
"sql.js": "^1.13.0", "sql.js": "^1.13.0",
"tslib": "^2.3.0" "tslib": "^2.3.0",
"ygopro-msg-encode": "^1.1.2"
}, },
"devDependencies": { "devDependencies": {
"@angular-eslint/eslint-plugin": "^21.1.0", "@angular-eslint/eslint-plugin": "^21.1.0",
...@@ -7284,9 +7285,9 @@ ...@@ -7284,9 +7285,9 @@
} }
}, },
"node_modules/koishipro-core.js": { "node_modules/koishipro-core.js": {
"version": "1.1.0", "version": "1.2.2",
"resolved": "https://registry.npmjs.org/koishipro-core.js/-/koishipro-core.js-1.1.0.tgz", "resolved": "https://registry.npmjs.org/koishipro-core.js/-/koishipro-core.js-1.2.2.tgz",
"integrity": "sha512-37EfMRItFCKQZELSfzMY+Q65p7feSChWHuVtJ8twciHrJLSG0SFaDVLMVxGfoXpSOhahSOTwjfMNV0svXhzcvQ==", "integrity": "sha512-kbSCNsRn1mAlqe1fMPaYhVajHdknJhVImE8kCL6hcQIT2WozndZ+uvmsnUB6zexfrd6DgFNJJj6Fu566OZqqXA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@types/emscripten": "^1.41.5", "@types/emscripten": "^1.41.5",
...@@ -7294,7 +7295,7 @@ ...@@ -7294,7 +7295,7 @@
"buffer": "^6.0.3", "buffer": "^6.0.3",
"jszip": "^3.10.1", "jszip": "^3.10.1",
"sql.js": "^1.13.0", "sql.js": "^1.13.0",
"ygopro-msg-encode": "^1.0.1", "ygopro-msg-encode": "^1.1.2",
"ygopro-yrp-encode": "^1.0.1" "ygopro-yrp-encode": "^1.0.1"
} }
}, },
...@@ -10255,9 +10256,9 @@ ...@@ -10255,9 +10256,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/ygopro-msg-encode": { "node_modules/ygopro-msg-encode": {
"version": "1.0.1", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/ygopro-msg-encode/-/ygopro-msg-encode-1.0.1.tgz", "resolved": "https://registry.npmjs.org/ygopro-msg-encode/-/ygopro-msg-encode-1.1.2.tgz",
"integrity": "sha512-S0CpVpHVVtqTAjkU83NAs12dgBuasGkIC5ukf6Mgirwifr+bA3SxC/fMo54HZEBKzZgWhVw/ykH90/TNoQL/9g==", "integrity": "sha512-EWudwA47tz2gpwmfW0lRkRmXyW4MHRDHbMUUT80rMeEy7hZgW6TgJfAije8ew2BrY5lxHj1V1w11/8MM8apLAQ==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"typed-reflector": "^1.0.14", "typed-reflector": "^1.0.14",
......
package.json
View file @ 3e83ac87
...@@ -38,10 +38,11 @@ ...@@ -38,10 +38,11 @@
"@angular/router": "^21.1.0", "@angular/router": "^21.1.0",
"bootstrap": "^5.3.8", "bootstrap": "^5.3.8",
"jszip": "^3.10.1", "jszip": "^3.10.1",
"koishipro-core.js": "^1.1.0", "koishipro-core.js": "^1.2.2",
"rxjs": "~7.8.0", "rxjs": "~7.8.0",
"sql.js": "^1.13.0", "sql.js": "^1.13.0",
"tslib": "^2.3.0" "tslib": "^2.3.0",
"ygopro-msg-encode": "^1.1.2"
}, },
"devDependencies": { "devDependencies": {
"@angular-eslint/eslint-plugin": "^21.1.0", "@angular-eslint/eslint-plugin": "^21.1.0",
......
src/app/app.ts
View file @ 3e83ac87
...@@ -8,16 +8,16 @@ import { ...@@ -8,16 +8,16 @@ import {
import JSZip from 'jszip'; import JSZip from 'jszip';
import initSqlJs, { type Database, type SqlJsStatic } from 'sql.js'; import initSqlJs, { type Database, type SqlJsStatic } from 'sql.js';
import { import {
OcgcoreCommonConstants,
OcgcoreMessageType, OcgcoreMessageType,
ZipReader, ZipScriptReader,
createOcgcoreWrapper, createOcgcoreWrapper,
createSqljsCardReader, SqljsCardReader,
testCard, testCard,
type ScriptReader, type ScriptReader,
type TestCardMessage, type TestCardMessage,
} from 'koishipro-core.js'; } from 'koishipro-core.js';
import { YGOPRO_CDB_URL, YGOPRO_SCRIPT_ZIP_URL } from './resource-urls'; import { YGOPRO_CDB_URL, YGOPRO_SCRIPT_ZIP_URL } from './resource-urls';
import { OcgcoreCommonConstants } from 'ygopro-msg-encode';
type PackageStatus = 'pending' | 'running' | 'done' | 'error'; type PackageStatus = 'pending' | 'running' | 'done' | 'error';
type CdbStatus = 'pending' | 'running' | 'done' | 'error'; type CdbStatus = 'pending' | 'running' | 'done' | 'error';
...@@ -539,7 +539,7 @@ export class App { ...@@ -539,7 +539,7 @@ export class App {
const baseDb = await this.getBaseDatabase(); const baseDb = await this.getBaseDatabase();
const baseScriptReader = await this.getBaseScriptReader(); const baseScriptReader = await this.getBaseScriptReader();
const wasmBinary = await this.getOcgcoreWasmBinary(); const wasmBinary = await this.getOcgcoreWasmBinary();
const packageScriptReader = await ZipReader(buffer); const packageScriptReader = await ZipScriptReader(buffer);
for (let cdbIndex = 0; cdbIndex < cdbEntries.length; cdbIndex += 1) { for (let cdbIndex = 0; cdbIndex < cdbEntries.length; cdbIndex += 1) {
await this.testCdb({ await this.testCdb({
...@@ -762,7 +762,7 @@ export class App { ...@@ -762,7 +762,7 @@ export class App {
throw new Error(`无法加载基础脚本包：${response.status}`); throw new Error(`无法加载基础脚本包：${response.status}`);
} }
const buffer = await response.arrayBuffer(); const buffer = await response.arrayBuffer();
this.baseScriptReader = await ZipReader(buffer); this.baseScriptReader = await ZipScriptReader(buffer);
return this.baseScriptReader; return this.baseScriptReader;
} }
...@@ -799,7 +799,7 @@ export class App { ...@@ -799,7 +799,7 @@ export class App {
} = args; } = args;
const wrapper = await createOcgcoreWrapper({ wasmBinary }); const wrapper = await createOcgcoreWrapper({ wasmBinary });
try { try {
const cardReader = createSqljsCardReader(cdbDb, baseDb); const cardReader = SqljsCardReader(cdbDb, baseDb);
wrapper.setCardReader(cardReader, true); wrapper.setCardReader(cardReader, true);
wrapper.setScriptReader(packageScriptReader, true); wrapper.setScriptReader(packageScriptReader, true);
wrapper.setScriptReader(baseScriptReader); wrapper.setScriptReader(baseScriptReader);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment