@spirobel/monero-wallet-api 0.6.7 → 0.6.9

package/dist/tools/content.d.ts

@@ -15,8 +15,7 @@ declare global {
     var browser: ExtensionBrowser;
     var chrome: ExtensionBrowser;
 }
-/** send toolCall and openSidebar to worker. after the check, toolCall message to worker again to persist validity status,
- * potential second round of communication with backend. */
 export declare function interceptToolLinkCallback(e: Event): void;
+export declare function deliverToolUrl(url: string): boolean;
 export declare function installToolLinkEventInterception(): void;
 export {};

package/dist/tools/content.js

@@ -12,17 +12,23 @@ function processTargetLink(element) {
     //invo id created here 
     return parseToolInvocation(href, text, location);
 }
+function anchorFromEvent(e) {
+    const host = e.target instanceof Element ? e.target : null;
+    const light = host?.closest("a") ?? null;
+    if (light)
+        return light;
+    // open shadow root hides the inner anchor. walk the path only then.
+    if (!host?.shadowRoot)
+        return null;
+    for (const node of e.composedPath()) {
+        if (node instanceof HTMLAnchorElement)
+            return node;
+    }
+    return null;
+}
 /** send toolCall and openSidebar to worker. after the check, toolCall message to worker again to persist validity status,
  * potential second round of communication with backend. */
-export function interceptToolLinkCallback(e) {
-    if (!(e.target instanceof Element))
-        return;
-    const link = e.target.closest("a");
-    const monerotoolLink = processTargetLink(link);
-    if (!link || !monerotoolLink)
-        return;
-    e.preventDefault();
-    e.stopImmediatePropagation();
+function deliver(monerotoolLink) {
     void sendToBackground("toolCall", monerotoolLink).catch(() => { });
     void sendToBackground("openSidebar", null).catch(() => { });
     checkToolInvocationValidity(monerotoolLink).then((result) => {
@@ -34,8 +40,36 @@ export function interceptToolLinkCallback(e) {
         tools[id]?.content.execute_deliver?.(monerotoolLink);
     });
 }
+export function interceptToolLinkCallback(e) {
+    const link = anchorFromEvent(e);
+    const monerotoolLink = processTargetLink(link);
+    if (!link || !monerotoolLink)
+        return;
+    e.preventDefault();
+    e.stopImmediatePropagation();
+    deliver(monerotoolLink);
+}
+// the page url itself is the tool link. a click never happens.
+export function deliverToolUrl(url) {
+    let href = url;
+    let hostname = "";
+    try {
+        const parsed = new URL(url);
+        href = parsed.href;
+        hostname = parsed.hostname;
+    }
+    catch {
+        return false;
+    }
+    const invo = parseToolInvocation(href, "", { href, hostname });
+    if (!invo)
+        return false;
+    deliver(invo);
+    return true;
+}
 export function installToolLinkEventInterception() {
     document.addEventListener("click", interceptToolLinkCallback, true);
     document.addEventListener("touchend", interceptToolLinkCallback, true);
     document.addEventListener("keydown", interceptToolLinkCallback, true);
+    deliverToolUrl(location.href);
 }

package/dist/tools/monero-tools.js

@@ -45,11 +45,12 @@ export function createToolLink(tool) {
         throw new Error("unknown tool");
     return tools[id].counterparty.make(tool.payload);
 }
+// xmr3.ts API to parse tool links
 export function parseToolInvocation(link, linkText, context_location) {
-    const context_domain = getDomainWithTLD(context_location.hostname);
-    const context_href = context_location.href;
     const link_parse = parseToolLink(link);
     if (link_parse) {
+        const context_domain = getDomainWithTLD(context_location.hostname);
+        const context_href = context_location.href;
         return {
             tool: link_parse,
             destination_domain: parseDestination(link),
@@ -65,6 +66,8 @@ export function parseToolInvocation(link, linkText, context_location) {
     }
     const linkText_parse = parseToolLink(linkText);
     if (linkText_parse) {
+        const context_domain = getDomainWithTLD(context_location.hostname);
+        const context_href = context_location.href;
         return {
             tool: linkText_parse,
             destination_domain: parseDestination(linkText),

package/dist/worker_unpacked.js

@@ -1,11 +1,14 @@
-var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined")
-    return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
+var __esm = (fn, res, err) => () => {
+  if (fn)
+    try {
+      res = fn(fn = 0);
+    } catch (e) {
+      err = [e];
+    }
+  if (err)
+    throw err[0];
+  return res;
+};
 
 // wallet-api/actionlog/actionLogTypes.ts
 var TERMINAL_EVENT_TYPES;
@@ -351,9 +354,9 @@ class TinyWASI {
     const buffers = [];
     for (let i = 0;i < iovsLen; i++) {
       const iov = iovs + i * 8;
-      const offset2 = view.getUint32(iov, true);
+      const offset = view.getUint32(iov, true);
       const len = view.getUint32(iov + 4, true);
-      buffers.push(new Uint8Array(memory.buffer, offset2, len));
+      buffers.push(new Uint8Array(memory.buffer, offset, len));
     }
     const length = buffers.reduce((s, b) => s + b.length, 0);
     const buffer = new Uint8Array(length);
@@ -668,8 +671,8 @@ async function getBlocksBinScanResponse(processor, getBlocksBinResponseBuffer, m
     resultMeta = JSON.parse(processor.readString(ptr, len));
     if (metaCallBack)
       metaCallBack(resultMeta);
-    processor.readFromWasmMemory = (ptr2, len2) => {
-      result = JSON.parse(processor.readString(ptr2, len2), (key, value) => {
+    processor.readFromWasmMemory = (ptr, len) => {
+      result = JSON.parse(processor.readString(ptr, len), (key, value) => {
         if (key === "amount")
           return BigInt(value);
         return value;
@@ -1113,8 +1116,8 @@ function makeInput(processor, outputToBeSpent, candidates, get_outs_Response) {
   });
   processor.writeToWasmMemory = (ptr, len) => {
     processor.writeString(ptr, len, makeInputArgs);
-    processor.writeToWasmMemory = (ptr2, len2) => {
-      processor.writeArray(ptr2, len2, get_outs_Response);
+    processor.writeToWasmMemory = (ptr, len) => {
+      processor.writeArray(ptr, len, get_outs_Response);
     };
   };
   let result = null;
@@ -1408,8 +1411,8 @@ class ViewPair extends WasmProcessor {
     const tinywasi = await viewPair.initWasmModule(await getMoneroWasmBytes());
     viewPair.writeToWasmMemory = (ptr, len) => {
       viewPair.writeString(ptr, len, primary_address);
-      viewPair.writeToWasmMemory = (ptr2, len2) => {
-        viewPair.writeString(ptr2, len2, secret_view_key);
+      viewPair.writeToWasmMemory = (ptr, len) => {
+        viewPair.writeString(ptr, len, secret_view_key);
       };
     };
     let init_viewpair_result = undefined;
@@ -1559,8 +1562,8 @@ async function computeKeyImage(output, sender_spend_key, wasmProcessor) {
     wasmProcessor = await WasmProcessor.init(await getMoneroWasmBytes());
   wasmProcessor.writeToWasmMemory = (ptr, len) => {
     wasmProcessor.writeString(ptr, len, output.serialized);
-    wasmProcessor.writeToWasmMemory = (ptr2, len2) => {
-      wasmProcessor.writeString(ptr2, len2, sender_spend_key);
+    wasmProcessor.writeToWasmMemory = (ptr, len) => {
+      wasmProcessor.writeString(ptr, len, sender_spend_key);
     };
   };
   let result = undefined;
@@ -1839,8 +1842,8 @@ function connectionStatusFilePath(scan_settings_path = SCAN_SETTINGS_STORE_NAME_
 async function readConnectionStatusDefaultLocation(scan_settings_path) {
   return await readConnectionStatusFile(connectionStatusFilePath(scan_settings_path));
 }
-async function readConnectionStatusFile(connectionStatusFilePath2) {
-  const jsonString = await Bun.file(connectionStatusFilePath2).text().catch(() => {
+async function readConnectionStatusFile(connectionStatusFilePath) {
+  const jsonString = await Bun.file(connectionStatusFilePath).text().catch(() => {
     return;
   });
   return jsonString ? JSON.parse(jsonString) : undefined;
@@ -13336,7 +13339,7 @@ async function handleCpuboundScan(msg, cpu_worker_status) {
   const first_block_meta = item.batch.get_blocks_result_meta.block_infos[0];
   if (!first_block_meta)
     throw new Error("no first block meta");
-  const scanResult2 = {
+  const scanResult = {
     outputs: [],
     all_key_images: [],
     new_height: first_block_meta.block_height + item.from,
@@ -13350,9 +13353,9 @@ async function handleCpuboundScan(msg, cpu_worker_status) {
     const blockResult = await viewpair.getBlocksBinScanOneBlock(i);
     if ("error" in blockResult)
       throw new Error(blockResult.error);
-    scanResult2.outputs.push(...blockResult.outputs);
-    scanResult2.all_key_images.push(...blockResult.all_key_images);
-    scanResult2.new_height = first_block_meta.block_height + i;
+    scanResult.outputs.push(...blockResult.outputs);
+    scanResult.all_key_images.push(...blockResult.all_key_images);
+    scanResult.new_height = first_block_meta.block_height + i;
     blockCount++;
     if (blockCount % 10 === 0) {
       log("handleCpuboundScan", [
@@ -13380,7 +13383,7 @@ async function handleCpuboundScan(msg, cpu_worker_status) {
   return {
     type: "Ready",
     work_uuid: item.work_uuid,
-    result: scanResult2
+    result: scanResult
   };
 }
 function handleCpuboundScanTry(msg, cpu_worker_status) {
@@ -14015,11 +14018,11 @@ var handleMessage = async (e) => {
       cpuPort = e.ports[0];
       if (cpuPort) {
         cpuPort.onmessage = CPU_PORT_HANDLER;
-        cpuPort.addEventListener("message", (e2) => {
-          log("handleMessage", ["message received", e2]);
+        cpuPort.addEventListener("message", (e) => {
+          log("handleMessage", ["message received", e]);
         });
-        cpuPort.addEventListener("messageerror", (e2) => {
-          log("handleMessage", ["messageerror received", e2]);
+        cpuPort.addEventListener("messageerror", (e) => {
+          log("handleMessage", ["messageerror received", e]);
         });
       }
     } else if (msg.role === "coordinator") {

package/package.json

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