@spirobel/monero-wallet-api 0.5.4 → 0.5.5

package/dist/scanning-syncing/worker-mains/coordinator-main.d.ts

@@ -1 +1,2 @@
+export declare function requestCoordinatorShutdown(): void;
 export declare function coordinatorMainWorker(scan_settings_path?: string, pathPrefix?: string, cpuPorts?: MessagePort[]): Promise<void>;

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

@@ -1,9 +1,16 @@
 import { coordinatorMainMultithreaded } from "../scanresult/scanCoordination";
 import { log } from "../../io/logging";
+// one controller per coordinator worker; shutdown aborts fetch + race
+let shutdownController;
+export function requestCoordinatorShutdown() {
+    log("coordinatorMainWorker", ["shutdown requested"]);
+    shutdownController?.abort();
+}
 export async function coordinatorMainWorker(scan_settings_path, pathPrefix, cpuPorts) {
     log("coordinatorMainWorker", "cpuPorts=" + cpuPorts?.length);
+    shutdownController = new AbortController();
     try {
-        const gen = coordinatorMainMultithreaded(scan_settings_path, pathPrefix, cpuPorts);
+        const gen = coordinatorMainMultithreaded(scan_settings_path, pathPrefix, cpuPorts, shutdownController.signal);
         for await (const event of gen) {
             log("coordinatorMainWorker", ["event:", event]);
             if (event.type === "scan_ready") {
@@ -15,9 +22,17 @@ export async function coordinatorMainWorker(scan_settings_path, pathPrefix, cpuP
                     },
                 });
             }
+            else if (event.type === "shutdown_done") {
+                self.postMessage({ type: "SHUTDOWN_DONE" });
+                return;
+            }
         }
+        // generator returned without shutdown_done (e.g. empty)
+        self.postMessage({ type: "SHUTDOWN_DONE" });
     }
     catch (error) {
+        // still tell main thread we stopped so terminate can proceed
+        self.postMessage({ type: "SHUTDOWN_DONE" });
         self.postMessage({ type: "ERROR", payload: error });
     }
 }

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

@@ -14,8 +14,9 @@ export async function handleCpuboundScan(msg, cpu_worker_status) {
         throw new Error("[cpubound] no content msg! ( ScanLoopInput = undefined )");
     }
     if (msg === "cancel") {
+        // idle cancel: nothing in flight, just ack
         log("handleCpuboundScan", "cancel msg! ( ScanLoopInput = cancel )");
-        throw new Error("[cpubound] no content msg! ( ScanLoopInput = undefined )");
+        return { type: "Canceled" };
     }
     log("handleCpuboundScan", "got scan msg, walletConfig=" +
         msg.walletConfig?.primary_address?.slice(0, 6));
@@ -89,7 +90,7 @@ export async function handleCpuboundScan(msg, cpu_worker_status) {
         if (cpu_worker_status.cancel) {
             cpu_worker_status.cancel = false;
             log("handleCpuboundScan", ["cpu work canceled"]);
-            return { type: "Ready" };
+            return { type: "Canceled", work_uuid: item.work_uuid };
         }
         await sleep(10); // make sure the loop is not tight
     }

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

@@ -1,4 +1,4 @@
-import { coordinatorMainWorker } from "./coordinator-main";
+import { coordinatorMainWorker, requestCoordinatorShutdown, } from "./coordinator-main";
 import { handleCpuboundScanTry, sendFromCpuWorker } from "./cpubound-main";
 import { log, setupLoggingPath } from "../../io/logging";
 import { multisigMainWorkerCall } from "./multisig-main";
@@ -9,21 +9,32 @@ let SCAN_SETTINGS_PATH;
 let PATH_PREFIX;
 let cpuPort;
 const cpu_worker_status = { cancel: false };
+// true while a scan is running so idle cancel can ack immediately
+let cpu_work_in_flight = false;
 let multisig_dkg;
 export function CPU_PORT_HANDLER(pe) {
     if (pe.data === "cancel") {
-        cpu_worker_status.cancel = true;
+        if (cpu_work_in_flight) {
+            cpu_worker_status.cancel = true;
+            return;
+        }
+        // idle cancel: ack right away so coordinator drain does not hang
+        if (cpuPort) {
+            sendFromCpuWorker(cpuPort, { type: "Canceled" });
+        }
         return;
     }
     if (!cpuPort)
         throw new Error("[cpubound] cpuPort is undefined in port.onmessage");
     log("CPU_PORT_HANDLER", "new workitem msg received");
+    cpu_work_in_flight = true;
     cpuPort.postMessage({
         type: "WORKSTART",
         work_uuid: pe.data.work_uuid,
     });
     handleCpuboundScanTry(pe.data, cpu_worker_status).then((result) => {
         log("CPU_PORT_HANDLER", "work finished, sending result");
+        cpu_work_in_flight = false;
         if (!cpuPort)
             throw new Error("[cpubound] cpuPort is undefined in port.onmessage");
         cpuPort.onmessage = CPU_PORT_HANDLER;
@@ -33,6 +44,38 @@ export function CPU_PORT_HANDLER(pe) {
 const handleMessage = async (e) => {
     const msg = e.data;
     log("handleMessage", ["msg received", msg]);
+    if (msg.type === "shutdown") {
+        // only coordinator listens for this; abort fetch + race loop
+        requestCoordinatorShutdown();
+        return;
+    }
+    if (msg.type === "heap_snapshot") {
+        try {
+            const path = typeof msg.path === "string" && msg.path.length > 0
+                ? msg.path
+                : `worker-heap-${Date.now()}.heapsnapshot`;
+            // @ts-ignore bun has generateHeapSnapshot; node has v8.writeHeapSnapshot
+            let out;
+            if (typeof Bun !== "undefined" && typeof Bun.generateHeapSnapshot === "function") {
+                const snap = Bun.generateHeapSnapshot("v8");
+                await Bun.write(path, typeof snap === "string" ? snap : JSON.stringify(snap));
+                out = path;
+            }
+            else {
+                throw Error("in the browser use the inspector directly to observe worker memory growth");
+                // const v8 = await import("node:v8");
+                // out = v8.writeHeapSnapshot(path);
+            }
+            self.postMessage({ type: "HEAP_SNAPSHOT_DONE", path: out ?? path });
+        }
+        catch (err) {
+            self.postMessage({
+                type: "HEAP_SNAPSHOT_ERROR",
+                error: err instanceof Error ? err.message : String(err),
+            });
+        }
+        return;
+    }
     if (msg.type === "setup") {
         const settingsPath = msg.scan_settings_path || SCAN_SETTINGS_STORE_NAME_DEFAULT;
         SCAN_SETTINGS_PATH = settingsPath;

package/package.json

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