@spirobel/monero-wallet-api 0.6.2 → 0.6.4

package/dist/actionlog/actionLogOpened.js

@@ -245,8 +245,13 @@ export class ActionLogOpened {
             }
             case "worker.changeNodeUrlAndStartHeight": {
                 const p = env.payload;
-                await this.mco?.changeNodeUrlAndStartHeight(p?.node_url, p?.start_height);
-                return {};
+                try {
+                    await this.mco?.changeNodeUrlAndStartHeight(p?.node_url, p?.start_height);
+                    return {};
+                }
+                catch (err) {
+                    return { error: err instanceof Error ? err.message : String(err) };
+                }
             }
             case "worker.buildWallets":
                 await this.mco?.buildWallets();

package/dist/scanning-syncing/scanresult/scanCacheOpened.js

@@ -173,14 +173,19 @@ export class ScanCacheOpened {
         return this._scanSettings.logs_exclude;
     }
     async changeNodeUrlAndStartHeight(node_url, start_height) {
-        await this.stopWorker();
-        if (node_url !== undefined) {
-            await this._scanSettings.setNodeUrl(node_url);
-            this.node_url = node_url;
+        // stop first so a live worker cannot write the old file over the new url.
+        try {
+            await this.stopWorker();
         }
-        if (start_height !== undefined) {
-            await this._scanSettings.setStartHeight(start_height);
-            this._start_height = start_height;
+        catch {
+            // stop can fail. still write the new url.
+        }
+        if (node_url !== undefined || start_height !== undefined) {
+            await this._scanSettings.setNodeUrlAndStartHeight(node_url, start_height);
+            if (node_url !== undefined)
+                this.node_url = node_url;
+            if (start_height !== undefined)
+                this._start_height = start_height;
         }
         await this.unpause();
     }
@@ -751,7 +756,11 @@ export class ScanCacheOpened {
             delete this.worker;
             // drain coordinator first, then hard kill workers
             try {
-                await worker.shutdown();
+                // shutdown already races 5s. this race still returns if that promise never settles.
+                await Promise.race([
+                    worker.shutdown(),
+                    new Promise((resolve) => setTimeout(resolve, 5000)),
+                ]);
             }
             catch {
                 // still terminate below
@@ -925,17 +934,25 @@ export class ManyScanCachesOpened {
     }
     async changeNodeUrlAndStartHeight(node_url, start_height) {
         if (this.actionLogOpened.extensionMessageBus === "ui") {
-            await sendToBackground("worker.changeNodeUrlAndStartHeight", {
+            // the background owns the worker. it stops, then writes. do not write here first.
+            const result = await sendToBackground("worker.changeNodeUrlAndStartHeight", {
                 node_url,
                 start_height,
-            }).catch(() => { });
+            });
+            if (result &&
+                typeof result === "object" &&
+                "error" in result &&
+                result.error) {
+                throw new Error(String(result.error));
+            }
+            if (result == null)
+                throw new Error("background did not save the node url");
             return;
         }
         if (this.wallets.length === 0) {
-            if (node_url !== undefined)
-                await this._scanSettings.setNodeUrl(node_url);
-            if (start_height !== undefined)
-                await this._scanSettings.setStartHeight(start_height);
+            if (node_url !== undefined || start_height !== undefined) {
+                await this._scanSettings.setNodeUrlAndStartHeight(node_url, start_height);
+            }
             return;
         }
         await this.wallets[0].changeNodeUrlAndStartHeight(node_url, start_height);

package/dist/scansettings/scanSettingsOpened.d.ts

@@ -20,6 +20,7 @@ export declare class ScanSettingsOpened {
     get pathPrefix(): string;
     setNodeUrl(node_url: string): Promise<void>;
     setStartHeight(start_height: number | null): Promise<void>;
+    setNodeUrlAndStartHeight(node_url?: string, start_height?: number | null): Promise<void>;
     setMerchantConfirmations(merchant_confirmations: number | undefined | null): Promise<void>;
     setCpuWorkerCount(cpu_worker_count: number | undefined | null): Promise<void>;
     setLogSettings(logs?: LogSetting | null, logs_include?: PossibleLogs[] | null, logs_exclude?: PossibleLogs[] | null): Promise<void>;

package/dist/scansettings/scanSettingsOpened.js

@@ -54,14 +54,21 @@ export class ScanSettingsOpened {
         return this._pathPrefix;
     }
     async setNodeUrl(node_url) {
-        await this.reload();
-        this._settings.node_url = ScanSettingsOpened._validateNodeUrl(node_url);
-        await this._persist();
+        await this.setNodeUrlAndStartHeight(node_url, undefined);
     }
     async setStartHeight(start_height) {
+        await this.setNodeUrlAndStartHeight(undefined, start_height);
+    }
+    // one read and one write. a second reload must not put the old url back.
+    async setNodeUrlAndStartHeight(node_url, start_height) {
         await this.reload();
-        ScanSettingsOpened._validateStartHeight(start_height);
-        this._settings.start_height = start_height;
+        if (node_url !== undefined) {
+            this._settings.node_url = ScanSettingsOpened._validateNodeUrl(node_url);
+        }
+        if (start_height !== undefined) {
+            ScanSettingsOpened._validateStartHeight(start_height);
+            this._settings.start_height = start_height;
+        }
         await this._persist();
     }
     async setMerchantConfirmations(merchant_confirmations) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spirobel/monero-wallet-api",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "main": "dist/xmr3.js",
   "module": "dist/xmr3.js",
   "devDependencies": {