fix loading wasm module concurrently #173

woodser · Jan 27, 2024 · 4d8c417 · 4d8c417
1 parent a46ea22
commit 4d8c417
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 22 deletions.
diff --git a/src/main/ts/common/LibraryUtils.ts b/src/main/ts/common/LibraryUtils.ts
@@ -86,16 +86,11 @@ export default class LibraryUtils {
     if (LibraryUtils.WASM_MODULE) return LibraryUtils.WASM_MODULE;
 
     // load module
-    delete LibraryUtils.WASM_MODULE;
-    LibraryUtils.WASM_MODULE = require("../../../../dist/monero_wallet_keys")();
-    return new Promise(function(resolve, reject) {
-      LibraryUtils.WASM_MODULE.then(module => {
-        LibraryUtils.WASM_MODULE = module
-        delete LibraryUtils.WASM_MODULE.then;
-        LibraryUtils.initWasmModule(LibraryUtils.WASM_MODULE);
-        resolve(LibraryUtils.WASM_MODULE);
-      });
-    });
+    let module = await require("../../../../dist/monero_wallet_keys")();
+    LibraryUtils.WASM_MODULE = module
+    delete LibraryUtils.WASM_MODULE.then;
+    LibraryUtils.initWasmModule(LibraryUtils.WASM_MODULE);
+    return module;
   }
 
   /**
@@ -111,17 +106,12 @@ export default class LibraryUtils {
     if (LibraryUtils.WASM_MODULE && LibraryUtils.FULL_LOADED) return LibraryUtils.WASM_MODULE;
 
     // load module
-    delete LibraryUtils.WASM_MODULE;
-    LibraryUtils.WASM_MODULE = require("../../../../dist/monero_wallet_full")();
-    return new Promise(function(resolve, reject) {
-      LibraryUtils.WASM_MODULE.then(module => {
-        LibraryUtils.WASM_MODULE = module;
-        delete LibraryUtils.WASM_MODULE.then;
-        LibraryUtils.FULL_LOADED = true;
-        LibraryUtils.initWasmModule(LibraryUtils.WASM_MODULE);
-        resolve(LibraryUtils.WASM_MODULE);
-      });
-    });
+    let module = await require("../../../../dist/monero_wallet_full")();
+    LibraryUtils.WASM_MODULE = module
+    delete LibraryUtils.WASM_MODULE.then;
+    LibraryUtils.FULL_LOADED = true;
+    LibraryUtils.initWasmModule(LibraryUtils.WASM_MODULE);
+    return module;
   }
 
   /**

diff --git a/src/main/ts/common/MoneroUtils.ts b/src/main/ts/common/MoneroUtils.ts
@@ -165,7 +165,7 @@ export default class MoneroUtils {
     if (LibraryUtils.getWasmModule() === undefined) await LibraryUtils.loadKeysModule();
 
     // get integrated address in queue
-    return LibraryUtils.getWasmModule().queueTask(async function() {
+    return LibraryUtils.getWasmModule().queueTask(async () => {
       let integratedAddressJson = LibraryUtils.getWasmModule().get_integrated_address_util(networkType, standardAddress, paymentId ? paymentId : "");
       if (integratedAddressJson.charAt(0) !== '{') throw new MoneroError(integratedAddressJson);
       return new MoneroIntegratedAddress(JSON.parse(integratedAddressJson));