x/themblem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix wasm path passing

Browse Source
This commit is contained in:
Fam Zheng 2025-10-15 12:44:40 +01:00
parent c08d830127
commit 80f72d0a7f
6 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
alg/pre.wx.js
View File

@ -8,8 +8,11 @@ var performance = {
Module['instantiateWasm'] = (info, receiveInstance) => { Module['instantiateWasm'] = (info, receiveInstance) => {
console.log("loading wasm...", info); console.log("loading wasm...", info);
// Use provided wasmPath parameter, fallback to hardcoded path // Use global wasmFilePath (should always be set by the main app)
var wasmPath = Module.wasmFilePath || "pages/emblemscanner/qrtool.wx.wasm.br"; var wasmPath = global.wasmFilePath;
if (!wasmPath) {
throw new Error("wasmFilePath must be provided via global.wasmFilePath");
}
console.log("Using WASM path:", wasmPath); console.log("Using WASM path:", wasmPath);
WebAssembly.instantiate(wasmPath, info).then((result) => { WebAssembly.instantiate(wasmPath, info).then((result) => {

1
scanner/pages/emblemscanner/libemblemscanner.js
View File

@ -164,6 +164,7 @@ function get_current_package_path() {
*/ */
function get_wasm_file_path(filename) { function get_wasm_file_path(filename) {
const packagePath = get_current_package_path(); const packagePath = get_current_package_path();
console.log('current package path', packagePath);
return `${packagePath}/${filename}`; return `${packagePath}/${filename}`;
} }

6
scanner/pages/emblemscanner/qrprocessor.js
View File

@ -8,12 +8,12 @@ var qrtool_ready = false;
* Load qrtool WASM module * Load qrtool WASM module
*/ */
function load_qrtool(wasmFilePath) { function load_qrtool(wasmFilePath) {
// Set global WASM file path before loading the module
global.wasmFilePath = wasmFilePath;
// Load the WASM module // Load the WASM module
var m = require('./qrtool.wx.js'); var m = require('./qrtool.wx.js');
// Set the WASM file path
m.wasmFilePath = wasmFilePath;
m.onRuntimeInitialized = () => { m.onRuntimeInitialized = () => {
qrtool_ready = true; qrtool_ready = true;
qrtool = m; qrtool = m;

7
scanner/pages/emblemscanner/qrtool.wx.js
View File

@ -34,8 +34,11 @@ var performance = {
}; };
Module["instantiateWasm"] = (info, receiveInstance) => { Module["instantiateWasm"] = (info, receiveInstance) => {
console.log("loading wasm...", info); console.log("loading wasm...", info);
// Use provided wasmPath parameter, fallback to hardcoded path // Use global wasmFilePath (should always be set by the main app)
var wasmPath = Module.wasmFilePath || "pages/emblemscanner/qrtool.wx.wasm.br"; var wasmPath = global.wasmFilePath;
if (!wasmPath) {
throw new Error("wasmFilePath must be provided via global.wasmFilePath");
}
console.log("Using WASM path:", wasmPath); console.log("Using WASM path:", wasmPath);
WebAssembly.instantiate(wasmPath, info).then(result => { WebAssembly.instantiate(wasmPath, info).then(result => {
console.log("result:", result); console.log("result:", result);

7
scanner/pages/emblemscanner/worker/index.js
View File

@ -1,11 +1,10 @@
console.log("hello from emblemscanner worker"); console.log("hello from emblemscanner worker");
// Set WASM file path before loading qrtool // Set global WASM file path before loading qrtool
// The wasmFilePath will be passed from the main thread when the worker is created // The wasmFilePath will be passed from the main thread when the worker is created
if (typeof worker !== "undefined" && worker.wasmFilePath) { if (typeof worker !== "undefined" && worker.wasmFilePath) {
let qrtoolModule = require('./qrtool.wx.js'); global.wasmFilePath = worker.wasmFilePath;
qrtoolModule.wasmFilePath = worker.wasmFilePath; let qrtool = require('./qrtool.wx.js');
let qrtool = qrtoolModule;
} else { } else {
let qrtool = require('./qrtool.wx.js'); let qrtool = require('./qrtool.wx.js');
} }

7
scanner/pages/emblemscanner/worker/qrtool.wx.js
View File

@ -34,8 +34,11 @@ var performance = {
}; };
Module["instantiateWasm"] = (info, receiveInstance) => { Module["instantiateWasm"] = (info, receiveInstance) => {
console.log("loading wasm...", info); console.log("loading wasm...", info);
// Use provided wasmPath parameter, fallback to hardcoded path // Use global wasmFilePath (should always be set by the main app)
var wasmPath = Module.wasmFilePath || "pages/emblemscanner/qrtool.wx.wasm.br"; var wasmPath = global.wasmFilePath;
if (!wasmPath) {
throw new Error("wasmFilePath must be provided via global.wasmFilePath");
}
console.log("Using WASM path:", wasmPath); console.log("Using WASM path:", wasmPath);
WebAssembly.instantiate(wasmPath, info).then(result => { WebAssembly.instantiate(wasmPath, info).then(result => {
console.log("result:", result); console.log("result:", result);