@spirobel/monero-wallet-api 0.4.0 → 0.4.1

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

@@ -1,10 +1,11 @@
 import { coordinatorMainMultithreaded } from "../scanresult/scanCoordination";
+import { log } from "../../io/logging";
 export async function coordinatorMainWorker(scan_settings_path, pathPrefix, cpuPorts) {
-    console.log("[coordinatorMainWorker] cpuPorts=" + cpuPorts?.length);
+    log("coordinatorMainWorker", "cpuPorts=" + cpuPorts?.length);
     try {
         const gen = coordinatorMainMultithreaded(scan_settings_path, pathPrefix, cpuPorts);
         for await (const event of gen) {
-            // console.log("event:", event);
+            log("coordinatorMainWorker", ["event:", event]);
             if (event.type === "scan_ready") {
                 self.postMessage({
                     type: "SCAN_RESULT",

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

@@ -1,4 +1,5 @@
 import { sleep, ViewPair } from "../../api";
+import { log } from "../../io/logging";
 import {} from "../scanresult/scanLoop";
 /**
  * handle a single scan work item dispatched from the coordinator.
@@ -7,24 +8,24 @@ import {} from "../scanresult/scanLoop";
 let callcounter = 0;
 export async function handleCpuboundScan(msg, port) {
     callcounter++;
-    console.log("[cpubound] callcounter=" + callcounter);
+    log("handleCpuboundScan", "callcounter=" + callcounter);
     if (!msg) {
-        console.log("[cpubound] no content msg! ( ScanLoopInput = undefined )");
+        log("handleCpuboundScan", "no content msg! ( ScanLoopInput = undefined )");
         throw new Error("[cpubound] no content msg! ( ScanLoopInput = undefined )");
     }
     if (msg === "cancel") {
-        console.log("[cpubound] cancel msg! ( ScanLoopInput = cancel )");
+        log("handleCpuboundScan", "cancel msg! ( ScanLoopInput = cancel )");
         throw new Error("[cpubound] no content msg! ( ScanLoopInput = undefined )");
     }
-    console.log("[cpubound] got scan msg, walletConfig=" +
+    log("handleCpuboundScan", "got scan msg, walletConfig=" +
         msg.walletConfig?.primary_address?.slice(0, 6));
     const walletConfig = msg.walletConfig;
     const item = msg;
     if (!port) {
-        console.log("[cpubound] no port!");
+        log("handleCpuboundScan", "no port!");
         throw new Error("[cpubound] no port");
     }
-    console.log("[cpubound] primed, feeding workItem uuid=" +
+    log("handleCpuboundScan", "primed, feeding workItem uuid=" +
         (item && typeof item === "object"
             ? item.work_uuid?.slice(0, 8)
             : "cancel"));
@@ -78,17 +79,26 @@ export async function handleCpuboundScan(msg, port) {
         // the reconciliation workitembuffer -> blocksbuffer is done on every workitembuffer marked done at the end of the workbuffer (left end)
         blockCount++;
         if (blockCount % 10 === 0) {
-            console.log("[cpubound] scanned " +
-                blockCount +
-                " " +
-                walletConfig.primary_address.slice(0, 6), "@", heighfrom, "-", heightto);
+            log("handleCpuboundScan", [
+                "scanned " +
+                    blockCount +
+                    " " +
+                    walletConfig.primary_address.slice(0, 6),
+                "@",
+                heighfrom,
+                "-",
+                heightto,
+            ]);
         }
         await sleep(10); // make sure the loop is not tight
     }
-    console.log("[cpubound] scan done " +
-        blockCount +
-        " " +
-        walletConfig.primary_address.slice(0, 6), "@", heighfrom, "-", heightto);
+    log("handleCpuboundScan", [
+        "scan done " + blockCount + " " + walletConfig.primary_address.slice(0, 6),
+        "@",
+        heighfrom,
+        "-",
+        heightto,
+    ]);
     return {
         type: "Ready",
         work_uuid: item.work_uuid,

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

@@ -1,5 +1,7 @@
 import { coordinatorMainWorker } from "./coordinator-main";
-import { handleCpuboundScan, handleCpuboundScanTry, sendFromCpuWorker, } from "./cpubound-main";
+import { handleCpuboundScanTry, sendFromCpuWorker } from "./cpubound-main";
+import { log, setupLoggingPath } from "../../io/logging";
+import { SCAN_SETTINGS_STORE_NAME_DEFAULT } from "../scanSettings";
 self.onerror = (e) => self.postMessage({ type: "ERROR", payload: e });
 self.addEventListener("unhandledrejection", (e) => self.postMessage({ type: "ERROR", payload: e.reason }));
 let SCAN_SETTINGS_PATH;
@@ -8,13 +10,13 @@ let cpuPort;
 export function CPU_PORT_HANDLER(pe) {
     if (!cpuPort)
         throw new Error("[cpubound] cpuPort is undefined in port.onmessage");
-    console.log("[cpubound] new workitem msg received");
+    log("CPU_PORT_HANDLER", "new workitem msg received");
     cpuPort.postMessage({
         type: "WORKSTART",
         work_uuid: pe.data.work_uuid,
     });
     handleCpuboundScanTry(pe.data, cpuPort).then((result) => {
-        console.log("[cpubound] work finished, sending result");
+        log("CPU_PORT_HANDLER", "work finished, sending result");
         if (!cpuPort)
             throw new Error("[cpubound] cpuPort is undefined in port.onmessage");
         cpuPort.onmessage = CPU_PORT_HANDLER;
@@ -23,19 +25,21 @@ export function CPU_PORT_HANDLER(pe) {
 }
 const handleMessage = async (e) => {
     const msg = e.data;
-    console.log("[worker] msg received", msg);
+    log("handleMessage", ["msg received", msg]);
     if (msg.type === "setup") {
-        SCAN_SETTINGS_PATH = msg.scan_settings_path;
+        const settingsPath = msg.scan_settings_path || SCAN_SETTINGS_STORE_NAME_DEFAULT;
+        SCAN_SETTINGS_PATH = settingsPath;
         PATH_PREFIX = msg.pathPrefix;
+        await setupLoggingPath(settingsPath, msg.pathPrefix ?? "", msg.role, msg.cpu_worker_id);
         if (msg.role === "cpubound") {
             cpuPort = e.ports[0];
             if (cpuPort) {
                 cpuPort.onmessage = CPU_PORT_HANDLER;
                 cpuPort.addEventListener("message", (e) => {
-                    console.log("[cpubound] message received", e);
+                    log("handleMessage", ["message received", e]);
                 });
                 cpuPort.addEventListener("messageerror", (e) => {
-                    console.log("[cpubound] messageerror received", e);
+                    log("handleMessage", ["messageerror received", e]);
                 });
             }
         }

package/package.json

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