@spirobel/monero-wallet-api 0.3.3 → 0.3.5

package/dist/scanning-syncing/worker-mains/worker.js

@@ -1,7 +1,12 @@
 import { sleep } from "../../io/sleep";
 import { scanWallets } from "../backgroundWorker";
 while (true) {
-    await scanWallets((x) => self.postMessage({ type: "RESULT", payload: x }), undefined, scan_settings_path, pathPrefix);
-    console.log("no wallets found to scan in wallet settings, trying again in 1 second");
-    await sleep(1000);
+    try {
+        await scanWallets((x) => self.postMessage({ type: "RESULT", payload: x }), undefined, scan_settings_path, pathPrefix);
+        console.log("no wallets found to scan in wallet settings, trying again in 1 second");
+        await sleep(1000);
+    }
+    catch (error) {
+        self.postMessage({ type: "ERROR", payload: error });
+    }
 }

package/dist/viewpair/ViewPair.js

@@ -127,51 +127,51 @@ export class ViewPair extends WasmProcessor {
      * scan
      */
     async scan(cacheChanged = (params) => console.log(params), stopSync, scan_settings_path, pathPrefix) {
-        const processor = this;
-        const nonHaltedWallets = await openNonHaltedWallets(scan_settings_path);
-        const masterWalletSettings = nonHaltedWallets[0];
-        if (masterWalletSettings.primary_address !== this.primary_address)
-            throw new Error("master wallet should be the first of the non halted wallets");
-        let masterStartHeight = await cullTooLargeScanHeight(processor.node_url, scan_settings_path);
-        let current_range = await initScanCache(processor, masterStartHeight, scan_settings_path, pathPrefix);
-        const blockGenerator = (async function* () {
-            while (true) {
-                if (stopSync?.aborted)
-                    return;
-                const firstResponse = await processor.getBlocksBinExecuteRequest({ block_ids: current_range.block_hashes.map((b) => b.block_hash) }, stopSync);
-                await readWriteConnectionStatusFile((cs) => {
-                    if (cs?.last_packet.status === "catastrophic_reorg")
+        try {
+            const processor = this;
+            const nonHaltedWallets = await openNonHaltedWallets(scan_settings_path);
+            const masterWalletSettings = nonHaltedWallets[0];
+            if (masterWalletSettings.primary_address !== this.primary_address)
+                throw new Error("master wallet should be the first of the non halted wallets");
+            let masterStartHeight = await cullTooLargeScanHeight(processor.node_url, scan_settings_path);
+            let current_range = await initScanCache(processor, masterStartHeight, scan_settings_path, pathPrefix);
+            const blockGenerator = (async function* () {
+                while (true) {
+                    if (stopSync?.aborted)
                         return;
-                    const connectionStatus = {
-                        last_packet: {
-                            status: "OK",
-                            bytes_read: firstResponse.length,
-                            node_url: processor.node_url,
-                            timestamp: new Date().toISOString(),
-                        },
-                    };
-                    return connectionStatus;
-                });
-                yield firstResponse;
-            }
-        })();
-        const masterWithKeys = await walletSettingsPlusKeys(masterWalletSettings);
-        const slaveViewPairs = [];
-        if (nonHaltedWallets.length > 1) {
-            for (const slaveWallet of nonHaltedWallets.slice(1)) {
-                const slaveWithKeys = await walletSettingsPlusKeys(slaveWallet);
-                const viewpair = await ViewPair.create(slaveWallet.primary_address, slaveWithKeys.secret_view_key, slaveWallet.subaddress_index, masterWalletSettings.node_url);
-                slaveViewPairs.push({
-                    viewpair,
-                    current_range: await initScanCache(viewpair, masterStartHeight, scan_settings_path, pathPrefix),
-                    secret_spend_key: slaveWithKeys.secret_spend_key,
-                });
+                    const firstResponse = await processor.getBlocksBinExecuteRequest({ block_ids: current_range.block_hashes.map((b) => b.block_hash) }, stopSync);
+                    await readWriteConnectionStatusFile((cs) => {
+                        if (cs?.last_packet.status === "catastrophic_reorg")
+                            return;
+                        const connectionStatus = {
+                            last_packet: {
+                                status: "OK",
+                                bytes_read: firstResponse.length,
+                                node_url: processor.node_url,
+                                timestamp: new Date().toISOString(),
+                            },
+                        };
+                        return connectionStatus;
+                    });
+                    yield firstResponse;
+                }
+            })();
+            const masterWithKeys = await walletSettingsPlusKeys(masterWalletSettings);
+            const slaveViewPairs = [];
+            if (nonHaltedWallets.length > 1) {
+                for (const slaveWallet of nonHaltedWallets.slice(1)) {
+                    const slaveWithKeys = await walletSettingsPlusKeys(slaveWallet);
+                    const viewpair = await ViewPair.create(slaveWallet.primary_address, slaveWithKeys.secret_view_key, slaveWallet.subaddress_index, masterWalletSettings.node_url);
+                    slaveViewPairs.push({
+                        viewpair,
+                        current_range: await initScanCache(viewpair, masterStartHeight, scan_settings_path, pathPrefix),
+                        secret_spend_key: slaveWithKeys.secret_spend_key,
+                    });
+                }
             }
-        }
-        const catastrophic_reorg_cb = async () => {
-            writeConnectionStatusFile("catastrophic_reorg", processor.node_url, undefined, scan_settings_path);
-        };
-        try {
+            const catastrophic_reorg_cb = async () => {
+                writeConnectionStatusFile("catastrophic_reorg", processor.node_url, undefined, scan_settings_path);
+            };
             for await (const firstResponse of blockGenerator) {
                 if (!firstResponse)
                     continue;
@@ -227,6 +227,7 @@ export class ViewPair extends WasmProcessor {
         }
         catch (error) {
             handleScanError(error);
+            const processor = this;
             const cache = await readCacheFileDefaultLocation(processor.primary_address, pathPrefix);
             if (!cache)
                 throw new Error(`${error} in scan() + cache not found for primary address: ${processor.primary_address} and path prefix: ${pathPrefix}`);
@@ -234,6 +235,7 @@ export class ViewPair extends WasmProcessor {
                 newCache: cache,
                 changed_outputs: [],
             });
+            throw error;
         }
     }
     /**

package/package.json

@@ -40,7 +40,7 @@
     "clean": "rm -rf ./dist"
   },
   "files": ["dist"],
-  "version": "0.3.3",
+  "version": "0.3.5",
   "devDependencies": {
     "@types/bun": "latest"
   },